Эх сурвалжийг харах

fix:5187【生产入库审批】从业务流程走的生产入库,产品信息编辑 添加 删除等功能需隐藏掉,只能给驳回操作

mlchen 2 долоо хоног өмнө
parent
commit
d504ff7f71

+ 48 - 0
src/views/bpm/handleTask/components/productionWarehousing/submit.vue

@@ -18,6 +18,14 @@
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
+      <el-button
+        icon="el-icon-edit-outline"
+        type="success"
+        size="mini"
+        v-click-once
+        @click="storeManagerApprove"
+        >申请入库
+      </el-button>
       <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -31,6 +39,8 @@
 </template>
 
 <script>
+  import { approveTaskWithVariablesOther } from '@/api/bpm/task';
+  import outin from '@/api/warehouseManagement/outin';
   import storageApi from '@/api/warehouseManagement';
   export default {
     name: '',
@@ -50,6 +60,7 @@
     },
     data() {
       return {
+        isSaveLoading: false,
         form: {
           reason: '同意'
         },
@@ -60,6 +71,43 @@
       console.log('taskDefinitionKey-------------', this.taskDefinitionKey);
     },
     methods: {
+      async storeManagerApprove() {
+        let res = await this.getTableValue();
+        let storageData = res.returnStorageData;
+        if (!storageData) {
+          return;
+        }
+        console.log('我需要的~~~~~~~~~~~~~~~~', res);
+        // 入库来源isSkip 0-正常  1-外部(外部跳过内部审核流程)
+        storageData.isSkip = 1;
+        storageData.workOrderCode = res.form.workOrderCode;
+        console.log('storageData~~~~~~~~~~~~~~~~', storageData);
+        try {
+          this.isSaveLoading = true;
+          let res = await storageApi.storage(storageData);
+
+          approveTaskWithVariablesOther({
+            id: this.taskId,
+            reason: this.form.reason,
+            outInId: res.data[0],
+            businessId: this.businessId,
+            variables: {
+              pass: true
+            }
+          }).then((res) => {
+            if (res.code != '-1') {
+              this.$emit('handleAudit', {
+                status: 1,
+                title: '入库'
+              });
+            }
+            this.isSaveLoading = false;
+          });
+        } catch (error) {
+          this.isSaveLoading = false;
+          this.$message.error('保存失败');
+        }
+      },
       async handleAudit(status) {
         let variables = {
           pass: !!status

+ 2 - 2
vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.105:18086',
-        // target: 'http://localhost:18086',
+        target: 'http://localhost:18090',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.251:18186',
@@ -46,7 +46,7 @@ module.exports = {
         // target: 'http://192.168.1.3:18086',
         // target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://192.168.1.3:18086',
-        target: 'http://192.168.1.147:18086', // 陈兵
+        // target: 'http://192.168.1.147:18086', // 陈兵
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.113:18086', // 郭丹