reactor:element-plus 版本更新;

src/views/auxiliary/notice/index.vue

@@ -74,9 +74,6 @@
 						<SvgIcon name="ele-Plus" class="mr5" />新增
 					</el-button>
 				</template>
-				<template #isProvince="{ row }">
-					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-				</template>
 				<template #isMustRead="{ row }">
 					{{ row.isMustRead ? '是' : '否' }}
 				</template>

src/views/business/discern/apply.vue

@@ -9,20 +9,20 @@
               <el-segmented
                   :options="[
 									{
-										value: '',
+										value: 'all',
 										label: '全部',
 									},
 									{
-										value: 'false',
+										value: 'city',
 										label: '市工单',
 									},
 									{
-										value: 'true',
+										value: 'province',
 										label: '省工单',
 									},
 								]"
-                  v-model="state.queryParams.IsProvince"
-                  @change="handleQuery"
+                  v-model="fastSearch"
+                  @change="fastSearchChange"
               />
             </el-form-item>
           </el-col>
@@ -77,16 +77,16 @@
 					</transition>
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
-							<el-form-item label="接办时间" prop="crTime">
+							<el-form-item label="接办时间" prop="jbTime">
 								<el-date-picker
-									v-model="state.queryParams.crTime"
+									v-model="state.queryParams.jbTime"
 									type="datetimerange"
 									unlink-panels
 									range-separator="至"
 									start-placeholder="开始时间"
 									end-placeholder="结束时间"
 									:shortcuts="shortcuts"
-									@change="timeStartChangeCr"
+									@change="handleQuery"
 									value-format="YYYY-MM-DD[T]HH:mm:ss"
                   :default-time="defaultTimeStartEnd"
 								/>
@@ -95,16 +95,16 @@
 					</transition>
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
-							<el-form-item label="办结时间" prop="exTime">
+							<el-form-item label="办结时间" prop="bjTime">
 								<el-date-picker
-									v-model="state.queryParams.exTime"
+									v-model="state.queryParams.bjTime"
 									type="datetimerange"
 									unlink-panels
 									range-separator="至"
 									start-placeholder="开始时间"
 									end-placeholder="结束时间"
 									:shortcuts="shortcuts"
-									@change="timeStartChangeEx"
+									@change="handleQuery"
 									value-format="YYYY-MM-DD[T]HH:mm:ss"
                   :default-time="defaultTimeStartEnd"
 								/>
@@ -122,7 +122,7 @@
 									start-placeholder="开始时间"
 									end-placeholder="结束时间"
 									:shortcuts="shortcuts"
-									@change="timeStartChangeSl"
+									@change="handleQuery"
 									value-format="YYYY-MM-DD[T]HH:mm:ss"
                   :default-time="defaultTimeStartEnd"
 								/>
@@ -140,7 +140,7 @@
 									start-placeholder="开始时间"
 									end-placeholder="结束时间"
 									:shortcuts="shortcuts"
-									@change="timeStartChangeHf"
+									@change="handleQuery"
 									value-format="YYYY-MM-DD[T]HH:mm:ss"
                   :default-time="defaultTimeStartEnd"
 								/>
@@ -256,6 +256,7 @@ import { formatDate } from '@/utils/formatTime';
 import { screenApplyList, screenBaseData } from '@/api/business/discern';
 import { commonEnum, defaultTimeStartEnd, shortcuts } from "@/utils/constants";
 import other from '@/utils/other';
+import Other from "@/utils/other";
 // 引入组件
 const ProcessAudit = defineAsyncComponent(() => import('@/components/ProcessAudit/index.vue')); // 流程审批
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
@@ -317,16 +318,26 @@ const state = reactive<any>({
 		PageIndex: 1,
 		PageSize: 10,
 		Keyword: null, // 关键字
-		IsProvince: '',
+		IsProvince: null,
 		IsHomePage: null,
 		CounterSignType: null, // 会签类型
 		OrgLevelOneName: null, // 一级部门
 		ActualHandleOrgName: null, // 接办部门名称
-		slTime: [], // 受理时间
-		hfTime: [], // 回访时间
 		VisitOrgName: null, // 回访部门
 		OrgProcessingResults: null, // 部门办件结果
 		OrgNoSatisfiedReason: null, // 不满意原因
+    jbTime:[], // 接办时间
+    ActualHandleTime:null,
+    EndActualHandleTime:null,
+    bjTime:[], // 办结时间
+    FiledTime:null,
+    EndFiledTime:null,
+    slTime:[],// 受理时间
+    CreationTime:null,
+    EndCreationTime:null,
+    hfTime:[], // 回访时间
+    VisitTime:null,
+    EndVisitTime:null
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -339,37 +350,27 @@ const state = reactive<any>({
 	dissatisfiedReason: [], // 不满意原因
 	visitSatisfaction: [], // 满意度
 });
+const fastSearch = ref('all'); // tab位置
+const fastSearchChange = (val: string) => {
+  fastSearch.value = val;
+  switch (val) {
+    case 'all':
+      state.queryParams.IsProvince = null;
+      break;
+    case 'city':
+      state.queryParams.IsProvince = false;
+      break;
+    case 'province':
+      state.queryParams.IsProvince = true;
+      break;
+  }
+  handleQuery();
+};
 const searchCol = ref(true); // 展开/收起
 // 展开/收起
 const closeSearch = () => {
 	searchCol.value = !searchCol.value;
 };
-const handleTimeChange = (val: string[], startKey: string, endKey: string) => {
-	if (val) {
-		state.queryParams[startKey] = val[0];
-		state.queryParams[endKey] = val[1];
-	} else {
-		state.queryParams[startKey] = '';
-		state.queryParams[endKey] = '';
-	}
-	handleQuery();
-};
-// 实际办理时间
-const timeStartChangeCr = (val: string[]) => {
-	handleTimeChange(val, 'ActualHandleTime', 'EndActualHandleTime');
-};
-// 归档时间
-const timeStartChangeEx = (val: string[]) => {
-	handleTimeChange(val, 'FiledTime', 'EndFiledTime');
-};
-// 受理时间
-const timeStartChangeSl = (val: string[]) => {
-	handleTimeChange(val, 'CreationTime', 'EndCreationTime');
-};
-// 回访时间
-const timeStartChangeHf = (val: string[]) => {
-	handleTimeChange(val, 'VisitTime', 'EndVisitTime');
-};
 // 获取查询条件基础信息
 const getBaseData = async () => {
 	try {
@@ -391,14 +392,23 @@ const handleQuery = () => {
 	queryList();
 };
 /** 获取列表 */
+const requestParams = ref({});
 const queryList = () => {
-	let request = other.deepClone(state.queryParams);
-	Reflect.deleteProperty(request, 'crTime'); // 删除无用的参数
-	Reflect.deleteProperty(request, 'exTime'); // 删除无用的参数
-	Reflect.deleteProperty(request, 'slTime'); // 删除无用的参数
-	Reflect.deleteProperty(request, 'hfTime'); // 删除无用的参数
+  requestParams.value = Other.deepClone(state.queryParams);
+  requestParams.value.ActualHandleTime = state.queryParams.jbTime === null ? null : state.queryParams.jbTime[0]; // 接办时间
+  requestParams.value.EndActualHandleTime = state.queryParams.jbTime === null ? null : state.queryParams.jbTime[1];
+  Reflect.deleteProperty(requestParams.value, 'jbTime'); // 删除无用的参数
+  requestParams.value.CreationTime = state.queryParams.slTime === null ? null : state.queryParams.slTime[0]; // 受理时间
+  requestParams.value.EndCreationTime = state.queryParams.slTime === null ? null : state.queryParams.slTime[1];
+  Reflect.deleteProperty(requestParams.value, 'slTime'); // 删除无用的参数
+  requestParams.value.FiledTime = state.queryParams.bjTime === null ? null : state.queryParams.bjTime[0]; // 办结时间
+  requestParams.value.EndFiledTime = state.queryParams.bjTime === null ? null : state.queryParams.bjTime[1];
+  Reflect.deleteProperty(requestParams.value, 'bjTime'); // 删除无用的参数
+  requestParams.value.VisitTime = state.queryParams.hfTime === null ? null : state.queryParams.hfTime[0]; // 回访时间
+  requestParams.value.EndVisitTime = state.queryParams.hfTime === null ? null : state.queryParams.hfTime[1];
+  Reflect.deleteProperty(requestParams.value, 'hfTime'); // 删除无用的参数
 	state.loading = true;
-	screenApplyList(request)
+	screenApplyList(requestParams.value)
 		.then((response: any) => {
 			state.tableData = response?.result.items ?? [];
 			state.total = response?.result.total;
@@ -412,15 +422,9 @@ const queryList = () => {
 const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
-	state.queryParams.ActualHandleTime = null;
-	state.queryParams.EndActualHandleTime = null;
-	state.queryParams.FiledTime = null;
-	state.queryParams.EndFiledTime = null;
-	state.queryParams.CreationTime = null;
-	state.queryParams.EndCreationTime = null;
-	state.queryParams.VisitTime = null;
-	state.queryParams.EndVisitTime = null;
 	state.queryParams.IsHomePage = null;
+  state.queryParams.IsProvince = null;
+  fastSearch.value = 'all';
 	queryList();
 };
 // 甄别审批

src/views/business/order/copy-index.vue

@@ -5,24 +5,24 @@
 				<el-row :gutter="0">
 					<el-col>
 						<el-form-item label="快捷查询" prop="IsProvinceOrder">
-              <el-segmented
-                  :options="[
+							<el-segmented
+								:options="[
 									{
-										value: '',
+										value: 'all',
 										label: '全部',
 									},
 									{
-										value: 'false',
+										value: 'city',
 										label: '市工单',
 									},
 									{
-										value: 'true',
+										value: 'province',
 										label: '省工单',
 									},
 								]"
-                  v-model="state.queryParams.IsProvinceOrder"
-                  @change="handleQuery"
-              />
+								v-model="fastSearch"
+								@change="fastSearchChange"
+							/>
 							<el-checkbox-group v-model="checkList" @change="changeCheckList" class="ml15">
 								<el-checkbox value="IsSensitiveWord" border>敏感类工单</el-checkbox>
 							</el-checkbox-group>
@@ -458,7 +458,7 @@ const state = reactive<any>({
 		ActualHandleTimeStart: null,
 		ActualHandleTimeEnd: null,
 		PushTypeCode: null, //推送类型
-		IsProvinceOrder: '', // 省市工单
+		IsProvinceOrder: null, // 省市工单
 		IsSensitiveWord: null, // 是否敏感词工单
 		SensitiveWord: null, // 敏感词
 		IsUrgent: null, // 是否加急
@@ -476,6 +476,22 @@ const state = reactive<any>({
 	orgData: [], // 机构数据
 	areaOptions: [], // 省市区数据
 });
+const fastSearch = ref('all'); // tab位置
+const fastSearchChange = (val: string) => {
+	fastSearch.value = val;
+	switch (val) {
+		case 'all':
+			state.queryParams.IsProvinceOrder = null;
+			break;
+		case 'city':
+			state.queryParams.IsProvinceOrder = false;
+			break;
+		case 'province':
+			state.queryParams.IsProvinceOrder = true;
+			break;
+	}
+	handleQuery();
+};
 const checkList = ref([]);
 // 是否展示总数
 const showTotal = ref(false);
@@ -500,11 +516,11 @@ const route = useRoute(); // 路由
 const router = useRouter(); // 路由
 const proTableRef = ref<RefType>(); // 表格ref
 const selectable = (row: any) => {
-  if (state.queryParams.IsProvinceOrder === 'true') {
-    return row?.isProvince && row?.source > 1 && row?.status <= 1;
-  } else {
-    return true;
-  }
+	if (state.queryParams.IsProvinceOrder) {
+		return row?.isProvince && row?.source > 1 && row?.status <= 1;
+	} else {
+		return true;
+	}
 };
 // 表格配置项
 const columns = ref<any[]>([
@@ -685,7 +701,8 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	state.queryParams.IsSensitiveWord = null;
-	state.queryParams.IsProvinceOrder = '';
+	state.queryParams.IsProvinceOrder = null;
+  fastSearch.value = 'all';
 	checkList.value = [];
 	queryIndex.value = 0;
 	queryList(true);

src/views/business/order/index.vue

@@ -4,24 +4,24 @@
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent label-width="100px">
 				<el-row>
 					<el-col>
-						<el-form-item label="快捷查询" prop="IsProvinceOrder">
+						<el-form-item label="快捷查询" prop="fastSearch">
 							<el-segmented
 								:options="[
 									{
-										value: '',
+										value: 'all',
 										label: '全部',
 									},
 									{
-										value: 'false',
+										value: 'city',
 										label: '市工单',
 									},
 									{
-										value: 'true',
+										value: 'province',
 										label: '省工单',
 									},
 								]"
-								v-model="state.queryParams.IsProvinceOrder"
-								@change="handleQuery"
+								v-model="fastSearch"
+								@change="fastSearchChange"
 							/>
 							<el-checkbox-group v-model="checkList" @change="changeCheckList" class="ml15">
 								<el-checkbox value="IsSensitiveWord" border>敏感类工单</el-checkbox>
@@ -432,6 +432,22 @@ const state = reactive<any>({
 	pushTypeOptions: [], //推送分类
 	areaOptions: [], // 省市区数据
 });
+const fastSearch = ref('all'); // tab位置
+const fastSearchChange = (val: string) => {
+	fastSearch.value = val;
+	switch (val) {
+		case 'all':
+			state.queryParams.IsProvinceOrder = null;
+			break;
+		case 'city':
+			state.queryParams.IsProvinceOrder = false;
+			break;
+		case 'province':
+			state.queryParams.IsProvinceOrder = true;
+			break;
+	}
+	handleQuery();
+};
 const checkList = ref([]);
 // 多选
 const changeCheckList = () => {
@@ -449,7 +465,7 @@ const route = useRoute(); // 路由
 const router = useRouter(); // 路由
 const proTableRef = ref<RefType>(); // 表格ref
 const selectable = (row: any) => {
-	if (state.queryParams.IsProvinceOrder === 'true') {
+	if (state.queryParams.IsProvinceOrder) {
 		return row?.isProvince && row?.source > 1 && row?.status <= 1;
 	} else {
 		return true;
@@ -578,7 +594,8 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	state.queryParams.IsSensitiveWord = null;
-	state.queryParams.IsProvinceOrder = '';
+	state.queryParams.IsProvinceOrder = null;
+  fastSearch.value = 'all';
 	checkList.value = [];
 	queryList();
 };

src/views/business/secondVisit/index.vue

@@ -25,9 +25,6 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #isProvince="{ row }">
-					<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-				</template>
 				<template #title="{ row }">
 					<order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
 				</template>
@@ -71,9 +68,9 @@ const proTableRef = ref<RefType>(); // 表格ref
 const columns = ref<any[]>([
 	{ type: 'selection', fixed: 'left', width: 40 },
 	{ prop: 'order.no', label: '工单编码', minWidth: 140 },
-	{ prop: 'statusText', label: '回访状态', minWidth: 100 },
-	{ prop: 'isProvince', label: '省/市工单', minWidth: 90 },
-	{ prop: 'title', label: '工单标题', minWidth: 200 },
+	{ prop: 'order.statusText', label: '回访状态', minWidth: 100 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', minWidth: 90 },
+	{ prop: 'order.title', label: '工单标题', minWidth: 200 },
 	{ prop: 'order.sourceChannel', label: '来源渠道', minWidth: 100 },
 	{ prop: 'order.acceptType', label: '受理类型', minWidth: 100 },
 	{ prop: 'order.hotspotName', label: '热点分类', minWidth: 150 },

src/views/business/special/audit.vue

@@ -36,9 +36,6 @@
 						>批量审批
 					</el-button>
 				</template>
-				<template #isProvince="{ row }">
-					<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-				</template>
 				<template #title="{ row }">
 					<order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
 				</template>

src/views/business/visit/index.vue

@@ -4,19 +4,28 @@
 		<el-card shadow="never">
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent label-width="100px">
 				<el-row :gutter="20">
-          <el-col>
-            <el-form-item label="数据范围" prop="IsProvince">
-              <el-segmented
-                  :options="[
-									{ label: '全部', value: '' },
-									{ label: '市工单', value: 'false' },
-									{ label: '省工单', value: 'true' },
+					<el-col>
+						<el-form-item label="数据范围" prop="IsProvince">
+							<el-segmented
+								:options="[
+									{
+										value: 'all',
+										label: '全部',
+									},
+									{
+										value: 'city',
+										label: '市工单',
+									},
+									{
+										value: 'province',
+										label: '省工单',
+									},
 								]"
-                  v-model="state.queryParams.IsProvince"
-                  @change="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
+								v-model="fastSearch"
+								@change="fastSearchChange"
+							/>
+						</el-form-item>
+					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
 						<el-form-item label="工单标题" prop="Keyword">
 							<el-input v-model="state.queryParams.Keyword" placeholder="工单标题" clearable @keyup.enter="handleQuery" />
@@ -35,16 +44,16 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-          <transition name="el-zoom-in-top">
-					<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
-						<el-form-item label="是否会签" prop="IsCountersign">
-							<el-select v-model="state.queryParams.IsCountersign" placeholder="请选择是否会签" @change="handleQuery" class="w100">
-								<el-option label="是" value="true" />
-								<el-option label="否" value="false" />
-							</el-select>
-						</el-form-item>
-					</el-col>
-          </transition>
+					<transition name="el-zoom-in-top">
+						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
+							<el-form-item label="是否会签" prop="IsCountersign">
+								<el-select v-model="state.queryParams.IsCountersign" placeholder="请选择是否会签" @change="handleQuery" class="w100">
+									<el-option label="是" value="true" />
+									<el-option label="否" value="false" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</transition>
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="回访状态" prop="VisitState">
@@ -133,6 +142,22 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
 const proTableRef = ref<RefType>(); // 表格ref
 const searchCol = ref(true); // 展开/收起
+const fastSearch = ref('all'); // tab位置
+const fastSearchChange = (val: string) => {
+	fastSearch.value = val;
+	switch (val) {
+		case 'all':
+			state.queryParams.IsProvince = null;
+			break;
+		case 'city':
+			state.queryParams.IsProvince = false;
+			break;
+		case 'province':
+			state.queryParams.IsProvince = true;
+			break;
+	}
+	handleQuery();
+};
 // 展开/收起
 const closeSearch = () => {
 	searchCol.value = !searchCol.value;
@@ -153,7 +178,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'order.startTime',
 		label: '受理时间',
-    minWidth: 160,
+		minWidth: 160,
 		render: (scope) => {
 			return <span>{formatDate(scope.row.order?.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
@@ -161,7 +186,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'order.filedTime',
 		label: '办结时间',
-    minWidth: 160,
+		minWidth: 160,
 		render: (scope) => {
 			return <span>{formatDate(scope.row.order?.filedTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
@@ -169,7 +194,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'publishTime',
 		label: '发布时间',
-    minWidth: 160,
+		minWidth: 160,
 		render: (scope) => {
 			return <span>{formatDate(scope.row.publishTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
@@ -177,7 +202,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'creationTime',
 		label: '回访任务创建时间',
-    minWidth: 160,
+		minWidth: 160,
 		render: (scope) => {
 			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
@@ -186,7 +211,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'visitTime',
 		label: '回访时间',
-    minWidth: 160,
+		minWidth: 160,
 		render: (scope) => {
 			return <span>{formatDate(scope.row.visitTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
@@ -196,7 +221,7 @@ const columns = ref<any[]>([
 	{ prop: 'hwyPj', label: '话务员满意度', minWidth: 120 },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 170, align: 'center' },
 ]);
-const state = reactive({
+const state = reactive<any>({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
@@ -205,9 +230,9 @@ const state = reactive({
 		VisitState: null, // 回访状态
 		VisitType: null, // 回访方式
 		No: null,
-    IsCountersign:null, // 是否会签
-    FiledType:null, // 归档类型
-    IsProvince:''
+		IsCountersign: null, // 是否会签
+		FiledType: null, // 归档类型
+		IsProvince: null,
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -253,16 +278,15 @@ const queryList = () => {
 const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
+	state.queryParams.QuerySelf = 'true';
+	state.queryParams.IsProvince = null;
+  fastSearch.value = 'all';
 	queryList();
 };
 // 回访详情
 const visitDetailRef = ref<RefType>();
 const visitDetail = (row: any) => {
-  visitDetailRef.value.openDialog(row, '回访详情');
-};
-// 导出
-const exportCurrent = (cloums, prop) => {
-	console.log(cloums, prop);
+	visitDetailRef.value.openDialog(row, '回访详情');
 };
 onMounted(() => {
 	getBaseData();

src/views/business/visit/todo.vue

@@ -20,12 +20,21 @@
 						<el-form-item label="工单类型" prop="IsProvince">
 							<el-segmented
 								:options="[
-									{ label: '全部', value: '' },
-									{ label: '市工单', value: 'false' },
-									{ label: '省工单', value: 'true' },
+									{
+										value: 'all',
+										label: '全部',
+									},
+									{
+										value: 'city',
+										label: '市工单',
+									},
+									{
+										value: 'province',
+										label: '省工单',
+									},
 								]"
-								v-model="state.queryParams.IsProvince"
-								@change="handleQuery"
+								v-model="fastSearch"
+								@change="fastSearchChange"
 							/>
 						</el-form-item>
 					</el-col>
@@ -151,6 +160,22 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
 const proTableRef = ref<RefType>(); // 表格ref
 const searchCol = ref(true); // 展开/收起
+const fastSearch = ref('all'); // tab位置
+const fastSearchChange = (val: string) => {
+	fastSearch.value = val;
+	switch (val) {
+		case 'all':
+			state.queryParams.IsProvince = null;
+			break;
+		case 'city':
+			state.queryParams.IsProvince = false;
+			break;
+		case 'province':
+			state.queryParams.IsProvince = true;
+			break;
+	}
+	handleQuery();
+};
 // 展开/收起
 const closeSearch = () => {
 	searchCol.value = !searchCol.value;
@@ -210,7 +235,7 @@ const columns = ref<any[]>([
 	},*/
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
 ]);
-const state = reactive({
+const state = reactive<any>({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
@@ -223,7 +248,7 @@ const state = reactive({
 		No: null,
 		QuerySelf: 'true', // 是否只查询自己的待回访工单
 		EmployeeName: null, // 回访人
-		IsProvince: '', // 是否省工单
+		IsProvince: null, // 是否省工单
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -260,22 +285,10 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	state.queryParams.QuerySelf = 'true';
+	state.queryParams.IsProvince = null;
+	fastSearch.value = 'all';
 	queryList();
 };
-// 短信回访
-const onTextMessageFollowUp = () => {
-	ElMessageBox.confirm('您确定要短信回访吗？', '提示', {
-		confirmButtonText: '确定',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			state.loading = true;
-		})
-		.catch(() => {
-			// 取消
-		});
-};
 // 批量分配
 const assignReturnVisitorsRef = ref<RefType>();
 const multiplePeople = () => {

src/views/statistics/center/detailEventFrequently.vue

@@ -274,7 +274,6 @@ const state = reactive<any>({
 		Statuses: [], // 状态
 		doneTime: [], // 办结时间
 		PushTypeCode: null, //推送类型
-		IsProvinceOrder: null, // 省市工单
 	},
 	tableData: [], //表单
 	loading: false, // 加载

src/views/statistics/center/detailTelFrequently.vue

@@ -333,7 +333,6 @@ const state = reactive<any>({
     ActualHandleTimeStart: null,
     ActualHandleTimeEnd: null,
     PushTypeCode: null, //推送类型
-    IsProvinceOrder: null, // 省市工单
 	},
 	tableData: [], //表单
 	loading: false, // 加载

src/views/statistics/order/specialTable.vue

@@ -33,9 +33,6 @@
         v-model:page-index="state.queryParams.PageIndex"
         v-model:page-size="state.queryParams.PageSize"
       >
-        <template #isProvince="{ row }">
-          <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-        </template>
         <template #title="{ row }">
           <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
         </template>
@@ -82,7 +79,7 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
   { prop: 'order.no', label: '工单编码', minWidth: 140 },
-  { prop: 'isProvince', label: '省/市工单', width: 90 },
+  { prop: 'order.isProvinceText', label: '省/市工单', width: 90 },
   { prop: 'order.title', label: '工单标题', minWidth: 200 },
   { prop: 'order.actualHandleStepName', label: '办理节点', minWidth: 100 },
   { prop: 'stateText', label: '特提审批状态', minWidth: 120 },

src/views/todo/seats/accept/Expand-form.vue

@@ -2,18 +2,19 @@
 	<el-dialog v-model="state.dialogVisible" width="80%" draggable title="拓展信息" append-to-body @closed="closed" @opened="opened">
 		<el-form :model="state.expandForm" scroll-to-error ref="expandFormRef" label-width="120px" v-loading="state.loading">
 			<el-row :gutter="20">
-				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-					<el-form-item label="工单类型">
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="工单类型" prop="orderTypeObj">
 						<el-select
 							v-model="state.expandForm.orderTypeObj"
 							filterable
 							value-key="dicDataValue"
 							placeholder="请选择工单类型"
 							class="w100"
+							clearable
 							@change="
 								(val) => {
-									state.expandForm.orderType = val.dicDataName;
-									state.expandForm.orderTypeCode = val.dicDataValue;
+									state.expandForm.orderType = val?.dicDataName ?? '';
+									state.expandForm.orderTypeCode = val?.dicDataValue ?? '';
 								}
 							"
 						>
@@ -21,6 +22,11 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+          <el-form-item prop="orderTypeObj">
+            <el-text type="danger" tag="b">注意：保存拓展单后，需要再点下保存工单才可以保存拓展单。</el-text>
+          </el-form-item>
+        </el-col>
 				<!-- （1）医疗服务中心受理单 -->
 				<template v-if="state.expandForm.orderTypeCode === 'yl'">
 					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
@@ -401,8 +407,8 @@
 								class="w100"
 								@change="
 									(val) => {
-										state.expandForm.licenceType = val.dicDataName;
-										state.expandForm.licenceTypeCode = val.dicDataValue;
+										state.expandForm.licenceType = val?.dicDataName ?? '';
+										state.expandForm.licenceTypeCode = val?.dicDataValue ?? '';
 									}
 								"
 							>
@@ -438,8 +444,8 @@
 								class="w100"
 								@change="
 									(val) => {
-										state.expandForm.identityType = val.dicDataName;
-										state.expandForm.identityTypeCode = val.dicDataValue;
+										state.expandForm.identityType = val?.dicDataName ?? '';
+										state.expandForm.identityTypeCode = val?.dicDataValue ?? '';
 									}
 								"
 							>
@@ -458,8 +464,8 @@
 								class="w100"
 								@change="
 									(val) => {
-										state.expandForm.identity = val.dicDataName;
-										state.expandForm.identityCode = val.dicDataValue;
+										state.expandForm.identity = val?.dicDataName ?? '';
+										state.expandForm.identityCode = val?.dicDataValue ?? '';
 									}
 								"
 							>
@@ -478,8 +484,8 @@
 								value-key="dicDataValue"
 								@change="
 									(val) => {
-										state.expandForm.nationality = val.dicDataName;
-										state.expandForm.nationalityCode = val.dicDataValue;
+										state.expandForm.nationality = val.dicDataName ?? '';
+										state.expandForm.nationalityCode = val?.dicDataValue ?? '';
 									}
 								"
 							>
@@ -498,8 +504,8 @@
 								class="w100"
 								@change="
 									(val) => {
-										state.expandForm.nation = val.dicDataName;
-										state.expandForm.nationCode = val.dicDataValue;
+										state.expandForm.nation = val?.dicDataName ?? '';
+										state.expandForm.nationCode = val?.dicDataValue ?? '';
 									}
 								"
 							>
@@ -525,13 +531,13 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
 						<el-form-item
-							label="邮箱"
+							label="电子邮箱"
 							prop="email"
 							:rules="[
-								{ required: false, message: '请填写邮箱', trigger: 'blur' },
+								{ required: false, message: '请填写电子邮箱', trigger: 'blur' },
 								{
 									pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
-									message: '邮箱格式错误',
+									message: '电子邮箱格式错误',
 									trigger: 'blur',
 								},
 							]"
@@ -550,14 +556,52 @@
 						</el-text>
 					</el-divider>
 					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
-						<el-form-item label="企业名称" prop="enterpriseName" :rules="[{ required: true, message: '请填写企业名称', trigger: 'blur' }]">
-							<el-input v-model="state.expandForm.enterpriseName" placeholder="请填写企业名称" clearable> </el-input>
-						</el-form-item>
-					</el-col>
+						<el-form-item label="对象名称" prop="enterpriseName" :rules="[{ required: true, message: '请填写对象名称', trigger: 'blur' }]">
+							<el-input v-model="state.expandForm.enterpriseName" placeholder="请填写对象名称" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
+            <el-form-item label="对象注册地址" prop="registerAddress" :rules="[{ required: true, message: '请填写对象注册地址', trigger: 'blur' }]">
+              <el-input v-model="state.expandForm.registerAddress" placeholder="请填写对象注册地址" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
+            <el-form-item label="市场主体类型" prop="marketTypeCode" :rules="[{ required: false, message: '请选择市场主体类型', trigger: 'change' }]">
+              <el-cascader
+                  :options="state.marketTypeOptions"
+                  filterable
+                  :props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false }"
+                  placeholder="请选择市场主体类型"
+                  class="w100"
+                  v-model="state.expandForm.marketTypeCode"
+                  ref="marketTypeRef"
+                  @change="changeMarketType"
+                  clearable
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
+            <el-form-item label="行业分类" prop="industryClassifyCode" :rules="[{ required: false, message: '请选择行业分类', trigger: 'blur' }]">
+              <el-cascader
+                  :options="state.industryClassifyOptions"
+                  filterable
+                  :props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false }"
+                  placeholder="请选择行业分类"
+                  class="w100"
+                  v-model="state.expandForm.industryClassifyCode"
+                  ref="industryClassifyRef"
+                  @change="changeIndustryClassify"
+                  clearable
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
 					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
 						<el-form-item
 							label="统一社会信用代码"
 							prop="unifiedSocialCreditCode"
+              label-width="130px"
 							:rules="[
 								{ required: false, message: '请填写统一社会信用代码', trigger: 'blur' },
 								{
@@ -570,11 +614,6 @@
 							<el-input v-model="state.expandForm.unifiedSocialCreditCode" placeholder="请填写统一社会信用代码" clearable> </el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
-						<el-form-item label="注册地址" prop="registerAddress" :rules="[{ required: true, message: '请填写注册地址', trigger: 'blur' }]">
-							<el-input v-model="state.expandForm.registerAddress" placeholder="请填写注册地址" clearable> </el-input>
-						</el-form-item>
-					</el-col>
 					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
 						<!-- 数字字母 -->
 						<el-form-item
@@ -593,38 +632,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
-						<el-form-item label="企业联系人" prop="enterpriseContact" :rules="[{ required: false, message: '请填写企业联系人', trigger: 'blur' }]">
-							<el-input v-model="state.expandForm.enterpriseContact" placeholder="请填写企业联系人" clearable> </el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
-						<el-form-item label="市场主体类型" prop="marketTypeCode" :rules="[{ required: false, message: '请选择市场主体类型', trigger: 'change' }]">
-							<el-cascader
-								:options="state.marketTypeOptions"
-								filterable
-								:props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false }"
-								placeholder="请选择市场主体类型"
-								class="w100"
-								v-model="state.expandForm.marketTypeCode"
-								ref="marketTypeRef"
-								@change="changeMarketType"
-							>
-							</el-cascader>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
-						<el-form-item label="行业分类" prop="industryClassifyCode" :rules="[{ required: false, message: '请选择行业分类', trigger: 'blur' }]">
-							<el-cascader
-								:options="state.industryClassifyOptions"
-								filterable
-								:props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false }"
-								placeholder="请选择行业分类"
-								class="w100"
-								v-model="state.expandForm.industryClassifyCode"
-								ref="industryClassifyRef"
-								@change="changeIndustryClassify"
-							>
-							</el-cascader>
+						<el-form-item label="联系人" prop="enterpriseContact" :rules="[{ required: false, message: '请填写联系人', trigger: 'blur' }]">
+							<el-input v-model="state.expandForm.enterpriseContact" placeholder="请填写联系人" clearable> </el-input>
 						</el-form-item>
 					</el-col>
 					<el-divider content-position="left">
@@ -643,31 +652,33 @@
 								v-model="state.expandForm.brandCode"
 								ref="brandRef"
 								@change="changeBrand"
+                clearable
 							>
 							</el-cascader>
 						</el-form-item>
 					</el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
+            <el-form-item label="客体类别" prop="objectClassifyCode" :rules="[{ required: true, message: '请选择客体类别', trigger: 'change' }]">
+              <el-cascader
+                  :options="state.objectClassifyOptions"
+                  filterable
+                  :props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false }"
+                  placeholder="请选择客体类别"
+                  class="w100"
+                  v-model="state.expandForm.objectClassifyCode"
+                  ref="objectClassifyRef"
+                  @change="changeObjectClassify"
+                  clearable
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
 					<!-- 只能填写数字，且只能填写非负数 -->
 					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
-						<el-form-item label="消费金额" prop="amount" :rules="[{ required: true, message: '请填写消费金额', trigger: 'blur' }]">
+						<el-form-item label="消费金额(元)" prop="amount" :rules="[{ required: true, message: '请填写消费金额', trigger: 'blur' }]">
 							<el-input-number v-model="state.expandForm.amount" :min="0" placeholder="请填写消费金额" class="w100" />
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
-						<el-form-item label="客体类别" prop="objectClassifyCode" :rules="[{ required: true, message: '请选择客体类别', trigger: 'change' }]">
-							<el-cascader
-								:options="state.objectClassifyOptions"
-								filterable
-								:props="{ value: 'dicDataValue', label: 'dicDataName', emitPath: false }"
-								placeholder="请选择客体类别"
-								class="w100"
-								v-model="state.expandForm.objectClassifyCode"
-								ref="objectClassifyRef"
-								@change="changeObjectClassify"
-							>
-							</el-cascader>
-						</el-form-item>
-					</el-col>
 					<!-- 举报展示 -->
 					<template v-if="state.expandForm.orderTypeCode === 'scjgjjb'">
 						<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6">
@@ -707,6 +718,7 @@
 									v-model="state.expandForm.complainClassifyCode"
 									ref="problemCascadeRef"
 									@change="changeProblems"
+                  clearable
 								>
 								</el-cascader>
 							</el-form-item>
@@ -966,6 +978,7 @@ const props = defineProps({
 const state = reactive<any>({
 	dialogVisible: false,
 	expandForm: {
+		orderTypeObj: null,
 		orderType: null, // 工单类型
 		orderTypeCode: null, // 工单类型code
 		mailAmount: 0, // 涉及金额
@@ -1113,37 +1126,37 @@ const changeProblems = () => {
 const marketTypeRef = ref<RefType>();
 const changeMarketType = () => {
 	let currentNode = marketTypeRef.value.getCheckedNodes();
-	state.expandForm.marketType = currentNode[0].label;
+	state.expandForm.marketType = currentNode[0]?.label;
 };
 // 选择行业分类
 const industryClassifyRef = ref<RefType>();
 const changeIndustryClassify = () => {
 	let currentNode = industryClassifyRef.value.getCheckedNodes();
-	state.expandForm.industryClassify = currentNode[0].label;
+	state.expandForm.industryClassify = currentNode[0]?.label;
 };
 // 选择商品分类/品牌
 const brandRef = ref<RefType>();
 const changeBrand = () => {
 	let currentNode = brandRef.value.getCheckedNodes();
-	state.expandForm.brand = currentNode[0].label;
+	state.expandForm.brand = currentNode[0]?.label;
 };
 // 选择客体类别
 const objectClassifyRef = ref<RefType>();
 const changeObjectClassify = () => {
 	let currentNode = objectClassifyRef.value.getCheckedNodes();
-	state.expandForm.objectClassify = currentNode[0].label;
+	state.expandForm.objectClassify = currentNode[0]?.label;
 };
 // 电商平台
 const eCommercePlatformRef = ref<RefType>();
 const changeECommercePlatform = () => {
 	let currentNode = eCommercePlatformRef.value.getCheckedNodes();
-	state.expandForm.eCommercePlatform = currentNode[0].label;
+	state.expandForm.eCommercePlatform = currentNode[0]?.label;
 };
 // 经营地址选择
 const areaRef = ref<RefType>();
 const changeArea = () => {
 	const currentNode = areaRef.value.getCheckedNodes();
-	state.expandForm.businessPosition.address = currentNode[0].pathLabels.join(null);
+	state.expandForm.businessPosition.address = currentNode[0]?.pathLabels.join(null);
 };
 // 保存拓展表单
 const saveExpandForm = (formEl: FormInstance | undefined) => {
@@ -1205,62 +1218,89 @@ watch(
 	(newVal) => {
 		state.expandForm = newVal.orderExtension ?? {};
 		state.expandForm.complainTypes = newVal.orderExtension?.complainTypes ?? [];
-		state.expandForm.orderTypeObj = {
-			//工单类型
-			dicDataValue: state.expandForm.orderTypeCode,
-			dicDataName: state.expandForm.orderType,
-		};
-
+		if (state.expandForm.orderTypeCode) {
+			state.expandForm.orderTypeObj = {
+				//工单类型
+				dicDataValue: state.expandForm.orderTypeCode,
+				dicDataName: state.expandForm.orderType,
+			};
+		}
 		if (state.expandForm.businessPosition && state.expandForm.businessPosition.areaCode) {
 			// 经营地址
 			state.expandForm.businessArea = state.expandForm.businessPosition.areaCode;
 			state.expandForm.businessAddress = state.expandForm.businessPosition.street;
 		}
-		state.expandForm.licenceObj = {
-			//证件类型
-			dicDataValue: state.expandForm.licenceTypeCode,
-			dicDataName: state.expandForm.licenceType,
-		};
-		state.expandForm.identityTypeObj = {
-			//提供方类型
-			dicDataValue: state.expandForm.identityTypeCode,
-			dicDataName: state.expandForm.identityType,
-		};
-		state.expandForm.identityObj = {
-			//提供方身份
-			dicDataValue: state.expandForm.identityCode,
-			dicDataName: state.expandForm.identity,
-		};
-		state.expandForm.nationalityObj = {
-			//国籍/地区
-			dicDataValue: state.expandForm.nationalityCode,
-			dicDataName: state.expandForm.nationality,
-		};
-		state.expandForm.nationObj = {
-			//民族
-			dicDataValue: state.expandForm.nationCode,
-			dicDataName: state.expandForm.nation,
-		};
-		state.expandForm.salesModeObj = {
-			//销售方式
-			dicDataValue: state.expandForm.salesModeCode,
-			dicDataName: state.expandForm.salesMode,
-		};
-		state.expandForm.complainTargetObj = {
-			//投诉目标
-			dicDataValue: state.expandForm.complainTargetCode,
-			dicDataName: state.expandForm.complainTarget,
-		};
-		state.expandForm.reportTargetObj = {
-			//举报目标
-			dicDataValue: state.expandForm.reportTargetCode,
-			dicDataName: state.expandForm.reportTarget,
-		};
-		state.expandForm.salesChannelObj = {
-			//销售渠道
-			dicDataValue: state.expandForm.salesChannelCode,
-			dicDataName: state.expandForm.salesChannel,
-		};
+		if (state.expandForm.licenceTypeCode) {
+			state.expandForm.licenceObj = {
+				//证件类型
+				dicDataValue: state.expandForm.licenceTypeCode,
+				dicDataName: state.expandForm.licenceType,
+			};
+		}
+		if (state.expandForm.identityTypeCode) {
+			state.expandForm.identityTypeObj = {
+				//提供方类型
+				dicDataValue: state.expandForm.identityTypeCode,
+				dicDataName: state.expandForm.identityType,
+			};
+		}
+		if (state.expandForm.identityCode) {
+			state.expandForm.identityObj = {
+				//提供方身份
+				dicDataValue: state.expandForm.identityCode,
+				dicDataName: state.expandForm.identity,
+			};
+		}
+		if (state.expandForm.nationalityCode) {
+			state.expandForm.nationalityObj = {
+				//国籍/地区
+				dicDataValue: state.expandForm.nationalityCode,
+				dicDataName: state.expandForm.nationality,
+			};
+		}
+		if (state.expandForm.nationCode) {
+			state.expandForm.nationObj = {
+				//民族
+				dicDataValue: state.expandForm.nationCode,
+				dicDataName: state.expandForm.nation,
+			};
+		}
+		if (state.expandForm.salesModeCode) {
+			state.expandForm.salesModeObj = {
+				//销售方式
+				dicDataValue: state.expandForm.salesModeCode,
+				dicDataName: state.expandForm.salesMode,
+			};
+		}
+		if (state.expandForm.complainTargetCode) {
+			state.expandForm.complainTargetObj = {
+				//投诉目标
+				dicDataValue: state.expandForm.complainTargetCode,
+				dicDataName: state.expandForm.complainTarget,
+			};
+		}
+
+		if (state.expandForm.reportClassifyCode) {
+			state.expandForm.reportClassifyObj = {
+				//举报问题类别
+				dicDataValue: state.expandForm.reportClassifyCode,
+				dicDataName: state.expandForm.reportClassify,
+			};
+		}
+		if (state.expandForm.reportTargetCode) {
+			state.expandForm.reportTargetObj = {
+				//举报目标
+				dicDataValue: state.expandForm.reportTargetCode,
+				dicDataName: state.expandForm.reportTarget,
+			};
+		}
+		if (state.expandForm.salesChannelCode) {
+			state.expandForm.salesChannelObj = {
+				//销售渠道
+				dicDataValue: state.expandForm.salesChannelCode,
+				dicDataName: state.expandForm.salesChannel,
+			};
+		}
 		if (state.expandForm.patentTypeCode) {
 			//专利类型
 			state.expandForm.patentTypeObj = {

src/views/todo/seats/accept/Voice-assistant.vue

@@ -280,7 +280,6 @@ const wsNotice = (message: any) => {
 };
 // 消息筛选
 const filterMessage = (type: string) => {
-  console.log(type, '消息筛选-坐席辅助')
 	switch (type) {
 		case 'user':
 			showMessageList.value = messageList.value.filter((item: any) => item.body.content.callSentenceInfo.role === 'user');

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

@@ -252,6 +252,7 @@
 											placeholder="请选择受理类型"
 											class="w100"
 											value-key="dicDataValue"
+                      clearable
 											@change="
 												(val) => {
 													state.ruleForm.acceptType = val?.dicDataName ?? null;