浏览代码

reactor:工单受调整;

zhangchong 9 月之前
父节点
当前提交
3da3b2940c

+ 3 - 3
.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
 # 文件上传地址前缀
@@ -25,4 +25,4 @@ VITE_JTHS_API_URL=http://118.121.58.161:19021
 # 捷通华声AppKey
 VITE_JTHS_APPKEY=MTAwMDAx
 # 当前地州市
-VITE_CURRENT_CITY=zigong
+VITE_CURRENT_CITY=yibin

+ 18 - 18
src/views/business/discern/components/Discern-detail.vue

@@ -20,20 +20,20 @@
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="申请类型"> {{ state.ruleForm?.typeDicName }} </el-form-item>
 				</el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="发起甄别耗时"> {{ state.ruleForm?.timeConsuminText }} </el-form-item>
-        </el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="发起甄别耗时"> {{ state.ruleForm?.timeConsuminText }} </el-form-item>
+				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="是否省甄别">{{ state.ruleForm?.isProvince ? '是' : '否' }} </el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 					<el-form-item label="申请理由">{{ state.ruleForm?.content }} </el-form-item>
 				</el-col>
-        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-          <el-form-item label="附件"
-          ><annex-list name="甄别申请附件" v-model="state.ruleForm.files" readonly classify="甄别申请附件" />
-          </el-form-item>
-        </el-col>
+				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<el-form-item label="附件"
+						><annex-list name="甄别申请附件" v-model="state.ruleForm.files" readonly classify="甄别申请附件" />
+					</el-form-item>
+				</el-col>
 			</el-row>
 		</el-form>
 		<template #footer>
@@ -43,14 +43,14 @@
 				<el-button
 					type="primary"
 					@click="onAudit"
-					v-if="[0, 1, 3].includes(state.ruleForm.status) && state.ruleForm.isCanHandle"
+					v-if="[0, 1, 3, 5].includes(state.ruleForm.status) && state.ruleForm.isCanHandle"
 					v-auths="['business:discern:audit:todo', 'business:discern:audit']"
 					>甄别审批</el-button
 				>
 				<el-button
 					type="primary"
 					@click="onReturn"
-					v-if="[0, 1, 3].includes(state.ruleForm.status) && state.ruleForm.isCanHandle"
+					v-if="[0, 1, 3, 5].includes(state.ruleForm.status) && state.ruleForm.isCanHandle"
 					v-auths="['business:discern:return:todo', 'business:discern:return']"
 					>甄别退回</el-button
 				>
@@ -67,7 +67,7 @@ import { defineAsyncComponent, reactive, ref } from 'vue';
 import { formatDate } from '@/utils/formatTime';
 import { screenDetail } from '@/api/business/discern';
 import { commonEnum } from '@/utils/constants';
-import {transformFile} from "@/utils/tools";
+import { transformFile } from '@/utils/tools';
 
 const AuditRecord = defineAsyncComponent(() => import('@/components/AuditRecord/index.vue')); // 流程明细
 const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue')); // 附件列表
@@ -85,12 +85,12 @@ const state = reactive<any>({
  * @description 打开弹窗
  * */
 const openDialog = async (row: any) => {
-  state.dialogVisible = true;
+	state.dialogVisible = true;
 	state.loading = true;
 	try {
 		const res = await screenDetail(row.id);
 		state.ruleForm = res.result ?? {};
-    state.ruleForm.files = transformFile(state.ruleForm.files);
+		state.ruleForm.files = transformFile(state.ruleForm.files);
 		state.loading = false;
 	} catch (e) {
 		console.log(e);
@@ -184,7 +184,7 @@ const onReturn = () => {
 				dialogTitle: '甄别退回',
 				inputPlaceholder: '请填写甄别退回意见',
 				annexName: '甄别附件',
-        classify: '甄别上传',
+				classify: '甄别上传',
 			},
 		};
 		processAuditRef.value.openDialog(params);
@@ -193,10 +193,10 @@ const onReturn = () => {
 	}
 };
 // 流程成功刷新页面
-const orderProcessSuccess = ()=>{
-  closeDialog();
-  emit('updateList');
-}
+const orderProcessSuccess = () => {
+	closeDialog();
+	emit('updateList');
+};
 defineExpose({
 	openDialog,
 	closeDialog,

+ 1 - 1
src/views/business/discern/todo.vue

@@ -376,7 +376,7 @@ const state = reactive<any>({
 		// 查询条件
 		PageIndex: 1,
 		PageSize: 20,
-		Status: 0, //  甄别申请状态甄别待办 1 甄别已办 1
+		// Status: 0, //  甄别申请状态甄别待办 1 甄别已办 1
 		source: '1', // 甄别查询来源 1 甄别待办 2 甄别列表
     TabStatus:0, // 甄别申请状态
 		No: null, // 工单编码

+ 1 - 1
src/views/todo/seats/accept/ybAccept.vue

@@ -1057,7 +1057,7 @@ const processOrder = (orderDetail: any) => {
 	} else {
 		// 如果没有流程id 说明没有发起过流程  调用工单受理
 		const params = {
-			id: state.ruleForm.id,
+			id: '',
 			processType: '工单受理',
 			extra: {
 				dialogTitle: '工单受理',

+ 80 - 16
src/views/todo/seats/accept/zgAccept.vue

@@ -420,7 +420,7 @@
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 									<el-form-item label="附件" prop="files" :rules="[{ required: false, message: '请填写诉求内容', trigger: 'change' }]">
-										<annex-list :businessId="state.orderId" classify="受理上传" v-model="state.ruleForm.files" v-model:format="filesFormat" />
+										<annex-list :businessId="state.ruleForm.id" classify="受理上传" v-model="state.ruleForm.files" v-model:format="filesFormat" />
 									</el-form-item>
 								</el-col>
 								<el-col :xs="24" :sm="12" :md="24" :lg="24" :xl="24">
@@ -450,7 +450,7 @@
 							<el-tab-pane label="历史工单" name="history">
 								<history-order
 									:ruleForm="state.ruleForm"
-									:orderId="state.orderId"
+									:orderId="state.ruleForm.id"
 									@handleSelectionChange="handleSelectionChange"
 									ref="historyOrderRef"
 								/>
@@ -855,7 +855,7 @@ const changeFocusEvent = (val: string[]) => {
 };
 // 删除不必要的属性
 const deleteUnnecessaryProperties = (obj: any) => {
-	const propertiesToDelete = ['ageRangeObj', 'pushTypeObj', 'licenceTypeObj', 'channel', 'acceptTypeObj', 'transpondCity','orderTagObj'];
+	const propertiesToDelete = ['ageRangeObj', 'pushTypeObj', 'licenceTypeObj', 'channel', 'acceptTypeObj', 'transpondCity', 'orderTagObj'];
 	propertiesToDelete.forEach((prop) => Reflect.deleteProperty(obj, prop));
 };
 const filesFormat = ref<EmptyArrayType>([]); // 附件列表格式化
@@ -890,7 +890,7 @@ const save = throttle((formEl: FormInstance | undefined) => {
 			files: filesFormat.value,
 		};
 		deleteUnnecessaryProperties(orderDetail);
-		const operation = state.orderId ? orderEdit : orderAdd;
+		const operation = state.ruleForm.id ? orderEdit : orderAdd;
 		const addOrderAndNavigate = () => {
 			operation(orderDetail)
 				.then((res: any) => {
@@ -953,7 +953,7 @@ const processOrder = (orderDetail: any) => {
 	} else {
 		// 如果没有流程id 说明没有发起过流程  调用工单受理
 		const params = {
-			id: state.orderId,
+			id: '',
 			processType: '工单受理',
 			extra: {
 				dialogTitle: '工单受理',
@@ -1046,8 +1046,72 @@ const loadBaseData = async () => {
 		state.pushTypeOptions = result?.pushTypeOptions ?? [];
 		state.licenceTypeOptions = result?.licenceTypeOptions ?? [];
 		state.transpondCity = result?.transpondCity ?? [];
-		state.focusOnEvents = result?.focusOnEvents ?? [];
-		state.orderTags = result?.orderTags ?? [];
+		/*state.focusOnEvents = result?.focusOnEvents ?? [];
+		state.orderTags = result?.orderTags ?? [];*/
+		state.focusOnEvents = [
+			{
+				dicDataValue: '0',
+				dicDataName: '紧急工单',
+			},
+			{
+				dicDataValue: '4',
+				dicDataName: '24小时办结',
+			},
+		];
+		state.orderTags = [
+			{
+				dicDataName: '企业',
+				dicDataValue: 'qy',
+			},
+			{
+				dicDataName: '国家政务平台',
+				dicDataValue: 'gjzwpt',
+			},
+			{
+				dicDataName: '天府通办',
+				dicDataValue: 'tftb',
+			},
+			{
+				dicDataName: '中国政府网',
+				dicDataValue: 'zgzfw',
+			},
+			{
+				dicDataName: '省政民互动',
+				dicDataValue: 'szmhd',
+			},
+			{
+				dicDataName: '一次性告知',
+				dicDataValue: 'ycxgz',
+			},
+			{
+				dicDataName: '办不成事投诉',
+				dicDataValue: 'bbcsts',
+			},
+			{
+				dicDataName: '领导接听日',
+				dicDataValue: 'ldjtr',
+			},
+			{
+				dicDataName: '30分钟响应件',
+				dicDataValue: '30fzxyj',
+			},
+			{
+				dicDataName: '漏接回拨',
+				dicDataValue: 'ljhb',
+			},
+			{
+				dicDataName: '农民工诉求',
+				dicDataValue: 'nmgsq',
+			},
+			{
+				dicDataName: '延时服务',
+				dicDataValue: 'ysfw',
+			},
+			{
+				dicDataName: '物业管理',
+				dicDataValue: 'wygl',
+			},
+		];
 	} catch (error) {
 		console.log(error);
 	}
@@ -1084,10 +1148,10 @@ const loadForm = async () => {
 
 		if (route.query.id) {
 			// 如果 有id
-			state.orderId = route.query.id;
+			state.ruleForm.id = route.query.id;
 			const response = await orderDetail(route.query.id);
 			// 如果获取到id 调用查询详情
-			state.ruleForm =   Object.assign(state.ruleForm, response.result);
+			state.ruleForm = Object.assign(state.ruleForm, response.result);
 			state.ruleForm.files = transformFile(response.result.files);
 			if (response.result.duplicateIds && response.result.duplicateIds.length) {
 				// 是否重复
@@ -1145,13 +1209,13 @@ const loadForm = async () => {
 					dicDataName: state.ruleForm.pushType,
 				};
 			}
-      if(state.ruleForm.orderTagCode){
-        state.ruleForm.orderTagObj = {
-          // 工单标签
-          dicDataValue: state.ruleForm.orderTagCode,
-          dicDataName: state.ruleForm.orderTag,
-        };
-      }
+			if (state.ruleForm.orderTagCode) {
+				state.ruleForm.orderTagObj = {
+					// 工单标签
+					dicDataValue: state.ruleForm.orderTagCode,
+					dicDataName: state.ruleForm.orderTag,
+				};
+			}
 			if (state.ruleForm.transpondCityValue) {
 				state.ruleForm.transpondCityObj = {
 					// 市州互转