yusheng 10 месяцев назад
Родитель
Сommit
36dd26e388

+ 1 - 1
src/api/warehouseManagement/index.js

@@ -46,7 +46,7 @@ export default {
   submitTwo: async (data) => {
     const res = await request.post('/bpm/outinApprove/submitTwo', data);
     if (res.data.code == 0) {
-      return res.data.data;
+      return res.data;
     }
     return Promise.reject(new Error(res.data.message));
   },

+ 1 - 1
src/api/warehouseManagement/outin.js

@@ -135,7 +135,7 @@ export default {
   outApprove: async (params) => {
     const res = await request.post(`/bpm/outApprove/submit`, params);
     if (res.data.code == 0) {
-      return res.data.data;
+      return res.data
     }
   },
   outApproves: async (params) => {

+ 8 - 2
src/views/warehouseManagement/outgoingManagement/index.vue

@@ -135,6 +135,7 @@
         @cell-click="cellClick"
         :pageSize="20"
         cache-key="systemRoleTable"
+        v-loading="loading"
       >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
@@ -300,6 +301,7 @@
         factoryList: [],
         tableData: [],
         fromUserList: [],
+        loading:false,
         formData: {
           deptIds: '',
           categoryCode: '',
@@ -498,9 +500,13 @@
           type: 'warning'
         })
           .then(async () => {
+            this.loading = true;
+
             const data = await outin.outApprove({ outInId: row.id });
-            if (data) {
-              this.$message.success('流程发起成功!');
+            this.loading = false;
+
+            if (data.code == 0) {
+              this.$message.success(data.message);
               this.getList();
             }
           })

+ 7 - 2
src/views/warehouseManagement/stockManagement/index.vue

@@ -153,6 +153,7 @@
         :pageSize="20"
         :datasource="datasource"
         @cell-click="cellClick"
+        v-loading="loading"
       >
         <template v-slot:selection="{ row }">
           <el-radio class="radio" v-model="currentRow.id" :label="row.id"
@@ -298,6 +299,7 @@
           time: []
           // type: 1
         },
+        loading: false,
         isPrice: 1,
         total: 0,
         status: [
@@ -532,9 +534,12 @@
           type: 'warning'
         })
           .then(async () => {
+            this.loading = true;
             const data = await storageApi.submitTwo({ outInId: row.id });
-            if (data) {
-              this.$message.success('流程发起成功!');
+            this.loading = false;
+
+            if (data.code == 0) {
+              this.$message.success(data.message);
               this.getList();
             }
           })

+ 1 - 1
vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
 
-        target: 'http://192.168.1.105:18086', //开发
+        target: 'http://192.168.1.251:18086', //开发
         // target: 'http://192.168.1.251:18186', //测试
 
         // target: 'http://192.168.1.116:18086',