fix : 征集公司校验,单文件显示改为表格,手机端审批后刷新,需求征集回车触发搜索,组织机构管理搜索

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

@@ -261,7 +261,7 @@
     <div class="oper-page-btn">
       <!--      <el-button type="info" @click="staging">存为草稿</el-button>-->
       <el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button>
+      <el-button color="#DED0B2" v-else @click="handleResubmit(summaryForm)">重新发布</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
@@ -472,47 +472,58 @@ const handleSubmit = debounce(async (instance) => {
     }
   })
 })
-const handleResubmit = debounce(() => {
-  let otherFiles = []
-  if (name.value === 'Summary/edit') {
-    attachment.value.allFileList.forEach(item => {
-      otherFiles.push(getFileParam(item))
-    })
-  }
-  if (attachment.value.singleFile == null) {
-    attachment.value.validate()
-    ElNotification({
-      title: '提示',
-      message: '请上传附件',
-      type: 'error'
-    })
-    return;
-  } else {
-    // formData.value.resultForm=JSON.stringify(formData.value.resultForm)
-    attachment.value.clearValidate()
-  }
-  if (formData.value.isSpecialFund && formData.value.specialFund === null) {
-    formData.value.specialFund = getFundName(formData.value.specialFundId)
-  }
-  let params = {
-    ...formData.value,
-    deploymentId: deploymentId.value,
-    fileList: otherFiles,
-    requirementId: route.query.id ? route.query.id : '-1'
-  }
-  // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
-  resubmitReported(params).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: 'Summary'
+const handleResubmit = debounce((instance) => {
+  if (!instance) return
+  instance.validate(async (valid, fields) => {
+    if (!valid) {
+      ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+      return;
+    }
+    let otherFiles = []
+    if (name.value === 'Summary/edit') {
+      attachment.value.allFileList.forEach(item => {
+        otherFiles.push(getFileParam(item))
       })
     }
+    if (formData.value.isSpecialFund && formData.value.specialFund === null) {
+      formData.value.specialFund = getFundName(formData.value.specialFundId)
+    }
+    if (attachment.value.singleFile == null) {
+      attachment.value.validate()
+      ElNotification({
+        title: '提示',
+        message: '请上传附件',
+        type: 'error'
+      })
+      return;
+    } else {
+      // formData.value.resultForm=JSON.stringify(formData.value.resultForm)
+      attachment.value.clearValidate()
+    }
+    let params = {
+      ...formData.value,
+      deploymentId: deploymentId.value,
+      fileList: otherFiles,
+      requirementId: route.query.id ? route.query.id : '-1'
+    }
+    // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
+    resubmitReported(params).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: 'Summary'
+        })
+      }
+    })
   })
 })
 

src/views/project-demand/summary/index.vue

@@ -348,13 +348,25 @@ const handleEdit = (row) => {
     }
   })
 }
+// const handleDetail = (row) => {
+//   router.push({
+//     name: 'Summary/detail',
+//     query: {
+//       id: row.requirementId == null ? '-1' : row.requirementId,
+//       projectId: row.projectId,
+//       state: row.state
+//     }
+//   })
+// }
+
 const handleDetail = (row) => {
   router.push({
-    name: 'Summary/detail',
+    name: 'Implementation/detail',
     query: {
       id: row.requirementId == null ? '-1' : row.requirementId,
       projectId: row.projectId,
-      state: row.state
+      state: row.state,
+      step: '10'
     }
   })
 }