Merge branch 'master' into release

src/views/business/order/index.vue

@@ -142,7 +142,7 @@
 		<order-return ref="orderReturnRef" @updateList="refreshList" />
 		<!--	更多查询	-->
 		<el-drawer v-model="drawer" title="更多查询" size="500px">
-			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px">
+			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px" :disabled="gridOptions.loading">
 				<el-form-item label="受理时间" prop="slTime">
 					<el-date-picker
 						v-model="state.queryParams.slTime"
@@ -227,9 +227,17 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="工单标签" prop="OrderTagCode" v-if="['ZiGong', 'LuZhou'].includes(themeConfig.appScope)">
-					<el-select v-model="state.queryParams.OrderTagCode" placeholder="请选择推送分类" clearable @change="handleQuery">
-						<el-option v-for="item in state.orderTagOptions" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
-					</el-select>
+          <el-cascader
+              :options="state.orderTagOptions"
+              filterable
+              :props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false, checkStrictly: true }"
+              placeholder="请选择工单标签"
+              class="w100"
+              v-model="state.queryParams.orderTagCode"
+              @change="handleQuery"
+              clearable
+          >
+          </el-cascader>
 				</el-form-item>
 				<el-form-item label="重点标记" prop="FocusOnEvents" v-if="['YiBin'].includes(themeConfig.appScope)">
 					<el-select v-model="state.queryParams.FocusOnEvents" placeholder="请选择重点标记" clearable @change="handleQuery">

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

@@ -180,17 +180,19 @@
 						</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' }]">
-							<el-select
-								v-model="state.ruleForm.orderTagObj"
+						<el-form-item label="工单标签" prop="orderTagCode" :rules="[{ required: false, message: '请选择工单标签', trigger: 'change' }]">
+							<el-cascader
+								:options="state.orderTags"
+								filterable
+								:props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false, checkStrictly: true }"
 								placeholder="请选择工单标签"
 								class="w100"
-								clearable
-								value-key="dicDataValue"
+								v-model="state.ruleForm.orderTagCode"
+								ref="tagRef"
 								@change="changeOrderTag"
+								clearable
 							>
-								<el-option v-for="item in state.orderTags" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
-							</el-select>
+							</el-cascader>
 						</el-form-item>
 					</el-col>
 				</template>
@@ -545,13 +547,13 @@ const getOrderDetail = async (id: string) => {
 				dicDataName: state.ruleForm.licenceType,
 			};
 		}
-		if (state.ruleForm.orderTagCode) {
+		/*		if (state.ruleForm.orderTagCode) {
 			state.ruleForm.orderTagObj = {
 				// 工单标签
 				dicDataValue: state.ruleForm.orderTagCode,
 				dicDataName: state.ruleForm.orderTag,
 			};
-		}
+		}*/
 
 		if (!state.ruleForm.acceptType) {
 			// 外部输入数据没有受理名称和热点名称 需要根据code调用一次change事件获取
@@ -644,9 +646,14 @@ const changeIndustry = (val: any) => {
 	state.ruleForm.industryName = val?.name ?? null;
 };
 // 选择工单标签
-const changeOrderTag = (val: any) => {
-	state.ruleForm.orderTag = val?.dicDataName ?? null;
-	state.ruleForm.orderTagCode = val?.dicDataValue ?? null;
+const tagRef = ref<RefType>();
+const changeOrderTag = () => {
+	const currentNode = tagRef.value.getCheckedNodes();
+	if (currentNode && currentNode.length) {
+		state.ruleForm.orderTag = currentNode[0].label;
+	} else {
+		state.ruleForm.orderTag = null;
+	}
 };
 // 选择事件分类
 const chooseEvent = (val: any, node: any, externalArr: any) => {
@@ -830,7 +837,7 @@ const recordFile = (obj: any) => {
 const repeatableEventDetails = ref<EmptyArrayType>([]);
 // 删除不必要的属性
 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));
 };
 // 保存

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

@@ -191,17 +191,19 @@
 									</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' }]">
-										<el-select
-											v-model="state.ruleForm.orderTagObj"
-											placeholder="请选择工单标签"
-											class="w100"
-											clearable
-											value-key="dicDataValue"
-											@change="changeOrderTag"
-										>
-											<el-option v-for="item in state.orderTags" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
-										</el-select>
+									<el-form-item label="工单标签" prop="orderTagCode" :rules="[{ required: false, message: '请选择工单标签', trigger: 'change' }]">
+                    <el-cascader
+                        :options="state.orderTags"
+                        filterable
+                        :props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false, checkStrictly: true }"
+                        placeholder="请选择工单标签"
+                        class="w100"
+                        v-model="state.ruleForm.orderTagCode"
+                        ref="tagRef"
+                        @change="changeOrderTag"
+                        clearable
+                    >
+                    </el-cascader>
 									</el-form-item>
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
@@ -608,9 +610,14 @@ const changeIndustry = (val: any) => {
 	state.ruleForm.industryName = val?.name ?? null;
 };
 // 选择工单标签
-const changeOrderTag = (val: any) => {
-	state.ruleForm.orderTag = val?.dicDataName ?? null;
-	state.ruleForm.orderTagCode = val?.dicDataValue ?? null;
+const tagRef = ref<RefType>();
+const changeOrderTag = () => {
+  const currentNode = tagRef.value.getCheckedNodes();
+  if(currentNode && currentNode.length){
+    state.ruleForm.orderTag = currentNode[0].label;
+  }else{
+    state.ruleForm.orderTag = null;
+  }
 };
 // 选择是否市州互转
 const changeTransPond = (val: any) => {
@@ -873,7 +880,7 @@ const changeFocusEvent = (val: string[]) => {
 };
 // 删除不必要的属性
 const deleteUnnecessaryProperties = (obj: any) => {
-	const propertiesToDelete = ['ageRangeObj', 'licenceTypeObj', 'channel', 'acceptTypeObj', 'transpondCity', 'orderTagObj', 'industryObj'];
+	const propertiesToDelete = ['ageRangeObj', 'licenceTypeObj', 'channel', 'acceptTypeObj', 'transpondCity', 'industryObj'];
 	propertiesToDelete.forEach((prop) => Reflect.deleteProperty(obj, prop));
 };
 const filesFormat = ref<EmptyArrayType>([]); // 附件列表格式化
@@ -1271,13 +1278,13 @@ const loadForm = async () => {
 					dicDataName: state.ruleForm.acceptType,
 				};
 			}
-			if (state.ruleForm.orderTagCode) {
+	/*		if (state.ruleForm.orderTagCode) {
 				state.ruleForm.orderTagObj = {
 					// 工单标签
 					dicDataValue: state.ruleForm.orderTagCode,
 					dicDataName: state.ruleForm.orderTag,
 				};
-			}
+			}*/
 			if (state.ruleForm.transpondCityValue) {
 				state.ruleForm.transpondCityObj = {
 					// 市州互转