Merge branch 'hotfix' of http://carsafe.uicp.cn/Front_Team/SPDM into hotfix

src/components/common/uploadList/index.vue

@@ -105,11 +105,11 @@ emitter.on('ADD_UPLOAD_FILE', (addData: any) => {
   }
 });
 
-$wujie.bus.$on('UPLOAD_LIST_DATA_EMPTY', () => {
+$wujie?.bus?.$on('UPLOAD_LIST_DATA_EMPTY', () => {
   emptyFun();
 });
 
-$wujie.bus.$on('UPLOAD_LIST_DATA_REMOVE', (index: any) => {
+$wujie?.bus?.$on('UPLOAD_LIST_DATA_REMOVE', (index: any) => {
   removeFun(index);
 });
 

src/views/task/simulationTask/newDemand/index.vue

@@ -748,10 +748,6 @@ const changeFun = async (val: any) => {
         //   };
         // });
       }
-
-      if (editFormInfo.value.simType) {
-        await disposeDeptMember();
-      }
     }
     if (nodeId) {
       const optionList = await getPhaseList(nodeType, nodeId);
@@ -802,6 +798,9 @@ const changeFun = async (val: any) => {
         tableFormRef.value.setOptionsFun('workspaceId', []);
         tableFormRef.value.setOptionsFun('workspaceCode', []);
       }
+      if (editFormInfo.value.simType && editFormInfo.value?.selectPhaseName) {
+        await disposeDeptMember();
+      }
     } else {
       tableFormRef.value.setOptionsFun(nextKey, []);
       editFormInfo.value.phaseId = '';
@@ -916,13 +915,13 @@ const disposeDeptMember = async () => {
     // 非设计阶段 走技术中心    设计阶段不走技术中心
     if (editFormInfo.value?.selectPhaseName.indexOf('设计') !== -1) {
       return (
-        item.deptName.indexOf(currentProjectUndertaker.value) !== -1 &&
-        item.deptName.indexOf('技术中心') === -1
+        item.deptName.startsWith(currentProjectUndertaker.value) &&
+        item.deptName.endsWith('技术中心')
       );
     } else {
       return (
-        item.deptName.indexOf(currentProjectUndertaker.value) !== -1 &&
-        item.deptName.indexOf('技术中心') !== -1
+        item.deptName.startsWith(currentProjectUndertaker.value) &&
+        item.deptName.endsWith('技术中心')
       );
     }
   });