reactor:退回新增附件展示;工单详情新增省本地编码和省编码;省平台对接调整查询条件和展示省编码;

src/components/OrderDetail/index.vue

@@ -120,10 +120,15 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.provinceNo">
-								<el-form-item label="省工单编码">
+								<el-form-item label="省本地编码">
 									<div style="word-break: break-all">{{ state.ruleForm.provinceNo }}</div>
 								</el-form-item>
 							</el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.receiveProvinceNo">
+								<el-form-item label="省编码">
+									<div style="word-break: break-all">{{ state.ruleForm.receiveProvinceNo }}</div>
+								</el-form-item>
+							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.ruleForm?.orderExtension?.orderTypeCode">
 								<el-form-item label="工单类型">
 									{{ state.ruleForm.orderExtension?.orderType }}
@@ -507,7 +512,7 @@
 				<!-- 100-200 表示工单正在办理中 并且应该自己办理 -->
 				<el-button
 					type="primary"
-					@click="onSubmit('工单退回', '退回附件')"
+					@click="onSubmit('工单退回', '退回附件', '退回附件', '退回意见')"
 					:loading="state.loading"
 					v-if="isInRange(state.ruleForm?.status, 100, 200) && state.ruleForm?.canHandle && state.ruleForm?.canPrevious"
 					v-auth="'business:order:return'"
@@ -772,7 +777,7 @@ const onRecord = () => {
 };
 // 提交流程
 const processAuditRef = ref<RefType>(); // 处理流程
-const onSubmit = (val: string, annexName: string = '办理附件', classify: string = '办理附件') => {
+const onSubmit = (val: string, annexName: string = '办理附件', classify: string = '办理附件', inputPlaceholder = '办理意见') => {
 	if (['工单办理', '工单退回'].includes(val) && state.ruleForm.isReturnUnderApproval) {
 		ElMessage.warning(`该工单存在正在审核中的退回，不能办理！`);
 		return;
@@ -783,7 +788,7 @@ const onSubmit = (val: string, annexName: string = '办理附件', classify: str
 		orderDetail: state.ruleForm,
 		extra: {
 			dialogTitle: val,
-			inputPlaceholder: '办理意见',
+			inputPlaceholder,
 			annexName,
 			classify,
 		},

src/components/ProcessAudit/index.vue

@@ -887,7 +887,7 @@
 				<el-button class="default-button" @click="onNext" :loading="state.loading" v-if="activeStep === 0 && showStepsArr.includes(state.processType)"
 				>下一步</el-button
 				>
-						<el-button type="primary" @click="handleTempSave" :loading="state.loading" v-if="activeStep === 1">临时保存</el-button>
+<!--						<el-button type="primary" @click="handleTempSave" :loading="state.loading" v-if="activeStep === 1">临时保存</el-button>-->
 				<el-button type="primary" @click="onSubmit(ruleFormRef)" :loading="state.loading" v-if="activeStep === 1">办理</el-button>
 				</template>
 			</span>
@@ -976,7 +976,7 @@ const state = reactive<any>({
 	handleId: '', // 流程处理ID
 	dialogTitle: '', // 弹窗标题
 	annexName: '', // 附件标题
-	inputPlaceholder: '', // 意见提示
+	inputPlaceholder: '办理意见', // 意见提示
 	orderDetail: {}, // 工单详情
 });
 const ruleFormRef = ref<RefType>(); //表单组件

src/views/business/order/index.vue

@@ -303,8 +303,8 @@
 				<el-form-item label="受理人" prop="NameOrNo">
 					<el-input v-model="state.queryParams.NameOrNo" placeholder="受理人/坐席工号" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
-				<el-form-item label="省工单编码" prop="ProvinceNo">
-					<el-input v-model="state.queryParams.ProvinceNo" placeholder="省工单编码" clearable @keyup.enter="handleQuery" />
+				<el-form-item label="省本地编码" prop="ProvinceNo">
+					<el-input v-model="state.queryParams.ProvinceNo" placeholder="省本地编码" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
 				<el-form-item label="来电号码" prop="FromPhone">
 					<el-input v-model="state.queryParams.FromPhone" placeholder="来电号码" clearable @keyup.enter="handleQuery" />
@@ -435,7 +435,7 @@ const state = reactive<any>({
 		PageSize: 50, // 每页条数
 		// 查询条件
 		No: null, // 工单编码
-		ProvinceNo: null, // 省工单编码
+		ProvinceNo: null, // 省本地编码
 		ActualHandlerName: null, // 接办人
 		IsScreen: null, // 是否甄别
 		CurrentStepCode: null, // 办理节点

src/views/business/return/components/Return-audit-detail.vue

@@ -1,7 +1,6 @@
 <template>
 	<el-dialog v-model="state.dialogVisible" draggable title="退回详情" width="50%" append-to-body destroy-on-close>
-		<div class="collapse-container"  v-loading="state.loading">
-			<el-form label-width="110px" :model="state.ruleForm" class="show-info-form">
+			<el-form label-width="110px" :model="state.ruleForm" class="show-info-form" v-loading="state.loading">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="工单编码"> {{ state.detail.order?.no }} </el-form-item>
@@ -21,6 +20,9 @@
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="申请理由" class="formatted-text"> {{ state.detail.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.detail.files" readonly classify="退回附件" /> </el-form-item>
+					</el-col>
 				<template v-if="state.detail?.auditTime">
           <el-divider content-position="left">
             <el-text tag="b" size="large"> 审批详情 </el-text>
@@ -48,16 +50,15 @@
         </template>
 				</el-row>
 			</el-form>
-		</div>
 	</el-dialog>
 </template>
 <script setup lang="ts" name="returnAuditDetailDialog">
-import { reactive } from 'vue';
+import { defineAsyncComponent, reactive } from 'vue';
 import { formatDate } from '@/utils/formatTime';
 import { returnAuditDetail } from '@/api/business/return';
+import { transformFile } from '@/utils/tools';
 
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['updateList']);
+const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue')); // 附件列表
 // 定义变量内容
 const state = reactive<any>({
 	dialogVisible: false, // 是否显示弹窗
@@ -72,6 +73,7 @@ const openDialog = async (val: any) => {
 		const { result } = await returnAuditDetail(val.id);
     if(result) state.detail = result;
 		else state.detail = val;
+		state.detail.files = transformFile(state.detail.files);
 		state.loading = false;
 	} catch (e) {
 		console.log(e);

src/views/business/return/components/Return-audit.vue

@@ -1,60 +1,68 @@
 <template>
 	<el-dialog v-model="state.dialogVisible" draggable title="退回审批" width="50%" append-to-body destroy-on-close @close="close">
-		<div class="collapse-container">
-			<el-form label-width="110px" ref="ruleFormRef" :model="state.ruleForm">
-				<el-row :gutter="35">
-					<el-divider content-position="left">
-						<el-text tag="b" size="large"> 退回详情 </el-text>
-					</el-divider>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="工单编码" class="mb5"> {{ state.orderDetail.order?.no }} </el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="工单标题" class="mb5"> {{ state.orderDetail.order?.title }} </el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="申请人" class="mb5"> {{ state.orderDetail.creatorName }} </el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="申请部门" class="mb5"> {{ state.orderDetail.creatorOrgName }} </el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="申请时间" class="mb5"> {{ formatDate(state.orderDetail?.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="申请理由" class="formatted-text"> {{ state.orderDetail.content }} </el-form-item>
-					</el-col>
-					<el-divider content-position="left">
-						<el-text tag="b" size="large"> 审批详情 </el-text>
-					</el-divider>
-					<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-						<el-form-item label="审批结果" prop="state" :rules="[{ required: true, message: '请选择审批结果', trigger: 'change' }]">
-							<el-radio-group v-model="state.ruleForm.state">
-								<el-radio :value="1">审批通过</el-radio>
-								<el-radio :value="2">审批拒绝</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" v-if="['ZiGong'].includes(themeConfig.appScope) && state.orderDetail.isReturnAgainShow">
-						<el-form-item label="是否允许再退回" prop="isReturnAgain" :rules="[{ required: true, message: '请选择是否允许再退回', trigger: 'change' }]" label-width="120px">
-							<el-radio-group v-model="state.ruleForm.isReturnAgain">
-								<el-radio :value="true">允许</el-radio>
-								<el-radio :value="false">不允许</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item
-							label="审批意见"
-							prop="auditContent"
-							:rules="[{ required: state.ruleForm.state === 2, message: '请填写审批意见', trigger: 'blur' }]"
-						>
-							<el-input v-model="state.ruleForm.auditContent" type="textarea" :autosize="{ minRows: 6, maxRows: 10 }" placeholder="请填写审批意见" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-		</div>
+		<el-form label-width="110px" ref="ruleFormRef" :model="state.ruleForm" v-loading="state.loading">
+			<el-row :gutter="35">
+				<el-divider content-position="left">
+					<el-text tag="b" size="large"> 退回详情 </el-text>
+				</el-divider>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="工单编码" class="mb5"> {{ state.orderDetail.order?.no }} </el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="工单标题" class="mb5"> {{ state.orderDetail.order?.title }} </el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="申请人" class="mb5"> {{ state.orderDetail.creatorName }} </el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="申请部门" class="mb5"> {{ state.orderDetail.creatorOrgName }} </el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="申请时间" class="mb5"> {{ formatDate(state.orderDetail?.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<el-form-item label="申请理由" class="formatted-text"> {{ state.orderDetail.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.orderDetail.files" readonly classify="退回附件" businessId=""/>
+					</el-form-item>
+				</el-col>
+				<el-divider content-position="left">
+					<el-text tag="b" size="large"> 审批详情 </el-text>
+				</el-divider>
+				<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+					<el-form-item label="审批结果" prop="state" :rules="[{ required: true, message: '请选择审批结果', trigger: 'change' }]">
+						<el-radio-group v-model="state.ruleForm.state">
+							<el-radio :value="1">审批通过</el-radio>
+							<el-radio :value="2">审批拒绝</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" v-if="['ZiGong'].includes(themeConfig.appScope) && state.orderDetail.isReturnAgainShow">
+					<el-form-item
+						label="是否允许再退回"
+						prop="isReturnAgain"
+						:rules="[{ required: true, message: '请选择是否允许再退回', trigger: 'change' }]"
+						label-width="120px"
+					>
+						<el-radio-group v-model="state.ruleForm.isReturnAgain">
+							<el-radio :value="true">允许</el-radio>
+							<el-radio :value="false">不允许</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<el-form-item
+						label="审批意见"
+						prop="auditContent"
+						:rules="[{ required: state.ruleForm.state === 2, message: '请填写审批意见', trigger: 'blur' }]"
+					>
+						<el-input v-model="state.ruleForm.auditContent" type="textarea" :autosize="{ minRows: 6, maxRows: 10 }" placeholder="请填写审批意见" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
 				<el-button @click="closeDialog" class="default-button">取 消</el-button>
@@ -64,13 +72,15 @@
 	</el-dialog>
 </template>
 <script setup lang="ts" name="returnAuditDialog">
-import { reactive, ref } from 'vue';
+import { defineAsyncComponent, reactive, ref } from 'vue';
 import { ElMessage, FormInstance } from 'element-plus';
 import { formatDate } from '@/utils/formatTime';
-import { returnAuditAdd } from '@/api/business/return';
+import { returnAuditAdd, returnAuditDetail } from '@/api/business/return';
 import { useThemeConfig } from '@/stores/themeConfig';
 import { storeToRefs } from 'pinia';
+import { transformFile } from '@/utils/tools';
 
+const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue')); // 附件列表
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
 // 定义变量内容
@@ -80,7 +90,7 @@ const state = reactive<any>({
 	ruleForm: {
 		state: 1, // 审批结果
 		auditContent: '', // 拒绝原因
-		isReturnAgain:null,
+		isReturnAgain: null,
 	},
 	orderDetail: {}, // 工单详情
 	workflowId: null, // 工作流id
@@ -93,8 +103,18 @@ const { themeConfig } = storeToRefs(storesThemeConfig);
  * @param {object} val 工单详情
  */
 const openDialog = async (val: any) => {
-	state.orderDetail = val;
+	state.loading = true;
 	state.dialogVisible = true;
+	try {
+		const { result } = await returnAuditDetail(val.id);
+		if (result) state.orderDetail = result;
+		else state.orderDetail = val;
+		state.orderDetail.files = transformFile(state.orderDetail.files);
+		state.loading = false;
+	} catch (e) {
+		console.log(e);
+		state.loading = false;
+	}
 };
 // 关闭弹窗
 const closeDialog = () => {

src/views/province/delay.vue

@@ -60,8 +60,8 @@
 		<!--	更多查询	-->
 		<el-drawer v-model="drawer" title="更多查询" size="500px">
 			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px">
-				<el-form-item label="省工单编码" prop="ProvinceNo">
-					<el-input v-model="state.queryParams.ProvinceNo" placeholder="省工单编码" clearable @keyup.enter="handleQuery" />
+				<el-form-item label="省编码" prop="ReceiveProvinceNo">
+					<el-input v-model="state.queryParams.ReceiveProvinceNo" placeholder="省编码" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
 				<el-form-item label="申请时间" prop="crTime">
 					<el-date-picker
@@ -109,7 +109,7 @@ const state = reactive<any>({
 		Title: null, // 工单标题
 		State: '0', // 审核中
 		ApplyUserName: null, // 申请人
-		ProvinceNo: null, // 省工单编号
+		ReceiveProvinceNo: null, // 省编码
 		crTime: [], // 申请时间
 		ApplyStartTime: null,
 		ApplyEndTime: null,
@@ -150,7 +150,7 @@ const columns = ref<any[]>([
 			return <span class="color-danger font-bold">{scope.row.order?.isUrgentText}</span>;
 		},
 	},
-	{ prop: 'order.provinceNo', label: '省工单编码', minWidth: 240 },
+	{ prop: 'order.receiveProvinceNo', label: '省编码', minWidth: 240 },
 	{ prop: 'order.no', label: '工单编码', minWidth: 140 },
 	{
 		prop: 'order.startTime',

src/views/province/return.vue

@@ -39,7 +39,7 @@
 						<el-form-item label="工单编码" prop="No">
 							<el-input v-model="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery" class="keyword-input"/>
 						</el-form-item>
-						<el-form-item label="">
+						<el-form-item>
 							<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
 							<el-button @click="drawer = true" class="default-button"> <SvgIcon name="ele-Search" class="mr5" />更多查询</el-button>
 						</el-form-item>
@@ -60,8 +60,8 @@
 		<!--	更多查询	-->
 		<el-drawer v-model="drawer" title="更多查询" size="500px">
 			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px">
-				<el-form-item label="省工单编码" prop="ProvinceNo">
-					<el-input v-model="state.queryParams.ProvinceNo" placeholder="省工单编码" clearable @keyup.enter="handleQuery" />
+				<el-form-item label="省编码" prop="ReceiveProvinceNo">
+					<el-input v-model="state.queryParams.ReceiveProvinceNo" placeholder="省编码" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
 				<el-form-item label="申请时间" prop="crTime">
 					<el-date-picker
@@ -109,7 +109,7 @@ const state = reactive<any>({
 		Title: null, // 工单标题
 		State: '0', // 审核中
 		ApplyUserName: null, // 申请人
-		ProvinceNo: null, // 省工单编号
+		ReceiveProvinceNo: null, // 省编码
 		crTime: [], // 申请时间
 		ApplyStartTime: null,
 		ApplyEndTime: null,
@@ -150,7 +150,7 @@ const columns = ref<any[]>([
 			return <span class="color-danger font-bold">{scope.row.order?.isUrgentText}</span>;
 		},
 	},
-	{ prop: 'order.provinceNo', label: '省工单编码', minWidth: 240 },
+	{ prop: 'order.receiveProvinceNo', label: '省编码', minWidth: 240 },
 	{ prop: 'order.no', label: '工单编码', minWidth: 140 },
 	{
 		prop: 'order.startTime',

src/views/province/screen.vue

@@ -62,8 +62,8 @@
 		<!--	更多查询	-->
 		<el-drawer v-model="drawer" title="更多查询" size="500px">
 			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px">
-				<el-form-item label="省工单编码" prop="ProvinceNo">
-					<el-input v-model="state.queryParams.ProvinceNo" placeholder="省工单编码" clearable @keyup.enter="handleQuery" />
+				<el-form-item label="省编码" prop="ReceiveProvinceNo">
+					<el-input v-model="state.queryParams.ReceiveProvinceNo" placeholder="省编码" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
 				<el-form-item label="申请时间" prop="crTime">
 					<el-date-picker
@@ -111,7 +111,7 @@ const state = reactive<any>({
 		Title: null, // 工单标题
 		State: '0', // 审核中
 		ApplyUserName: null, // 申请人
-		ProvinceNo: null, // 省工单编号
+		ReceiveProvinceNo: null, // 省编码
 		crTime: [], // 申请时间
 		ApplyStartTime: null,
 		ApplyEndTime: null,
@@ -152,7 +152,7 @@ const columns = ref<any[]>([
 			return <span class="color-danger font-bold">{scope.row.order?.isUrgentText}</span>;
 		},
 	},
-	{ prop: 'order.provinceNo', label: '省工单编码', minWidth: 240 },
+	{ prop: 'order.receiveProvinceNo', label: '省编码', minWidth: 240 },
 	{ prop: 'order.no', label: '工单编码', minWidth: 140 },
 	{
 		prop: 'order.startTime',

src/views/province/zmhd/index.vue

@@ -64,8 +64,8 @@
 		<!--	更多查询	-->
 		<el-drawer v-model="drawer" title="更多查询" size="500px">
 			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px">
-				<el-form-item label="省工单编号" prop="ProvinceNo">
-					<el-input v-model="state.queryParams.ProvinceNo" placeholder="省工单编号" clearable @keyup.enter="handleQuery" />
+				<el-form-item label="省编码" prop="ReceiveProvinceNo">
+					<el-input v-model="state.queryParams.ReceiveProvinceNo" placeholder="省编码" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
 				<el-form-item label="答复部门名称" prop="AnswerOu">
 					<el-input v-model="state.queryParams.AnswerOu" placeholder="来电人姓名" clearable @keyup.enter="handleQuery" />
@@ -118,7 +118,7 @@ const state = reactive<any>({
 		PageSize: 20, // 每页条数
 		// 查询条件
 		No: null, // 工单编码
-		ProvinceNo: null, // 省工单编号
+		ReceiveProvinceNo: null, // 省编码
 		Title: null, // 标题
 		AnswerOu: null, // 回答部门名称
 		AuditFirstName: null, // 初审人姓名
@@ -151,7 +151,7 @@ const columns = ref<any[]>([
 			return <span class="color-danger font-bold">{scope.row.isUrgentText}</span>;
 		},
 	},
-	{ prop: 'provinceNo', label: '省工单编码', minWidth: 230 },
+	{ prop: 'receiveProvinceNo', label: '省编码', minWidth: 230 },
 	{ prop: 'no', label: '工单编码', width: 140 },
 	{
 		prop: 'startTime',