Browse Source

fix:968【客户管理】逻辑优化 -1

mlchen 4 days ago
parent
commit
6ea56c5a8d

+ 6 - 0
README.md

@@ -1,2 +1,8 @@
 node版本----v16.20.0
 
+## 客户审批详情
+
+`contact_approve` 未配置流程表单路由时,待办使用
+`src/views/bpm/handleTask/components/contact/contactDetailDialog.vue` 和
+`src/views/bpm/handleTask/components/contact/submit.vue`;已办及抄送使用同一详情组件。
+客户详情以只读方式展示当前档案版本。

+ 2 - 0
src/views/bpm/carbonCopy/index.vue

@@ -302,6 +302,8 @@
             id: row.processInstanceId
           },
           businessId:row.vals.businessId,
+          businessKey: String(row.processDefinitionId || '').split(':')[0],
+          processDefinitionKey: String(row.processDefinitionId || '').split(':')[0],
           pcViewRouter: row.pcViewRouter
         }
         // this.$refs.detailRef.open({

+ 12 - 1
src/views/bpm/done/detailDialog.vue

@@ -254,7 +254,18 @@ import businessTripComponent from '@/BIZComponents/processSubmitDialog/component
         if (this.isStockBatchChange() && (!router || invalidViewRouter)) {
           return '/bpm/handleTask/components/stockBatchChange/detailDialog.vue';
         }
-        const path = String(router || '').trim();
+        const businessKey = String(
+          this.form.businessKey ||
+            this.form.processDefinitionKey ||
+            this.form.processInstance?.processDefinitionId?.split(':')[0] ||
+            this.form.processInstance?.processDefinition?.key ||
+            ''
+        );
+        const fallback =
+          businessKey === 'contact_approve'
+            ? '/bpm/handleTask/components/contact/contactDetailDialog.vue'
+            : '';
+        const path = String(!router || router === '/' ? fallback : router).trim();
         if (!path || path === '/' || !path.startsWith('/')) return '';
         return path;
       },

+ 7 - 1
src/views/bpm/handleTask/components/contact/contactDetailDialog.vue

@@ -40,6 +40,11 @@
                 <el-input v-model="form.simpleName" disabled></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8" v-if="form.version != null">
+              <el-form-item label="档案版本:" prop="version">
+                <el-input v-model="form.version" disabled></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="8">
               <el-form-item label="法定代表人:" prop="legalPerson">
@@ -335,7 +340,8 @@
         legalPerson: '',
         registeredCapital: '',
         type: 1,
-        unifiedSocialCreditCode: ''
+        unifiedSocialCreditCode: '',
+        version: null
       };
       let otherFormDef = {
         settlementMode: '',

+ 8 - 2
src/views/bpm/handleTask/index.vue

@@ -487,7 +487,7 @@
           this.parseFormRouteConfig(this.listData.formKey) ||
           this.parseFormRouteConfig(this.listData.formCustomCreatePath) ||
           {};
-        // 录用审批 / 劳动合同:流程未配路由时使用本项目约定路径
+        // 已有审批组件的流程未配路由时使用本项目约定路径
         const businessKey = String(
           def.key ||
             this.listData.businessKey ||
@@ -495,7 +495,13 @@
             ''
         );
         const formFallback =
-          businessKey === 'hr_recruit_hiring_approval'
+          businessKey === 'contact_approve'
+            ? {
+                pcView:
+                  '/bpm/handleTask/components/contact/contactDetailDialog.vue',
+                pcHandle: '/bpm/handleTask/components/contact/submit.vue'
+              }
+            : businessKey === 'hr_recruit_hiring_approval'
             ? {
                 pcView:
                   '/bpm/handleTask/components/hiringApproval/hiringApprovalDetail.vue',