Merge branch 'release' into dev

src/views/business/order/index.vue

@@ -733,7 +733,8 @@ const onObserve = () => {
 				queryList();
 			});
 		})
-		.catch(() => {});
+		.catch(() => {
+		});
 };
 // 设置终结件
 const onEnd = () => {
@@ -755,7 +756,8 @@ const onEnd = () => {
 				queryList();
 			});
 		})
-		.catch(() => {});
+		.catch(() => {
+		});
 };
 // 创建重复性事件
 const repeatEventEditRef = ref<RefType>();
@@ -790,7 +792,22 @@ const onJbExport = () => {
 					state.loading = false;
 				});
 		})
-		.catch(() => {});
+		.catch(() => {
+		});
+};
+// 打开内容检索
+const contentRetrieval = () => {
+	state.dialogVisible = !state.dialogVisible;
+};
+const ruleFormContentRef = ref<RefType>();
+// 内容检索
+const onSearch = (formEl: FormInstance | undefined) => {
+	if (!formEl) return;
+	formEl.validate((valid: boolean) => {
+		if (!valid) return;
+		queryList(true);
+		state.dialogVisible = false;
+	});
 };
 // 打开内容检索
 const contentRetrieval = () => {

src/views/business/visit/component/Visit-detail.vue

@@ -271,7 +271,7 @@
 													:prop="`visitDetails.${index}.voiceEvaluate`"
 													:rules="[{ required: true, message: '请选择语音评价', trigger: 'change' }]"
 												>
-													<el-radio-group v-model="item.voiceEvaluate">
+													<el-radio-group v-model="item.voiceEvaluate" :disabled="dialogTitle === '修改回访结果'">
 														<el-radio v-for="items in viceEvaluate" :key="items.key" :label="items.value" :value="items.key">{{
 															items.value
 														}}</el-radio>