刘洋 8 місяців тому
батько
коміт
a311e03873

+ 40 - 1
src/views/report/project-analysis/index.vue

@@ -32,6 +32,8 @@
                   searchByX({
                     leadId: row.leadId,
                     process: '',
+                    supplierId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.total }}</t-link
@@ -44,6 +46,8 @@
                   searchByX({
                     process: 'PREPARE',
                     leadId: row.leadId,
+                    supplierId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.prepareSopNum }} ({{ row.prepareSopRatio }})</t-link
@@ -56,6 +60,8 @@
                   searchByX({
                     process: 'SCAN',
                     leadId: row.leadId,
+                    supplierId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.scanSopNum }} ({{ row.scanSopRatio }})</t-link
@@ -68,6 +74,8 @@
                   searchByX({
                     process: 'MARK',
                     leadId: row.leadId,
+                    supplierId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.markSopNum }} ({{ row.markSopRatio }})</t-link
@@ -80,6 +88,8 @@
                   searchByX({
                     process: 'FINAL',
                     leadId: row.leadId,
+                    supplierId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.finalSopNum }} ({{ row.finalSopRatio }})</t-link
@@ -92,6 +102,8 @@
                   searchByX({
                     process: 'FINISH',
                     leadId: row.leadId,
+                    supplierId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.finishSopNum }} ({{ row.finishSopRatio }})</t-link
@@ -119,6 +131,8 @@
                   searchByX({
                     supplierId: row.supplierId,
                     process: '',
+                    leadId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.total }}</t-link
@@ -131,6 +145,8 @@
                   searchByX({
                     process: 'PREPARE',
                     supplierId: row.supplierId,
+                    leadId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.prepareSopNum }} ({{ row.prepareSopRatio }})</t-link
@@ -143,6 +159,8 @@
                   searchByX({
                     process: 'SCAN',
                     supplierId: row.supplierId,
+                    leadId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.scanSopNum }} ({{ row.scanSopRatio }})</t-link
@@ -155,6 +173,8 @@
                   searchByX({
                     process: 'MARK',
                     supplierId: row.supplierId,
+                    leadId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.markSopNum }} ({{ row.markSopRatio }})</t-link
@@ -167,6 +187,8 @@
                   searchByX({
                     process: 'FINAL',
                     supplierId: row.supplierId,
+                    leadId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.finalSopNum }} ({{ row.finalSopRatio }})</t-link
@@ -179,6 +201,8 @@
                   searchByX({
                     process: 'FINISH',
                     supplierId: row.supplierId,
+                    leadId: '',
+                    coordinatorId: '',
                   })
                 "
                 >{{ row.finishSopNum }} ({{ row.finishSopRatio }})</t-link
@@ -206,7 +230,12 @@
               <t-link
                 theme="primary"
                 @click="
-                  searchByX({ coordinatorId: row.coordinatorId, process: '' })
+                  searchByX({
+                    coordinatorId: row.coordinatorId,
+                    process: '',
+                    leadId: '',
+                    supplierId: '',
+                  })
                 "
                 >{{ row.total }}</t-link
               >
@@ -218,6 +247,8 @@
                   searchByX({
                     process: 'PREPARE',
                     coordinatorId: row.coordinatorId,
+                    leadId: '',
+                    supplierId: '',
                   })
                 "
                 >{{ row.prepareSopNum }} ({{ row.prepareSopRatio }})</t-link
@@ -230,6 +261,8 @@
                   searchByX({
                     process: 'SCAN',
                     coordinatorId: row.coordinatorId,
+                    leadId: '',
+                    supplierId: '',
                   })
                 "
                 >{{ row.scanSopNum }} ({{ row.scanSopRatio }})</t-link
@@ -242,6 +275,8 @@
                   searchByX({
                     process: 'MARK',
                     coordinatorId: row.coordinatorId,
+                    leadId: '',
+                    supplierId: '',
                   })
                 "
                 >{{ row.markSopNum }} ({{ row.markSopRatio }})</t-link
@@ -254,6 +289,8 @@
                   searchByX({
                     process: 'FINAL',
                     coordinatorId: row.coordinatorId,
+                    leadId: '',
+                    supplierId: '',
                   })
                 "
                 >{{ row.finalSopNum }} ({{ row.finalSopRatio }})</t-link
@@ -266,6 +303,8 @@
                   searchByX({
                     process: 'FINISH',
                     coordinatorId: row.coordinatorId,
+                    leadId: '',
+                    supplierId: '',
                   })
                 "
                 >{{ row.finishSopNum }} ({{ row.finishSopRatio }})</t-link

+ 6 - 1
src/views/sop/sop-manage/office-sop/index.vue

@@ -687,7 +687,12 @@ const transParams = computed(() => {
   );
   return {
     ...omit(params, ['fastSearch', 'fastColumns']),
-    formWidgetMetadataViewList,
+    // formWidgetMetadataViewList,
+    formWidgetMetadataViewList: [
+      ...formWidgetMetadataViewList,
+      { fieldId: 'serviceName' },
+      { fieldId: 'productName' },
+    ],
     type: 'OFFICE_SOP_FLOW',
   };
 });

+ 6 - 1
src/views/sop/sop-manage/student-sop/index.vue

@@ -693,7 +693,12 @@ const transParams = computed(() => {
   );
   return {
     ...omit(params, ['fastSearch', 'fastColumns']),
-    formWidgetMetadataViewList,
+    // formWidgetMetadataViewList,
+    formWidgetMetadataViewList: [
+      ...formWidgetMetadataViewList,
+      { fieldId: 'serviceName' },
+      { fieldId: 'productName' },
+    ],
     type: 'CLOUD_MARK_SOP_FLOW',
   };
 });