fix : 修复部门分管领导回显,需求上报排版

src/views/project-demand/requirement/add.vue

@@ -1,14 +1,14 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData" ref="demandForm" :rules="rules">
-      <el-row gutter="14">
-        <el-col :span="6">
+    <el-form :model="formData" ref="demandForm" :rules="rules" :scroll-to-error="true">
+      <el-row gutter="40">
+        <el-col :span="5">
           <el-form-item label="征集名称" prop="requirementName" >
             <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="征集类型" prop="collectType">
             <el-select v-model="formData.collectType" placeholder="请选择征集类型" clearable filterable>
               <el-option
@@ -20,7 +20,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="需求上报截止时间" prop="deadline">
             <el-config-provider>
               <el-date-picker
@@ -34,15 +34,15 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="专项资金" prop="isSpecialFund" required>
+        <el-col :span="4">
+          <el-form-item label="是否专项资金" prop="isSpecialFund">
             <el-select v-model="formData.isSpecialFund" placeholder="是否专项资金" clearable filterable>
               <el-option :value="true" label="是"></el-option>
               <el-option :value="false" label="否"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="专项资金名称" prop="specialFundId" v-if="formData.isSpecialFund">
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
               <el-option
@@ -54,7 +54,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-bottom: -25px">
+        <el-col :span="24" style="margin-bottom: -18px">
           <el-form-item label="征集公司" :required="true" prop="" class="company-select">
             <div style="width: 100%">
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
@@ -89,19 +89,22 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-start;">
-        <div class="base-title">流程图</div>
-        <el-switch
-            v-model="changeDiagram"
-            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd;margin-left: 10px"
-        />
+      <div class="approval-title" >
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="diagram">
+          <div class="base-title">流程图</div>
+          <el-switch
+              v-model="changeDiagram"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;"
+          />
+        </div>
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div style="width: 100%;height: 30px"></div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
+      <el-button color="#DED0B2" v-else @click="handleResubmit(demandForm)">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
 
@@ -159,7 +162,7 @@ const formData = ref({
   deadline: '',
   collectExplain: '',
   fileList: [],
-  isSpecialFund: false
+  isSpecialFund: true
 })
 const routerName = ref(router.currentRoute.value.name)
 const processDiagramViewer = ref(false)
@@ -175,9 +178,9 @@ const formPermMap = ref(new Map());
 const companyNameArray = ref([])
 const rules = reactive({
   requirementName: [{required: true, message: '请输入征集名称', trigger: ['blur','change']}],
-  // companyIds: [{required: true, message: '请选择征集公司', trigger:  ['blur','change']}],
+  isSpecialFund: [{required: true, message: '请选择是否专项资金', trigger:  ['blur','change']}],
   collectType: [{required: true, message: '请选择征集类型', trigger:  ['blur','change']}],
-  deadline: [{required: true, message: '请选择截止时间', trigger:  ['blur','change']}],
+  deadline: [{required: true, message: '请选择需求上报截止时间', trigger:  ['blur','change']}],
   specialFundId: [{required: true, message: '请选择专项资金名称', trigger:  ['blur','change']}],
 })
 
@@ -418,19 +421,38 @@ const handleSubmit = async (instance) => {
     }
   })
 }
-const handleResubmit = () => {
-  resubmit(submitParam(formData.value)).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Requirement'
+const handleResubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) {
+      ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
       })
+      return;
     }
+    if (formData.value.companyIds.length === 0) {
+      ElNotification({
+        title: '提示',
+        message: '请选择征集公司',
+        type: 'error'
+      })
+      return;
+    }
+    resubmit(submitParam(formData.value)).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push({
+          name: 'Requirement'
+        })
+      }
+    })
   })
 }
 const matterTree = (array,data, id) => {