tijiao

build/utils.js

@@ -18,7 +18,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
 // let devModules = ["index", "TMS", "appoint", "WMS", "queue"];
 // let devModules = ["index", "statisticalReport", "inward"];
-let devModules = ["all"];
+let devModules = ["index", "WMS", "inward"];
 
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

config/index.js

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

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

@@ -1,20 +1,32 @@
 <template>
   <!-- 新增入库转预留作业页面 -->
   <div class="addCheckWarehouse">
-    <page-title>入库转预留作业</page-title>
+    <page-title>预留转入库作业</page-title>
     <div class="material from">
       <span class="text">物资规格型号：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
     <div class="materialNumber from">
-      <span class="text">最大预留件数：</span>
+      <span class="text">最大入库件数：</span>
       <el-input class="input" v-model="max" disabled> </el-input>
     </div>
     <div class="materialNumber from">
       <span class="text">件数：</span>
       <el-input class="input" v-model="materialNumber"> </el-input>
     </div>
+    <div class="materialNumber from">
+      <span class="text">理重(磅重)</span>
+      <el-input class="input" v-model="materialTheWeight" disabled> </el-input>
+    </div>
+    <div class="materialNumber from">
+      <span class="text">实重</span>
+      <el-input class="input" v-model="actuallyWeight"> </el-input>
+    </div>
+    <div class="materialNumber from">
+      <span class="text">备注</span>
+      <el-input class="input" v-model="remark"> </el-input>
+    </div>
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
       <div style="margin-bottom: 10px">
@@ -39,11 +51,13 @@
           v-bind.sync="second"
           @radio-change="currentRadioChange2"
         ></dilTable>
-      </div>          
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled="disabled"
+        >确认</el-button
+      >
     </div>
   </div>
 </template>
@@ -55,22 +69,22 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      startTime:null,
-      endTime:null,
-      max:null,
-      disabled:false,
+      startTime: null,
+      endTime: null,
+      max: null,
+      disabled: false,
       //仓库名称
-      warehouseName:null,
+      warehouseName: null,
       //物资名称
       materialName: null,
       //物资编码
-      materialCode:null,
+      materialCode: null,
       // 物资规格
-      materialSpecification:null,
+      materialSpecification: null,
       // 物资型号
-      materialModel:null,
+      materialModel: null,
       //盘点数量
-      materialNumber:null,
+      materialNumber: null,
       //物资id
       materialId: null,
       //是否需要打开模态窗口
@@ -81,12 +95,15 @@ export default {
       first: {
         requestUrl: "",
         selectionType: "radio",
-        mapList1: [],
+        mapList1: []
       },
       second: {
-          requestUrl: "",
-          selectionType:"radio"
-      }
+        requestUrl: "",
+        selectionType: "radio"
+      },
+      materialTheWeight: 0,
+      actuallyWeight: 0,
+      remark: null
     };
   },
   watch: {
@@ -95,46 +112,99 @@ export default {
         this.input = null;
       }
     },
+    materialNumber() {
+      this.getTheoreticalByInfo();
+    }
   },
   created() {
-      let strTime=this.formatDate(new Date(),"yyyy-MM-dd hh:mm:ss")
-      this.startTime= Date.parse(new Date(strTime));
-      this.endTime=new Date(this.startTime+86400000);
+    let strTime = this.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
+    this.startTime = Date.parse(new Date(strTime));
+    this.endTime = new Date(this.startTime + 86400000);
   },
   methods: {
-    formatDate (date, fmt) {
-        if (/(y+)/.test(fmt)) {
-          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
-        }
-        let o = {
-          'M+': date.getMonth() + 1,
-          'd+': date.getDate(),
-          'h+': 0,
-          'm+': 0,
-          's+': 0
+    getTheoreticalByInfo() {
+      this.axios
+        .post(
+          "/api/v1/wms/getTheoreticalByInfo?warehouseId=" +
+            3 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&num=" +
+            this.materialNumber +
+            "&status=1"
+        )
+        .then(res => {
+          if (res.data.data == -1) {
+            this.$message.error("数量超出");
+            this.materialTheWeight = null;
+          } else {
+            this.materialTheWeight = parseFloat(res.data.data);
+          }
+        });
+    },
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+        );
       }
+      let o = {
+        "M+": date.getMonth() + 1,
+        "d+": date.getDate(),
+        "h+": 0,
+        "m+": 0,
+        "s+": 0
+      };
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + ''
-          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+          let str = o[k] + "";
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : this.padLeftZero(str)
+          );
         }
-            }
-      return fmt
+      }
+      return fmt;
     },
-    padLeftZero (str) {
-        return ('00' + str).substr(str.length)
+    padLeftZero(str) {
+      return ("00" + str).substr(str.length);
     },
     onclick(a) {
       if (a == 1) {
-        console.log(this.input)
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+this.input+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime)
+        console.log(this.input);
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          3 +
+          "&status=" +
+          1 +
+          "&con=" +
+          this.input +
+          "&startTime=" +
+          sjTime(this.startTime) +
+          "&endTime=" +
+          sjTime(this.endTime);
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
-      if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+""+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime)
+      if (num == 1) {
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          3 +
+          "&status=" +
+          1 +
+          "&con=" +
+          "" +
+          "&startTime=" +
+          sjTime(this.startTime) +
+          "&endTime=" +
+          sjTime(this.endTime);
       }
     },
     // 返回
@@ -150,97 +220,124 @@ export default {
       this.max = selection.max;
     },
     currentRadioChange2(selection) {
-      this.warehouseId = selection.warehouseId
-      this.warehouseName = selection.warehouseName
+      this.warehouseId = selection.warehouseId;
+      this.warehouseName = selection.warehouseName;
     },
     // 确认
     onClickConfirm() {
-      // console.log(this.warehouseId,this.materialCode,this.materialNumber);
-      this.disabled = true
-      this.axios.post("/api/v1/wms/insertReserved?warehouseId=" + 3 + "&materialCode=" + this.materialCode+"&materialSpecification="+this.materialSpecification+"&materialModel="+this.materialModel+ "&quantity=" + this.materialNumber ).then((res) => {
-        console.log(res.data)
+      this.disabled = true;
+      // if(isNumber(this.actuallyWeight))
+      if (!isNumber(this.actuallyWeight)) {
+        this.$message.error("实重填写不正确");
+        return;
+      }
+      this.axios
+        .post(
+          "/api/v1/wms/insertReserved?warehouseId=" +
+            3 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&quantity=" +
+            this.materialNumber +
+            "&actuallyWeight=" +
+            Number(parseFloat(this.actuallyWeight)) +
+            "&materialTheWeight=" +
+            Number(parseFloat(this.materialTheWeight)) +
+            "&remark=" +
+            this.remark
+        )
+        .then(res => {
+          console.log(res.data);
           if (res.data.code == "200") {
             this.$message({
-              message: "预留成功!",
-              type: "success",
+              message: "入库成功!",
+              type: "success"
             });
-            this.disabled = false
-            this.onClickCancel()
-            this.$router.go(-1)
-          }else if(res.data.code=="201"){
+            this.disabled = false;
+            this.onClickCancel();
+            this.$router.go(-1);
+          } else if (res.data.code == "201") {
             this.$message({
-              message:"预留的数量不正确",
-              type:"faile",
-            })
+              message: "入库的数量不正确",
+              type: "faile"
+            });
+            this.disabled = false;
           }
-          this.$router.go(-1)
+          this.$router.go(-1);
+        })
+        .catch(() => {
+          this.disabled = false;
         });
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scope>
-.addCheckWarehouse{
-.contractDetails {
-  width: 100%;
-}
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.warehouse {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  margin-right: 70px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+.addCheckWarehouse {
+  .contractDetails {
+    width: 100%;
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .from {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
   }
-}
-.material {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+  .warehouse {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    margin-right: 70px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .material {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-}
-.materialNumber {
+  .materialNumber {
     display: flex;
     justify-content: center;
     margin-top: 20px;
     margin-right: 70px;
     .text {
-        display:inline-block;
-        width: 170px;
-        text-align: right;
+      display: inline-block;
+      width: 170px;
+      text-align: right;
     }
     .input {
-        width: 250px;
-        margin-right: 20px;
+      width: 250px;
+      margin-right: 20px;
     }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100px;
+  }
 }
-.button_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100px;
-}
-}
-</style>
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 新增预留转入库作业页面 -->
   <div class="addCheckWarehouse">
-    <page-title>预留转入库作业</page-title>
+    <page-title>入库转预留作业</page-title>
     <div class="material from">
       <span class="text">物资规格型号：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
@@ -39,11 +39,13 @@
           v-bind.sync="second"
           @radio-change="currentRadioChange2"
         ></dilTable>
-      </div>          
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled="disabled"
+        >确认</el-button
+      >
     </div>
   </div>
 </template>
@@ -55,20 +57,20 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      max:null,
-      disabled:false,
+      max: null,
+      disabled: false,
       //仓库名称
-      warehouseName:null,
+      warehouseName: null,
       //物资名称
       materialName: null,
       //物资编码
-      materialCode:null,
-       // 物资规格
-      materialSpecification:null,
+      materialCode: null,
+      // 物资规格
+      materialSpecification: null,
       // 物资型号
-      materialModel:null,
+      materialModel: null,
       //盘点数量
-      materialNumber:null,
+      materialNumber: null,
       //物资id
       materialId: null,
       //是否需要打开模态窗口
@@ -79,11 +81,11 @@ export default {
       first: {
         requestUrl: "",
         selectionType: "radio",
-        mapList1: [],
+        mapList1: []
       },
       second: {
-          requestUrl: "",
-          selectionType:"radio"
+        requestUrl: "",
+        selectionType: "radio"
       }
     };
   },
@@ -92,22 +94,32 @@ export default {
       if (!val) {
         this.input = null;
       }
-    },
-  },
-  created() {
-      
+    }
   },
+  created() {},
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+2+"&con="+this.input
+        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+"&con="+""
+      if (num == 1) {
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          3 +
+          "&status=" +
+          2 +
+          "&con=" +
+          "";
       }
     },
     // 返回
@@ -116,7 +128,12 @@ export default {
     },
     currentRadioChange1(selection) {
       console.log(selection);
-      this.materialName = selection.materialName + selection.materialSpecification + '(' + selection.materialModel + ')' ;
+      this.materialName =
+        selection.materialName +
+        selection.materialSpecification +
+        "(" +
+        selection.materialModel +
+        ")";
       this.materialId = selection.materialId;
       this.materialCode = selection.materialCode;
       this.materialSpecification = selection.materialSpecification;
@@ -124,97 +141,110 @@ export default {
       this.max = selection.max;
     },
     currentRadioChange2(selection) {
-      this.warehouseId = selection.warehouseId
-      this.warehouseName = selection.warehouseName
+      this.warehouseId = selection.warehouseId;
+      this.warehouseName = selection.warehouseName;
     },
     // 确认
     onClickConfirm() {
       // console.log(this.warehouseId,this.materialCode,this.materialNumber);
-      this.disabled = true
-      this.axios.post("/api/v1/wms/insertInbounds?warehouseId=" + 3 + "&materialCode=" + this.materialCode+"&materialSpecification="+this.materialSpecification+"&materialModel="+this.materialModel+ "&quantity=" + this.materialNumber ).then((res) => {
-        console.log(res.data)
+      this.disabled = true;
+      this.axios
+        .post(
+          "/api/v1/wms/insertInbounds?warehouseId=" +
+            3 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&quantity=" +
+            this.materialNumber
+        )
+        .then(res => {
+          console.log(res.data);
           if (res.data.code == "200") {
             this.$message({
-              message: "入库成功!",
-              type: "success",
+              message: "转预留成功!",
+              type: "success"
             });
-            this.disabled = false
-            this.onClickCancel()
-            this.$router.go(-1)
-          }else if(res.data.code=="201"){
+            this.disabled = false;
+            this.onClickCancel();
+            this.$router.go(-1);
+          } else if (res.data.code == "201") {
             this.$message({
-              message:"入库的数量不正确",
-              type:"faile",
-            })
+              message: "转预留的数量不正确",
+              type: "faile"
+            });
           }
-          this.$router.go(-1)
+          this.$router.go(-1);
         });
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scope>
-.addCheckWarehouse{
-.contractDetails {
-  width: 100%;
-}
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.warehouse {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  margin-right: 70px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+.addCheckWarehouse {
+  .contractDetails {
+    width: 100%;
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .from {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
   }
-}
-.material {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+  .warehouse {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    margin-right: 70px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .material {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-}
-.materialNumber {
+  .materialNumber {
     display: flex;
     justify-content: center;
     margin-top: 20px;
     margin-right: 70px;
     .text {
-        display:inline-block;
-        width: 170px;
-        text-align: right;
+      display: inline-block;
+      width: 170px;
+      text-align: right;
     }
     .input {
-        width: 250px;
-        margin-right: 20px;
+      width: 250px;
+      margin-right: 20px;
     }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100px;
+  }
 }
-.button_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100px;
-}
-}
-</style>
+</style>

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

@@ -1,14 +1,14 @@
 <template>
   <!-- 新增入库转预留作业页面 -->
   <div class="addCheckWarehouse">
-    <page-title>入库转预留作业</page-title>
+    <page-title>预留转入库作业</page-title>
     <div class="material from">
       <span class="text">物资规格型号：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
     <div class="materialNumber from">
-      <span class="text">最大预留件数：</span>
+      <span class="text">最大入库件数：</span>
       <el-input class="input" v-model="max" disabled> </el-input>
     </div>
     <div class="materialNumber from">
@@ -39,11 +39,13 @@
           v-bind.sync="second"
           @radio-change="currentRadioChange2"
         ></dilTable>
-      </div>          
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled="disabled"
+        >确认</el-button
+      >
     </div>
   </div>
 </template>
@@ -55,22 +57,22 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      startTime:null,
-      endTime:null,
-      max:null,
-      disabled:false,
+      startTime: null,
+      endTime: null,
+      max: null,
+      disabled: false,
       //仓库名称
-      warehouseName:null,
+      warehouseName: null,
       //物资名称
       materialName: null,
       //物资编码
-      materialCode:null,
-       // 物资规格
-      materialSpecification:null,
+      materialCode: null,
+      // 物资规格
+      materialSpecification: null,
       // 物资型号
-      materialModel:null,
+      materialModel: null,
       //盘点数量
-      materialNumber:null,
+      materialNumber: null,
       //物资id
       materialId: null,
       //是否需要打开模态窗口
@@ -81,11 +83,11 @@ export default {
       first: {
         requestUrl: "",
         selectionType: "radio",
-        mapList1: [],
+        mapList1: []
       },
       second: {
-          requestUrl: "",
-          selectionType:"radio"
+        requestUrl: "",
+        selectionType: "radio"
       }
     };
   },
@@ -94,46 +96,72 @@ export default {
       if (!val) {
         this.input = null;
       }
-    },
+    }
   },
   created() {
-      let strTime=this.formatDate(new Date(),"yyyy-MM-dd hh:mm:ss")
-      this.startTime= Date.parse(new Date(strTime));
-      this.endTime=new Date(this.startTime+86400000);
+    let strTime = this.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
+    this.startTime = Date.parse(new Date(strTime));
+    this.endTime = new Date(this.startTime + 86400000);
   },
   methods: {
-    formatDate (date, fmt) {
-        if (/(y+)/.test(fmt)) {
-          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
-        }
-        let o = {
-          'M+': date.getMonth() + 1,
-          'd+': date.getDate(),
-          'h+': 0,
-          'm+': 0,
-          's+': 0
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+        );
       }
+      let o = {
+        "M+": date.getMonth() + 1,
+        "d+": date.getDate(),
+        "h+": 0,
+        "m+": 0,
+        "s+": 0
+      };
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + ''
-          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+          let str = o[k] + "";
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : this.padLeftZero(str)
+          );
         }
-            }
-      return fmt
+      }
+      return fmt;
     },
-    padLeftZero (str) {
-        return ('00' + str).substr(str.length)
+    padLeftZero(str) {
+      return ("00" + str).substr(str.length);
     },
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+1+"&con="+this.input+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime)
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          1 +
+          "&status=" +
+          1 +
+          "&con=" +
+          this.input +
+          "&startTime=" +
+          sjTime(this.startTime) +
+          "&endTime=" +
+          sjTime(this.endTime);
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
-      if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+1+"&con="+""+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime)
+      if (num == 1) {
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          1 +
+          "&status=" +
+          1 +
+          "&con=" +
+          "" +
+          "&startTime=" +
+          sjTime(this.startTime) +
+          "&endTime=" +
+          sjTime(this.endTime);
       }
     },
     // 返回
@@ -142,7 +170,12 @@ export default {
     },
     currentRadioChange1(selection) {
       console.log(selection);
-      this.materialName = selection.materialName + selection.materialSpecification + '(' + selection.materialModel + ')' ;
+      this.materialName =
+        selection.materialName +
+        selection.materialSpecification +
+        "(" +
+        selection.materialModel +
+        ")";
       this.materialId = selection.materialId;
       this.materialCode = selection.materialCode;
       this.materialSpecification = selection.materialSpecification;
@@ -150,97 +183,110 @@ export default {
       this.max = selection.max;
     },
     currentRadioChange2(selection) {
-      this.warehouseId = selection.warehouseId
-      this.warehouseName = selection.warehouseName
+      this.warehouseId = selection.warehouseId;
+      this.warehouseName = selection.warehouseName;
     },
     // 确认
     onClickConfirm() {
       // console.log(this.warehouseId,this.materialCode,this.materialNumber);
-      this.disabled = true
-      this.axios.post("/api/v1/wms/insertReserved?warehouseId=" + 1 + "&materialCode=" + this.materialCode+"&materialSpecification="+this.materialSpecification+"&materialModel="+this.materialModel+ "&quantity=" + this.materialNumber ).then((res) => {
-        console.log(res.data)
+      this.disabled = true;
+      this.axios
+        .post(
+          "/api/v1/wms/insertReserved?warehouseId=" +
+            1 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&quantity=" +
+            this.materialNumber
+        )
+        .then(res => {
+          console.log(res.data);
           if (res.data.code == "200") {
             this.$message({
-              message: "预留成功!",
-              type: "success",
+              message: "入库成功!",
+              type: "success"
             });
-            this.disabled = false
-            this.onClickCancel()
-            this.$router.go(-1)
-          }else if(res.data.code=="201"){
+            this.disabled = false;
+            this.onClickCancel();
+            this.$router.go(-1);
+          } else if (res.data.code == "201") {
             this.$message({
-              message:"预留的数量不正确",
-              type:"faile",
-            })
+              message: "入库的数量不正确",
+              type: "faile"
+            });
           }
-          this.$router.go(-1)
+          this.$router.go(-1);
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang="scss" scope>
-.addCheckWarehouse{
-.contractDetails {
-  width: 100%;
-}
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.warehouse {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  margin-right: 70px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+<style lang="scss" scoped>
+.addCheckWarehouse {
+  .contractDetails {
+    width: 100%;
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .from {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
   }
-}
-.material {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+  .warehouse {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    margin-right: 70px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .material {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-}
-.materialNumber {
+  .materialNumber {
     display: flex;
     justify-content: center;
     margin-top: 20px;
     margin-right: 70px;
     .text {
-        display:inline-block;
-        width: 170px;
-        text-align: right;
+      display: inline-block;
+      width: 170px;
+      text-align: right;
     }
     .input {
-        width: 250px;
-        margin-right: 20px;
+      width: 250px;
+      margin-right: 20px;
     }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100px;
+  }
 }
-.button_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100px;
-}
-}
-</style>
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 新增预留转入库作业页面 -->
   <div class="addCheckWarehouse">
-    <page-title>预留转入库作业</page-title>
+    <page-title>入库转预留作业</page-title>
     <div class="material from">
       <span class="text">物资规格型号：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
@@ -39,11 +39,13 @@
           v-bind.sync="second"
           @radio-change="currentRadioChange2"
         ></dilTable>
-      </div>          
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled="disabled"
+        >确认</el-button
+      >
     </div>
   </div>
 </template>
@@ -55,20 +57,20 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      max:null,
-      disabled:false,
+      max: null,
+      disabled: false,
       //仓库名称
-      warehouseName:null,
+      warehouseName: null,
       //物资名称
       materialName: null,
       //物资编码
-      materialCode:null,
-       // 物资规格
-      materialSpecification:null,
+      materialCode: null,
+      // 物资规格
+      materialSpecification: null,
       // 物资型号
-      materialModel:null,
+      materialModel: null,
       //盘点数量
-      materialNumber:null,
+      materialNumber: null,
       //物资id
       materialId: null,
       //是否需要打开模态窗口
@@ -79,11 +81,11 @@ export default {
       first: {
         requestUrl: "",
         selectionType: "radio",
-        mapList1: [],
+        mapList1: []
       },
       second: {
-          requestUrl: "",
-          selectionType:"radio"
+        requestUrl: "",
+        selectionType: "radio"
       }
     };
   },
@@ -92,22 +94,32 @@ export default {
       if (!val) {
         this.input = null;
       }
-    },
-  },
-  created() {
-      
+    }
   },
+  created() {},
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+2+"&con="+this.input
+        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+"&con="+""
+      if (num == 1) {
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          1 +
+          "&status=" +
+          2 +
+          "&con=" +
+          "";
       }
     },
     // 返回
@@ -123,97 +135,110 @@ export default {
       this.max = selection.max;
     },
     currentRadioChange2(selection) {
-      this.warehouseId = selection.warehouseId
-      this.warehouseName = selection.warehouseName
+      this.warehouseId = selection.warehouseId;
+      this.warehouseName = selection.warehouseName;
     },
     // 确认
     onClickConfirm() {
       // console.log(this.warehouseId,this.materialCode,this.materialNumber);
-      this.disabled = true
-      this.axios.post("/api/v1/wms/insertInbounds?warehouseId=" + 1 + "&materialCode=" + this.materialCode+"&materialSpecification="+this.materialSpecification+"&materialModel="+this.materialModel+ "&quantity=" + this.materialNumber ).then((res) => {
-        console.log(res.data)
+      this.disabled = true;
+      this.axios
+        .post(
+          "/api/v1/wms/insertInbounds?warehouseId=" +
+            1 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&quantity=" +
+            this.materialNumber
+        )
+        .then(res => {
+          console.log(res.data);
           if (res.data.code == "200") {
             this.$message({
-              message: "入库成功!",
-              type: "success",
+              message: "转预留成功!",
+              type: "success"
             });
-            this.disabled = false
-            this.onClickCancel()
-            this.$router.go(-1)
-          }else if(res.data.code=="201"){
+            this.disabled = false;
+            this.onClickCancel();
+            this.$router.go(-1);
+          } else if (res.data.code == "201") {
             this.$message({
-              message:"入库的数量不正确",
-              type:"faile",
-            })
+              message: "转预留的数量不正确",
+              type: "faile"
+            });
           }
-          this.$router.go(-1)
+          this.$router.go(-1);
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang="scss" scope>
-.addCheckWarehouse{
-.contractDetails {
-  width: 100%;
-}
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.warehouse {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  margin-right: 70px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+<style lang="scss" scoped>
+.addCheckWarehouse {
+  .contractDetails {
+    width: 100%;
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .from {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
   }
-}
-.material {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+  .warehouse {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    margin-right: 70px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .material {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-}
-.materialNumber {
+  .materialNumber {
     display: flex;
     justify-content: center;
     margin-top: 20px;
     margin-right: 70px;
     .text {
-        display:inline-block;
-        width: 170px;
-        text-align: right;
+      display: inline-block;
+      width: 170px;
+      text-align: right;
     }
     .input {
-        width: 250px;
-        margin-right: 20px;
+      width: 250px;
+      margin-right: 20px;
     }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100px;
+  }
 }
-.button_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100px;
-}
-}
-</style>
+</style>

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

@@ -8,8 +8,12 @@
         clearable>
       </el-input>
        -->
-      <span>入库时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      <span>扫码时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
@@ -18,11 +22,11 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="onreserved">
-        预留
+        入库
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" >
+      <dilTable v-bind.sync="options">
         <!-- <el-table-column fixed="right" label="操作" width="150">
 								<template slot-scope="scope">
 									<el-button type="text" size="mini" @click="inboundDetails(scope)">
@@ -37,60 +41,71 @@
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      inputText:"",
+  data() {
+    return {
+      inputText: "",
       startTime: null,
       endTime: null,
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+1,
+        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 1
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-   created(){
+  created() {
     var date = new Date();
-    let dateStr=this.formatDate(date, 'yyyy-MM-dd hh:mm:ss');
-    
-    this.startTime= Date.parse(new Date(dateStr));
-    this.endTime=new Date(this.startTime+86400000);
+    let dateStr = this.formatDate(date, "yyyy-MM-dd hh:mm:ss");
 
-    this.options.requestUrl= "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+1+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime) ;
-    this.tableShow=true;
+    this.startTime = Date.parse(new Date(dateStr));
+    this.endTime = new Date(this.startTime + 86400000);
+
+    this.options.requestUrl =
+      "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+      1 +
+      "&startTime=" +
+      sjTime(this.startTime) +
+      "&endTime=" +
+      sjTime(this.endTime);
+    this.tableShow = true;
   },
-  
-  methods:{
-    formatDate (date, fmt) {
-        if (/(y+)/.test(fmt)) {
-          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
-        }
-        let o = {
-          'M+': date.getMonth() + 1,
-          'd+': date.getDate(),
-          'h+': 0,
-          'm+': 0,
-          's+': 0
+
+  methods: {
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+        );
       }
+      let o = {
+        "M+": date.getMonth() + 1,
+        "d+": date.getDate(),
+        "h+": 0,
+        "m+": 0,
+        "s+": 0
+      };
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + ''
-          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+          let str = o[k] + "";
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : this.padLeftZero(str)
+          );
         }
-            }
-      return fmt
+      }
+      return fmt;
     },
-    padLeftZero (str) {
-        return ('00' + str).substr(str.length)
+    padLeftZero(str) {
+      return ("00" + str).substr(str.length);
     },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
-    onclick(){
-
+    onclick() {
       let startTime = null;
       let endTime = null;
       if (this.startTime) {
@@ -102,11 +117,19 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl =
+            "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+            1 +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
-          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
-          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }
         } else {
           this.startTime = null;
@@ -114,28 +137,28 @@ export default {
           this.$message.warning("开始时间要比结束时间早");
         }
       } else {
-        this.getRequestUrl()
+        this.getRequestUrl();
       }
     },
     selectionChange(selection) {
       this.options.mapList = selection;
     },
-    onreserved(){
+    onreserved() {
       this.$router.push({
-        path: "/bar1_addSteelInbound",
+        path: "/bar1_addSteelInbound"
       });
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     height: 5rem;
     display: flex;
     align-items: center;
     padding-left: 1.875rem;
   }
 }
-</style>
+</style>

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

@@ -5,9 +5,11 @@
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        clearable>
+        clearable
+        style="width:250px"
+      >
       </el-input>
-      
+
       <!-- <span>入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
@@ -18,11 +20,11 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="onreserved">
-        入库
+        预留
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" >
+      <dilTable v-bind.sync="options">
         <!-- <el-table-column fixed="right" label="操作" width="150">
 								<template slot-scope="scope">
 									<el-button type="text" size="mini" @click="inboundDetails(scope)">
@@ -37,47 +39,52 @@
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      inputText:"",
+  data() {
+    return {
+      inputText: "",
       startTime: null,
       endTime: null,
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+1,
+        requestUrl:
+          "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId=" + 1
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-  methods:{
+  methods: {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
-    onclick(){
-      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+1+"&con="+this.inputText;
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId=" +
+        1 +
+        "&con=" +
+        this.inputText;
     },
     selectionChange(selection) {
       this.options.mapList = selection;
     },
-    onreserved(){
+    onreserved() {
       this.$router.push({
-        path: "/bar1_addSteelReserved",
+        path: "/bar1_addSteelReserved"
       });
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     height: 5rem;
     display: flex;
     align-items: center;
     padding-left: 1.875rem;
   }
 }
-</style>
+</style>

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

@@ -0,0 +1,96 @@
+<template>
+  <div class="steel_inbound_real">
+    <div class="sache">
+      <span class="text">入库时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options" ref="table">
+        <el-table-column label="操作" width="120px">
+          <template slot-scope="scope">
+            <el-button type="text" @click="crtlZ(scope.row)">撤销</el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  data() {
+    return {
+      inputText: "",
+      startTime: null,
+      endTime: null,
+      region: "0",
+      options: {
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=" + 1
+        // selectionType: "select",
+        // mapList: [],
+      }
+    };
+  },
+  methods: {
+    // inboundDetails(scope){
+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
+    // }
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      this.options.requestUrl =
+        "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=1&startTime=" +
+        startTime +
+        "&endTime=" +
+        endTime +
+        "&i=" +
+        new Date();
+    },
+    crtlZ(row) {
+      console.log(row.inboundEasId);
+      this.axios
+        .post("/api/v1/wms/reduceInboundEas?inboundEasId=" + row.inboundEasId)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("撤销成功");
+          } else {
+            this.$message.error("撤销失败");
+          }
+          this.options.requestUrl =
+            "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=1" +
+            "&i=" +
+            new Date();
+        });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.steel_inbound_real {
+  .sache {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+}
+</style>

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

@@ -1,14 +1,14 @@
 <template>
   <!-- 新增入库转预留作业页面 -->
   <div class="addCheckWarehouse">
-    <page-title>入库转预留作业</page-title>
+    <page-title>预留转入库作业</page-title>
     <div class="material from">
       <span class="text">物资规格型号：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
     <div class="materialNumber from">
-      <span class="text">最大预留件数：</span>
+      <span class="text">最大入库件数：</span>
       <el-input class="input" v-model="max" disabled> </el-input>
     </div>
     <div class="materialNumber from">
@@ -39,11 +39,13 @@
           v-bind.sync="second"
           @radio-change="currentRadioChange2"
         ></dilTable>
-      </div>          
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled="disabled"
+        >确认</el-button
+      >
     </div>
   </div>
 </template>
@@ -55,22 +57,22 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      startTime:null,
-      endTime:null,
-      max:null,
-      disabled:false,
+      startTime: null,
+      endTime: null,
+      max: null,
+      disabled: false,
       //仓库名称
-      warehouseName:null,
+      warehouseName: null,
       //物资名称
       materialName: null,
       //物资编码
-      materialCode:null,
-       // 物资规格
-      materialSpecification:null,
+      materialCode: null,
+      // 物资规格
+      materialSpecification: null,
       // 物资型号
-      materialModel:null,
+      materialModel: null,
       //盘点数量
-      materialNumber:null,
+      materialNumber: null,
       //物资id
       materialId: null,
       //是否需要打开模态窗口
@@ -81,11 +83,11 @@ export default {
       first: {
         requestUrl: "",
         selectionType: "radio",
-        mapList1: [],
+        mapList1: []
       },
       second: {
-          requestUrl: "",
-          selectionType:"radio"
+        requestUrl: "",
+        selectionType: "radio"
       }
     };
   },
@@ -94,46 +96,72 @@ export default {
       if (!val) {
         this.input = null;
       }
-    },
+    }
   },
   created() {
-      let strTime=this.formatDate(new Date(),"yyyy-MM-dd hh:mm:ss")
-      this.startTime= Date.parse(new Date(strTime));
-      this.endTime=new Date(this.startTime+86400000);
+    let strTime = this.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
+    this.startTime = Date.parse(new Date(strTime));
+    this.endTime = new Date(this.startTime + 86400000);
   },
   methods: {
-    formatDate (date, fmt) {
-        if (/(y+)/.test(fmt)) {
-          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
-        }
-        let o = {
-          'M+': date.getMonth() + 1,
-          'd+': date.getDate(),
-          'h+': 0,
-          'm+': 0,
-          's+': 0
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+        );
       }
+      let o = {
+        "M+": date.getMonth() + 1,
+        "d+": date.getDate(),
+        "h+": 0,
+        "m+": 0,
+        "s+": 0
+      };
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + ''
-          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+          let str = o[k] + "";
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : this.padLeftZero(str)
+          );
         }
-            }
-      return fmt
+      }
+      return fmt;
     },
-    padLeftZero (str) {
-        return ('00' + str).substr(str.length)
+    padLeftZero(str) {
+      return ("00" + str).substr(str.length);
     },
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+1+"&con="+this.input+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime)
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          2 +
+          "&status=" +
+          1 +
+          "&con=" +
+          this.input +
+          "&startTime=" +
+          sjTime(this.startTime) +
+          "&endTime=" +
+          sjTime(this.endTime);
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
-      if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+1+"&con="+""+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime)
+      if (num == 1) {
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          2 +
+          "&status=" +
+          1 +
+          "&con=" +
+          "" +
+          "&startTime=" +
+          sjTime(this.startTime) +
+          "&endTime=" +
+          sjTime(this.endTime);
       }
     },
     // 返回
@@ -142,7 +170,12 @@ export default {
     },
     currentRadioChange1(selection) {
       console.log(selection);
-      this.materialName = selection.materialName + selection.materialSpecification + '(' + selection.materialModel + ')' ;
+      this.materialName =
+        selection.materialName +
+        selection.materialSpecification +
+        "(" +
+        selection.materialModel +
+        ")";
       this.materialId = selection.materialId;
       this.materialCode = selection.materialCode;
       this.materialSpecification = selection.materialSpecification;
@@ -150,97 +183,110 @@ export default {
       this.max = selection.max;
     },
     currentRadioChange2(selection) {
-      this.warehouseId = selection.warehouseId
-      this.warehouseName = selection.warehouseName
+      this.warehouseId = selection.warehouseId;
+      this.warehouseName = selection.warehouseName;
     },
     // 确认
     onClickConfirm() {
       // console.log(this.warehouseId,this.materialCode,this.materialNumber);
-      this.disabled = true
-      this.axios.post("/api/v1/wms/insertReserved?warehouseId=" + 2 + "&materialCode=" + this.materialCode+"&materialSpecification="+this.materialSpecification+"&materialModel="+this.materialModel+ "&quantity=" + this.materialNumber ).then((res) => {
-        console.log(res.data)
+      this.disabled = true;
+      this.axios
+        .post(
+          "/api/v1/wms/insertReserved?warehouseId=" +
+            2 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&quantity=" +
+            this.materialNumber
+        )
+        .then(res => {
+          console.log(res.data);
           if (res.data.code == "200") {
             this.$message({
-              message: "预留成功!",
-              type: "success",
+              message: "入库成功!",
+              type: "success"
             });
-            this.disabled = false
-            this.onClickCancel()
-            this.$router.go(-1)
-          }else if(res.data.code=="201"){
+            this.disabled = false;
+            this.onClickCancel();
+            this.$router.go(-1);
+          } else if (res.data.code == "201") {
             this.$message({
-              message:"预留的数量不正确",
-              type:"faile",
-            })
+              message: "入库的数量不正确",
+              type: "faile"
+            });
           }
-          this.$router.go(-1)
+          this.$router.go(-1);
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang="scss" scope>
-.addCheckWarehouse{
-.contractDetails {
-  width: 100%;
-}
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.warehouse {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  margin-right: 70px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+<style lang="scss" scoped>
+.addCheckWarehouse {
+  .contractDetails {
+    width: 100%;
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .from {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
   }
-}
-.material {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+  .warehouse {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    margin-right: 70px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .material {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-}
-.materialNumber {
+  .materialNumber {
     display: flex;
     justify-content: center;
     margin-top: 20px;
     margin-right: 70px;
     .text {
-        display:inline-block;
-        width: 170px;
-        text-align: right;
+      display: inline-block;
+      width: 170px;
+      text-align: right;
     }
     .input {
-        width: 250px;
-        margin-right: 20px;
+      width: 250px;
+      margin-right: 20px;
     }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100px;
+  }
 }
-.button_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100px;
-}
-}
-</style>
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 新增预留转入库作业页面 -->
   <div class="addCheckWarehouse">
-    <page-title>预留转入库作业</page-title>
+    <page-title>入库转预留作业</page-title>
     <div class="material from">
       <span class="text">物资规格型号：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
@@ -39,11 +39,13 @@
           v-bind.sync="second"
           @radio-change="currentRadioChange2"
         ></dilTable>
-      </div>          
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled="disabled"
+        >确认</el-button
+      >
     </div>
   </div>
 </template>
@@ -55,20 +57,20 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      max:null,
-      disabled:false,
+      max: null,
+      disabled: false,
       //仓库名称
-      warehouseName:null,
+      warehouseName: null,
       //物资名称
       materialName: null,
       //物资编码
-      materialCode:null,
-       // 物资规格
-      materialSpecification:null,
+      materialCode: null,
+      // 物资规格
+      materialSpecification: null,
       // 物资型号
-      materialModel:null,
+      materialModel: null,
       //盘点数量
-      materialNumber:null,
+      materialNumber: null,
       //物资id
       materialId: null,
       //是否需要打开模态窗口
@@ -79,11 +81,11 @@ export default {
       first: {
         requestUrl: "",
         selectionType: "radio",
-        mapList1: [],
+        mapList1: []
       },
       second: {
-          requestUrl: "",
-          selectionType:"radio"
+        requestUrl: "",
+        selectionType: "radio"
       }
     };
   },
@@ -92,22 +94,32 @@ export default {
       if (!val) {
         this.input = null;
       }
-    },
-  },
-  created() {
-      
+    }
   },
+  created() {},
   methods: {
     onclick(a) {
       if (a == 1) {
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+2+"&con="+this.input
+        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+"&con="+""
+      if (num == 1) {
+        this.first.requestUrl =
+          "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+          2 +
+          "&status=" +
+          2 +
+          "&con=" +
+          "";
       }
     },
     // 返回
@@ -116,7 +128,12 @@ export default {
     },
     currentRadioChange1(selection) {
       console.log(selection);
-      this.materialName = selection.materialName + selection.materialSpecification + '(' + selection.materialModel + ')' ;
+      this.materialName =
+        selection.materialName +
+        selection.materialSpecification +
+        "(" +
+        selection.materialModel +
+        ")";
       this.materialId = selection.materialId;
       this.materialCode = selection.materialCode;
       this.materialSpecification = selection.materialSpecification;
@@ -124,97 +141,110 @@ export default {
       this.max = selection.max;
     },
     currentRadioChange2(selection) {
-      this.warehouseId = selection.warehouseId
-      this.warehouseName = selection.warehouseName
+      this.warehouseId = selection.warehouseId;
+      this.warehouseName = selection.warehouseName;
     },
     // 确认
     onClickConfirm() {
       // console.log(this.warehouseId,this.materialCode,this.materialNumber);
-      this.disabled = true
-      this.axios.post("/api/v1/wms/insertInbounds?warehouseId=" + 2 + "&materialCode=" + this.materialCode+"&materialSpecification="+this.materialSpecification+"&materialModel="+this.materialModel+ "&quantity=" + this.materialNumber ).then((res) => {
-        console.log(res.data)
+      this.disabled = true;
+      this.axios
+        .post(
+          "/api/v1/wms/insertInbounds?warehouseId=" +
+            2 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&quantity=" +
+            this.materialNumber
+        )
+        .then(res => {
+          console.log(res.data);
           if (res.data.code == "200") {
             this.$message({
-              message: "入库成功!",
-              type: "success",
+              message: "转预留成功!",
+              type: "success"
             });
-            this.disabled = false
-            this.onClickCancel()
-            this.$router.go(-1)
-          }else if(res.data.code=="201"){
+            this.disabled = false;
+            this.onClickCancel();
+            this.$router.go(-1);
+          } else if (res.data.code == "201") {
             this.$message({
-              message:"入库的数量不正确",
-              type:"faile",
-            })
+              message: "转预留数量不正确",
+              type: "faile"
+            });
           }
-          this.$router.go(-1)
+          this.$router.go(-1);
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang="scss" scope>
-.addCheckWarehouse{
-.contractDetails {
-  width: 100%;
-}
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.warehouse {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  margin-right: 70px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+<style lang="scss" scoped>
+.addCheckWarehouse {
+  .contractDetails {
+    width: 100%;
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .from {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
   }
-}
-.material {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+  .warehouse {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    margin-right: 70px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-  .input {
-    width: 250px;
-    margin-right: 20px;
+  .material {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+    }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
-}
-.materialNumber {
+  .materialNumber {
     display: flex;
     justify-content: center;
     margin-top: 20px;
     margin-right: 70px;
     .text {
-        display:inline-block;
-        width: 170px;
-        text-align: right;
+      display: inline-block;
+      width: 170px;
+      text-align: right;
     }
     .input {
-        width: 250px;
-        margin-right: 20px;
+      width: 250px;
+      margin-right: 20px;
     }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100px;
+  }
 }
-.button_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100px;
-}
-}
-</style>
+</style>

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

@@ -2,14 +2,12 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <!-- <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
-      </el-input>
-       -->
-      <span>入库时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      <span>扫码时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
@@ -18,79 +16,82 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="onreserved">
-        预留
+        入库
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" >
-        <!-- <el-table-column fixed="right" label="操作" width="150">
-								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
-									</el-button>
-								</template>
-				</el-table-column> -->
-      </dilTable>
+      <dilTable v-bind.sync="options"> </dilTable>
     </div>
   </div>
 </template>
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      inputText:"",
+  data() {
+    return {
+      inputText: "",
       startTime: null,
       endTime: null,
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+2,
+        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 2
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-  created(){
+  created() {
     var date = new Date();
-    let dateStr=this.formatDate(date, 'yyyy-MM-dd hh:mm:ss');
-    
-    this.startTime= Date.parse(new Date(dateStr));
-    this.endTime=new Date(this.startTime+86400000);
+    let dateStr = this.formatDate(date, "yyyy-MM-dd hh:mm:ss");
 
-    this.options.requestUrl= "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+2+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime) ;
-    this.tableShow=true;
+    this.startTime = Date.parse(new Date(dateStr));
+    this.endTime = new Date(this.startTime + 86400000);
+
+    this.options.requestUrl =
+      "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+      2 +
+      "&startTime=" +
+      sjTime(this.startTime) +
+      "&endTime=" +
+      sjTime(this.endTime);
+    this.tableShow = true;
   },
-  
-  methods:{
-    formatDate (date, fmt) {
-        if (/(y+)/.test(fmt)) {
-          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
-        }
-        let o = {
-          'M+': date.getMonth() + 1,
-          'd+': date.getDate(),
-          'h+': 0,
-          'm+': 0,
-          's+': 0
+
+  methods: {
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+        );
       }
+      let o = {
+        "M+": date.getMonth() + 1,
+        "d+": date.getDate(),
+        "h+": 0,
+        "m+": 0,
+        "s+": 0
+      };
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + ''
-          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+          let str = o[k] + "";
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : this.padLeftZero(str)
+          );
         }
-            }
-      return fmt
+      }
+      return fmt;
     },
-    padLeftZero (str) {
-        return ('00' + str).substr(str.length)
+    padLeftZero(str) {
+      return ("00" + str).substr(str.length);
     },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
-    onclick(){
-
+    onclick() {
       let startTime = null;
       let endTime = null;
       if (this.startTime) {
@@ -102,11 +103,19 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+2+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl =
+            "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+            2 +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
-          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
-          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }
         } else {
           this.startTime = null;
@@ -114,28 +123,28 @@ export default {
           this.$message.warning("开始时间要比结束时间早");
         }
       } else {
-        this.getRequestUrl()
+        this.getRequestUrl();
       }
     },
     selectionChange(selection) {
       this.options.mapList = selection;
     },
-    onreserved(){
+    onreserved() {
       this.$router.push({
-        path: "/bar2_addSteelInbound",
+        path: "/bar2_addSteelInbound"
       });
     }
   }
-}
+};
 </script>
 
-<style lang="scss" scode>
-.steel_inbound{
-  .sache{
+<style lang="scss" scoped>
+.steel_inbound {
+  .sache {
     height: 5rem;
     display: flex;
     align-items: center;
     padding-left: 1.875rem;
   }
 }
-</style>
+</style>

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

@@ -5,9 +5,11 @@
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        clearable>
+        clearable
+        style="width:250px"
+      >
       </el-input>
-      
+
       <!-- <span>入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
@@ -18,11 +20,11 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="onreserved">
-        入库
+        预留
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" >
+      <dilTable v-bind.sync="options">
         <!-- <el-table-column fixed="right" label="操作" width="150">
 								<template slot-scope="scope">
 									<el-button type="text" size="mini" @click="inboundDetails(scope)">
@@ -37,47 +39,52 @@
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      inputText:"",
+  data() {
+    return {
+      inputText: "",
       startTime: null,
       endTime: null,
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+2,
+        requestUrl:
+          "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId=" + 2
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-  methods:{
+  methods: {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
-    onclick(){
-      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+2+"&con="+this.inputText;
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId=" +
+        2 +
+        "&con=" +
+        this.inputText;
     },
     selectionChange(selection) {
       this.options.mapList = selection;
     },
-    onreserved(){
+    onreserved() {
       this.$router.push({
-        path: "/bar2_addSteelReserved",
+        path: "/bar2_addSteelReserved"
       });
     }
   }
-}
+};
 </script>
 
-<style lang="scss" scode>
-.steel_inbound{
-  .sache{
+<style lang="scss" scoped>
+.steel_inbound {
+  .sache {
     height: 5rem;
     display: flex;
     align-items: center;
     padding-left: 1.875rem;
   }
 }
-</style>
+</style>

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

@@ -0,0 +1,96 @@
+<template>
+  <div class="steel_inbound_real">
+    <div class="sache">
+      <span class="text">入库时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options" ref="table">
+        <el-table-column label="操作" width="120px">
+          <template slot-scope="scope">
+            <el-button type="text" @click="crtlZ(scope.row)">撤销</el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  data() {
+    return {
+      inputText: "",
+      startTime: null,
+      endTime: null,
+      region: "0",
+      options: {
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=" + 2
+        // selectionType: "select",
+        // mapList: [],
+      }
+    };
+  },
+  methods: {
+    // inboundDetails(scope){
+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
+    // }
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      this.options.requestUrl =
+        "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=2&startTime=" +
+        startTime +
+        "&endTime=" +
+        endTime +
+        "&i=" +
+        new Date();
+    },
+    crtlZ(row) {
+      console.log(row.inboundEasId);
+      this.axios
+        .post("/api/v1/wms/reduceInboundEas?inboundEasId=" + row.inboundEasId)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("撤销成功");
+          } else {
+            this.$message.error("撤销失败");
+          }
+          this.options.requestUrl =
+            "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=2" +
+            "&i=" +
+            new Date();
+        });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.steel_inbound_real {
+  .sache {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+}
+</style>

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

@@ -0,0 +1,97 @@
+<template>
+  <div class="steel_inbound_real">
+    <div class="sache">
+      <span class="text">入库时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options" ref="table">
+        <el-table-column label="操作" width="120px">
+          <template slot-scope="scope"
+            ><el-button type="text" @click="crtlZ(scope.row)"
+              >撤销</el-button
+            ></template
+          >
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  data() {
+    return {
+      inputText: "",
+      startTime: null,
+      endTime: null,
+      region: "0",
+      options: {
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=" + 3
+        // selectionType: "select",
+        // mapList: [],
+      }
+    };
+  },
+  methods: {
+    // inboundDetails(scope){
+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
+    // }
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      this.options.requestUrl =
+        "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=3&startTime=" +
+        startTime +
+        "&endTime=" +
+        endTime +
+        "&i=" +
+        new Date();
+    },
+    crtlZ(row) {
+      this.axios
+        .post("/api/v1/wms/reduceInboundEas?inboundEasId=" + row.inboundEasId)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("撤销成功");
+          } else {
+            this.$message.error("撤销失败");
+          }
+          this.options.requestUrl =
+            "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=3" +
+            "&i=" +
+            new Date();
+        });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.steel_inbound_real {
+  .sache {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+}
+</style>

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

@@ -3,28 +3,42 @@
   <div class="steel_inbound">
     <div class="sache">
       <span class="text">入库时间：</span>
-      <el-date-picker disabled v-model="startTime" type="datetime" placeholder="选择日期">
+      <el-date-picker
+        disabled
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span class="text">至</span>
-      <el-date-picker disabled v-model="endTime" type="datetime" placeholder="选择日期">
+      <el-date-picker
+        disabled
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span class="text">物资类型</span>
       <el-autocomplete
-      class="inputStyle"
-      v-model="inputText"
-      :fetch-suggestions="querySearch"
-      placeholder="请输入内容"
-      @select="handleSelect"
-    ></el-autocomplete>
+        class="inputStyle"
+        v-model="inputText"
+        :fetch-suggestions="querySearch"
+        placeholder="请输入内容"
+        @select="handleSelect"
+      ></el-autocomplete>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="onreserved">
-        预留
+        入库
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-if="tableShow" :selectionType="selectionType"  v-bind.sync="options" >
+      <dilTable
+        v-if="tableShow"
+        :selectionType="selectionType"
+        v-bind.sync="options"
+      >
       </dilTable>
     </div>
   </div>
@@ -32,77 +46,92 @@
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      tableShow:false,
-      selectionType:"",
-      inputText:"",
+  data() {
+    return {
+      tableShow: false,
+      selectionType: "",
+      inputText: "",
       startTime: null,
       endTime: null,
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+3,
+        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 3
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-  mounted(){
-
+  mounted() {
     var date = new Date();
-    let dateStr=this.formatDate(date, 'yyyy-MM-dd hh:mm:ss');
-    
-    this.startTime= Date.parse(new Date(dateStr));
-    this.endTime=new Date(this.startTime+86400000);
+    let dateStr = this.formatDate(date, "yyyy-MM-dd hh:mm:ss");
 
-    this.options.requestUrl= "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+3+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime) ;
-    this.tableShow=true;
+    this.startTime = Date.parse(new Date(dateStr));
+    this.endTime = new Date(this.startTime + 86400000);
+
+    this.options.requestUrl =
+      "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+      3 +
+      "&startTime=" +
+      sjTime(this.startTime) +
+      "&endTime=" +
+      sjTime(this.endTime);
+    this.tableShow = true;
   },
-  methods:{
-    formatDate (date, fmt) {
-        if (/(y+)/.test(fmt)) {
-          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
-        }
-        let o = {
-          'M+': date.getMonth() + 1,
-          'd+': date.getDate(),
-          'h+': 0,
-          'm+': 0,
-          's+': 0
+  methods: {
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+        );
       }
+      let o = {
+        "M+": date.getMonth() + 1,
+        "d+": date.getDate(),
+        "h+": 0,
+        "m+": 0,
+        "s+": 0
+      };
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + ''
-          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+          let str = o[k] + "";
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : this.padLeftZero(str)
+          );
         }
-            }
-      return fmt
+      }
+      return fmt;
     },
-    padLeftZero (str) {
-        return ('00' + str).substr(str.length)
+    padLeftZero(str) {
+      return ("00" + str).substr(str.length);
+    },
+    querySearch(queryString, cb) {
+      var restaurants = [
+        { value: "螺纹钢" },
+        { value: "盘螺" },
+        { value: "乱尺" }
+      ];
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return restaurant => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
     },
-     querySearch(queryString, cb) {
-        var restaurants = [ 
-                            {"value":"螺纹钢"},
-                            {"value":"盘螺"},
-                            {"value":"乱尺"}
-                          ];
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-        // 调用 callback 返回建议列表的数据
-        cb(results);
-      },
-      createFilter(queryString) {
-        return (restaurant) => {
-          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
-        };
-      },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
-    onclick(){
-
+    onclick() {
       let startTime = null;
       let endTime = null;
       if (this.startTime) {
@@ -113,10 +142,18 @@ export default {
       }
       if (startTime && endTime) {
         if (startTime < endTime) {
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+3+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
-          this.options.requestQuery={
-            "materialNames":this.inputText
-          }
+          this.options.requestUrl =
+            "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+            3 +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
+          this.options.requestQuery = {
+            materialNames: this.inputText
+          };
           // this.selectionType="select";
         } else {
           this.startTime = null;
@@ -124,7 +161,7 @@ export default {
           this.$message.warning("开始时间要比结束时间早");
         }
       } else {
-         this.$message.warning("没有选择时间段");
+        this.$message.warning("没有选择时间段");
         // this.getRequestUrl()
       }
     },
@@ -132,48 +169,48 @@ export default {
       this.options.mapList = selection;
     },
     handleSelect(item) {
-        console.log(item);
+      console.log(item);
     },
-    onreserved(){
+    onreserved() {
       this.$router.push({
-        path: "/addSteelInbound",
+        path: "/addSteelInbound"
       });
     }
   }
-}
+};
 </script>
 
-<style lang="scss" scode>
-.steel_inbound{
+<style lang="scss" scoped>
+.steel_inbound {
   margin-top: 30px;
   margin-left: 20px;
-   
-    .sache{
-      display: flex;
-      margin-bottom: 10px;
-      padding-right: 10px;
-       .inputStyle{
-          width: 200px;
-          margin-right: 5px;
-        margin-left: 5px;
-        }
-      .text {
-        text-align: left;
-        line-height: 40px;
-      }
-      .el-date-editor {
-        margin-right: 5px;
-        margin-left: 5px;
-      }
-      .btn {
-        margin-left: 10px;
-      }
-      .el-select {
+
+  .sache {
+    display: flex;
+    margin-bottom: 10px;
+    padding-right: 10px;
+    .inputStyle {
+      width: 200px;
+      margin-right: 5px;
+      margin-left: 5px;
+    }
+    .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>
+</style>

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

@@ -2,79 +2,80 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="onreserved">
-        入库
+        预留
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" >
-      </dilTable>
+      <dilTable v-bind.sync="options"> </dilTable>
     </div>
   </div>
 </template>
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      inputText:"",
+  data() {
+    return {
+      inputText: "",
       startTime: null,
       endTime: null,
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+3,
+        requestUrl:
+          "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId=" + 3
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-  methods:{
+  methods: {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
-    onclick(){
-      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+3+"&con="+this.inputText;
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId=" +
+        3 +
+        "&con=" +
+        this.inputText;
     },
     selectionChange(selection) {
       this.options.mapList = selection;
     },
-    onreserved(){
+    onreserved() {
       this.$router.push({
-        path: "/addSteelReserved",
+        path: "/addSteelReserved"
       });
     }
   }
-}
+};
 </script>
 
-<style lang="scss" scope>
-.steel_inbound{
+<style lang="scss" scoped>
+.steel_inbound {
   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;
-      }
+  .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>
+</style>

src/views/WMS/router/index.js

@@ -44,6 +44,7 @@ import addSteelInbound from "../components/steel/addSteelInbound.vue";
 import addSteelReserved from "../components/steel/addSteelReserved.vue";
 import steel_outboundStatistics from "../components/steel/steel_outboundStatistics.vue";
 import steel_inboundStatistics from "../components/steel/steel_inboundStatistics.vue";
+import inboundEas03 from "../components/steel/inboundEas03.vue";
 
 // 一帮库页面配置
 import bar1_addTransfer from "../components/steel/bar1_steel/bar1_addTransfer.vue";
@@ -72,6 +73,7 @@ import bar1_addSteelInbound from "../components/steel/bar1_steel/bar1_addSteelIn
 import bar1_addSteelReserved from "../components/steel/bar1_steel/bar1_addSteelReserved.vue";
 import bar1_steel_inboundStatistics from "../components/steel/bar1_steel/bar1_steel_inboundStatistics.vue";
 import bar1_steel_outboundStatistics from "../components/steel/bar1_steel/bar1_steel_outboundStatistics.vue";
+import inboundEas01 from "../components/steel/bar1_steel/inboundEas01.vue";
 
 // 二棒库路径配置
 import bar2_addTransfer from "../components/steel/bar2_steel/bar2_addTransfer.vue";
@@ -101,6 +103,7 @@ import bar2_addSteelReserved from "../components/steel/bar2_steel/bar2_addSteelR
 import bar2_steel_inboundStatistics from "../components/steel/bar2_steel/bar2_steel_inboundStatistics.vue";
 import bar2_steel_outboundStatistics from "../components/steel/bar2_steel/bar2_steel_outboundStatistics.vue";
 import wmsOrderDetails from "../components/billingOrder/orderDetails.vue";
+import inboundEas02 from "../components/steel/bar2_steel/inboundEas02.vue";
 Vue.use(Router);
 const constantRouterMap = [
   {
@@ -661,6 +664,24 @@ const constantRouterMap = [
         name: "wmsOrderDetails",
         meta: { code: "xtpzgl-yhgl" },
         component: wmsOrderDetails
+      },
+      {
+        path: "inboundEas01",
+        name: "inboundEas01",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inboundEas01
+      },
+      {
+        path: "inboundEas02",
+        name: "inboundEas02",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inboundEas02
+      },
+      {
+        path: "inboundEas03",
+        name: "inboundEas03",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inboundEas03
       }
     ]
   }

src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -72,11 +72,11 @@
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
       >
-        <el-table-column type="selection" width="55" :selectable="selectInit">
+        <el-table-column type="selection" width="40" :selectable="selectInit">
         </el-table-column>
         <el-table-column
           prop="index"
-          width="50"
+          width="40"
           label="序号"
           align="center"
           :resizable="false"
@@ -123,7 +123,7 @@
           column-key="capacityNo"
           label="车牌号"
           align="center"
-          width="250px"
+          width="200px"
         >
           <template slot-scope="scope">
             <el-autocomplete
@@ -146,14 +146,14 @@
           prop="toTheStation"
           label="到站"
           align="center"
-          width="150px"
+          width="100px"
         >
         </el-table-column>
         <el-table-column
           prop="materialName"
           label="物资名称"
           align="center"
-          width="150px"
+          width="100px"
         >
         </el-table-column>
         <el-table-column prop="materialSpe" label="物资规格" align="center">
@@ -162,7 +162,7 @@
           prop="materialNum"
           label="物资件数"
           align="center"
-          width="150px"
+          width="100px"
         >
           <!-- <template slot-scope="scope">
             <button
@@ -277,58 +277,6 @@
           align="center"
         >
         </el-table-column>
-        <!-- <el-table-column
-          label="操作"
-          fixed="right"
-          width="120px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="closeEasEntryId(scope.row)"
-              v-if="scope.row.deletedStatus == null"
-              >关闭分录</el-button
-            >
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-          fixed="right"
-          width="120px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="deleteEasEntryId(scope.row)"
-              v-if="
-                scope.row.carStatus == 4 ||
-                scope.row.carStatus == 5 ||
-                scope.row.carStatus == null
-              "
-              >关闭车辆</el-button
-            >
-          </template>
-        </el-table-column> -->
-        <!-- <el-table-column
-          label="操作"
-          fixed="right"
-          width="120px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="adverseCloseSaleMaterial(scope.row)"
-              v-if="scope.row.deletedStatus != null"
-              >反关闭分录</el-button
-            >
-          </template>
-        </el-table-column> -->
       </el-table>
     </div>
     <!-- 多拼弹出层-->