dysj

build/utils.js

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

config/index.js

@@ -64,16 +64,17 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:8080",
-    target: "http://localhost:8019",
+    target: "http://172.16.33.166:8080",
+    // target: "http://localhost:8019",
     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;
     }
   }
 }

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

@@ -1,11 +1,11 @@
-//入库
+//入库转预留
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <span>入库时间：</span>
+      <span class="text">入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <span>至</span>
+      <span class="text">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
@@ -87,13 +87,29 @@ export default {
 
 <style lang="scss" scode>
 .steel_inbound{
+  margin-top: 30px;
   margin-left: 20px;
-  margin-top: 20px;
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
-  }
+    .sache{
+      display: flex;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+      }
+      .el-date-editor {
+        margin-right: 5px;
+        margin-left: 5px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
+      .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
+    }
 }
 </style>

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

@@ -2,10 +2,10 @@
 <template>
   <div class="steel_inboundStatistics">
     <div class="sache">
-      <span>入库时间：</span>
+      <span class="text">入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <span>至</span>
+      <span class="text1">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
@@ -18,13 +18,13 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-col :span="3" v-html="'\u2003'"/>
-      <span>生产总件数</span>
+      <span class="text">生产总件数</span>
       <el-input
         placeholder="请输入内容"
         v-model="input3"
         :disabled="true" class="inputs" style="width:10%">
       </el-input>
-      <span>生产总重量</span>
+      <span class="text">生产总重量</span>
       <el-input
         placeholder="请输入内容"
         v-model="input4"
@@ -200,24 +200,35 @@ export default {
 
 <style lang="scss" scoped>
 .steel_inboundStatistics {
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
-    .el-select {
+    margin-top: 30px;
+    margin-left: 20px;
+    .sache{
+      display: flex;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+        width: 70px;
+      }
+      .text1 {
+        text-align: left;
+        line-height: 40px;
+      }
+      .el-date-editor {
+        margin-right: 5px;
+        margin-left: 5px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
+      .el-select {
       width: 100%;
       .el-input__inner {
         width: 150px;
       }
     }
-  }
-  .funcnum {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-  }
+    }
 }
 
 </style>

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

@@ -2,10 +2,10 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <span>出库时间：</span>
+      <span class="text">出库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <span>至</span>
+      <span class="text1">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
            <el-input
@@ -19,9 +19,9 @@
       <!-- <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button> -->
-      <span style="margin-left: 1rem;">总件数：</span>
+      <span style="margin-left: 1rem;" class="text">总件数：</span>
       <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
-      <span style="margin-left: 1rem;">总重量：</span>
+      <span style="margin-left: 1rem;" class="text">总重量：</span>
       <el-input v-model="totalWeight" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">
@@ -92,17 +92,39 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
+<style lang="scss" scope>
 .steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
-     .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
+  margin-top: 30px;
+  margin-left: 20px;
+    .sache{
+      display: flex;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+        width: 70px;
+      }
+      .text1 {
+        text-align: left;
+        line-height: 40px;
+      }
+      .el-date-editor {
+        margin-right: 5px;
+        margin-left: 5px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
+      .el-input {
+        width: 250px;
+      }
+      .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
     }
-  }
 }
 </style>

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

@@ -57,13 +57,24 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
+<style lang="scss" scope>
 .steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
-  }
+  margin-top: 30px;
+  margin-left: 20px;
+    .sache{
+      display: flex;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
+      .el-input {
+        width: 250px;
+      }
+    }
 }
 </style>