Explorar o código

reactor:列表字段调整;

zhangchong hai 1 ano
pai
achega
cf5ada2449

+ 12 - 12
src/views/business/delay/backlog/index.vue

@@ -31,16 +31,17 @@
             <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
           </template>
         </el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
+        <el-table-column label="工单标题" show-overflow-tooltip width="300">
+          <template #default="{ row }">
             <span class="color-primary">{{ row.order?.title }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="expiredTime" label="受理时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
+          </template>
+        </el-table-column>
+        <el-table-column prop="delayStateText" label="延期申请状态" show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column prop="expiredTime" label="受理时间" show-overflow-tooltip width="170">
+          <template #default="{ row }">
+            <span>{{ formatDate(row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="acceptorName" label="受理人" show-overflow-tooltip width="170">
           <template #default="{row}">
             <span>{{ row.order?.acceptorName}} <span v-if="row.order?.acceptorStaffNo">[{{row.order?.acceptorStaffNo}}]</span> </span>
@@ -48,21 +49,20 @@
         </el-table-column>
 				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip></el-table-column>
         <el-table-column prop="actualHandleTime" label="接办时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.order.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
-
-				<el-table-column prop="delayStateText" label="延期申请状态" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column label="延期申请时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
+        <el-table-column prop="creatorOrgName" label="延期申请部门" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column prop="creatorName" label="延期申请人" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column prop="creatorOrgName" label="延期申请部门" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column prop="delayNum" label="延期申请时限" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column prop="delayUnitText" label="延期申请单位" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column prop="delayReason" label="申请理由" show-overflow-tooltip width="120"></el-table-column>

+ 4 - 2
src/views/business/delay/index.vue

@@ -48,6 +48,9 @@
             <span class="color-primary">{{ row.order?.title }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="order.currentStepName" label="当前办理节点" show-overflow-tooltip width="150"></el-table-column>
+        <el-table-column prop="order.currentStepName" label="当前办理人" show-overflow-tooltip width="150"></el-table-column>
+        <el-table-column prop="delayStateText" label="延期申请状态" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column prop="expiredTime" label="受理时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
@@ -60,14 +63,13 @@
         </el-table-column>
         <el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip></el-table-column>
         <el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip></el-table-column>
         <el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip></el-table-column>
         <el-table-column prop="actualHandleTime" label="接办时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.order.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
-
-        <el-table-column prop="delayStateText" label="延期申请状态" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="延期申请时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>

+ 6 - 0
src/views/business/discern/apply/index.vue

@@ -42,6 +42,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column prop="acceptTypeText" label="中心会签" show-overflow-tooltip></el-table-column>
         <el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
           <template #default="{ row }">
@@ -65,6 +66,11 @@
             <span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="visitTime" label="办结时间" show-overflow-tooltip width="170">
+          <template #default="{ row }">
+            <span>{{ formatDate(row.orderVisit?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="visitTime" label="回访时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.orderVisit?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}</span>

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

@@ -88,11 +88,11 @@
 						<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
-				<!--				<el-table-column prop="expiredTime" label="办结时间" show-overflow-tooltip width="170">
+        <el-table-column prop="expiredTime" label="办结时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
-				</el-table-column>-->
+				</el-table-column>
 				<el-table-column prop="visit.publishTime" label="发布时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.visit?.publishTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
@@ -103,6 +103,7 @@
 						<span>{{ formatDate(row.visit?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
+        <el-table-column prop="order.actualHandleOrgName" label="中心会签" show-overflow-tooltip width="150"></el-table-column>
 				<el-table-column prop="visit.employee" label="回访人" show-overflow-tooltip></el-table-column>
 				<el-table-column label="被回访部门" show-overflow-tooltip width="150">
 					<template #default="{ row }">

+ 21 - 17
src/views/business/followUp/backlog/index.vue

@@ -39,12 +39,14 @@
 			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="55" />
 				<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="visitStateText" label="回访状态" show-overflow-tooltip></el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
+        <el-table-column label="工单标题" show-overflow-tooltip width="300">
+          <template #default="{ row }">
             <span class="color-primary">{{ row.order?.title }}</span>
-					</template>
-				</el-table-column>
+          </template>
+        </el-table-column>
+        <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="visitStateText" label="回访状态" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="visitTypeText" label="回访方式" show-overflow-tooltip width="100"></el-table-column>
 				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="200"></el-table-column>
 				<el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
@@ -59,24 +61,34 @@
 						<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
-<!--				<el-table-column prop="expiredTime" label="办结时间" show-overflow-tooltip width="170">
+				<el-table-column prop="expiredTime" label="办结时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
-				</el-table-column>-->
+				</el-table-column>
 				<el-table-column prop="publishTime" label="发布时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.publishTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
+        <el-table-column prop="publishTime" label="办结短信发送时间" show-overflow-tooltip width="170">
+          <template #default="{ row }">
+            <span>{{ formatDate(row.publishTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+          </template>
+        </el-table-column>
 				<el-table-column prop="creationTime" label="回访任务创建时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="140" fixed="right" align="center">
+        <el-table-column prop="employeeName" label="回访人" show-overflow-tooltip width="150"></el-table-column>
+        <el-table-column label="是否接通" show-overflow-tooltip width="150">
+          <template #default="{ row }">
+            <span>{{ row.isPutThrough ? '未接通' : '已接通' }}</span>
+          </template>
+        </el-table-column>
+				<el-table-column label="操作" width="100" fixed="right" align="center">
 					<template #default="{ row }">
-						<el-button link type="primary" @click="onOrderDetail(row)" title="查看工单详情" v-auth="'business:followUp:backlog:detail'"> 工单详情 </el-button>
 						<el-button link type="primary" @click="onManpower(row)" title="工单回访" v-auth="'business:followUp:backlog:manpower'"> 回访 </el-button>
 					</template>
 				</el-table-column>
@@ -94,8 +106,6 @@
 		</el-card>
 		<!-- 回访 -->
 		<follow-up-detail ref="followUpDetailRef" @updateList="queryList" />
-		<!-- 工单详情 -->
-		<order-detail ref="OrderDetailRef" @updateList="queryList" />
     <!--  分配回访人  -->
     <assign-return-visitors ref="assignReturnVisitorsRef" @updateList="queryList" />
 	</div>
@@ -113,7 +123,6 @@ import { useRouter } from 'vue-router';
 import {visitList} from "/@/api/business/followUp";
 // 引入组件
 const FollowUpDetail = defineAsyncComponent(() => import('/@/views/business/followUp/component/Follow-up-detail.vue'));   // 回访
-const OrderDetail = defineAsyncComponent(() => import('/@/views/business/order/components/Order-detail.vue'));  // 工单详情
 const AssignReturnVisitors = defineAsyncComponent(() => import('/@/views/business/followUp/component/Assign-return-visitors.vue')); // 分配回访人
 
 // 定义变量内容
@@ -187,11 +196,6 @@ const handleSelectionChange = (val: any[]) => {
 const onExport = () => {
 	console.log('导出');
 };
-// 工单详情
-const OrderDetailRef = ref<RefType>();
-const onOrderDetail = (row: any) => {
-	OrderDetailRef.value.openDialog(row.order);
-};
 // 回访
 const followUpDetailRef = ref<RefType>();
 const onManpower = (row: any) => {

+ 14 - 30
src/views/business/followUp/index.vue

@@ -32,20 +32,19 @@
 			<el-table :data="state.tableData" v-loading="state.loading">
 				<el-table-column type="selection" width="55" />
 				<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
         <el-table-column width="100" label="省/市工单" prop="isProvince" >
           <template #default="{ row }">
             <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
           </template>
         </el-table-column>
-				<el-table-column prop="no" label="中心会签" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="visitStateText" label="回访状态" show-overflow-tooltip width="100"></el-table-column>
-				<el-table-column prop="visitTypeText" label="回访方式" show-overflow-tooltip width="100"></el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
+        <el-table-column label="工单标题" show-overflow-tooltip width="300">
+          <template #default="{ row }">
             <span class="color-primary">{{ row.order?.title }}</span>
-					</template>
-				</el-table-column>
+          </template>
+        </el-table-column>
+        <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="visitStateText" label="回访状态" show-overflow-tooltip width="100"></el-table-column>
+        <el-table-column prop="visitTypeText" label="回访方式" show-overflow-tooltip width="100"></el-table-column>
         <el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="200"></el-table-column>
         <el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
@@ -60,11 +59,11 @@
             <span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
-<!--				<el-table-column prop="expiredTime" label="办结时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>-->
+        <el-table-column prop="expiredTime" label="办结时间" show-overflow-tooltip width="170">
+          <template #default="{ row }">
+            <span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="publishTime" label="发布时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.publishTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
@@ -81,12 +80,7 @@
 						<span>{{ formatDate(row.visitTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
-        <el-table-column prop="no" label="回访标签" show-overflow-tooltip>
-          <template #default="{ row }">
-            <span v-if="row.isPutThrough == null"></span>
-            <span v-else><span>{{ row.isPutThrough ? '已接通' : '未接通' }}</span></span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="no" label="中心会签" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="no" label="语音评价" show-overflow-tooltip>
           <template #default="{ row }">
               <span v-for="item in row.orderVisitDetails">
@@ -123,9 +117,8 @@
             </span>
           </template>
         </el-table-column>
-				<el-table-column label="操作" width="160" fixed="right" align="center">
+				<el-table-column label="操作" width="100" fixed="right" align="center">
 					<template #default="{ row }">
-            <el-button link type="primary" @click="onOrderDetail(row)" title="查看工单详情" v-auth="'business:followUp:detail'"> 工单详情 </el-button>
 						<el-button link type="primary" @click="followUpDetail(row)" title="查看回访详情" v-auth="'business:followUp:detail'">
 							回访详情
 						</el-button>
@@ -143,9 +136,6 @@
 				@pagination="queryList"
 			/>
 		</el-card>
-    <!-- 工单详情 -->
-    <order-detail ref="OrderDetailRef" @updateList="queryList" />
-
     <!-- 回访详情 -->
     <follow-up-detail-com ref="followUpDetailComRef" @updateList="queryList" />
 	</div>
@@ -162,7 +152,6 @@ import {visitList} from "/@/api/business/followUp";
 
 // 引入组件
 const FollowUpDetailCom = defineAsyncComponent(() => import('/@/views/business/followUp/component/Follow-up-detail.vue')); // 回访
-const OrderDetail = defineAsyncComponent(() => import('/@/views/business/order/components/Order-detail.vue'));  // 工单详情
 
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
@@ -214,11 +203,6 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	formEl.resetFields();
 	queryList();
 }, 300);
-// 工单详情
-const OrderDetailRef = ref<RefType>();
-const onOrderDetail = (row: any) => {
-  OrderDetailRef.value.openDialog(row.order);
-};
 // 回访详情
 const followUpDetailComRef = ref<RefType>();
 const followUpDetail = (row: any) => {

+ 14 - 10
src/views/business/publish/backlog/index.vue

@@ -31,22 +31,20 @@
 			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="55" :selectable="selectable" />
 				<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="no" label="是否会签件" show-overflow-tooltip width="100"></el-table-column>
 				<el-table-column width="100" label="省/市工单" prop="isProvince">
 					<template #default="{ row }">
 						<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
 					</template>
 				</el-table-column>
+        <el-table-column prop="statusText" label="发布状态" show-overflow-tooltip></el-table-column>
 				<el-table-column label="工单标题" show-overflow-tooltip width="300">
 					<template #default="{ row }">
 						<span class="color-primary">{{ row.title }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="startTime" label="受理时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
+        <el-table-column prop="sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="150"></el-table-column>
+        <el-table-column prop="acceptType" label="中心会签" show-overflow-tooltip width="150"></el-table-column>
 				<el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span
@@ -54,15 +52,21 @@
 						</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="hotspotName" label="热点分类" show-overflow-tooltip width="200"></el-table-column>
-				<el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="actualHandleOrgName" label="接办部门" show-overflow-tooltip width="170"></el-table-column>
 				<el-table-column prop="actualHandleTime" label="接办时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="statusText" label="状态" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="startTime" label="受理时间" show-overflow-tooltip width="170">
+          <template #default="{ row }">
+            <span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="startTime" label="办结时间" show-overflow-tooltip width="170">
+          <template #default="{ row }">
+            <span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+          </template>
+        </el-table-column>
 				<el-table-column label="操作" width="120" fixed="right" align="center">
 					<template #default="{ row }">
 						<el-button link type="primary" @click="publish(row)" title="发布工单" v-auth="'business:publish:backlog:publish'"> 发布 </el-button>

+ 18 - 18
src/views/business/publish/index.vue

@@ -27,7 +27,6 @@
 			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="55" :selectable="selectable" />
 				<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="order.no" label="是否会签件" show-overflow-tooltip width="100"></el-table-column>
 				<el-table-column width="100" label="省/市工单" prop="isProvince">
 					<template #default="{ row }">
 						<span>{{ row.order.isProvince ? '省工单' : '市工单' }}</span>
@@ -38,33 +37,34 @@
 						<span class="color-primary">{{ row.order.title }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="受理时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.order.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="受理人" show-overflow-tooltip width="170">
-					<template #default="{ row }">
+        <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order.statusText" label="发布状态" show-overflow-tooltip width="100"></el-table-column>
+        <el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="150"></el-table-column>
+        <el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="200"></el-table-column>
+        <el-table-column label="受理人" show-overflow-tooltip width="170">
+          <template #default="{ row }">
 						<span
-							>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
+            >{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
 						</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="200"></el-table-column>
-				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="170"></el-table-column>
-				<el-table-column label="接办时间" show-overflow-tooltip width="170">
+          </template>
+        </el-table-column>
+        <el-table-column prop="publishMan" label="发布人" show-overflow-tooltip width="120"></el-table-column>
+				<el-table-column label="受理时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
-						<span>{{ formatDate(row.order.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+						<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
+        <el-table-column label="工单期满时间" show-overflow-tooltip width="170">
+          <template #default="{ row }">
+            <span>{{ formatDate(row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+          </template>
+        </el-table-column>
 				<el-table-column prop="publishTime" label="发布时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.publishTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="publishMan" label="发布人" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column prop="order.statusText" label="发布状态" show-overflow-tooltip width="100"></el-table-column>
+
 				<el-table-column prop="publishState" label="是否公开" show-overflow-tooltip width="100">
 					<template #default="{ row }">
 						<span>{{ row.publishState ? '公开' : '不公开' }}</span>

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

@@ -28,8 +28,8 @@
             <span class="color-primary">{{ row.order.title }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="order.statusText" label="工单状态" show-overflow-tooltip></el-table-column>
         <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order.statusText" label="工单状态" show-overflow-tooltip></el-table-column>
         <el-table-column width="100" label="省/市工单" prop="isProvince" >
           <template #default="{ row }">
             <span>{{ row.order.isProvince ? '省工单' : '市工单' }}</span>
@@ -48,7 +48,7 @@
             <span>{{ formatDate(row.order.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="order.expiredTime" label="期满时间" show-overflow-tooltip width="170">
+        <el-table-column prop="order.expiredTime" label="工单期满时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.order.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>

+ 8 - 7
src/views/business/supervise/index.vue

@@ -46,11 +46,7 @@
             <span class="color-primary">{{ row.order.title }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="creatorOrgName" label="督办状态" show-overflow-tooltip width="80">
-          <template #default="{ row }">
-            <span>{{ row.state == 0 ? '未回复' : '已回复' }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
         <el-table-column prop="order.statusText" label="工单状态" show-overflow-tooltip></el-table-column>
         <el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip></el-table-column>
         <el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="120"></el-table-column>
@@ -59,6 +55,11 @@
             <span>{{ row.order?.acceptorName}} <span v-if="row.order?.acceptorStaffNo">[{{row.order?.acceptorStaffNo}}]</span> </span>
           </template>
         </el-table-column>
+        <el-table-column label="督办状态" show-overflow-tooltip width="100">
+          <template #default="{ row }">
+            <span>{{ row.state == 0 ? '督办未回复' : '督办已回复' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip></el-table-column>
         <el-table-column prop="startTime" label="受理时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
@@ -70,6 +71,8 @@
             <span>{{ formatDate(row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="creatorOrgName" label="督办部门" show-overflow-tooltip width="150"></el-table-column>
+        <el-table-column prop="crUser" label="督办人" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column prop="creationTime" label="督办时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
@@ -80,8 +83,6 @@
             <span>{{ formatDate(row.replyLimitTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="creatorOrgName" label="督办部门" show-overflow-tooltip width="150"></el-table-column>
-        <el-table-column prop="crUser" label="督办人" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column prop="orgName" label="被督办部门" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column prop="applyContent" label="督办意见" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column prop="replyTime" label="督办回复时间" show-overflow-tooltip width="170">

+ 3 - 17
src/views/business/urge/index.vue

@@ -53,7 +53,7 @@
             <span>{{ formatDate(row.order.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="100"></el-table-column>
         <el-table-column prop="order.statusText" label="工单状态" show-overflow-tooltip></el-table-column>
         <el-table-column label="工单标题" show-overflow-tooltip width="300">
           <template #default="{ row }">
@@ -67,16 +67,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="150"></el-table-column>
-        <el-table-column prop="acceptorName" label="受理人" show-overflow-tooltip width="170">
-          <template #default="{row}">
-            <span>{{ row.order?.acceptorName}} <span v-if="row.order?.acceptorStaffNo">[{{row.order?.acceptorStaffNo}}]</span> </span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="creatorOrgName" label="催办状态" show-overflow-tooltip width="100">
-          <template #default="{ row }">
-            <span>{{ row.state ==0 ? '未回复' : '已回复' }}</span>
-          </template>
-        </el-table-column>
+
         <el-table-column prop="creatorOrgName" label="催办部门" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column prop="crUser" label="催办人" show-overflow-tooltip></el-table-column>
         <el-table-column prop="creationTime" label="催办时间" show-overflow-tooltip width="170">
@@ -85,12 +76,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="orgName" label="被催办部门" show-overflow-tooltip width="150"></el-table-column>
-        <el-table-column prop="applyContent" label="催办内容" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="signTime" label="催办签收时间" show-overflow-tooltip width="170">
-          <template #default="{ row }">
-            <span>{{ formatDate(row.signTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="applyContent" label="催办内容" show-overflow-tooltip width="200"></el-table-column>
         <el-table-column label="操作" width="100" fixed="right" align="center">
           <template #default="{ row }">
             <el-button link type="primary" @click="onDetail(row)" title="查看工单详情" v-auth="'business:urge:detail'"> 催办详情 </el-button>