Merge branch 'master' into dev

src/views/auxiliary/smsTask/components/Add-citizen.vue

@@ -103,6 +103,7 @@ let loading = ref<Boolean>(false); // 加载状态
 // 打开弹窗
 const openDialog = async () => {
 	try {
+    queryList();
 		state.dialogVisible = true;
 	} catch (error) {
 		console.log(error);
@@ -121,9 +122,6 @@ const onSubmit = () => {
 	emit('selectCitizen', proTableRef.value?.selectedList);
 	closeDialog();
 };
-onMounted(() => {
-	queryList();
-});
 // 暴露变量
 defineExpose({
 	openDialog,

src/views/business/overdue/index.vue

@@ -17,8 +17,8 @@
         </el-form-item>
         <el-form-item label="是否延期" prop="Delay">
           <el-select v-model="state.queryParams.Delay" placeholder="请选择是否延期" @change="handleQuery" class="w100">
-            <el-option label="是" value="true" />
-            <el-option label="否" value="false" />
+            <el-option label="是" :value="1" />
+            <el-option label="否" :value="2" />
           </el-select>
         </el-form-item>
         <el-form-item>

src/views/business/overdue/soon.vue

@@ -17,8 +17,8 @@
         </el-form-item>
         <el-form-item label="是否延期" prop="Delay">
           <el-select v-model="state.queryParams.Delay" placeholder="请选择是否延期" @change="handleQuery" class="w100">
-            <el-option label="是" value="true" />
-            <el-option label="否" value="false" />
+            <el-option label="是" :value="1" />
+            <el-option label="否" :value="2" />
           </el-select>
         </el-form-item>
 				<el-form-item>

src/views/knowledge/retrieval/index.vue

@@ -386,19 +386,23 @@ const getKnowledgeType = async () => {
 };
 // 点击节点
 const handleNodeClick = (data: any) => {
-	switch (state.activeName) {
-		case '0':
-			state.queryParams.CreateOrgId = data.id;
-			break;
-		case '1':
-			state.queryParams.KnowledgeTypeId = data.id;
-			break;
-		case '2':
-			state.queryParams.HotspotId = data.id;
-			break;
-		default:
-			break;
-	}
+  if(userInfos.value.isCenter){
+    switch (state.activeName) {
+      case '0':
+        state.queryParams.CreateOrgId = data.id;
+        break;
+      case '1':
+        state.queryParams.KnowledgeTypeId = data.id;
+        break;
+      case '2':
+        state.queryParams.HotspotId = data.id;
+        break;
+      default:
+        break;
+    }
+  }else{
+    state.queryParams.KnowledgeTypeId = data.id;
+  }
   handleQuery();
 };
 // 预览