优化

src/views/approve/Appro/components/config.ts

@@ -92,7 +92,7 @@ export const columns: BasicColumn[] = [
     title: '缓级',
     componentType: 'select',
     align: 'left',
-    width: 100,
+    width: 80,
     sorter: true,
   },
 
@@ -113,7 +113,14 @@ export const columns: BasicColumn[] = [
     
     sorter: true,
   },
-
+  {
+    dataIndex: 'comName',
+    title: '拟稿人所属公司',
+    componentType: 'input',
+    align: 'left',
+    
+    sorter: true,
+  },
   {
     dataIndex: 'dateAppro',
     title: '拟稿日期',

src/views/approve/Appro/components/createForm.vue

@@ -42,6 +42,11 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <a-col :span="8">
+              <a-form-item label="拟稿日期" name="dateAppro">
+                <a-date-picker v-model:value="formState.dateAppro" :disabled="isDisable" style="width: 100%" placeholder="请选择评价日期" />
+              </a-form-item>
+            </a-col>
             <a-col :span="8">
               <a-form-item label="拟稿人" name="empName">
                 <a-input-search v-model:value="formState.empName" :disabled="isDisable" placeholder="请选择拟稿人"  readonly @search="onSearchUser"/>
@@ -49,7 +54,7 @@
             </a-col>
             <a-col :span="8">
               <a-form-item label="拟稿人所属部门" name="bDeptName">
-                <a-input-search v-model:value="formState.bDeptName" :disabled="isDisable" placeholder="请选择拟稿人部门"  readonly @search="onSearch"/>
+                <a-input-search v-model:value="formState.bDeptName" disabled placeholder="请选择拟稿人部门"  readonly @search="onSearch"/>
               </a-form-item>
             </a-col>
             <a-col :span="8">
@@ -57,11 +62,6 @@
                 <a-input v-model:value="formState.comName" disabled/>
               </a-form-item>
             </a-col>
-            <a-col :span="8">
-              <a-form-item label="拟稿日期" name="dateAppro">
-                <a-date-picker v-model:value="formState.dateAppro" :disabled="isDisable" style="width: 100%" placeholder="请选择评价日期" />
-              </a-form-item>
-            </a-col>
             <a-col :span="8">
               <a-form-item label="审批状态" name="approCode">
                 <a-select v-model:value="formState.approCode" disabled style="width: 100%" allow-clear>
@@ -160,7 +160,7 @@
       securityCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       urgencyCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       empName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      bDeptName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
+      bDeptName: [{ required: false, message: "该项为必填项", trigger: 'change' }],
       comName: [{ required: false, message: "该项为必填项", trigger: 'change' }],
       dateAppro: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       content: [{ required: true, message: "该项为必填项", trigger: 'change' }],
@@ -236,15 +236,18 @@
       optionSelect.approCodeList = await getDictionary('LNG_APPRO')
 
       if (!pageId.value) {
-        const res = await getCompDept(userInfo.id)
-        formState.bDeptName = res?.dept?.name
-        formState.bDeptId = res?.dept?.id
-  
-        formState.comName = res?.comp?.name
-        formState.comId = res?.comp?.id
+        getCompDeptInfo(userInfo.id)
       }
 
     }
+    const getCompDeptInfo = async (id)=> {
+      const res = await getCompDept(id)
+      formState.bDeptName = res?.dept?.name
+      formState.bDeptId = res?.dept?.id
+
+      formState.comName = res?.comp?.name
+      formState.comId = res?.comp?.id
+    }
     const onSearch = (val)=> {
       openModalDept(true,{isUpdate: false})
     }
@@ -254,6 +257,7 @@
     const handleSuccess = (val) => {
       formState.empName = val[0].name
       formState.empId = val[0].id
+      getCompDeptInfo(formState.empId)
     }
     const handleSuccessDept = (val, info) => {
       formState.bDeptName = val[0].name

src/views/approve/Appro/index.vue

@@ -169,7 +169,7 @@
           },
         }
       ],
-      fieldMapToTime: [['dateAppro', ['startDate', 'endDate'], 'YYYY-MM-DD '],],
+      fieldMapToTime: [['dateAppro', ['startDate', 'endDate'], 'YYYY-MM-DD'],],
       showResetButton: true,
     },
     immediate: false,