Merge branch 'release' into dev

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

@@ -1,6 +1,6 @@
 <template>
 	<el-drawer v-model="state.dialogVisible" title="修改工单信息" destroy-on-close size="50%" append-to-body>
-		<el-form label-width="110px" ref="ruleFormRef" :model="state.ruleForm" v-loading="state.loading" scroll-to-error>
+		<el-form label-width="110px" ref="ruleFormRef" :model="state.ruleForm" :disabled="state.loading" scroll-to-error>
 			<el-row :gutter="10">
 				<el-col>
 					<p class="border-title mb10">来电信息</p>
@@ -650,7 +650,7 @@ const tagRef = ref<RefType>();
 const changeOrderTag = () => {
 	const currentNode = tagRef.value.getCheckedNodes();
 	if (currentNode && currentNode.length) {
-		state.ruleForm.orderTag = currentNode[0].label;
+		state.ruleForm.orderTag = currentNode[0].pathLabels.join('-');
 	} else {
 		state.ruleForm.orderTag = null;
 	}

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

@@ -5,7 +5,7 @@
 			<el-col :span="14" class="left-content h100">
 				<el-scrollbar class="h100">
 					<el-card shadow="never">
-						<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px" label-position="right" scroll-to-error>
+						<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px" label-position="right" scroll-to-error :disabled="buttonLoading">
 							<p class="border-title mb10">来电信息</p>
 							<el-row :gutter="20">
 								<!-- 来源渠道 -->

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

@@ -26,7 +26,7 @@
 			<el-col :span="12" class="left-content h100">
 				<el-scrollbar class="h100">
 					<el-card shadow="never">
-						<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px" label-position="right" scroll-to-error>
+						<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px" label-position="right" scroll-to-error :disabled="buttonLoading">
 							<p class="border-title mb10">来电信息</p>
 							<el-row :gutter="20">
 								<!-- 来源渠道 -->

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

@@ -5,7 +5,7 @@
 			<el-col :span="14" class="left-content h100">
 				<el-scrollbar class="h100">
 					<el-card shadow="never">
-						<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px" label-position="right" scroll-to-error>
+						<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px" label-position="right" scroll-to-error :disabled="buttonLoading">
 							<p class="border-title mb10">来电信息</p>
 							<el-row :gutter="20">
 								<!-- 来源渠道 -->
@@ -192,18 +192,18 @@
 								</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-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-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">
@@ -612,12 +612,12 @@ const changeIndustry = (val: any) => {
 // 选择工单标签
 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 currentNode = tagRef.value.getCheckedNodes();
+	if (currentNode && currentNode.length) {
+		state.ruleForm.orderTag = currentNode[0].pathLabels.join('-');
+	} else {
+		state.ruleForm.orderTag = null;
+	}
 };
 // 选择是否市州互转
 const changeTransPond = (val: any) => {
@@ -1278,7 +1278,7 @@ const loadForm = async () => {
 					dicDataName: state.ruleForm.acceptType,
 				};
 			}
-	/*		if (state.ruleForm.orderTagCode) {
+			/*		if (state.ruleForm.orderTagCode) {
 				state.ruleForm.orderTagObj = {
 					// 工单标签
 					dicDataValue: state.ruleForm.orderTagCode,