Răsfoiți Sursa

update 调整流程图预览校验

gssong 10 luni în urmă
părinte
comite
38df345078
2 a modificat fișierele cu 15 adăugiri și 13 ștergeri
  1. 4 2
      src/api/workflow/leave/types.ts
  2. 11 11
      src/views/workflow/leave/leaveEdit.vue

+ 4 - 2
src/api/workflow/leave/types.ts

@@ -5,7 +5,8 @@ export interface LeaveVO {
   endDate: string;
   leaveDays: number;
   remark: string;
-  processInstanceVo: any;
+  status?: string;
+  processInstanceId?: string;
 }
 
 export interface LeaveForm extends BaseEntity {
@@ -15,7 +16,8 @@ export interface LeaveForm extends BaseEntity {
   endDate?: string;
   leaveDays?: number;
   remark?: string;
-  processInstanceVo?: any;
+  status?: string;
+  processInstanceId?: string;
 }
 
 export interface LeaveQuery extends PageQuery {

+ 11 - 11
src/views/workflow/leave/leaveEdit.vue

@@ -4,18 +4,20 @@
       <div style="display: flex; justify-content: space-between">
         <div>
           <el-button
-            v-if="routeParams.type === 'add' ||
-                (routeParams.type === 'update' &&form.status &&
-                (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))"
+            v-if="
+              routeParams.type === 'add' ||
+              (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
+            "
             :loading="buttonLoading"
             type="info"
             @click="submitForm('draft')"
             >暂存</el-button
           >
           <el-button
-            v-if="routeParams.type === 'add' ||
-                (routeParams.type === 'update' && form.status &&
-                (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))"
+            v-if="
+              routeParams.type === 'add' ||
+              (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
+            "
             :loading="buttonLoading"
             type="primary"
             @click="submitForm('submit')"
@@ -28,7 +30,7 @@
             @click="approvalVerifyOpen"
             >审批</el-button
           >
-          <el-button v-if="processInstanceId" type="primary" @click="handleApprovalRecord">流程进度</el-button>
+          <el-button v-if="form.processInstanceId" type="primary" @click="handleApprovalRecord">流程进度</el-button>
         </div>
         <div>
           <el-button style="float: right" @click="goBack()">返回</el-button>
@@ -123,7 +125,8 @@ const initFormData: LeaveForm = {
   endDate: undefined,
   leaveDays: undefined,
   remark: undefined,
-  processInstanceVo: {}
+  status: undefined,
+  processInstanceId: undefined
 };
 const data = reactive<PageData<LeaveForm, LeaveQuery>>({
   form: { ...initFormData },
@@ -166,9 +169,6 @@ const getInfo = () => {
     leaveTime.value = [];
     leaveTime.value.push(form.value.startDate);
     leaveTime.value.push(form.value.endDate);
-    if (form.value.processInstanceVo) {
-      processInstanceId.value = form.value.processInstanceVo.id;
-    }
     loading.value = false;
     buttonLoading.value = false;
   });