Browse Source

reactor:496 甄别申请和审批界面增加部分字段;

zhangchong 2 tuần trước cách đây
mục cha
commit
9eb6505b33

+ 1 - 0
src/views/business/discern/ZGApply.vue

@@ -436,6 +436,7 @@ const submitDiscern = (row: any) => {
 			extra: {
 				screenType: state.queryParams.ScreenType,
 			},
+			rowData:row
 		};
 		discernApplyRef.value.openDialog(params);
 	}

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

@@ -26,9 +26,20 @@
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="申请部门"> {{ userInfos.orgName }} </el-form-item>
 					</el-col>
-					<el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请时间"> {{ formatDate(Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="申请时间"> {{ formatDate(Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
+					<template v-if="['ZiGong'].includes(themeConfig.appScope) && screenType === 0">
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+							<el-form-item label="不满意原因"> {{ state.rowData?.orgNoSatisfiedReasonText }} </el-form-item>
+						</el-col>
+						<el-col>
+							<el-form-item label="部门回访内容"> {{ state.rowData?.visitContent }} </el-form-item>
+						</el-col>
+					</template>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="下一环节" prop="nextStepCode" :rules="[{ required: true, message: '请选择下一环节', trigger: 'change' }]">
 							<el-select v-model="state.discernForm.nextStepCode" placeholder="请选择下一环节" class="w100" @change="selectNextStep">
@@ -116,6 +127,7 @@ import { formatDate } from '@/utils/formatTime';
 import { useAppConfig } from '@/stores/appConfig';
 import { storeToRefs } from 'pinia';
 import { useUserInfo } from '@/stores/userInfo';
+import { useThemeConfig } from '@/stores/themeConfig';
 
 // 引入组件
 const CommonAdvice = defineAsyncComponent(() => import('@/components/CommonAdvice/index.vue')); // 常用意见
@@ -126,6 +138,8 @@ const storesUserInfo = useUserInfo();
 const { userInfos } = storeToRefs(storesUserInfo); // 用户信息
 const appConfigStore = useAppConfig();
 const { AppConfigInfo } = storeToRefs(appConfigStore); // 系统配置信息
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 // 定义变量内容
 const state = reactive<any>({
 	dialogVisible: false, // 弹窗显示隐藏
@@ -144,6 +158,7 @@ const state = reactive<any>({
 	loading: false, // 提交按钮loading
 	handleId: '', // 流程处理ID
 	orderDetail: {}, // 工单详情
+	rowData: {}, // 列表行
 });
 
 const screenTypeOptions = ref<EmptyArrayType>([]); // 甄别类型
@@ -156,9 +171,10 @@ const openDialog = async (val: any) => {
 		const [workflowDiscernResponse, responseDiscern] = await Promise.all([workflowDiscernParams(), screenBaseData()]); //获取开启流程参数
 		screenTypeOptions.value = responseDiscern.result?.screenType ?? []; // 甄别理由
 		handleResult(workflowDiscernResponse);
-		const { extra, orderDetail } = val;
+		const { extra, orderDetail, rowData } = val;
 		state.orderDetail = orderDetail ?? {}; // 工单详情
 		screenType.value = extra.screenType; // 甄别类型
+		state.rowData = rowData;
 		state.loading = false;
 	} finally {
 		state.loading = false;

+ 3 - 0
src/views/business/discern/components/Discern-audit.vue

@@ -42,6 +42,9 @@
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="不满意原因">{{ state.infoForm?.visitDetail?.orgNoSatisfiedReasonText }} </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.infoForm?.visitDetail?.visitContent }} </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.infoForm?.content }} </el-form-item>
 					</el-col>