提交

src/components/common/device-manage-new/index.vue

@@ -84,11 +84,13 @@ const curStep = ref('设备签收登记');
 const emit = defineEmits(['update:visible', 'confirm']);
 const crmInfo = ref({});
 watch(
-  () => props.sop,
-  () => {
-    sopEditApi(props.sop.id).then((res) => {
-      crmInfo.value = res?.crmInfo || {};
-    });
+  () => props.visible,
+  (val) => {
+    if (val) {
+      sopEditApi(props.sop.id).then((res) => {
+        crmInfo.value = res?.crmInfo || {};
+      });
+    }
   }
 );
 </script>

src/views/service-unit/dispatch/dispatch-manage/allocation-dialog.vue

@@ -170,18 +170,9 @@ const getOptions = () => {
     tableData.value[0].history = res.regionCoordinatorInfo.historicalList;
     tableData.value[1].history = res.projectManagerInfo.historicalList;
     tableData.value[2].history = res.engineerInfo.historicalList;
-    options1.value = [
-      ...(res.regionCoordinatorInfo.allocatedList || []),
-      ...(res.regionCoordinatorInfo.canChooseList || []),
-    ];
-    options2.value = [
-      ...(res.projectManagerInfo.allocatedList || []),
-      ...(res.projectManagerInfo.canChooseList || []),
-    ];
-    options3.value = [
-      ...(res.engineerInfo.allocatedList || []),
-      ...(res.engineerInfo.canChooseList || []),
-    ];
+    options1.value = [...(res.regionCoordinatorInfo.canChooseList || [])];
+    options2.value = [...(res.projectManagerInfo.canChooseList || [])];
+    options3.value = [...(res.engineerInfo.canChooseList || [])];
     formData.allocationParams[0].userIdList = (
       res.regionCoordinatorInfo.allocatedList || []
     ).map((item) => item.userId);

src/views/sop/components/dynamic-form-item/SELECT.vue

@@ -50,6 +50,7 @@ const getOptions = async () => {
 
   if (!props.config.dataGrid) return;
   const data = await getOptionsApi();
+  console.log('data', data);
   options.value = data || [];
 };
 

src/views/sop/sop-manage/office-sop/index.vue

@@ -419,6 +419,11 @@ const columns = computed(() => {
     return [
       ...defaultColumns.slice(0, -1),
       ...metadataColumns,
+      {
+        colKey: 'statusStr',
+        title: '流程状态',
+        width: 120,
+      },
       ...defaultColumns.slice(-1),
     ];
   } else {

src/views/sop/sop-manage/sop-step/index.vue

@@ -464,6 +464,17 @@ const initEdit = async () => {
           if (v.formName === 'third_service_region_cb_1') {
             v.writable = false;
           }
+          if (
+            props.sop?.status === 'FINISH' &&
+            [
+              'service_scope_radio_1',
+              'deploy_way_radio_1',
+              'mark_way_radio_1',
+              'scan_net_radio_1',
+            ].includes(v.formName)
+          ) {
+            v.writable = false;
+          }
           return v;
         });
       }

src/views/sop/sop-manage/student-sop/index.vue

@@ -431,6 +431,11 @@ const columns = computed(() => {
     return [
       ...defaultColumns.slice(0, -1),
       ...metadataColumns,
+      {
+        colKey: 'statusStr',
+        title: '流程状态',
+        width: 120,
+      },
       ...defaultColumns.slice(-1),
     ];
   } else {