Browse Source

reactor:部门满意度列表明细调整;未签收工单红色;

zhangchong 9 months ago
parent
commit
c389a2fea6

+ 2 - 2
.env.development

@@ -3,11 +3,11 @@ VITE_MODE_NAME=development
 # 防止部署多套系统到同一域名不同目录时,变量共用的问题 设置不同的前缀
 VITE_STORAGE_NAME=dev
 # 基础请求地址
-VITE_API_URL=http://110.188.24.28:50300
+VITE_API_URL=http://110.188.24.28:50100
 # 数据共享平台请求地址
 VITE_DATASHARE_API_YRL=http://ds.12345lm.cn
 # socket API
-VITE_API_SOCKET_URL=http://110.188.24.28:50300/hubs/hotline
+VITE_API_SOCKET_URL=http://110.188.24.28:50100/hubs/hotline
 # 上传 API
 VITE_API_UPLOAD_URL=http://110.188.24.28:50120
 # 文件上传地址前缀

+ 11 - 0
src/api/statistics/department.ts

@@ -154,6 +154,17 @@ export const departmentSatisfactionDetailExport = (data: object) => {
     reduce_data_format: false
   });
 }
+/**
+ * @description 部门满意度统计明细列表基础数据
+ * @param {object} params
+ */
+export const departmentSatisfactionDetailBase = (params?: object) => {
+  return request({
+    url: `/api/v1/biorder/org-visitdetail-list-basedata`,
+    method: 'get',
+    params,
+  });
+}
 /**
  * @description 部门满意度统计明细列表
  * @param {object} params

+ 1 - 1
src/components/OrderDetail/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-button link :type="props.type" @click.stop="onOrderDetail" title="点击查看工单详情">
+	<el-button link :type="props.order?.canSign ? 'danger' : 'primary'" @click.stop="onOrderDetail" title="点击查看工单详情">
 		<slot>工单详情</slot>
 	</el-button>
 	<el-dialog

+ 1 - 1
src/views/auxiliary/province/zmhd/index.vue

@@ -97,7 +97,7 @@
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
 				<template #title="{ row }">
-					<order-detail :order="row" @updateList="queryList" :type="row.canSign ? 'danger' : 'primary'">{{ row.title }}</order-detail>
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">

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

@@ -341,7 +341,7 @@
 						<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 					</template>
 					<template #title="{ row }">
-						<order-detail :order="row" @updateList="queryList" :type="row.canSign ? 'danger' : 'primary'">{{ row.title }}</order-detail>
+						<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 					</template>
 					<!-- 表格操作 -->
 					<template #operation="{ row }">
@@ -403,7 +403,7 @@
 						<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 					</template>
 					<template #title="{ row }">
-						<order-detail :order="row" @updateList="queryList" :type="row.canSign ? 'danger' : 'primary'">{{ row.title }}</order-detail>
+						<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 					</template>
 					<!-- 表格操作 -->
 					<template #operation="{ row }">

+ 1 - 1
src/views/business/order/index.vue

@@ -349,7 +349,7 @@
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
 				<template #title="{ row }">
-					<order-detail :order="row" @updateList="queryList" :type="row.canSign ? 'danger' : 'primary'">{{ row.title }}</order-detail>
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">

+ 1 - 1
src/views/dataShare/editExpire.vue

@@ -34,7 +34,7 @@
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
 				<template #title="{ row }">
-					<order-detail :order="row" @updateList="queryList" :type="row.canSign ? 'danger' : 'primary'">{{ row.title }}</order-detail>
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">

+ 1 - 1
src/views/home/component/ToDo.vue

@@ -39,7 +39,7 @@
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
 				<template #title="{ row }">
-					<order-detail :order="row" @updateList="handleChange(activeName)" :type="row.canSign ? 'danger' : 'primary'">{{ row.title }}</order-detail>
+					<order-detail :order="row" @updateList="handleChange(activeName)">{{ row.title }}</order-detail>
 				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">

+ 1 - 1
src/views/statistics/center/detailWrongItem.vue

@@ -72,7 +72,7 @@
         :exportParams="requestParams"
 			>
 				<template #title="{ row }">
-					<order-detail :order="row.orderSpecial.order" @updateList="queryList" :type="row.orderSpecial.order?.canSign ? 'danger' : 'primary'">{{
+					<order-detail :order="row.orderSpecial.order" @updateList="queryList">{{
 						row.orderSpecial?.order?.title
 					}}</order-detail>
 				</template>

+ 1 - 0
src/views/statistics/department/detailHandle.vue

@@ -112,6 +112,7 @@ const queryList = () => {
   requestParams.value.OrgCode = routeQueryParams.OrgCode;
   requestParams.value.StatisticsType = Number(routeQueryParams.StatisticsType);
   requestParams.value.isProvince = routeQueryParams.isProvince;
+  requestParams.value.ParentOrgCode = routeQueryParams.ParentOrgCode;
   state.loading = true;
   departmentOrderDetail(requestParams.value)
     .then((response: any) => {

+ 2 - 0
src/views/statistics/department/detailHandleOrg.vue

@@ -546,6 +546,7 @@ const linkDetail = (scope, key?: string) => {
 				OrgCode: scope.row.orgCode,
 				StatisticsType: key,
 				isProvince: routeQueryParams.isProvince,
+        ParentOrgCode:routeQueryParams.id
 			},
 		});
 	} else {
@@ -557,6 +558,7 @@ const linkDetail = (scope, key?: string) => {
 				EndTime,
 				isProvince: routeQueryParams.isProvince,
 				id: scope.row.orgCode,
+        ParentOrgCode:routeQueryParams.id
 			},
 		});
 	}

+ 19 - 16
src/views/statistics/department/detailSatisfiedList.vue

@@ -26,6 +26,7 @@
 								@change="handleQuery"
 								value-format="YYYY-MM-DD[T]HH:mm:ss"
 								:default-time="defaultTimeStartEnd"
+								:clearable="false"
 							/>
 						</el-form-item>
 					</el-col>
@@ -36,10 +37,18 @@
 							</el-form-item>
 						</el-col>
 					</transition>
-					<transition name="el-zoom-in-top" v-show="!searchCol">
-						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
+					<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="OrgProcessingResults">
-								<el-input v-model="state.queryParams.OrgProcessingResults" placeholder="办件结果" clearable @keyup.enter="handleQuery" />
+								<el-select
+									v-model="state.queryParams.OrgProcessingResults"
+									placeholder="请选择来办件结果"
+									clearable
+									class="w100"
+									@change="handleQuery"
+								>
+									<el-option v-for="item in state.visitSatisfaction" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
+								</el-select>
 							</el-form-item>
 						</el-col>
 					</transition>
@@ -132,7 +141,7 @@
 						><SvgIcon name="iconfont icon-daochu" class="mr5" />交办单导出
 					</el-button>
 				</template>
-<!--				<template #description>
+				<!--				<template #description>
 					<el-popover :width="500" trigger="click">
 						<template #reference>
 							<el-button circle title="口径说明"><SvgIcon name="ele-QuestionFilled" /></el-button>
@@ -165,11 +174,10 @@
 <script setup lang="tsx" name="statisticsDepartmentSatisfiedDetailList">
 import { onMounted, reactive, ref, defineAsyncComponent } from 'vue';
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
-import { departmentSatisfactionList, departmentSatisfactionListExport } from '@/api/statistics/department';
+import { departmentSatisfactionDetailBase, departmentSatisfactionList, departmentSatisfactionListExport } from '@/api/statistics/department';
 import { formatDate } from '@/utils/formatTime';
-import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
+import { defaultDateOne, defaultDateTime, defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import { useRoute } from 'vue-router';
-import { listBaseData } from '@/api/judicial';
 import Other from '@/utils/other';
 import { exportJbOrder } from '@/api/business/order';
 import { downloadZip } from '@/utils/tools';
@@ -208,7 +216,7 @@ const columns = ref<any[]>([
 			return <span>{formatDate(scope.row.visitTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-	{ prop: 'orderScreenStatusText', label: '满意度', minWidth: 120 },
+	{ prop: 'orgProcessingResults', label: '满意度', minWidth: 120 },
 	{ prop: 'content', label: '受理内容', minWidth: 150 },
 	{ prop: 'fileOpinion', label: '承办意见', minWidth: 150 },
 	{
@@ -234,7 +242,7 @@ const state = reactive<any>({
 		PageIndex: 1,
 		PageSize: 10,
 		HotspotIds: [],
-		crTime: [], // 时间默认今天开始到今天结束
+		crTime: defaultDateOne,
 		CreationTimeStart: null,
 		CreationTimeEnd: null,
 		doneTime: [], // 办结时间
@@ -292,15 +300,10 @@ const visitDetail = (row: any) => {
 // 获取查询条件基础信息
 const getBaseData = async () => {
 	try {
-		const res: any = await listBaseData();
+		const res: any = await departmentSatisfactionDetailBase();
 		const mappings: any = {
-			acceptTypeOptions: 'acceptTypeOptions',
-			channelOptions: 'channelOptions',
+			visitSatisfaction: 'visitSatisfaction',
 			orgsOptions: 'orgsOptions',
-			pushTypeOptions: 'pushTypeOptions',
-			orderStatusOptions: 'orderStatusOptions',
-			identityTypeOptions: 'identityTypeOptions',
-			currentStepOptions: 'currentStepOptions',
 		};
 		for (const key in mappings) {
 			state[key] = res.result?.[mappings[key]] ?? [];

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

@@ -58,7 +58,7 @@
           <span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
         </template>
         <template #title="{ row }">
-          <order-detail :order="row.order" @updateList="queryList" :type="row.order?.canSign ? 'danger' : 'primary'">{{ row.order?.title }}</order-detail>
+          <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
         </template>
       </ProTable>
     </el-card>

+ 1 - 1
src/views/statistics/order/detailDispatch.vue

@@ -16,7 +16,7 @@
           <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
         </template>
         <template #title="{ row }">
-          <order-detail :order="row" @updateList="queryList" :type="row.canSign ? 'danger' : 'primary'">{{ row?.title }}</order-detail>
+          <order-detail :order="row" @updateList="queryList">{{ row?.title }}</order-detail>
         </template>
         <!-- 表格操作 -->
         <template #operation="{ row }">

+ 1 - 1
src/views/statistics/order/specialTable.vue

@@ -37,7 +37,7 @@
           <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
         </template>
         <template #title="{ row }">
-          <order-detail :order="row.order" @updateList="queryList" :type="row.order?.canSign ? 'danger' : 'primary'">{{ row.order?.title }}</order-detail>
+          <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
         </template>
         <!-- 表格操作 -->
         <template #operation="{ row }">

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

@@ -103,7 +103,7 @@
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
 				<template #title="{ row }">
-					<order-detail :order="row" @updateList="queryList" :type="row.canSign ? 'danger' : 'primary'">{{ row.title }}</order-detail>
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">