代码提交

2024-09-14 14:48:51 +08:00 · 2024-09-14 14:48:51 +08:00 · e5fa6ae335
parent b421a1f4c3
commit e5fa6ae335
5 changed files with 188 additions and 189 deletions
--- a/collect_information/src/request/index.ts
+++ b/collect_information/src/request/index.ts
@ -30,7 +30,6 @@ class CustomRequest {
        }).then()
      }

-      console.log(params,method)
      Taro.request<JsonResult<T>, object>({
        url: this.BASE_API + url,
        data: params,
--- a/collect_information/src/subPages/pages/form/form.vue
+++ b/collect_information/src/subPages/pages/form/form.vue
@ -1,5 +1,6 @@
 <template>
  <view class="form">
+    {{ formData }}
    <nut-form ref="formRef" :model-value="formData" :rules="rules">
      <nut-form-item label="姓名" prop="name">
        <nut-input v-model="formData.name" placeholder="请输入姓名" type="text"/>
@ -15,8 +16,11 @@
        <nut-input v-model="formData.idCard" placeholder="请填写身份证" type="text" @blur="idCardBlur"/>
      </nut-form-item>
      <nut-form-item label="出生日期" prop="dateOfBirth">
-           {{formData.dateOfBirth ||　"请填写出生年月"}}
-<!--         <nut-input @click="openDate"  :disabled="true"  placeholder="请填写出生年月" type="text">{{formData.dateOfBirth}}</nut-input>-->
+        <view @click="showPicker = true">
+          {{
+            dayjs(formData.dateOfBirth).isValid() ? dayjs(formData.dateOfBirth).format('YYYY-MM-DD') : '请选择出生年月'
+          }}
+        </view>
      </nut-form-item>
      <nut-form-item label="工作岗位" prop="workPost">
        <nut-input v-model="formData.workPost" placeholder="请输入工作岗位" type="text"/>
@ -36,15 +40,15 @@
    </nut-form>
    <view class="formButton">
      <nut-button style="width: 45%" type="success" size="small" @click="submit">提交</nut-button>
-       <nut-button style="width: 45%" size="small" @click="reset">重置提示状态</nut-button>
+      <nut-button style="width: 45%" size="small" @click="formRef.value?.reset()">重置表单</nut-button>
    </view>
    <nut-popup v-model:visible="showPicker" position="bottom">
      <nut-date-picker
-                   v-model="pickerValue"
+        v-model="formData.dateOfBirth"
        :three-dimensional="false"
        :min-date="new Date(1900,1,1)"
        :max-date="new Date(2100,1,1)"
-                   @confirm="confirm"
+        @confirm="showPicker = false"
        @cancel="showPicker = false"
      ></nut-date-picker>
    </nut-popup>
@ -57,16 +61,16 @@ import {FormRules} from "@nutui/nutui-taro/dist/types/__VUE/form/types";
 import api from "@/request";
 import './form.scss'
 import Taro, {useLoad} from "@tarojs/taro";
-import {formDate} from "../../../../types/pages/form";
+import dayjs from "dayjs";
+
 const showPicker = ref(false)
-const formData = ref<formDate>(null!)
-const pickerValue = ref(new Date())
+
+const formData = ref<formDate>({} as any)
 const formRef = ref(null)

 const rules: FormRules = {
  name: [
    {required: true, message: "请输入姓名"},
-
  ],
  sex: [{required: true, message: "请选择性别"}],
  idCard: [
@ -80,47 +84,33 @@ const rules: FormRules = {

 useLoad((options) => {
  formData.value = JSON.parse(options.item)
-  console.log(formData.value,'888')
 })
-const openDate = ()=>{
-  showPicker.value = true
-}
-const confirm = ({selectedValue })=>{
-  showPicker.value = false
-  formData.value.dateOfBirth = selectedValue[0] + '年' + selectedValue[1] +'月' + selectedValue[2] + ' 日'
-}
-const reset = () => {
-  formRef.value?.reset()
-}
-const idCardBlur = (e:string)=>{
+
+const idCardBlur = (e: any) => {
  const value = e.detail.value
+  if (!value?.length || value.length < 18) {
+    formData.value.dateOfBirth = null;
+    return
+  }
  const birthDate = value.substring(6, 14);
  const year = birthDate.substring(0, 4);
  const month = birthDate.substring(4, 6);
  const day = birthDate.substring(6, 8);
-  // 格式化为 “某年某月某日”
  formData.value.dateOfBirth = new Date(parseInt(year), parseInt(month) - 1, parseInt(day))
-
 }

-const snowFlakeId = ref<string>('')
 const submit = () => {
-  formRef.value?.validate().then(({valid, errors}) => {
+  formRef.value?.validate().then(async ({valid}) => {
    if (valid) {
-      if(formData.value.snowFlakeId === ''){
-         snowFlakeId.value = ''
-      }else{
-        snowFlakeId.value = formData.value.snowFlakeId as any
-      }
-      const resp = api.post('/projectManageIndex/saveOrUpdateSecurityUser',formData.value)
+      const resp = await api.post('/projectManageIndex/saveOrUpdateSecurityUser', formData.value)
      Taro.showToast({
-        title: '项目人员录入成功',
+        title: resp.message,
        icon: 'success',
        duration: 2000,
        mask: true,
      }).then()
      formData.value = {
-      snowFlakeId:'',
+        snowFlakeId: undefined,
        serviceProjectId: formData.value.serviceProjectId,
        name: '',
        workPost: '',
@ -128,13 +118,11 @@ const submit = () => {
        sex: 0,
        nativePlace: '',
        idCard: '',
-      dateOfBirth:'',
+        dateOfBirth: null,
        securityNumber: '',
        remark: '',
        homeAddress: ''
      }
-    } else {
-      console.warn('error:', errors)
    }
  })
 }
--- a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
+++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
@ -3,11 +3,16 @@
    <view class="projectDetailsItem" style="line-height: 50rpx">
      <view>
        <view style="display: flex;justify-content: space-between">
-            <text style="font-size: 18px">{{ nameValue ? nameValue : '' }}{{ '-----' + serviceProjectDetails?.name }}项目</text>
+          <text style="font-size: 18px">{{ nameValue ? nameValue : '' }}{{
+              '-----' + serviceProjectDetails?.name
+            }}项目
+          </text>
          <text>进行中</text>
        </view>
        <view>
-            <view style="float: left;width: 50%;" class="content">经理名称:{{ serviceProjectDetails?.projectManagerMiniProgramUserInfo.name }}</view>
+          <view style="float: left;width: 50%;" class="content">
+            经理名称:{{ serviceProjectDetails?.projectManagerMiniProgramUserInfo.name }}
+          </view>
          <view class="content">手机号:{{ serviceProjectDetails?.projectManagerMiniProgramUserInfo.telephone }}</view>
        </view>
      </view>
@ -110,6 +115,7 @@ import './projectDetails.scss'
 import {ref} from "vue";
 import api from "@/request/index";
 import * as dayjs from 'dayjs'
+
 const serviceProjectDetails = ref()
 const nameValue = ref('')
 const projectData = ref<Records[]>([])
@ -148,13 +154,13 @@ const projectDetailsTable = async () => {
 const formAdd = () => {
  const params = {
    serviceProjectId: serviceProjectDetails.value.snowFlakeId,
-    snowFlakeId:'',
+    snowFlakeId: undefined,
    name: '',
    workPost: '',
    sex: 0,
    nativePlace: '',
    idCard: '',
-    dateOfBirth:'',
+    dateOfBirth: null,
    securityNumber: '',
    remark: '',
    homeAddress: ''
--- a/collect_information/tsconfig.json
+++ b/collect_information/tsconfig.json
@ -11,17 +11,25 @@
    "outDir": "lib",
    "noUnusedLocals": false,
    "noUnusedParameters": false,
-    "strictNullChecks": true,
+    "strictNullChecks": false,
    "sourceMap": true,
    "rootDir": ".",
    "jsx": "preserve",
    "allowJs": true,
    "resolveJsonModule": true,
-    "typeRoots": ["node_modules/@types"],
+    "typeRoots": [
+      "node_modules/@types"
+    ],
    "paths": {
-      "@/*": ["src/*"]
+      "@/*": [
+        "src/*"
+      ]
    }
  },
-  "include": ["./src", "./types", "./config"],
+  "include": [
+    "./src",
+    "./types",
+    "./config"
+  ],
  "compileOnSave": false
 }
--- a/collect_information/types/pages/form/index.d.ts
+++ b/collect_information/types/pages/form/index.d.ts
@ -1,6 +1,4 @@
-import {Dayjs} from "dayjs";
-
-export interface formDate {
+interface formDate {
  snowFlakeId?: string;
  serviceProjectId: string;
  name?: string;
@ -9,7 +7,7 @@ export interface formDate {
  sex: number;
  nativePlace?: string;
  idCard: string;
-    dateOfBirth?:Dayjs;
+  dateOfBirth?: Date;
  securityNumber?: string;
  remark?: string;
  homeAddress?: string