Prechádzať zdrojové kódy

feat:延期审批对接;

zhangchong 1 rok pred
rodič
commit
0c1995b192

+ 9 - 2
src/components/ProcessAudit/index.vue

@@ -397,11 +397,11 @@
 							<el-checkbox v-model="state.ruleForm.isSms" label="短信通知" />
 						</el-form-item>
 					</el-col>
-<!--					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.processType === '延期审批'">
 						<el-form-item label="省延期申请" prop="applyDelayProvince">
 							<el-checkbox v-model="state.ruleForm.applyDelayProvince" label="省延期申请" />
 						</el-form-item>
-					</el-col>-->
+					</el-col>
 					<!--  办理流程展示期满时间  -->
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="handelArr.includes(state.processType)">
 						<el-form-item label="期满时间" prop="expiredTime" :rules="[{ required: true, message: '请选择期满时间', trigger: 'change' }]">
@@ -529,6 +529,7 @@ import {debounce} from '/@/utils/tools';
 import {bulletinAdd, bulletinAddBaseData, circularAdd, circularAddBaseData, getAllUsers, workflowBulletinParams, workflowCircularParams} from '/@/api/auxiliary/notice';
 import {getCanUseOrg} from '/@/api/system/user';
 import {KnowledgeAdd, KnowledgeAddStartFlowParams, KnowledgeDeleteStartFlowParams, KnowledgeDel, KnowledgeUpdate, KnowledgeUpdateStartFlowParams} from "/@/api/knowledge";
+import * as process from "process";
 
 // 引入组件
 const CommonAdvice = defineAsyncComponent(() => import('/@/components/CommonAdvice/index.vue')); // 常用意见
@@ -946,6 +947,12 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 						submitObj.nextMainHandler = submitObj.nextHandlers[0].key;
 					}
 				}
+        if(['延期审批'].includes(state.processType)){ // 如果特殊业务需要特殊字段
+          submitObj.external = {
+            isProvinceDelay: state.orderDetail.isProvinceDelay,
+          }
+          submitObj.expiredTime = state.orderDetail.expiredTime;
+        }
         submitObj.stepExpiredTime = submitObj.expiredTime; //节点过期时间
 				switch (state.processType) {
 					case '工单发起':

+ 1 - 1
src/views/auxiliary/noticeAudit/index.vue

@@ -252,7 +252,7 @@ const onAudit = (row:any)=>{
   const processType = listType.value === '0' ? '通知审批' : '公告审批';
   const annexName = listType.value === '0' ? '通知附件' : '公告附件';
   const params = {
-    id: row.workFlowId,
+    id: row.workflowId,
     processType,
     orderDetail: {},
     extra: {

+ 3 - 3
src/views/business/delay/backlog/index.vue

@@ -175,7 +175,7 @@ const onExport = () => {
 // 查看延期详情
 const onOrderDetail = (row: any) => {
   let request = {
-    ...row,
+    ...row.order,
     activeName:'1',// 默认展示延期记录
   }
   OrderDetailRef.value.openDialog(request);
@@ -184,7 +184,7 @@ const onOrderDetail = (row: any) => {
 const auditRecordRef = ref<RefType>();  // 审核记录ref
 const processDetail = (row:any) => {
   const params = {
-    title: `审核记录 (${row.title})`,
+    title: `审核记录 (${row.order?.title})`,
     ...row,
   };
   auditRecordRef.value.openDialog(params);
@@ -193,7 +193,7 @@ const processDetail = (row:any) => {
 const processAuditRef = ref<RefType>();  // 流程审批ref
 const approve = (row: any) => {
   const params = {
-    id: row.workFlowId,
+    id: row.workflowId,
     processType:'延期审批',
     orderDetail: row.order,
     extra: {