Browse Source

reactor:对接二次办理 新增外呼任务和短信任务页面;

zhangchong 11 months ago
parent
commit
8976e19c8e

+ 2 - 5
src/views/business/countersign/index.vue

@@ -113,12 +113,9 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #expiredStatus="{ row }">
+				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</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>
@@ -152,7 +149,7 @@ const HotSpotSelect = defineAsyncComponent(() => import('@/components/Hotspot/in
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'order.expiredStatus', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
+	{ prop: 'order.expiredStatusText', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
 	{ prop: 'stateText', label: '会签状态', width: 120 },
 	{ prop: 'order.counterSignTypeText', label: '会签类型', width: 120 },
 	{ prop: 'order.no', label: '工单编码', width: 150 },

+ 47 - 47
src/views/business/delay/index.vue

@@ -63,12 +63,12 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'expiredStatusText', label: '超期状态', align: 'center',fixed: 'left',width: 80},
+	{ prop: 'expiredStatusText', label: '超期状态', align: 'center', fixed: 'left', width: 80 },
 	{ prop: 'no', label: '工单编码', width: 150 },
 	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'title', label: '工单标题', width: 300 },
 	{ prop: 'currentStepName', label: '办理节点', width: 120 },
-  { prop: 'actualHandlerName', label: '审批人', width: 150 },
+	{ prop: 'actualHandlerName', label: '审批人', width: 150 },
 	{ prop: 'delayStateText', label: '延期申请状态', width: 120 },
 	{
 		prop: 'order.startTime',
@@ -79,47 +79,47 @@ const columns = ref<any[]>([
 		},
 	},
 	{ prop: 'order.acceptorName', label: '受理人', width: 120 },
-  { prop: 'order.hotspotName', label: '热点分类', width: 120 },
-  { prop: 'order.acceptType', label: '受理类型', width: 120 },
-  {prop: 'order.orgLevelOneName', label: '一级部门', width: 120 },
-  { prop: 'order.actualHandleOrgName', label: '接办部门', width: 120 },
-  {
-    prop: 'order.actualHandleTime',
-    label: '接办时间',
-    width: 170,
-    render: (scope) => {
-      return <span>{formatDate(scope.row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
-    },
-  },
-  {
-    prop: 'creationTime',
-    label: '延期申请时间',
-    width: 170,
-    render: (scope) => {
-      return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
-    },
-  },
-  { prop: 'creatorName', label: '延期申请人', width: 120 },
-  { prop: 'creatorOrgName', label: '延期申请部门', width: 120 },
-  { prop: 'delayNum', label: '延期申请时限', width: 120 },
-  { prop: 'delayUnitText', label: '延期申请单位', width: 120 },
-  { prop: 'delayReason', label: '申请理由', width: 120 },
-  {
-    prop: 'beforeDelay',
-    label: '申请前期满时间',
-    width: 170,
-    render: (scope) => {
-      return <span>{formatDate(scope.row.beforeDelay, 'YYYY-mm-dd HH:MM:SS')}</span>;
-    },
-  },
-  {
-    prop: 'afterDelay',
-    label: '通过后期满时间',
-    width: 170,
-    render: (scope) => {
-      return <span>{formatDate(scope.row.afterDelay, 'YYYY-mm-dd HH:MM:SS')}</span>;
-    },
-  },
+	{ prop: 'order.hotspotName', label: '热点分类', width: 120 },
+	{ prop: 'order.acceptType', label: '受理类型', width: 120 },
+	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 120 },
+	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 120 },
+	{
+		prop: 'order.actualHandleTime',
+		label: '接办时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'creationTime',
+		label: '延期申请时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'creatorName', label: '延期申请人', width: 120 },
+	{ prop: 'creatorOrgName', label: '延期申请部门', width: 120 },
+	{ prop: 'delayNum', label: '延期申请时限', width: 120 },
+	{ prop: 'delayUnitText', label: '延期申请单位', width: 120 },
+	{ prop: 'delayReason', label: '申请理由', width: 120 },
+	{
+		prop: 'beforeDelay',
+		label: '申请前期满时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.beforeDelay, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'afterDelay',
+		label: '通过后期满时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.afterDelay, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 170, align: 'center' },
 ]);
 // 定义变量内容
@@ -146,8 +146,8 @@ const getBaseData = async () => {
 };
 // 手动查询,将页码设置为1
 const handleQuery = () => {
-  state.queryParams.PageIndex = 1;
-  queryList();
+	state.queryParams.PageIndex = 1;
+	queryList();
 };
 /** 获取列表 */
 const queryList = () => {
@@ -161,14 +161,14 @@ const queryList = () => {
 		.catch((err: any) => {
 			state.loading = false;
 		});
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	queryList();
-}
+};
 // 导出
 const onExport = () => {
 	console.log('导出');

+ 3 - 12
src/views/business/discern/apply.vue

@@ -201,17 +201,9 @@
 				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>
-				<template #acceptorName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<template #visitTarget="{ row }">
 					<span v-if="row.visitTarget === 20">{{ row.visitOrgName }}</span>
 				</template>
@@ -255,13 +247,13 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'order.no', label: '工单编码', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.no', label: '工单编码', width: 150,fixed: 'left' },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{ prop: 'order.sourceChannel', label: '来源方式', width: 120 },
 	{ prop: 'order.acceptType', label: '受理类型', width: 120 },
 	{ prop: 'order.counterSignTypeText', label: '是否会签', width: 100 },
-	{ prop: 'acceptorName', label: '受理人', width: 170 },
+	{ prop: 'order.acceptorName', label: '受理人', width: 170 },
 	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 150 },
 	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
 	{
@@ -390,7 +382,6 @@ const getBaseData = async () => {
 		state.sourceChannelOptions = result?.sourceChannel ?? [];
 		state.visitSatisfaction = result?.visitSatisfaction ?? [];
 		state.dissatisfiedReason = result?.dissatisfiedReason ?? [];
-		console.log(result);
 	} catch (e) {
 		console.log(e);
 	}

+ 2 - 10
src/views/business/discern/index.vue

@@ -48,17 +48,9 @@
 				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>
-				<template #acceptorName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onDetail(row)" title="查看甄别详情"> 甄别详情 </el-button>
@@ -91,12 +83,12 @@ const proTableRef = ref<RefType>(); // 表格ref
 const columns = ref<any[]>([
 	{ prop: 'order.no', label: '工单编码', width: 150 },
 	{ prop: 'statusText', label: '甄别状态', width: 100 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{ prop: 'order.sourceChannel', label: '来源方式', width: 120 },
 	{ prop: 'order.acceptType', label: '受理类型', width: 120 },
 	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
-	{ prop: 'acceptorName', label: '受理人', width: 170 },
+	{ prop: 'order.acceptorName', label: '受理人', width: 170 },
 	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 150 },
 	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
 	{

+ 3 - 6
src/views/business/end/index.vue

@@ -30,12 +30,9 @@
 						<SvgIcon name="ele-Stopwatch" class="mr5" />取消终结件
 					</el-button>
 				</template>
-				<template #expiredStatus="{ row }">
+				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</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>
@@ -62,11 +59,11 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
 	{ type: 'selection', fixed: 'left', width: 55,align: 'center' },
-	{ prop: 'expiredStatus', label: '超期状态', align: 'center',width: 80 },
+	{ prop: 'order.expiredStatusText', label: '超期状态', align: 'center',width: 80 },
 	{ prop: 'order.no', label: '工单编码', width: 150 },
 	{ prop: 'order.sourceChannel', label: '来源方式', width: 120 },
 	{ prop: 'order.actualHandleStepName', label: '当前节点', width: 120 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{
 		prop: 'order.expiredTime',
 		label: '工单期满时间',

+ 3 - 6
src/views/business/observe/index.vue

@@ -30,12 +30,9 @@
 						<SvgIcon name="ele-View" class="mr5" />取消观察件
 					</el-button>
 				</template>
-				<template #expiredStatus="{ row }">
+				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</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>
@@ -62,11 +59,11 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
 	{ type: 'selection', fixed: 'left', width: 55,align: 'center' },
-	{ prop: 'expiredStatus', label: '超期状态', align: 'center',width: 80 },
+	{ prop: 'order.expiredStatusText', label: '超期状态', align: 'center',width: 80 },
 	{ prop: 'order.no', label: '工单编码', width: 150 },
 	{ prop: 'order.sourceChannel', label: '来源方式', width: 120 },
 	{ prop: 'order.actualHandleStepName', label: '当前节点', width: 120 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{
 		prop: 'order.expiredTime',
 		label: '工单期满时间',

+ 1 - 9
src/views/business/overdue/index.vue

@@ -25,14 +25,6 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #isProvince="{ row }">
-					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-				</template>
-				<template #employeeName="{ row }">
-					<span
-						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<template #title="{ row }">
 					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
@@ -58,7 +50,7 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
 	{ prop: 'no', label: '工单编码', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'actualHandleStepName', label: '办理节点', width: 150 },
 	{ prop: 'statusText', label: '工单状态', width: 100 },
 	{ prop: 'title', label: '标题', width: 300 },

+ 1 - 9
src/views/business/overdue/soon.vue

@@ -25,14 +25,6 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #isProvince="{ row }">
-					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-				</template>
-				<template #employeeName="{ row }">
-					<span
-						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<template #title="{ row }">
 					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
@@ -58,7 +50,7 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
 	{ prop: 'no', label: '工单编码', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'actualHandleStepName', label: '办理节点', width: 150 },
 	{ prop: 'statusText', label: '工单状态', width: 100 },
 	{ prop: 'title', label: '标题', width: 300 },

+ 2 - 10
src/views/business/return/audit.vue

@@ -57,17 +57,9 @@
 						>批量审批
 					</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>
-				<template #employeeName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onAudit(row)" title="退回特提" v-auth="'business:return:audit'" v-if="[0].includes(row.state)">
@@ -105,8 +97,8 @@ const proTableRef = ref<RefType>(); // 表格ref
 const columns = ref<any[]>([
 	{ type: 'selection', fixed: 'left', width: 55, align: 'center' },
 	{ prop: 'order.no', label: '工单编码', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
-	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
+	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{ prop: 'order.sourceChannel', label: '来源方式' },
 	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
 	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },

+ 3 - 11
src/views/business/return/province.vue

@@ -26,17 +26,9 @@
 				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>
-				<template #acceptorName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<template #visitTarget="{ row }">
 					<span v-if="row.visitTarget === 20">{{ row.visitOrgName }}</span>
 				</template>
@@ -94,9 +86,9 @@ const proTableRef = ref<RefType>(); // 表格ref
 const columns = ref<any[]>([
 	{ type: 'selection', fixed: 'left', width: 55 },
 	{ prop: 'order.no', label: '工单编码', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'stateText', label: '退回状态', width: 100 },
-	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{
 		prop: 'order.startTime',
 		label: '受理时间',
@@ -105,7 +97,7 @@ const columns = ref<any[]>([
 			return <span>{formatDate(scope.row.order?.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-	{ prop: 'acceptorName', label: '受理人', width: 170 },
+	{ prop: 'order.acceptorName', label: '受理人', width: 170 },
 	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
 	{ prop: 'order.sourceChannel', label: '热点分类', width: 200 },
 	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 170 },

+ 3 - 3
src/views/business/secondHandle/audit.vue

@@ -58,9 +58,9 @@
         </template>
         <!-- 表格操作 -->
         <template #operation="{ row }">
-          <el-button link type="primary" @click="onView(row)" title="查看办理明细"> 办理明细 </el-button>
-          <el-button link type="primary" @click="onReturn(row)" title="退回" v-auth="'business:secondHandle:return'"> 退回 </el-button>
-          <el-button link type="primary" @click="onAudit(row)" title="审批" v-auth="'business:secondHandle:audit'"> 审批 </el-button>
+          <el-button link type="primary" @click="onView(row)" title="查看办理明细" v-if="![1].includes(row.state)"> 办理明细 </el-button>
+          <el-button link type="primary" @click="onReturn(row)" title="退回" v-auth="'business:secondHandle:return'" v-if="[1].includes(row.state)"> 退回 </el-button>
+          <el-button link type="primary" @click="onAudit(row)" title="审批" v-auth="'business:secondHandle:audit'" v-if="[1].includes(row.state)"> 审批 </el-button>
         </template>
       </ProTable>
     </el-card>

+ 2 - 10
src/views/business/special/apply.vue

@@ -25,17 +25,9 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #isProvince="{ row }">
-					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-				</template>
 				<template #title="{ row }">
 					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
-				<template #employeeName="{ row }">
-					<span
-						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onSpecialApply(row)" title="特提申请" v-if="row.workflowId" v-auth="'business:special:apply'">
@@ -66,7 +58,7 @@ const proTableRef = ref<RefType>(); // 表格ref
 const columns = ref<any[]>([
 	{ type: 'selection', fixed: 'left', width: 55,align: 'center' },
 	{ prop: 'no', label: '工单编码', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'actualHandleStepName', label: '办理节点', width: 150 },
 	{ prop: 'statusText', label: '工单状态', width: 100 },
 	{ prop: 'title', label: '标题', width: 300 },
@@ -100,7 +92,7 @@ const columns = ref<any[]>([
 	{ prop: 'counterSignTypeText', label: '是否会签', width: 100 },
 	{ prop: 'hotspotName', label: '热点分类', width: 200 },
 	{ prop: 'tagNames', label: '工单标签', width: 200 },
-	{ prop: 'employeeName', label: '受理人', width: 120 },
+	{ prop: 'acceptorName', label: '受理人', width: 120 },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 170, align: 'center' },
 ]);
 const state = reactive({

+ 3 - 8
src/views/business/special/audit.vue

@@ -42,11 +42,6 @@
 				<template #title="{ row }">
 					<order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
 				</template>
-				<template #employeeName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onAudit(row)" title="审批特提" v-auth="'business:special:audit'" v-if="[0].includes(row.state)">
@@ -86,12 +81,12 @@ const selectable = (row: any) => {
 const columns = ref<any[]>([
 	{ type: 'selection', fixed: 'left', selectable: selectable, width: 55, align: 'center' },
 	{ prop: 'order.no', label: '工单编码', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
-	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
+	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{ prop: 'order.sourceChannel', label: '来源方式' },
 	{ prop: 'order.acceptType', label: '受理类型' },
 	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
-	{ prop: 'employeeName', label: '受理人', width: 170 },
+	{ prop: 'order.acceptorName', label: '受理人', width: 170 },
 	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 170 },
 	{ prop: 'stateText', label: '特提审批状态', width: 120 },
 	{ prop: 'cause', label: '特提原因', width: 150 },

+ 2 - 2
src/views/business/special/index.vue

@@ -43,7 +43,7 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #expiredStatus="{ row }">
+				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
 				<template #title="{ row }">
@@ -80,7 +80,7 @@ const router = useRouter(); // 路由
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'expiredStatus', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
+	{ prop: 'expiredStatusText', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
 	{ prop: 'no', label: '工单编码', width: 150 },
 	{ prop: 'statusText', label: '工单状态', width: 100 },
 	{ prop: 'state', label: '审批状态', width: 100 },

+ 2 - 10
src/views/business/supervise/index.vue

@@ -33,17 +33,9 @@
 				<template #state="{ row }">
 					<span>{{ row.state === 0 ? '督办未回复' : '督办已回复' }}</span>
 				</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>
-				<template #acceptorName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onReplay(row)" title="督办回复" v-if="row.state === 0" v-auth="'business:supervise:reply'">
@@ -74,8 +66,8 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
 	{ prop: 'order.no', label: '工单编码', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
-	{ prop: 'title', label: '标题', width: 300 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
+	{ prop: 'order.title', label: '标题', width: 300 },
 	{ prop: 'order.sourceChannel', label: '来源方式' },
 	{ prop: 'order.statusText', label: '工单状态' },
 	{ prop: 'order.acceptType', label: '受理类型' },

+ 7 - 15
src/views/business/supervise/todo.vue

@@ -25,20 +25,12 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #expiredStatus="{ row }">
+				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</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>
-				<template #employeeName="{ row }">
-					<span
-						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onReply(row)" title="回复督办" v-auth="'business:supervise:todo:reply'"> 回复 </el-button>
@@ -64,18 +56,18 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'expiredStatus', label: '超期状态', align: 'center',fixed: 'left',width: 80},
+	{ prop: 'order.expiredStatusText', label: '超期状态', align: 'center',fixed: 'left',width: 80},
 	{ prop: 'order.no', label: '工单编码', width: 150 },
-	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{ prop: 'order.sourceChannel', label: '来源方式', width: 100 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'order.statusText', label: '工单状态', width: 100 },
 	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
-	{ prop: 'employeeName', label: '受理人', width: 120 },
+	{ prop: 'order.acceptorName', label: '受理人', width: 120 },
 	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
 	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
 	{
-		prop: 'startTime',
+		prop: 'order.startTime',
 		label: '受理时间',
 		width: 170,
 		render: (scope) => {
@@ -83,7 +75,7 @@ const columns = ref<any[]>([
 		},
 	},
 	{
-		prop: 'expiredTime',
+		prop: 'order.expiredTime',
 		label: '工单期满时间',
 		width: 170,
 		render: (scope) => {

+ 4 - 12
src/views/business/urge/index.vue

@@ -25,20 +25,12 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #expiredStatus="{ row }">
+				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</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>
-				<template #employeeName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onDetail(row)" title="查看催办详情"> 催办详情 </el-button>
@@ -62,11 +54,11 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'expiredStatus', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
+	{ prop: 'order.expiredStatusText', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
 	{ prop: 'order.no', label: '工单编码', width: 150 },
 	{ prop: 'order.sourceChannel', label: '来源方式' },
 	{ prop: 'order.actualHandleStepName', label: '办理节点', width: 150 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{
 		prop: 'order.expiredTime',
 		label: '期满时间',
@@ -85,7 +77,7 @@ const columns = ref<any[]>([
 	},
 	{ prop: 'order.acceptType', label: '受理类型', width: 100 },
 	{ prop: 'order.statusText', label: '工单状态', width: 100 },
-	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
 	{
 		prop: 'order.actualHandleTime',

+ 6 - 9
src/views/business/urge/todo.vue

@@ -25,12 +25,9 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
-				<template #expiredStatus="{ row }">
+				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</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>
@@ -59,17 +56,17 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'expiredStatus', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
+	{ prop: 'order.expiredStatusText', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
 	{ prop: 'order.no', label: '工单编码', width: 150 },
-	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{ prop: 'order.sourceChannel', label: '来源方式', width: 100 },
-	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'order.statusText', label: '工单状态', width: 100 },
 	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
 	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
 	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
 	{
-		prop: 'startTime',
+		prop: 'order.startTime',
 		label: '受理时间',
 		width: 170,
 		render: (scope) => {
@@ -77,7 +74,7 @@ const columns = ref<any[]>([
 		},
 	},
 	{
-		prop: 'expiredTime',
+		prop: 'order.expiredTime',
 		label: '工单期满时间',
 		width: 170,
 		render: (scope) => {

+ 3 - 11
src/views/business/visit/index.vue

@@ -48,17 +48,9 @@
 				v-model:page-size="state.queryParams.PageSize"
 				@exportCurrent="exportCurrent"
 			>
-				<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>
-				<template #acceptorName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
 				<template #voicePj="{ row }">
 					<span v-for="item in row.orderVisitDetails">
 						<span v-if="item.visitTarget === 10">{{ item.voiceEvaluateText }}</span>
@@ -98,15 +90,15 @@ const router = useRouter(); // 路由
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'order.no', label: '工单编码', width: 150 },
-	{ prop: 'order.isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.no', label: '工单编码', width: 150,fixed: 'left' },
+	{ prop: 'order.isProvinceText', label: '省/市工单', width: 100 },
 	{ prop: 'order.title', label: '工单标题', width: 300 },
 	{ prop: 'order.sourceChannel', label: '来源方式', width: 100 },
 	{ prop: 'visitStateText', label: '回访状态', width: 100 },
 	{ prop: 'visitTypeText', label: '回访方式', width: 100 },
 	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
 	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
-	{ prop: 'acceptorName', label: '受理人', width: 170 },
+	{ prop: 'order.acceptorName', label: '受理人', width: 170 },
 	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 150 },
 	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 120 },
 	{

+ 3 - 8
src/views/business/visit/todo.vue

@@ -50,14 +50,9 @@
 				<template #title="{ row }">
 					<order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
 				</template>
-				<template #acceptorName="{ row }">
-					<span
-						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-					</span>
-				</template>
-				<template #isPutThrough="{ row }">
+<!--				<template #isPutThrough="{ row }">
 					<span v-if="row.isPutThrough">{{ row.isPutThrough ? '未接通' : '已接通' }}</span>
-				</template>
+				</template>-->
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onManpower(row)" title="工单回访" v-auth="'business:visit:todo:manpower'"> 回访 </el-button>
@@ -98,7 +93,7 @@ const columns = ref<any[]>([
 	{ prop: 'visitTypeText', label: '回访方式', width: 100 },
 	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
 	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
-	{ prop: 'acceptorName', label: '受理人', width: 120 },
+	{ prop: 'order.acceptorName', label: '受理人', width: 120 },
 	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 150 },
 	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
 	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },

+ 5 - 5
src/views/statistics/department/detailHandleOrg.vue

@@ -321,14 +321,14 @@ const columns = reactive<any[]>([
 				},
 			},
 			{
-				prop: 'satisfactionCount',
+				prop: 'publishedNoOpen',
 				label: '不公开件',
 				align: 'center',
 				minWidth: 90,
 				render: (scope) => {
 					return (
 						<el-button type="primary" link onClick={() => linkDetail(scope, '14')}>
-							{scope.row.satisfactionCount}
+							{scope.row.publishedNoOpen}
 						</el-button>
 					);
 				},
@@ -519,8 +519,8 @@ const getSummaries = (param: any) => {
 			case 'publishedOpen': // 公开件
 				sums[index] = state.totalCount?.publishedOpen;
 				break;
-			case 'satisfactionCount': // 不公开件
-				sums[index] = state.totalCount?.satisfactionCount;
+			case 'publishedNoOpen': // 不公开件
+				sums[index] = state.totalCount?.publishedNoOpen;
 				break;
 			case 'screenCount': // 甄别申请总量
 				sums[index] = state.totalCount?.screenCount;
@@ -531,7 +531,7 @@ const getSummaries = (param: any) => {
 			case 'screenNotPass': // 未同意
 				sums[index] = state.totalCount?.screenNotPass;
 				break;
-			case 'screenPass': // 不公开件
+			case 'screenPass': // 已同意
 				sums[index] = state.totalCount?.screenPass;
 				break;
 			case 'satisfactionRate': // 总满意率

+ 1 - 1
src/views/statistics/department/handle.vue

@@ -546,7 +546,7 @@ const getSummaries = (param: any) => {
 			case 'screenNotPass': // 未同意
 				sums[index] = state.totalCount?.screenNotPass;
 				break;
-			case 'screenPass': // 不公开件
+			case 'screenPass': // 已同意
 				sums[index] = state.totalCount?.screenPass;
 				break;
 			case 'satisfactionRate': // 总满意率

+ 2 - 1
src/views/todo/center/index.vue

@@ -104,6 +104,7 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
+<!--      :toolButton="['refresh', 'setting', 'exportCurrent', 'exportAll']"-->
 			<!-- 表格 -->
 			<ProTable
 				ref="proTableRef"
@@ -115,7 +116,7 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 				:key="Math.random()"
-        :toolButton="['refresh', 'setting', 'exportCurrent', 'exportAll']"
+
         @export-current="exportTable($event)"
         @export-all="exportTable($event, true)"
 			>

+ 2 - 1
src/views/todo/order/index.vue

@@ -35,6 +35,7 @@
 				</el-form-item>
 			</el-form>
 			<!-- 表格 -->
+<!--      :toolButton="['refresh', 'setting', 'exportCurrent', 'exportAll']"-->
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -45,7 +46,7 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 				:key="Math.random()"
-        :toolButton="['refresh', 'setting', 'exportCurrent', 'exportAll']"
+
         @export-current="exportTable($event)"
         @export-all="exportTable($event, true)"
 			>

+ 2 - 1
src/views/todo/seats/index.vue

@@ -29,6 +29,7 @@
 				</el-form-item>
 			</el-form>
 			<!-- 表格 -->
+<!--      	:toolButton="['refresh', 'setting', 'exportCurrent', 'exportAll']"-->
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -39,7 +40,7 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 				:key="Math.random()"
-				:toolButton="['refresh', 'setting', 'exportCurrent', 'exportAll']"
+
 				@export-current="exportTable($event)"
 				@export-all="exportTable($event, true)"
 			>