reactor:自贡泸州工单标签级联多选;

src/views/todo/edit/components/Edit-order.vue

@@ -184,13 +184,14 @@
 							<el-cascader
 								:options="state.orderTags"
 								filterable
-								:props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false, checkStrictly: true }"
+								:props="{ value: 'id', label: 'dicDataName', emitPath: false, checkStrictly: true, multiple: true }"
 								placeholder="请选择工单标签"
 								class="w100"
-								v-model="state.ruleForm.orderTagCode"
-								ref="tagRef"
-								@change="changeOrderTag"
+								v-model="state.ruleForm.tags"
+								collapse-tags
+								collapse-tags-tooltip
 								clearable
+                :show-all-levels="false"
 							>
 							</el-cascader>
 						</el-form-item>
@@ -458,7 +459,9 @@ const PlayRecord = defineAsyncComponent(() => import('@/components/PlayRecord/in
 const state = reactive<any>({
 	dialogVisible: false, // 是否显示弹窗
 	loading: false, // 是否显示加载
-	ruleForm: {},
+	ruleForm: {
+		tags: [], // 工单标签
+	},
 	formLoading: false, // 表单加载状态
 	hotspotExternal: [], // 热点分类外部数据
 	eventCategoryExternal: [], // 事件分类外部数据
@@ -547,13 +550,6 @@ const getOrderDetail = async (id: string) => {
 				dicDataName: state.ruleForm.licenceType,
 			};
 		}
-		/*		if (state.ruleForm.orderTagCode) {
-			state.ruleForm.orderTagObj = {
-				// 工单标签
-				dicDataValue: state.ruleForm.orderTagCode,
-				dicDataName: state.ruleForm.orderTag,
-			};
-		}*/
 
 		if (!state.ruleForm.acceptType) {
 			// 外部输入数据没有受理名称和热点名称 需要根据code调用一次change事件获取
@@ -577,9 +573,14 @@ const getOrderDetail = async (id: string) => {
 			};
 		}
 
+		// 工单标签
+		if (state.ruleForm.orderTags && state.ruleForm.orderTags.length) {
+			state.ruleForm.tags = state.ruleForm.orderTags.map((item: any) => item.id);
+		}
+
 		state.dialogVisible = true;
 		state.loading = false;
-	} catch (error) {
+	} catch (error: any) {
 		state.loading = false;
 		state.dialogVisible = false;
 	}
@@ -645,16 +646,6 @@ const changeIndustry = (val: any) => {
 	state.ruleForm.industryId = val?.id ?? null;
 	state.ruleForm.industryName = val?.name ?? null;
 };
-// 选择工单标签
-const tagRef = ref<RefType>();
-const changeOrderTag = () => {
-	const currentNode = tagRef.value.getCheckedNodes();
-	if (currentNode && currentNode.length) {
-		state.ruleForm.orderTag = currentNode[0].pathLabels.join('-');
-	} else {
-		state.ruleForm.orderTag = null;
-	}
-};
 // 选择事件分类
 const chooseEvent = (val: any, node: any, externalArr: any) => {
 	state.ruleForm.eventCategoryName = val?.eventName; // 事件分类名称

src/views/todo/seats/accept/lzAccept.vue

@@ -176,20 +176,18 @@
 									</el-form-item>
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item label="工单标签" prop="orderTagObj" :rules="[{ required: false, message: '请选择工单标签', trigger: 'change' }]">
-<!--                    multiple: true-->
+									<el-form-item label="工单标签" prop="tags" :rules="[{ required: false, message: '请选择工单标签', trigger: 'change' }]">
                     <el-cascader
                         :options="state.orderTags"
                         filterable
-                        :props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false, checkStrictly: true, }"
+                        :props="{ value: 'id', label: 'dicDataName', emitPath: false, checkStrictly: true, multiple: true }"
                         placeholder="请选择工单标签"
                         class="w100"
-                        v-model="state.ruleForm.orderTagCode"
-                        ref="tagRef"
-                        @change="changeOrderTag"
+                        v-model="state.ruleForm.tags"
                         collapse-tags
                         collapse-tags-tooltip
                         clearable
+                        :show-all-levels="false"
                     >
                     </el-cascader>
 									</el-form-item>
@@ -425,7 +423,7 @@
 </template>
 
 <script setup lang="ts" name="orderAccept">
-import { computed, defineAsyncComponent, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { storeToRefs } from 'pinia';
@@ -517,6 +515,7 @@ const state = reactive<any>({
 			dicDataValue: '10',
 			dicDataName: '咨询',
 		},
+    tags:[], // 工单标签
 	},
 	formLoading: false, // 表单加载状态
 	hotspotExternal: [], // 热点分类外部数据
@@ -582,16 +581,6 @@ const changeAcceptType = (val: any) => {
 	state.ruleForm.acceptType = val?.dicDataName ?? null;
 	state.ruleForm.acceptTypeCode = val?.dicDataValue ?? null;
 };
-// 选择工单标签
-const tagRef = ref<RefType>();
-const changeOrderTag = () => {
-  const currentNode = tagRef.value.getCheckedNodes();
-  if (currentNode && currentNode.length) {
-    state.ruleForm.orderTag = currentNode[0].pathLabels.join('-');
-  } else {
-    state.ruleForm.orderTag = null;
-  }
-};
 // 选择是否市州互转
 const changeTransPond = (val: any) => {
 	if (!val) {
@@ -844,7 +833,7 @@ const changeFocusEvent = (val: string[]) => {
 };
 // 删除不必要的属性
 const deleteUnnecessaryProperties = (obj: any) => {
-	const propertiesToDelete = ['ageRangeObj', 'licenceTypeObj', 'channel', 'acceptTypeObj', 'transpondCity', 'orderTagObj'];
+	const propertiesToDelete = ['ageRangeObj', 'licenceTypeObj', 'channel', 'acceptTypeObj', 'transpondCity'];
 	propertiesToDelete.forEach((prop) => Reflect.deleteProperty(obj, prop));
 };
 const filesFormat = ref<EmptyArrayType>([]); // 附件列表格式化
@@ -1118,35 +1107,39 @@ const loadBaseData = async () => {
 		console.log(error);
 	}
 };
-if (route.query.createBy) {
-	//  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
-	state.createBy = route.query.createBy;
-	if (route.query.createBy === 'tel') {
-		//通话
-		state.ruleForm.sourceChannel = '电话'; //电话
-		state.ruleForm.sourceChannelCode = 'RGDH'; //电话
-		state.ruleForm.fromPhone = route.query.fromTel; // 来电号码
-		state.ruleForm.contact = route.query.fromTel; // 联系电话
-		state.ruleForm.callId = route.query.callId; // 通话id
-		state.ruleForm.transferPhone = route.query.transfer; // 转接来源
-		state.ruleForm.channel = {
-			// 来源渠道
-			dicDataValue: state.ruleForm.sourceChannelCode,
-			dicDataName: state.ruleForm.sourceChannel,
-		};
-		const isNumberIdentityType = parseInt(<string>route.query.identityType);
-		if ([1, 2].includes(isNumberIdentityType)) {
-			// 按键接收（2：市民 1：企业） 默认市民
-			if (isNumberIdentityType == 2) state.ruleForm.identityType = 1;
-			else state.ruleForm.identityType = 2;
-		} else {
-			state.ruleForm.identityType = 1;
-		}
-	}
-}
+// 电话进来的来信
+const loadCreatedBy = () => {
+  if (route.query.createBy) {
+    //  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
+    state.createBy = route.query.createBy;
+    if (route.query.createBy === 'tel') {
+      //通话
+      state.ruleForm.sourceChannel = '电话'; //电话
+      state.ruleForm.sourceChannelCode = 'RGDH'; //电话
+      state.ruleForm.fromPhone = route.query.fromTel; // 来电号码
+      state.ruleForm.contact = route.query.fromTel; // 联系电话
+      state.ruleForm.callId = route.query.callId; // 通话id
+      state.ruleForm.transferPhone = route.query.transfer; // 转接来源
+      state.ruleForm.channel = {
+        // 来源渠道
+        dicDataValue: state.ruleForm.sourceChannelCode,
+        dicDataName: state.ruleForm.sourceChannel,
+      };
+      const isNumberIdentityType = parseInt(<string>route.query.identityType);
+      if ([1, 2].includes(isNumberIdentityType)) {
+        // 按键接收（2：市民 1：企业） 默认市民
+        if (isNumberIdentityType == 2) state.ruleForm.identityType = 1;
+        else state.ruleForm.identityType = 2;
+      } else {
+        state.ruleForm.identityType = 1;
+      }
+    }
+  }
+};
+loadCreatedBy();
 // 如果是修改加载表单内容
 const loadForm = async () => {
-	state.formLoading = true;
+  buttonLoading.value = true;
 	try {
 		/*		if (route.query.createBy) {
 			//  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
@@ -1238,13 +1231,6 @@ const loadForm = async () => {
 					dicDataName: state.ruleForm.acceptType,
 				};
 			}
-	/*		if (state.ruleForm.orderTagCode) {
-				state.ruleForm.orderTagObj = {
-					// 工单标签
-					dicDataValue: state.ruleForm.orderTagCode,
-					dicDataName: state.ruleForm.orderTag,
-				};
-			}*/
 			if (state.ruleForm.transpondCityValue) {
 				state.ruleForm.transpondCityObj = {
 					// 市州互转
@@ -1252,19 +1238,24 @@ const loadForm = async () => {
 					dicDataName: state.ruleForm.transpondCityName,
 				};
 			}
+      // 工单标签
+      if(state.ruleForm.orderTags && state.ruleForm.orderTags.length){
+        state.ruleForm.tags = state.ruleForm.orderTags.map((item:any)=>item.id);
+      }
 			isSaveSuccess.value = true; // 如果是修改进入 可以直接办理
 			setTimeout(() => {
 				watchPauseAbleFn.resume();
 			}, 300);
-			state.formLoading = false;
+      buttonLoading.value = false;
 		} else {
-			state.formLoading = false;
+      buttonLoading.value = false;
 		}
 		setTimeout(() => {
 			historyOrderRef.value.searchHistory();
 		}, 300);
-	} catch (e) {
-		state.formLoading = false;
+	} catch (e:any) {
+    console.log(e)
+    buttonLoading.value = false;
 	}
 };
 // 加载省市区

src/views/todo/seats/accept/ybAccept.vue

@@ -515,7 +515,7 @@
 </template>
 
 <script setup lang="ts" name="orderAccept">
-import { computed, defineAsyncComponent, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { ElMessage, ElMessageBox, ElNotification } from 'element-plus';
 import { storeToRefs } from 'pinia';
@@ -1186,58 +1186,62 @@ const loadBaseData = async () => {
 const isProvinceOrder = ref(true); // 是否需要排除掉人社热点 默认是
 // 如果是修改加载表单内容
 const sourceDisabled = ref<Boolean>(false);
-if (route.query.createBy) {
-	//  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
-	state.createBy = route.query.createBy;
-	if (route.query.createBy === 'tel') {
-		// 来电弹单
-		state.ruleForm.sourceChannel = '电话'; //电话
-		state.ruleForm.sourceChannelCode = 'RGDH'; //电话
-		state.ruleForm.fromPhone = route.query.fromTel; // 来电号码
-		state.ruleForm.contact = route.query.fromTel; // 联系电话
-		state.ruleForm.callId = route.query.callId; // 通话id
-		state.ruleForm.transferPhone = route.query.transfer; // 转接来源
-		state.ruleForm.channel = {
-			// 来源渠道
-			dicDataValue: state.ruleForm.sourceChannelCode,
-			dicDataName: state.ruleForm.sourceChannel,
-		};
-		// 获取到的按键转为数组并且只取最后一位
-		const keyPress: string = route.query.identityType?.split('_').slice(-1)[0];
-		const isNumberIdentityType = parseInt(keyPress);
-		if ([1, 2].includes(isNumberIdentityType)) {
-			// 按键接收（1：市民 2：企业 3：智能应答）
-			state.ruleForm.identityType = isNumberIdentityType;
-		} else {
-			state.ruleForm.identityType = 1;
-		}
-	}
-	if (route.query.createBy === 'transfer') {
-		// 通话转写
-		state.ruleForm.sourceChannel = '智能应答'; //智能应答
-		state.ruleForm.sourceChannelCode = 'ZNYD'; //智能应答
-		state.ruleForm.fromPhone = route.query.fromTel; // 来电号码
-		state.ruleForm.contact = route.query.fromTel; // 联系电话
-		state.ruleForm.callId = route.query.callId; // 通话id
-		state.ruleForm.transferPhone = route.query.transfer; // 转接来源
-		sourceDisabled.value = true; // 不允许更改
-		state.ruleForm.channel = {
-			// 来源渠道
-			dicDataValue: state.ruleForm.sourceChannelCode,
-			dicDataName: state.ruleForm.sourceChannel,
-		};
-		state.ruleForm.acceptTypeCode = '10';
-		state.ruleForm.acceptType = '咨询';
-		state.ruleForm.acceptTypeObj = {
-			// 受理类型
-			dicDataValue: state.ruleForm.acceptTypeCode,
-			dicDataName: state.ruleForm.acceptType,
-		};
-		state.ruleForm.content = Local.get(`${route.query.callId}`);
-	}
+// 电话进来的来信
+const loadCreatedBy = () => {
+  if (route.query.createBy) {
+    //  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
+    state.createBy = route.query.createBy;
+    if (route.query.createBy === 'tel') {
+      // 来电弹单
+      state.ruleForm.sourceChannel = '电话'; //电话
+      state.ruleForm.sourceChannelCode = 'RGDH'; //电话
+      state.ruleForm.fromPhone = route.query.fromTel; // 来电号码
+      state.ruleForm.contact = route.query.fromTel; // 联系电话
+      state.ruleForm.callId = route.query.callId; // 通话id
+      state.ruleForm.transferPhone = route.query.transfer; // 转接来源
+      state.ruleForm.channel = {
+        // 来源渠道
+        dicDataValue: state.ruleForm.sourceChannelCode,
+        dicDataName: state.ruleForm.sourceChannel,
+      };
+      // 获取到的按键转为数组并且只取最后一位
+      const keyPress: string = route.query.identityType?.split('_').slice(-1)[0];
+      const isNumberIdentityType = parseInt(keyPress);
+      if ([1, 2].includes(isNumberIdentityType)) {
+        // 按键接收（1：市民 2：企业 3：智能应答）
+        state.ruleForm.identityType = isNumberIdentityType;
+      } else {
+        state.ruleForm.identityType = 1;
+      }
+    }
+    if (route.query.createBy === 'transfer') {
+      // 通话转写
+      state.ruleForm.sourceChannel = '智能应答'; //智能应答
+      state.ruleForm.sourceChannelCode = 'ZNYD'; //智能应答
+      state.ruleForm.fromPhone = route.query.fromTel; // 来电号码
+      state.ruleForm.contact = route.query.fromTel; // 联系电话
+      state.ruleForm.callId = route.query.callId; // 通话id
+      state.ruleForm.transferPhone = route.query.transfer; // 转接来源
+      sourceDisabled.value = true; // 不允许更改
+      state.ruleForm.channel = {
+        // 来源渠道
+        dicDataValue: state.ruleForm.sourceChannelCode,
+        dicDataName: state.ruleForm.sourceChannel,
+      };
+      state.ruleForm.acceptTypeCode = '10';
+      state.ruleForm.acceptType = '咨询';
+      state.ruleForm.acceptTypeObj = {
+        // 受理类型
+        dicDataValue: state.ruleForm.acceptTypeCode,
+        dicDataName: state.ruleForm.acceptType,
+      };
+      state.ruleForm.content = Local.get(`${route.query.callId}`);
+    }
+  }
 }
+loadCreatedBy();
 const loadForm = async () => {
-	state.formLoading = true;
+  buttonLoading.value = true;
 	try {
 		/*		if (route.query.createBy) {
 			//  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
@@ -1361,20 +1365,20 @@ const loadForm = async () => {
 			}
 
 			isProvinceOrder.value = state.ruleForm.source !== 100; // 省工单需要展示人社热点
-
-			state.formLoading = false;
 			isSaveSuccess.value = true; // 如果是修改进入 可以直接办理
+      buttonLoading.value = false;
 			setTimeout(() => {
 				watchPauseAbleFn.resume();
 			}, 300);
 		} else {
-			state.formLoading = false;
+      buttonLoading.value = false;
 		}
     setTimeout(() => {
       historyOrderRef.value.searchHistory();
     }, 300);
-	} catch (e) {
-		state.formLoading = false;
+	} catch (e: any) {
+    console.log(e)
+    buttonLoading.value = false;
 	}
 };
 // 加载省市区

src/views/todo/seats/accept/zgAccept.vue

@@ -191,17 +191,18 @@
 									</el-form-item>
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item label="工单标签" prop="orderTagCode" :rules="[{ required: false, message: '请选择工单标签', trigger: 'change' }]">
+									<el-form-item label="工单标签" prop="tags" :rules="[{ required: false, message: '请选择工单标签', trigger: 'change' }]">
 										<el-cascader
 											:options="state.orderTags"
 											filterable
-											:props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false, checkStrictly: true }"
+											:props="{ value: 'id', label: 'dicDataName', emitPath: false, checkStrictly: true, multiple: true }"
 											placeholder="请选择工单标签"
 											class="w100"
-											v-model="state.ruleForm.orderTagCode"
-											ref="tagRef"
-											@change="changeOrderTag"
+											v-model="state.ruleForm.tags"
+											collapse-tags
+											collapse-tags-tooltip
 											clearable
+                      :show-all-levels="false"
 										>
 										</el-cascader>
 									</el-form-item>
@@ -441,7 +442,7 @@
 </template>
 
 <script setup lang="ts" name="orderAccept">
-import { computed, defineAsyncComponent, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { storeToRefs } from 'pinia';
@@ -538,6 +539,7 @@ const state = reactive<any>({
 		industryId: null, // 行业分类
 		industryName: null, // 行业分类名称
 		knowledgeQuote: [], // 知识库引用
+    tags: [], // 工单标签
 	},
 	formLoading: false, // 表单加载状态
 	hotspotExternal: [], // 热点分类外部数据
@@ -609,16 +611,6 @@ const changeIndustry = (val: any) => {
 	state.ruleForm.industryId = val?.id ?? null;
 	state.ruleForm.industryName = val?.name ?? null;
 };
-// 选择工单标签
-const tagRef = ref<RefType>();
-const changeOrderTag = () => {
-	const currentNode = tagRef.value.getCheckedNodes();
-	if (currentNode && currentNode.length) {
-		state.ruleForm.orderTag = currentNode[0].pathLabels.join('-');
-	} else {
-		state.ruleForm.orderTag = null;
-	}
-};
 // 选择是否市州互转
 const changeTransPond = (val: any) => {
 	if (!val) {
@@ -1175,37 +1167,41 @@ const loadBaseData = async () => {
 		console.log(error);
 	}
 };
-if (route.query.createBy) {
-	//  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
-	state.createBy = route.query.createBy;
-	if (route.query.createBy === 'tel') {
-		//通话
-		state.ruleForm.sourceChannel = '电话'; //电话
-		state.ruleForm.sourceChannelCode = 'RGDH'; //电话
-		state.ruleForm.fromPhone = route.query.fromTel; // 来电号码
-		state.ruleForm.contact = route.query.fromTel; // 联系电话
-		state.ruleForm.callId = route.query.callId; // 通话id
-		state.ruleForm.transferPhone = route.query.transfer; // 转接来源
-		state.ruleForm.channel = {
-			// 来源渠道
-			dicDataValue: state.ruleForm.sourceChannelCode,
-			dicDataName: state.ruleForm.sourceChannel,
-		};
-		const isNumberIdentityType = parseInt(<string>route.query.identityType);
-		if ([1, 2].includes(isNumberIdentityType)) {
-			// 按键接收（2：市民 1：企业） 默认市民
-			if (isNumberIdentityType == 2) state.ruleForm.identityType = 1;
-			else state.ruleForm.identityType = 2;
-		} else {
-			state.ruleForm.identityType = 1;
+// 电话进来的来信
+const loadCreatedBy = () => {
+	if (route.query.createBy) {
+		//  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
+		state.createBy = route.query.createBy;
+		if (route.query.createBy === 'tel') {
+			//通话
+			state.ruleForm.sourceChannel = '电话'; //电话
+			state.ruleForm.sourceChannelCode = 'RGDH'; //电话
+			state.ruleForm.fromPhone = route.query.fromTel; // 来电号码
+			state.ruleForm.contact = route.query.fromTel; // 联系电话
+			state.ruleForm.callId = route.query.callId; // 通话id
+			state.ruleForm.transferPhone = route.query.transfer; // 转接来源
+			state.ruleForm.channel = {
+				// 来源渠道
+				dicDataValue: state.ruleForm.sourceChannelCode,
+				dicDataName: state.ruleForm.sourceChannel,
+			};
+			const isNumberIdentityType = parseInt(<string>route.query.identityType);
+			if ([1, 2].includes(isNumberIdentityType)) {
+				// 按键接收（2：市民 1：企业） 默认市民
+				if (isNumberIdentityType == 2) state.ruleForm.identityType = 1;
+				else state.ruleForm.identityType = 2;
+			} else {
+				state.ruleForm.identityType = 1;
+			}
 		}
 	}
-}
+};
+loadCreatedBy();
 // 如果是修改加载表单内容
 const loadForm = async () => {
-	state.formLoading = true;
+	buttonLoading.value = true;
 	try {
-/*		if (route.query.createBy) {
+		/*		if (route.query.createBy) {
 			//  route.query.createBy  createBy 代表来源  tel:来电弹单  letter:互联网来信 默认表示手动创建
 			state.createBy = route.query.createBy;
 			if (route.query.createBy === 'tel') {
@@ -1302,13 +1298,6 @@ const loadForm = async () => {
 					dicDataName: state.ruleForm.acceptType,
 				};
 			}
-			/*		if (state.ruleForm.orderTagCode) {
-				state.ruleForm.orderTagObj = {
-					// 工单标签
-					dicDataValue: state.ruleForm.orderTagCode,
-					dicDataName: state.ruleForm.orderTag,
-				};
-			}*/
 			if (state.ruleForm.transpondCityValue) {
 				state.ruleForm.transpondCityObj = {
 					// 市州互转
@@ -1316,19 +1305,24 @@ const loadForm = async () => {
 					dicDataName: state.ruleForm.transpondCityName,
 				};
 			}
+      // 工单标签
+      if(state.ruleForm.orderTags && state.ruleForm.orderTags.length){
+        state.ruleForm.tags = state.ruleForm.orderTags.map((item:any)=>item.id);
+      }
 			isSaveSuccess.value = true; // 如果是修改进入 可以直接办理
 			setTimeout(() => {
 				watchPauseAbleFn.resume();
 			}, 300);
-			state.formLoading = false;
+			buttonLoading.value = false;
 		} else {
-			state.formLoading = false;
+			buttonLoading.value = false;
 		}
-    setTimeout(() => {
-      historyOrderRef.value.searchHistory();
-    }, 300);
-	} catch (e) {
-		state.formLoading = false;
+		setTimeout(() => {
+			historyOrderRef.value.searchHistory();
+		}, 300);
+	} catch (e: any) {
+		console.log(e);
+		buttonLoading.value = false;
 	}
 };
 // 加载省市区