提交

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','WMS']
+//  let devModules = ['all']
+ let devModules = ['index','WMS']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 
 // let devModules = ['index','appoint','WMS'];

config/index.js

@@ -64,8 +64,9 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    // target: "http://172.16.33.166:8080",
     // target: "http://localhost:8019",
+    target: "http://localhost:8082",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

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

@@ -105,7 +105,7 @@ export default {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=443&warehouseId="+3
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=443&warehouseId="+this.warehouseName
       }else{
           this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
       }

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

@@ -57,6 +57,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
       let startTime = null;
       let endTime = null;
@@ -115,8 +133,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)

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

@@ -94,6 +94,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
 
       let startTime = null;
@@ -152,8 +170,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)

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

@@ -57,6 +57,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
       let startTime = null;
       let endTime = null;
@@ -115,8 +133,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)

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

@@ -94,6 +94,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
 
       let startTime = null;
@@ -152,8 +170,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)

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

@@ -34,7 +34,7 @@ export default {
   },
   methods:{
      toInsert() {
-      this.$router.push("/insertCheckInventory");
+      this.$router.push("/addCheckWarehouse");
 
     },
     onclick(){

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

@@ -47,6 +47,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
       let startTime = null;
       let endTime = null;
@@ -105,8 +123,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)
@@ -144,8 +169,6 @@ export default {
           this.endTime = null;
           this.$message.warning("开始时间要比结束时间早");
         }
-      } else {
-        // this.getRequestUrl()
       }
     },
     selectionChange(selection) {

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

@@ -94,6 +94,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
 
       let startTime = null;
@@ -152,8 +170,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)
@@ -187,8 +212,6 @@ export default {
           this.endTime = null;
           this.$message.warning("开始时间要比结束时间早");
         }
-      } else {
-        this.getRequestUrl()
       }
     },
     selectionChange(selection) {