Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -16,7 +16,10 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
-let devModules = ['all']
+ let devModules = ['all']
+ // let devModules = ['index','WMS']
+// let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
+
 // let devModules = ['index','appoint','WMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

config/index.js

@@ -66,14 +66,16 @@ let proxyTable = {
   "/api/v1": {
     target: "http://172.16.33.166:8080",
     // target: "http://localhost:8019",
+    // target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    // target: "http://192.168.1.110:8019",
     target: "http://172.16.33.166:8080",
+    // target: "http://172.16.33.166:8080",
+
     // target: "http://192.168.1.115:8080",
     ws: true,
     pathRewrite: {

src/views/WMS/components/steel/addSteelInbound.vue

@@ -96,14 +96,15 @@ export default {
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1
+        console.log(this.input)
+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+this.input
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+""
       }
     },
     // 返回

src/views/WMS/components/steel/addSteelReserved.vue

@@ -96,14 +96,14 @@ export default {
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+2
+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+2+"&con="+this.input
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+2
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+2+"&con="+""
       }
     },
     // 返回

src/views/WMS/components/steel/bar1_steel/bar1_addSteelInbound.vue

@@ -96,14 +96,14 @@ export default {
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+1
+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+1+"&con="+this.input
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+1
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+1+"&con="+""
       }
     },
     // 返回

src/views/WMS/components/steel/bar1_steel/bar1_addSteelReserved.vue

@@ -96,14 +96,14 @@ export default {
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+2
+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+2+"&con="+this.input
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+2
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+2+"&con="+""
       }
     },
     // 返回

src/views/WMS/components/steel/bar1_steel/bar1_steel_close.vue

@@ -31,7 +31,7 @@ export default {
       totalNumber: 0,
       option:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=1&value="+ (sjTime(new Date() + "")),
+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&value="+ (sjTime(new Date() + "")),
       },
     }
   },

src/views/WMS/components/steel/bar1_steel/bar1_steel_restack.vue

@@ -62,7 +62,7 @@ export default {
         // second请求数据的地址
         // 请求已下发的数据
         requestUrl:
-          "/api/v1/wms/?apiId=440&DistrubtionStatus=1",
+          "/api/v1/wms/selectRestackList2?apiId=440&DistrubtionStatus=1",
       },
       //默认显示待下发的标签页
       activeName: "first",

src/views/WMS/components/steel/bar1_steel/bar1_steel_restackAdd.vue

@@ -112,7 +112,7 @@
             </div>
         </el-drawer> 
         <div class="table" >
-            <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
+            <dilTable v-bind.sync="options11"></diltable>
         </div>
            <!-- <div class="search">
             <div class="warehouse">
@@ -160,7 +160,7 @@ export default {
       options11:{
         // first请求数据的地址
         requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
-        selectionType: "select",
+      
       },
 //       options:{
 //         // first请求数据的地址

src/views/WMS/components/steel/bar1_steel/bar1_steel_sendreceive.vue

@@ -40,7 +40,7 @@ export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&startTime=null&endTime=null&i=" +new Date(),
       },
       startTime: null,
       endTime: null,
@@ -76,14 +76,14 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
         }else{
           this.startTime = null;
           this.endTime = null;
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
       }
     },
   },

src/views/WMS/components/steel/bar2_steel/bar2_addSteelInbound.vue

@@ -96,14 +96,14 @@ export default {
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+1
+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+1+"&con="+this.input
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+1
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+1+"&con="+""
       }
     },
     // 返回

src/views/WMS/components/steel/bar2_steel/bar2_addSteelReserved.vue

@@ -96,14 +96,14 @@ export default {
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+2
+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+2+"&con="+this.input
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+2
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+2+"&con="+""
       }
     },
     // 返回

src/views/WMS/components/steel/bar2_steel/bar2_steel_restack.vue

@@ -62,7 +62,7 @@ export default {
         // second请求数据的地址
         // 请求已下发的数据
         requestUrl:
-          "/api/v1/wms/?apiId=440&DistrubtionStatus=1",
+          "/api/v1/wms/selectRestackList2?apiId=440&DistrubtionStatus=1",
       },
       //默认显示待下发的标签页
       activeName: "first",

src/views/WMS/components/steel/steel_close.vue

@@ -31,7 +31,7 @@ export default {
       totalNumber: 0,
       option:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=3&value="+ (sjTime(new Date() + "")),
+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&value="+ (sjTime(new Date() + "")),
       },
     }
   },
@@ -51,7 +51,7 @@ export default {
       if(this.value){
         value = sjTime(this.value)
       }
-      this.option.requestUrl = "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=3&value="+value;
+      this.option.requestUrl = "/api/v1/wms/getInventoryClose?apiId=95&value="+value;
     }
   }
 }