huang_an 1 рік тому
батько
коміт
650347433a

+ 2 - 2
src/views/bpm/handleTask/components/selectedCollectionOutbound/submit.vue

@@ -34,7 +34,7 @@
         size="mini"
         :loading="isLoading"
         @click="handleAudit(1)"
-        v-if="taskDefinitionKey == 'storeman' && activeComp == 'inoutBound'"
+        v-if="taskDefinitionKey == 'storeman'"
         >申请出库
       </el-button>
       <el-button
@@ -64,7 +64,7 @@
 <script>
   import storageApi from '@/api/warehouseManagement';
   import { cancel } from '@/api/bpm/components/purchasingManage/outSourceSend';
-  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
 
   // 流程实例的详情页,可用于审批
   export default {

+ 2 - 2
src/views/bpm/outgoingManagement/outbound.vue

@@ -661,9 +661,9 @@
       }
     },
     async created() {
+      await this.getPickOrderDetail();
       await this.getFieldModel();
       await this.getListItems();
-      await this.getPickOrderDetail();
       await this.initDeptData().then(() => {
         this.initFormData();
       });
@@ -934,7 +934,7 @@
         // this.formData.extInfo.deptName = obj.name;
         // this.formData.extInfo.createUserName = this.user.info.name;
         // this.formData.createUserId = this.user.info.userId;
-
+        console.log(this.form, 'llllllllllllllllllllllllllllllllll');
         // 物品类型
         this.formData.extInfo.assetType = Array.from(
           new Set(this.form.categoryLevelTopId?.split(','))