刘洋 1 year ago
parent
commit
f79597eec7

+ 1 - 1
src/views/report/dispatch-analysis/index.vue

@@ -294,7 +294,7 @@ const crmArr = computed(() => {
   return numStr.split('').map((item) => {
     return {
       num: item,
-      type: Number(item) ? 'num' : 'split',
+      type: !isNaN(Number(item)) ? 'num' : 'split',
     };
   });
 });

+ 2 - 5
src/views/resource-guard/person-guard/person-allocate/index.vue

@@ -12,9 +12,7 @@
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"
-          default-select
-          :clearable="false"
-          @default-selected="initData"
+          :clearable="true"
         ></select-service-unit>
       </template>
       <template #area>
@@ -290,8 +288,7 @@ const { pagination, tableData, fetchData, search, onChange } = useFetchTable(
       selectedRowKeys.value = [];
     },
     params,
-  },
-  false
+  }
 );
 
 const rolesFilter = (row) => {

+ 3 - 5
src/views/resource-guard/person-guard/person-allocate/person-deploy-dialog.vue

@@ -237,15 +237,13 @@ const getDetail = async () => {
     (item) => item.roleType === 'REGION_COORDINATOR'
   );
   if (
-    regionUserInfo &&
-    regionUserInfo.userIdList[0] === props.curRow.regionManagerId
+    (regionUserInfo &&
+      regionUserInfo.userIdList[0] === props.curRow.regionManagerId) ||
+    props.curRow.concurrently
   ) {
     regionUseManage.value = true;
     regionUseManageChange();
   }
-  if (props.curRow.concurrently) {
-    regionUseManage.value = true;
-  }
 };
 
 const roleConfigInfoAllData = ref([]);