Merge branch 'release' into dev

src/layout/components/main.vue

@@ -196,7 +196,7 @@ onMounted(async () => {
 		// 检查是否有随手拍工单 自贡需求
 		await checkWorkOrder();
 	}
-	await checkReturnWorkOrder();
+	// await checkReturnWorkOrder();
 	setTimeout(() => {
 		signalR.joinGroup('CallCenter'); // 加入分组
 	}, 1000);

src/views/business/publish/todo.vue

@@ -493,7 +493,11 @@ const publishMultiple = () => {
 					type: 'info',
 				})*/
 				handleQuery();
-			});
+			}).catch(() => {
+        gridRef.value.clearCheckboxRow();
+        checkTable.value = [];
+        gridOptions.loading = false;
+      })
 		})
 		.catch(() => {
 			gridOptions.loading = false;

src/views/business/visit/index.vue

@@ -324,6 +324,7 @@ const gridOptions = reactive<any>({
 		{ field: 'order.acceptType', title: '受理类型', width: 110 },
 		{ field: 'order.acceptorName', title: '受理人', width: 120 },
 		{ field: 'order.hotspotName', title: '热点分类', width: 150 },
+    { field: 'order.fromPhone', title: '来电号码', width: 150 },
 		{ field: 'order.orgLevelOneName', title: '一级部门', width: 150 },
 		{ field: 'order.actualHandleOrgName', title: '接办部门', width: 140 },
 		{

src/views/business/visit/todo.vue

@@ -322,6 +322,7 @@ const gridOptions = reactive<any>({
 		{ field: 'visitTypeText', title: '回访方式', width: 100 },
 		{ field: 'order.acceptType', title: '受理类型', width: 110 },
 		{ field: 'order.hotspotName', title: '热点分类', width: 150 },
+    { field: 'order.fromPhone', title: '来电号码', width: 150 },
 		{ field: 'order.orgLevelOneName', title: '一级部门', width: 150 },
 		{ field: 'order.actualHandleOrgName', title: '接办部门', width: 140 },
 		{

src/views/snapshot/reAudit/grid/index.vue

@@ -29,7 +29,7 @@
 					<span v-else>{{ row.statusTxt }}</span>
 				</template>
 				<template #order_detail="{ row }">
-					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+					<order-detail :order="{ id: row.orderId }" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
 				<template #action="{ row }">
 					<el-button link type="primary" @click="onAudit(row)" v-if="state.queryParams.Status === 0"> 审批 </el-button>

src/views/statistics/department/detailSatisfied.vue

@@ -76,8 +76,19 @@
 					:params="{ exportMethod: departmentSatisfactionDetailExport, exportParams: requestParams }"
 				>
 					<vxe-column type="checkbox" width="60" align="center"></vxe-column>
-					<vxe-column field="no" title="工单编码" width="140"></vxe-column>
-					<vxe-column field="isProvinceText" title="省/市工单" width="90"></vxe-column>
+          <vxe-column field="isProvinceText" title="省/市工单" width="90"></vxe-column>
+          <vxe-column field="visitTime" title="回访时间" sortable width="160">
+            <template #default="{ row }">
+              {{ formatDate(row.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
+            </template>
+          </vxe-column>
+          <vxe-column field="visitOrgName" title="回访部门" width="140"></vxe-column>
+          <vxe-column field="no" title="工单编码" width="140"></vxe-column>
+          <vxe-column field="title" title="工单标题" width="200">
+            <template #default="{ row }">
+              <order-detail :order="{ ...row, id: row.orderId }" @updateList="queryList">{{ row.title }}</order-detail>
+            </template>
+          </vxe-column>
 					<vxe-column field="reTransactNum" title="重办次数" width="90"></vxe-column>
 					<vxe-column field="orderScreenStatusText" title="甄别" width="90"></vxe-column>
 					<vxe-column field="visitContent" title="回访信息" width="150"></vxe-column>
@@ -89,19 +100,8 @@
 							{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
-					<vxe-column field="title" title="工单标题" width="200">
-						<template #default="{ row }">
-							<order-detail :order="{ ...row, id: row.orderId }" @updateList="queryList">{{ row.title }}</order-detail>
-						</template>
-					</vxe-column>
 					<vxe-column field="visitUser" title="回访人" width="120"></vxe-column>
-					<vxe-column field="visitOrgName" title="回访部门" width="140"></vxe-column>
 					<vxe-column field="visitTypeText" title="回访方式" width="110"></vxe-column>
-					<vxe-column field="visitTime" title="回访时间" sortable width="160">
-						<template #default="{ row }">
-							{{ formatDate(row.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
-						</template>
-					</vxe-column>
 					<vxe-column field="orgProcessingResults" title="满意度" width="120"></vxe-column>
 					<vxe-column field="content" title="受理内容" width="150"></vxe-column>
 					<vxe-column field="fileOpinion" title="承办意见" width="150"></vxe-column>

src/views/statistics/department/detailSatisfiedList.vue

@@ -70,8 +70,19 @@
 					:params="{ exportMethod: departmentSatisfactionListExport, exportParams: requestParams }"
 				>
 					<vxe-column type="checkbox" width="60" align="center"></vxe-column>
+          <vxe-column field="isProvinceText" title="省/市工单" width="90"></vxe-column>
+          <vxe-column field="visitTime" title="回访时间" sortable width="160">
+            <template #default="{ row }">
+              {{ formatDate(row.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
+            </template>
+          </vxe-column>
+          <vxe-column field="visitOrgName" title="回访部门" width="140"></vxe-column>
 					<vxe-column field="no" title="工单编码" width="140"></vxe-column>
-					<vxe-column field="isProvinceText" title="省/市工单" width="90"></vxe-column>
+          <vxe-column field="title" title="工单标题" width="200">
+            <template #default="{ row }">
+              <order-detail :order="{ ...row, id: row.orderId }" @updateList="queryList">{{ row.title }}</order-detail>
+            </template>
+          </vxe-column>
 					<vxe-column field="reTransactNum" title="重办次数" width="90"></vxe-column>
 					<vxe-column field="orderScreenStatusText" title="甄别" width="90"></vxe-column>
 					<vxe-column field="visitContent" title="回访信息" width="150"></vxe-column>
@@ -83,20 +94,9 @@
 							{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
-					<vxe-column field="title" title="工单标题" width="200">
-						<template #default="{ row }">
-							<order-detail :order="{ ...row, id: row.orderId }" @updateList="queryList">{{ row.title }}</order-detail>
-						</template>
-					</vxe-column>
 					<!--					<vxe-column field="order.orderTag" title="工单标签" width="120" v-if="['ZiGong', 'LuZhou'].includes(themeConfig.appScope)"></vxe-column>-->
 					<vxe-column field="visitUser" title="回访人" width="120"></vxe-column>
-					<vxe-column field="visitOrgName" title="回访部门" width="140"></vxe-column>
 					<vxe-column field="visitTypeText" title="回访方式" width="110"></vxe-column>
-					<vxe-column field="visitTime" title="回访时间" sortable width="160">
-						<template #default="{ row }">
-							{{ formatDate(row.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
-						</template>
-					</vxe-column>
 					<vxe-column field="orgProcessingResults" title="满意度" width="120"></vxe-column>
 					<vxe-column field="content" title="受理内容" width="150"></vxe-column>
 					<vxe-column field="fileOpinion" title="承办意见" width="150"></vxe-column>

src/views/statistics/order/departmentAcceptType.vue

@@ -132,7 +132,7 @@
 						<vxe-column title="建议时长" field="jyAllTimes" min-width="100"></vxe-column>
 						<vxe-column title="建议平均" field="jyAverageTime" min-width="100"></vxe-column>
 					</vxe-colgroup>
-					<vxe-colgroup title="意见类" align="center">
+<!--					<vxe-colgroup title="意见类" align="center">
 						<vxe-column title="意见件数" field="yjAllCount" min-width="100">
 							<template #default="scope">
 								<el-button type="primary" link @click="linkDetail(scope.row, scope)">
@@ -142,7 +142,18 @@
 						</vxe-column>
 						<vxe-column title="意见时长" field="yjAllTimes" min-width="100"></vxe-column>
 						<vxe-column title="意见平均" field="yjAverageTime" min-width="100"></vxe-column>
-					</vxe-colgroup>
+					</vxe-colgroup>-->
+          <vxe-colgroup title="表扬类" align="center">
+            <vxe-column title="表扬件数" field="byAllCount" min-width="100">
+              <template #default="scope">
+                <el-button type="primary" link @click="linkDetail(scope.row, scope)">
+                  {{ scope.row.byAllCount }}
+                </el-button>
+              </template>
+            </vxe-column>
+            <vxe-column title="表扬时长" field="byAllTimes" min-width="100"></vxe-column>
+            <vxe-column title="表扬平均" field="byAverageTime" min-width="100"></vxe-column>
+          </vxe-colgroup>
 				</vxe-table>
 			</div>
 		</div>