Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wms into dev

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));
   },

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) => {

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();
             }
           })

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -236,6 +236,7 @@
   import tabMixins from '@/mixins/tableColumnsMixin';
 
   import { qualityStatus, qualityResults } from '@/utils/dict/index';
+  import { parameterGetByCode } from '@/api/sys/index.js';
 
   export default {
     mixins: [tabMixins],
@@ -274,11 +275,18 @@
         columnsVersion: 1,
         isLoading: false,
         exportErrorDioalogVisible: false,
-        errorData: []
+        errorData: [],
+        isPrice: 1
       };
     },
     created() {
       this.getFieldModel();
+      //仓库出入库是否显示金额（0：不显示 1：显示）
+      parameterGetByCode({
+        code: 'wms_price'
+      }).then((res) => {
+        this.isPrice = res.value;
+      });
     },
     computed: {
       // 表格列配置
@@ -545,11 +553,13 @@
                 showOverflowTooltip: true
               }
             : '',
-          {
-            prop: 'unitPrice',
-            label: '单价',
-            showOverflowTooltip: true
-          }
+          this.isPrice == 1
+            ? {
+                prop: 'unitPrice',
+                label: '单价',
+                showOverflowTooltip: true
+              }
+            : ''
         ];
         if (this.selectedDime == 1) {
           return arr.filter((item) => item != '').concat(this.newColumns);
@@ -801,9 +811,9 @@
       errorUpload(response) {
         this.isLoading = false;
       },
-       uploadFile() {
+      uploadFile() {
         this.$refs.importDialogRef.open();
-      },
+      }
     },
 
     watch: {

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"
@@ -307,6 +308,7 @@
           time: []
           // type: 1
         },
+        loading: false,
         isPrice: 1,
         total: 0,
         status: [
@@ -541,9 +543,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();
             }
           })

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',