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

build/utils.js

@@ -16,7 +16,8 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
-let devModules = ['all'];
+// let devModules = ["index", "appoint", "statisticalReport"];
+let devModules = ["all"];
 
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.js

@@ -26,16 +26,15 @@ export default {
       // 保存表格单选的数据 保存数据的id
       dataRadioId: "",
       // 合并数组
-      spanArr:[],
-
+      spanArr: []
     };
   },
   created() {
-    if(this.isHeigth){
-      window.addEventListener('resize',this.getHeight)
+    if (this.isHeigth) {
+      window.addEventListener("resize", this.getHeight);
       this.getHeight();
     }
-    
+
     this.dataCurrentPage = this.currentPage;
     this.dataPageSize = this.pageSize;
     this.requestData();
@@ -61,21 +60,17 @@ export default {
           if (data[i][this.comparison] === data[i - 1][this.comparison]) {
             this.spanArr[this.pos] += 1;
             this.spanArr.push(0);
-            data[i].group = data[i-1].group;
-
+            data[i].group = data[i - 1].group;
           } else {
             this.spanArr.push(1);
             this.pos = i;
-            data[i].group = data[i-1].group + 1
+            data[i].group = data[i - 1].group + 1;
           }
         }
       }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-    
-      if (
-        this.columnIndexs.indexOf(columnIndex)!=-1
-      ) {
+      if (this.columnIndexs.indexOf(columnIndex) != -1) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {
@@ -84,41 +79,41 @@ export default {
         };
       }
     },
-    getHeight(){
+    getHeight() {
       this.height = window.innerHeight - this.shiyHeigth;
     },
     //计算合计列
-    getSummaries(columns,data) {
+    getSummaries(columns, data) {
       const sums = [];
       columns.forEach((column, index) => {
-       const values = data.map(item => Number(item[column.property]));
-           if (column.property =='resultNetWeight' ) {
-            sums[index] = values.reduce((prev, curr) => {
-             const value = Number(curr);
-             if (!isNaN(value)) {
-               return prev + curr;
-             } else {
-               return prev;
-             }
-            }, 0);
-      
-            sums[index];
-           }
+        const values = data.map(item => Number(item[column.property]));
+        if (column.property == "resultNetWeight") {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+
+          sums[index];
+        }
       });
       // console.log("净重：" + sums)
-      return sums
-      },
+      return sums;
+    },
     // 通过请求获取数据
     requestData(options) {
       console.log(options);
       let pageNum = undefined;
       let pageSize = undefined;
-      
+
       if (options) {
         pageNum = options.pageNum;
         pageSize = options.pageSize;
       }
-      
+
       if (this.requestUrl) {
         // 处理请求地址逻辑
         let url;
@@ -128,41 +123,44 @@ export default {
           url = this.requestUrl;
         }
         // 判断是否需要在请求体中放入参数
-        if(this.requestQuery){
-          this.dataRequestQuery=this.requestQuery;
+        if (this.requestQuery) {
+          this.dataRequestQuery = this.requestQuery;
           // console.log(this.dataRequestQuery.resultBreakId)
         }
         let data = undefined;
         for (const key in this.dataRequestQuery) {
           const val = this.dataRequestQuery[key];
-          if (val||val==0) {
+          if (val || val == 0) {
             if (!data) data = {};
             data[key] = val;
           }
         }
         //判断是否是带分页查询
-        if(this.isKuang){
+        if (this.isKuang) {
           // 发送请求
           this.axios
-          .post(url, data, {
-            // 请求地址 中
-            params: {
-              pageNum: 1,
-              pageSize: pageSize || this.dataPageSize
-            }
-          })
-          .then(response => {
-            let d = response.data.data;
-            this.dataTabel = d.list;
-            this.getSpanArr(this.dataTabel);
-            this.dataTotal = d.total;
-            
-            //执行成功的回调
-            this.$emit('func',response.data.data);
-            this.refreshColumnData(d.columnData);
-            this.isShow = true;
-          });
-        }else{
+            .post(url, data, {
+              // 请求地址 中
+              params: {
+                pageNum: 1,
+                pageSize: pageSize || this.dataPageSize
+              }
+            })
+            .then(response => {
+              let d = response.data.data;
+              this.dataTabel = d.list;
+              this.getSpanArr(this.dataTabel);
+              this.dataTotal = d.total;
+
+              //执行成功的回调
+              this.$emit("func", response.data.data);
+              this.refreshColumnData(d.columnData);
+              this.isShow = true;
+            })
+            .catch(() => {
+              console.log();
+            });
+        } else {
           // 发送请求
           this.axios
             .post(url, data, {
@@ -178,7 +176,7 @@ export default {
               this.dataTotal = d.total;
               this.getSpanArr(this.dataTabel);
               //执行成功的回调
-              this.$emit('func',response.data.data);
+              this.$emit("func", response.data.data);
               this.refreshColumnData(d.columnData);
               this.isShow = true;
             });
@@ -191,11 +189,11 @@ export default {
     refreshColumnData(columnData) {
       // 表头只赋值一次(在查出全部数据的情况下才只赋值一次)
 
-      if (this.dataColumnData.length > 0){
-          return;
-      } 
+      if (this.dataColumnData.length > 0) {
+        return;
+      }
       // 如果前端有写表头，则加在后端表头前面
-      
+
       const d = this.columnData.concat(columnData);
       // 把操作列拼接到最后一列
       this.dataColumnData = d;
@@ -332,7 +330,7 @@ export default {
   computed: {
     // 计算是否使用排序功能
     dataSortable() {
-      return function (item) {
+      return function(item) {
         if (item.template) {
           return false;
         } else if (item.sortable) {
@@ -344,7 +342,7 @@ export default {
     },
     // 计算每列的最小宽度
     dataColumnMinWidth() {
-      return function (item) {
+      return function(item) {
         let mw = 0;
         if (this.dataSortable(item)) {
           // 如果使用排序功能
@@ -382,7 +380,7 @@ export default {
         }
         this.setDataRequestQuery(q);
       }
-    },
+    }
   },
   // 注册组件
   components: {

src/views/WMS/components/billingOrder/updateBill.vue

@@ -1,4 +1,4 @@
-// 采购内转需求
+//
 <template>
   <div class="admin">
     <template>
@@ -88,7 +88,7 @@
 </template>
 <script>
 import { isNumber } from "@/utils/sharedJsFile";
-var i = 0
+var i = 0;
 export default {
   data() {
     return {
@@ -107,7 +107,7 @@ export default {
       consigneeCompanyName: null,
       receiveAddressName: null,
       shipperName: null,
-      materialList1:[]
+      materialList1: []
     };
   },
   methods: {
@@ -196,12 +196,12 @@ export default {
         );
       };
     },
-    
+
     materialCompareTo(e) {
-      this.materialList1.forEach((e2) => {
-          console.log(e2.materialId)
+      this.materialList1.forEach(e2 => {
+        console.log(e2.materialId);
         if (e.materialId == e2.materialId) {
-            return e.materialNum
+          return e.materialNum;
         }
       });
     },
@@ -211,25 +211,28 @@ export default {
       this.materialList.forEach(e => {
         if (!isNumber(e.materialNum) || e.materialNum == 0) {
           this.$message.error("件数不符合要求");
-          i++
+          i++;
         }
       });
-      if(i!=0){
-          return
-      }
-      //判断不能超过最大值
-      this.materialList.forEach((e) =>{
-         for(let j=0;j<this.materialList1.length;j++){
-             if((this.materialList1[j].materialId == e.materialId) && (this.materialList1[j].materialNum == e.materialNum)){
-                 this.$message.error("修改数量不得大于计划数量")
-                 i++
-             }
-         }
-      })
-      console.log(i)
-      if(i!=0){
-          return
+      if (i != 0) {
+        return;
       }
+      // //判断不能超过最大值
+      // this.materialList.forEach(e => {
+      //   for (let j = 0; j < this.materialList1.length; j++) {
+      //     if (
+      //       this.materialList1[j].materialId == e.materialId &&
+      //       this.materialList1[j].materialNum == e.materialNum
+      //     ) {
+      //       this.$message.error("修改数量不得大于计划数量");
+      //       i++;
+      //     }
+      //   }
+      // });
+      // console.log(i);
+      // if (i != 0) {
+      //   return;
+      // }
       let updateNumMap = {
         orderId: this.orderId,
         mapList: this.materialList

src/views/WMS/router/index.js

@@ -1,217 +1,670 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-import routerBefore from '@/config/routerBefore.js'
+import routerBefore from "@/config/routerBefore.js";
 // 主要
-import main from '@/components/main.vue'
+import main from "@/components/main.vue";
 // 系统配置管理
-import editBill from '../components/billingOrder/updateBill.vue'
-import intrainst_real from '../components/intrainst/intrainst_real.vue'
-import offsite_check from '../components/offsite/offsite_check.vue'
-import offsite_close from '../components/offsite/offsite_close.vue'
-import offsite_inbound from '../components/offsite/offsite_inbound.vue'
-import offsite_outbound from '../components/offsite/offsite_outbound.vue'
-import offsite_sendreceive from '../components/offsite/offsite_sendreceive.vue'
-import loadPortStock from '../components/port_deposit/loadPortStock.vue'
-import port_deposit_inbound_add from '../components/port_deposit/port_deposit_inbound_add.vue'
-import port_deposit_inbound_edit from '../components/port_deposit/port_deposit_inbound_edit.vue'
-import port_deposit_inbound from '../components/port_deposit/port_deposit_inbound.vue'
-import port_deposit_outbound from '../components/port_deposit/port_deposit_outbound.vue'
-import unloadPortStock from '../components/port_deposit/unloadPortStock.vue'
-import addTransfer from '../components/steel/addTransfer.vue'
-import billOfLading from '../components/steel/billOfLading.vue'
-import billOfLadingAdd from '../components/steel/billOfLadingAdd.vue'
-import editSteel_restack from '../components/steel/editSteel_restack.vue'
-import inboundDetails from '../components/steel/inboundDetails.vue'
-import insertCheckInventory from '../components/steel/insertCheckInventory.vue'
-import insertTransfer from '../components/steel/insertTransfer.vue'
-import steel_check from '../components/steel/steel_check.vue'
-import steel_close from '../components/steel/steel_close.vue'
-import steel_inbound from '../components/steel/steel_inbound.vue'
-import steel_inboundReal from '../components/steel/steel_inboundReal.vue'
-import steel_reserved from '../components/steel/steel_reserved.vue'
-import steel_outbound from '../components/steel/steel_outbound.vue'
-import steel_real from '../components/steel/steel_real.vue'
-import steel_realDown from '../components/steel/steel_realDown.vue'
-import steel_rebound from '../components/steel/steel_rebound.vue'
-import steel_restack from '../components/steel/steel_restack.vue'
-import steel_restackAdd from '../components/steel/steel_restackAdd.vue'
-import steel_sendreceive from '../components/steel/steel_sendreceive.vue'
-import steel_transfer from '../components/steel/steel_transfer.vue'
-import steel_checkWarehouse from '../components/steel/checkWarehouse.vue'
-import steel_addCheckWarehouse from '../components/steel/addCheckWarehouse.vue'
-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 editBill from "../components/billingOrder/updateBill.vue";
+import intrainst_real from "../components/intrainst/intrainst_real.vue";
+import offsite_check from "../components/offsite/offsite_check.vue";
+import offsite_close from "../components/offsite/offsite_close.vue";
+import offsite_inbound from "../components/offsite/offsite_inbound.vue";
+import offsite_outbound from "../components/offsite/offsite_outbound.vue";
+import offsite_sendreceive from "../components/offsite/offsite_sendreceive.vue";
+import loadPortStock from "../components/port_deposit/loadPortStock.vue";
+import port_deposit_inbound_add from "../components/port_deposit/port_deposit_inbound_add.vue";
+import port_deposit_inbound_edit from "../components/port_deposit/port_deposit_inbound_edit.vue";
+import port_deposit_inbound from "../components/port_deposit/port_deposit_inbound.vue";
+import port_deposit_outbound from "../components/port_deposit/port_deposit_outbound.vue";
+import unloadPortStock from "../components/port_deposit/unloadPortStock.vue";
+import addTransfer from "../components/steel/addTransfer.vue";
+import billOfLading from "../components/steel/billOfLading.vue";
+import billOfLadingAdd from "../components/steel/billOfLadingAdd.vue";
+import editSteel_restack from "../components/steel/editSteel_restack.vue";
+import inboundDetails from "../components/steel/inboundDetails.vue";
+import insertCheckInventory from "../components/steel/insertCheckInventory.vue";
+import insertTransfer from "../components/steel/insertTransfer.vue";
+import steel_check from "../components/steel/steel_check.vue";
+import steel_close from "../components/steel/steel_close.vue";
+import steel_inbound from "../components/steel/steel_inbound.vue";
+import steel_inboundReal from "../components/steel/steel_inboundReal.vue";
+import steel_reserved from "../components/steel/steel_reserved.vue";
+import steel_outbound from "../components/steel/steel_outbound.vue";
+import steel_real from "../components/steel/steel_real.vue";
+import steel_realDown from "../components/steel/steel_realDown.vue";
+import steel_rebound from "../components/steel/steel_rebound.vue";
+import steel_restack from "../components/steel/steel_restack.vue";
+import steel_restackAdd from "../components/steel/steel_restackAdd.vue";
+import steel_sendreceive from "../components/steel/steel_sendreceive.vue";
+import steel_transfer from "../components/steel/steel_transfer.vue";
+import steel_checkWarehouse from "../components/steel/checkWarehouse.vue";
+import steel_addCheckWarehouse from "../components/steel/addCheckWarehouse.vue";
+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 bar1_addTransfer from '../components/steel/bar1_steel/bar1_addTransfer.vue'
-import bar1_billOfLading from '../components/steel/bar1_steel/bar1_billOfLading.vue'
-import bar1_billOfLadingAdd from '../components/steel/bar1_steel/bar1_billOfLadingAdd.vue'
-import bar1_editSteel_restack from '../components/steel/bar1_steel/bar1_editSteel_restack.vue'
-import bar1_inboundDetails from '../components/steel/bar1_steel/bar1_inboundDetails.vue'
-import bar1_insertCheckInventory from '../components/steel/bar1_steel/bar1_insertCheckInventory.vue'
-import bar1_insertTransfer from '../components/steel/bar1_steel/bar1_insertTransfer.vue'
-import bar1_steel_check from '../components/steel/bar1_steel/bar1_steel_check.vue'
-import bar1_steel_close from '../components/steel/bar1_steel/bar1_steel_close.vue'
-import bar1_steel_inbound from '../components/steel/bar1_steel/bar1_steel_inbound.vue'
-import bar1_steel_inboundReal from '../components/steel/bar1_steel/bar1_steel_inboundReal.vue'
-import bar1_steel_reserved from '../components/steel/bar1_steel/bar1_steel_reserved.vue'
-import bar1_steel_outbound from '../components/steel/bar1_steel/bar1_steel_outbound.vue'
-import bar1_steel_real from '../components/steel/bar1_steel/bar1_steel_real.vue'
-import bar1_steel_realDown from '../components/steel/bar1_steel/bar1_steel_realDown.vue'
-import bar1_steel_rebound from '../components/steel/bar1_steel/bar1_steel_rebound.vue'
-import bar1_steel_restack from '../components/steel/bar1_steel/bar1_steel_restack.vue'
-import bar1_steel_restackAdd from '../components/steel/bar1_steel/bar1_steel_restackAdd.vue'
-import bar1_steel_sendreceive from '../components/steel/bar1_steel/bar1_steel_sendreceive.vue'
-import bar1_steel_transfer from '../components/steel/bar1_steel/bar1_steel_transfer.vue'
-import bar1_steel_checkWarehouse from '../components/steel/bar1_steel/bar1_checkWarehouse.vue'
-import bar1_steel_addCheckWarehouse from '../components/steel/bar1_steel/bar1_addCheckWarehouse.vue'
-import bar1_addSteelInbound from '../components/steel/bar1_steel/bar1_addSteelInbound.vue'
-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 bar1_addTransfer from "../components/steel/bar1_steel/bar1_addTransfer.vue";
+import bar1_billOfLading from "../components/steel/bar1_steel/bar1_billOfLading.vue";
+import bar1_billOfLadingAdd from "../components/steel/bar1_steel/bar1_billOfLadingAdd.vue";
+import bar1_editSteel_restack from "../components/steel/bar1_steel/bar1_editSteel_restack.vue";
+import bar1_inboundDetails from "../components/steel/bar1_steel/bar1_inboundDetails.vue";
+import bar1_insertCheckInventory from "../components/steel/bar1_steel/bar1_insertCheckInventory.vue";
+import bar1_insertTransfer from "../components/steel/bar1_steel/bar1_insertTransfer.vue";
+import bar1_steel_check from "../components/steel/bar1_steel/bar1_steel_check.vue";
+import bar1_steel_close from "../components/steel/bar1_steel/bar1_steel_close.vue";
+import bar1_steel_inbound from "../components/steel/bar1_steel/bar1_steel_inbound.vue";
+import bar1_steel_inboundReal from "../components/steel/bar1_steel/bar1_steel_inboundReal.vue";
+import bar1_steel_reserved from "../components/steel/bar1_steel/bar1_steel_reserved.vue";
+import bar1_steel_outbound from "../components/steel/bar1_steel/bar1_steel_outbound.vue";
+import bar1_steel_real from "../components/steel/bar1_steel/bar1_steel_real.vue";
+import bar1_steel_realDown from "../components/steel/bar1_steel/bar1_steel_realDown.vue";
+import bar1_steel_rebound from "../components/steel/bar1_steel/bar1_steel_rebound.vue";
+import bar1_steel_restack from "../components/steel/bar1_steel/bar1_steel_restack.vue";
+import bar1_steel_restackAdd from "../components/steel/bar1_steel/bar1_steel_restackAdd.vue";
+import bar1_steel_sendreceive from "../components/steel/bar1_steel/bar1_steel_sendreceive.vue";
+import bar1_steel_transfer from "../components/steel/bar1_steel/bar1_steel_transfer.vue";
+import bar1_steel_checkWarehouse from "../components/steel/bar1_steel/bar1_checkWarehouse.vue";
+import bar1_steel_addCheckWarehouse from "../components/steel/bar1_steel/bar1_addCheckWarehouse.vue";
+import bar1_addSteelInbound from "../components/steel/bar1_steel/bar1_addSteelInbound.vue";
+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 bar2_addTransfer from '../components/steel/bar2_steel/bar2_addTransfer.vue'
-import bar2_billOfLading from '../components/steel/bar2_steel/bar2_billOfLading.vue'
-import bar2_billOfLadingAdd from '../components/steel/bar2_steel/bar2_billOfLadingAdd.vue'
-import bar2_editSteel_restack from '../components/steel/bar2_steel/bar2_editSteel_restack.vue'
-import bar2_inboundDetails from '../components/steel/bar2_steel/bar2_inboundDetails.vue'
-import bar2_insertCheckInventory from '../components/steel/bar2_steel/bar2_insertCheckInventory.vue'
-import bar2_insertTransfer from '../components/steel/bar2_steel/bar2_insertTransfer.vue'
-import bar2_steel_check from '../components/steel/bar2_steel/bar2_steel_check.vue'
-import bar2_steel_close from '../components/steel/bar2_steel/bar2_steel_close.vue'
-import bar2_steel_inbound from '../components/steel/bar2_steel/bar2_steel_inbound.vue'
-import bar2_steel_inboundReal from '../components/steel/bar2_steel/bar2_steel_inboundReal.vue'
-import bar2_steel_reserved from '../components/steel/bar2_steel/bar2_steel_reserved.vue'
-import bar2_steel_outbound from '../components/steel/bar2_steel/bar2_steel_outbound.vue'
-import bar2_steel_real from '../components/steel/bar2_steel/bar2_steel_real.vue'
-import bar2_steel_realDown from '../components/steel/bar2_steel/bar2_steel_realDown.vue'
-import bar2_steel_rebound from '../components/steel/bar2_steel/bar2_steel_rebound.vue'
-import bar2_steel_restack from '../components/steel/bar2_steel/bar2_steel_restack.vue'
-import bar2_steel_restackAdd from '../components/steel/bar2_steel/bar2_steel_restackAdd.vue'
-import bar2_steel_sendreceive from '../components/steel/bar2_steel/bar2_steel_sendreceive.vue'
-import bar2_steel_transfer from '../components/steel/bar2_steel/bar2_steel_transfer.vue'
-import bar2_steel_checkWarehouse from '../components/steel/bar2_steel/bar2_checkWarehouse.vue'
-import bar2_steel_addCheckWarehouse from '../components/steel/bar2_steel/bar2_addCheckWarehouse.vue'
-import bar2_addSteelInbound from '../components/steel/bar2_steel/bar2_addSteelInbound.vue'
-import bar2_addSteelReserved from '../components/steel/bar2_steel/bar2_addSteelReserved.vue'
-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'
-Vue.use(Router)
+import bar2_addTransfer from "../components/steel/bar2_steel/bar2_addTransfer.vue";
+import bar2_billOfLading from "../components/steel/bar2_steel/bar2_billOfLading.vue";
+import bar2_billOfLadingAdd from "../components/steel/bar2_steel/bar2_billOfLadingAdd.vue";
+import bar2_editSteel_restack from "../components/steel/bar2_steel/bar2_editSteel_restack.vue";
+import bar2_inboundDetails from "../components/steel/bar2_steel/bar2_inboundDetails.vue";
+import bar2_insertCheckInventory from "../components/steel/bar2_steel/bar2_insertCheckInventory.vue";
+import bar2_insertTransfer from "../components/steel/bar2_steel/bar2_insertTransfer.vue";
+import bar2_steel_check from "../components/steel/bar2_steel/bar2_steel_check.vue";
+import bar2_steel_close from "../components/steel/bar2_steel/bar2_steel_close.vue";
+import bar2_steel_inbound from "../components/steel/bar2_steel/bar2_steel_inbound.vue";
+import bar2_steel_inboundReal from "../components/steel/bar2_steel/bar2_steel_inboundReal.vue";
+import bar2_steel_reserved from "../components/steel/bar2_steel/bar2_steel_reserved.vue";
+import bar2_steel_outbound from "../components/steel/bar2_steel/bar2_steel_outbound.vue";
+import bar2_steel_real from "../components/steel/bar2_steel/bar2_steel_real.vue";
+import bar2_steel_realDown from "../components/steel/bar2_steel/bar2_steel_realDown.vue";
+import bar2_steel_rebound from "../components/steel/bar2_steel/bar2_steel_rebound.vue";
+import bar2_steel_restack from "../components/steel/bar2_steel/bar2_steel_restack.vue";
+import bar2_steel_restackAdd from "../components/steel/bar2_steel/bar2_steel_restackAdd.vue";
+import bar2_steel_sendreceive from "../components/steel/bar2_steel/bar2_steel_sendreceive.vue";
+import bar2_steel_transfer from "../components/steel/bar2_steel/bar2_steel_transfer.vue";
+import bar2_steel_checkWarehouse from "../components/steel/bar2_steel/bar2_checkWarehouse.vue";
+import bar2_steel_addCheckWarehouse from "../components/steel/bar2_steel/bar2_addCheckWarehouse.vue";
+import bar2_addSteelInbound from "../components/steel/bar2_steel/bar2_addSteelInbound.vue";
+import bar2_addSteelReserved from "../components/steel/bar2_steel/bar2_addSteelReserved.vue";
+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";
+Vue.use(Router);
 const constantRouterMap = [
-	{
-	  path: '/',
-	  name: 'main',
-	  meta: {title: '首页', code: 'xtpzgl'},
-	  component: main,
-	  redirect: {name: 'intrainst_real'},
-	  children: [
-		{path: 'intrainst_real', name: 'intrainst_real', meta: {code: 'xtpzgl-jggl'}, component: intrainst_real},
-		{path: 'offsite_check', name: 'offsite_check', meta: {code: 'xtpzgl-yhgl'}, component: offsite_check},
-		{path: 'offsite_close', name: 'offsite_close', meta: {code: 'xtpzgl-yhgl'}, component: offsite_close},
-		{path: 'offsite_inbound', name: 'offsite_inbound', meta: {code: 'xtpzgl-yhgl'}, component: offsite_inbound},
-		{path: 'offsite_outbound', name: 'offsite_outbound', meta: {code: 'xtpzgl-yhgl'}, component: offsite_outbound},
-		{path: 'offsite_sendreceive', name: 'offsite_sendreceive', meta: {code: 'xtpzgl-yhgl'}, component: offsite_sendreceive},
-		{path: 'loadPortStock', name: 'loadPortStock', meta: {code: 'xtpzgl-yhgl'}, component: loadPortStock},
-		{path: 'port_deposit_inbound_add', name: 'port_deposit_inbound_add', meta: {code: 'xtpzgl-yhgl'}, component: port_deposit_inbound_add},
-		{path: 'port_deposit_inbound_edit/:resultId', name: 'port_deposit_inbound_edit', meta: {code: 'xtpzgl-yhgl'}, component: port_deposit_inbound_edit},
-		{path: 'port_deposit_inbound', name: 'port_deposit_inbound', meta: {code: 'xtpzgl-yhgl'}, component: port_deposit_inbound},
-		{path: 'port_deposit_outbound', name: 'port_deposit_outbound', meta: {code: 'xtpzgl-yhgl'}, component: port_deposit_outbound},
-		{path: 'unloadPortStock', name: 'unloadPortStock', meta: {code: 'xtpzgl-yhgl'}, component: unloadPortStock},
-		{path: 'addTransfer', name: 'addTransfer', meta: {code: 'xtpzgl-yhgl'}, component: addTransfer},
-		{path: 'billOfLading', name: 'billOfLading', meta: {code: 'xtpzgl-yhgl'}, component: billOfLading},
-		{path: 'billOfLadingAdd/:orderId', name: 'billOfLadingAdd', meta: {code: 'xtpzgl-yhgl'}, component: billOfLadingAdd},
-		{path: 'editSteel_restack/:resultId', name: 'editSteel_restack', meta: {code: 'xtpzgl-yhgl'}, component: editSteel_restack},
-		{path: 'inboundDetails/:inboundId', name: 'inboundDetails', meta: {code: 'xtpzgl-yhgl'}, component: inboundDetails},
-		{path: 'insertCheckInventory', name: 'insertCheckInventory', meta: {code: 'xtpzgl-yhgl'}, component: insertCheckInventory},
-		{path: 'insertTransfer', name: 'insertTransfer', meta: {code: 'xtpzgl-yhgl'}, component: insertTransfer},
-		{path: 'steel_check', name: 'steel_check', meta: {code: 'xtpzgl-yhgl'}, component: steel_check},
-		{path: 'steel_close', name: 'steel_close', meta: {code: 'xtpzgl-yhgl'}, component: steel_close},
-		{path: 'steel_inbound', name: 'steel_inbound', meta: {code: 'xtpzgl-yhgl'}, component: steel_inbound},
-		{path: 'steel_inboundReal', name: 'steel_inboundReal', meta: {code: 'xtpzgl-yhgl'}, component: steel_inboundReal},
-		{path: 'steel_reserved', name: 'steel_reserved', meta: {code: 'xtpzgl-yhgl'}, component: steel_reserved},
-		{path: 'steel_outbound', name: 'steel_outbound', meta: {code: 'xtpzgl-yhgl'}, component: steel_outbound},
-		{path: 'steel_real', name: 'steel_real', meta: {code: 'xtpzgl-yhgl'}, component: steel_real},
-		{path: 'steel_realDown/gridId', name: 'steel_realDown', meta: {code: 'xtpzgl-yhgl'}, component: steel_realDown},
-		{path: 'steel_rebound', name: 'steel_rebound', meta: {code: 'xtpzgl-yhgl'}, component: steel_rebound},
-		{path: 'steel_restack', name: 'steel_restack', meta: {code: 'xtpzgl-yhgl'}, component: steel_restack},
-		{path: 'steel_restackAdd', name: 'steel_restackAdd', meta: {code: 'xtpzgl-yhgl'}, component: steel_restackAdd},
-		{path: 'steel_sendreceive', name: 'steel_sendreceive', meta: {code: 'xtpzgl-yhgl'}, component: steel_sendreceive},
-		{path: 'steel_transfer', name: 'steel_transfer', meta: {code: 'xtpzgl-yhgl'}, component: steel_transfer},
-		{path: 'steel_checkWarehouse', name: 'steel_checkWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: steel_checkWarehouse},
-		{path: 'steel_addCheckWarehouse', name: 'steel_addCheckWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: steel_addCheckWarehouse},
-		{path: 'addSteelInbound', name: 'addSteelInbound', meta: {code: 'xtpzgl-yhgl'}, component: addSteelInbound},
-		{path: 'addSteelReserved', name: 'addSteelReserved', meta: {code: 'xtpzgl-yhgl'}, component: addSteelReserved},
-		{path: 'steel_inboundStatistics', name: 'steel_inboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: steel_inboundStatistics},
-		{path: 'steel_outboundStatistics',name: 'steel_outboundStatistics',meta: {code: 'xtpzgl-yhgl'},component: steel_outboundStatistics},
-		{path: 'bar1_addTransfer', name: 'bar1_addTransfer', meta: {code: 'xtpzgl-yhgl'}, component: bar1_addTransfer},
-		{path: 'bar1_billOfLading', name: 'bar1_billOfLading', meta: {code: 'xtpzgl-yhgl'}, component: bar1_billOfLading},
-		{path: 'bar1_billOfLadingAdd/:orderId', name: 'bar1_billOfLadingAdd', meta: {code: 'xtpzgl-yhgl'}, component: bar1_billOfLadingAdd},
-		{path: 'bar1_editSteel_restack/:resultId', name: 'bar1_editSteel_restack', meta: {code: 'xtpzgl-yhgl'}, component: bar1_editSteel_restack},
-		{path: 'bar1_inboundDetails/:inboundId', name: 'bar1_inboundDetails', meta: {code: 'xtpzgl-yhgl'}, component: bar1_inboundDetails},
-		{path: 'bar1_insertCheckInventory', name: 'bar1_insertCheckInventory', meta: {code: 'xtpzgl-yhgl'}, component: bar1_insertCheckInventory},
-		{path: 'bar1_insertTransfer', name: 'bar1_insertTransfer', meta: {code: 'xtpzgl-yhgl'}, component: bar1_insertTransfer},
-		{path: 'bar1_steel_check', name: 'bar1_steel_check', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_check},
-		{path: 'bar1_steel_close', name: 'bar1_steel_close', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_close},
-		{path: 'bar1_steel_inbound', name: 'bar1_steel_inbound', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_inbound},
-		{path: 'bar1_steel_inboundReal', name: 'bar1_steel_inboundReal', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_inboundReal},
-		{path: 'bar1_steel_reserved', name: 'bar1_steel_reserved', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_reserved},
-		{path: 'bar1_steel_outbound', name: 'bar1_steel_outbound', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_outbound},
-		{path: 'bar1_steel_real', name: 'bar1_steel_real', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_real},
-		{path: 'bar1_steel_realDown/gridId', name: 'bar1_steel_realDown', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_realDown},
-		{path: 'bar1_steel_rebound', name: 'bar1_steel_rebound', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_rebound},
-		{path: 'bar1_steel_restack', name: 'bar1_steel_restack', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_restack},
-		{path: 'bar1_steel_restackAdd', name: 'bar1_steel_restackAdd', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_restackAdd},
-		{path: 'bar1_steel_sendreceive', name: 'bar1_steel_sendreceive', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_sendreceive},
-		{path: 'bar1_steel_transfer', name: 'bar1_steel_transfer', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_transfer},
-		{path: 'bar1_steel_checkWarehouse', name: 'bar1_steel_checkWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_checkWarehouse},
-		{path: 'bar1_steel_addCheckWarehouse', name: 'bar1_steel_addCheckWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_addCheckWarehouse},
-		{path: 'bar1_addSteelInbound', name: 'bar1_addSteelInbound', meta: {code: 'xtpzgl-yhgl'}, component: bar1_addSteelInbound},
-		{path: 'bar1_addSteelReserved', name: 'bar1_addSteelReserved', meta: {code: 'xtpzgl-yhgl'}, component: bar1_addSteelReserved},
-		{path: 'bar1_steel_inboundStatistics', name: 'bar1_steel_inboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_inboundStatistics},
-		{path: 'bar1_steel_outboundStatistics', name: 'bar1_steel_outboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_outboundStatistics},
-		{path: 'bar2_addTransfer', name: 'bar2_addTransfer', meta: {code: 'xtpzgl-yhgl'}, component: bar2_addTransfer},
-		{path: 'bar2_billOfLading', name: 'bar2_billOfLading', meta: {code: 'xtpzgl-yhgl'}, component: bar2_billOfLading},
-		{path: 'bar2_billOfLadingAdd/:orderId', name: 'bar2_billOfLadingAdd', meta: {code: 'xtpzgl-yhgl'}, component: bar2_billOfLadingAdd},
-		{path: 'bar2_editSteel_restack/:resultId', name: 'bar2_editSteel_restack', meta: {code: 'xtpzgl-yhgl'}, component: bar2_editSteel_restack},
-		{path: 'bar2_inboundDetails/:inboundId', name: 'bar2_inboundDetails', meta: {code: 'xtpzgl-yhgl'}, component: bar2_inboundDetails},
-		{path: 'bar2_insertCheckInventory', name: 'bar2_insertCheckInventory', meta: {code: 'xtpzgl-yhgl'}, component: bar2_insertCheckInventory},
-		{path: 'bar2_insertTransfer', name: 'bar2_insertTransfer', meta: {code: 'xtpzgl-yhgl'}, component: bar2_insertTransfer},
-		{path: 'bar2_steel_check', name: 'bar2_steel_check', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_check},
-		{path: 'bar2_steel_close', name: 'bar2_steel_close', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_close},
-		{path: 'bar2_steel_inbound', name: 'bar2_steel_inbound', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_inbound},
-		{path: 'bar2_steel_inboundReal', name: 'bar2_steel_inboundReal', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_inboundReal},
-		{path: 'bar2_steel_reserved', name: 'bar2_steel_reserved', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_reserved},
-		{path: 'bar2_steel_outbound', name: 'bar2_steel_outbound', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_outbound},
-		{path: 'bar2_steel_real', name: 'bar2_steel_real', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_real},
-		{path: 'bar2_steel_realDown/gridId', name: 'bar2_steel_realDown', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_realDown},
-		{path: 'bar2_steel_rebound', name: 'bar2_steel_rebound', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_rebound},
-		{path: 'bar2_steel_restack', name: 'bar2_steel_restack', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_restack},
-		{path: 'bar2_steel_restackAdd', name: 'bar2_steel_restackAdd', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_restackAdd},
-		{path: 'bar2_steel_sendreceive', name: 'bar2_steel_sendreceive', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_sendreceive},
-		{path: 'bar2_steel_transfer', name: 'bar2_steel_transfer', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_transfer},
-		{path: 'bar2_steel_checkWarehouse', name: 'bar2_steel_checkWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_checkWarehouse},
-		{path: 'bar2_steel_addCheckWarehouse', name: 'bar2_steel_addCheckWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_addCheckWarehouse},
-		{path: 'bar2_addSteelInbound', name: 'bar2_addSteelInbound', meta: {code: 'xtpzgl-yhgl'}, component: bar2_addSteelInbound},
-		{path: 'bar2_addSteelReserved', name: 'bar2_addSteelReserved', meta: {code: 'xtpzgl-yhgl'}, component: bar2_addSteelReserved},
-		{path: 'bar2_steel_inboundStatistics', name: 'bar2_steel_inboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_inboundStatistics},
-		{path: 'bar2_steel_outboundStatistics', name: 'bar2_steel_outboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_outboundStatistics},
-		{path: 'editBill/:capacityNumber', name: 'editBill', meta: {code: 'xtpzgl-yhgl'}, component: editBill},
-	  ]
-	}
-  ];
-  
-  const router = new Router({
-	routes: constantRouterMap
-  })
-  //  before
-  routerBefore(router, constantRouterMap);
-  
-  export default router;
-  //  constantRouterMap
-  export const routes = constantRouterMap;
-  
+  {
+    path: "/",
+    name: "main",
+    meta: { title: "首页", code: "xtpzgl" },
+    component: main,
+    redirect: { name: "intrainst_real" },
+    children: [
+      {
+        path: "intrainst_real",
+        name: "intrainst_real",
+        meta: { code: "xtpzgl-jggl" },
+        component: intrainst_real
+      },
+      {
+        path: "offsite_check",
+        name: "offsite_check",
+        meta: { code: "xtpzgl-yhgl" },
+        component: offsite_check
+      },
+      {
+        path: "offsite_close",
+        name: "offsite_close",
+        meta: { code: "xtpzgl-yhgl" },
+        component: offsite_close
+      },
+      {
+        path: "offsite_inbound",
+        name: "offsite_inbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: offsite_inbound
+      },
+      {
+        path: "offsite_outbound",
+        name: "offsite_outbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: offsite_outbound
+      },
+      {
+        path: "offsite_sendreceive",
+        name: "offsite_sendreceive",
+        meta: { code: "xtpzgl-yhgl" },
+        component: offsite_sendreceive
+      },
+      {
+        path: "loadPortStock",
+        name: "loadPortStock",
+        meta: { code: "xtpzgl-yhgl" },
+        component: loadPortStock
+      },
+      {
+        path: "port_deposit_inbound_add",
+        name: "port_deposit_inbound_add",
+        meta: { code: "xtpzgl-yhgl" },
+        component: port_deposit_inbound_add
+      },
+      {
+        path: "port_deposit_inbound_edit/:resultId",
+        name: "port_deposit_inbound_edit",
+        meta: { code: "xtpzgl-yhgl" },
+        component: port_deposit_inbound_edit
+      },
+      {
+        path: "port_deposit_inbound",
+        name: "port_deposit_inbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: port_deposit_inbound
+      },
+      {
+        path: "port_deposit_outbound",
+        name: "port_deposit_outbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: port_deposit_outbound
+      },
+      {
+        path: "unloadPortStock",
+        name: "unloadPortStock",
+        meta: { code: "xtpzgl-yhgl" },
+        component: unloadPortStock
+      },
+      {
+        path: "addTransfer",
+        name: "addTransfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addTransfer
+      },
+      {
+        path: "billOfLading",
+        name: "billOfLading",
+        meta: { code: "xtpzgl-yhgl" },
+        component: billOfLading
+      },
+      {
+        path: "billOfLadingAdd/:orderId",
+        name: "billOfLadingAdd",
+        meta: { code: "xtpzgl-yhgl" },
+        component: billOfLadingAdd
+      },
+      {
+        path: "editSteel_restack/:resultId",
+        name: "editSteel_restack",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSteel_restack
+      },
+      {
+        path: "inboundDetails/:inboundId",
+        name: "inboundDetails",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inboundDetails
+      },
+      {
+        path: "insertCheckInventory",
+        name: "insertCheckInventory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: insertCheckInventory
+      },
+      {
+        path: "insertTransfer",
+        name: "insertTransfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: insertTransfer
+      },
+      {
+        path: "steel_check",
+        name: "steel_check",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_check
+      },
+      {
+        path: "steel_close",
+        name: "steel_close",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_close
+      },
+      {
+        path: "steel_inbound",
+        name: "steel_inbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_inbound
+      },
+      {
+        path: "steel_inboundReal",
+        name: "steel_inboundReal",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_inboundReal
+      },
+      {
+        path: "steel_reserved",
+        name: "steel_reserved",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_reserved
+      },
+      {
+        path: "steel_outbound",
+        name: "steel_outbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_outbound
+      },
+      {
+        path: "steel_real",
+        name: "steel_real",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_real
+      },
+      {
+        path: "steel_realDown/gridId",
+        name: "steel_realDown",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_realDown
+      },
+      {
+        path: "steel_rebound",
+        name: "steel_rebound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_rebound
+      },
+      {
+        path: "steel_restack",
+        name: "steel_restack",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_restack
+      },
+      {
+        path: "steel_restackAdd",
+        name: "steel_restackAdd",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_restackAdd
+      },
+      {
+        path: "steel_sendreceive",
+        name: "steel_sendreceive",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_sendreceive
+      },
+      {
+        path: "steel_transfer",
+        name: "steel_transfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_transfer
+      },
+      {
+        path: "steel_checkWarehouse",
+        name: "steel_checkWarehouse",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_checkWarehouse
+      },
+      {
+        path: "steel_addCheckWarehouse",
+        name: "steel_addCheckWarehouse",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_addCheckWarehouse
+      },
+      {
+        path: "addSteelInbound",
+        name: "addSteelInbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addSteelInbound
+      },
+      {
+        path: "addSteelReserved",
+        name: "addSteelReserved",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addSteelReserved
+      },
+      {
+        path: "steel_inboundStatistics",
+        name: "steel_inboundStatistics",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_inboundStatistics
+      },
+      {
+        path: "steel_outboundStatistics",
+        name: "steel_outboundStatistics",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steel_outboundStatistics
+      },
+      {
+        path: "bar1_addTransfer",
+        name: "bar1_addTransfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_addTransfer
+      },
+      {
+        path: "bar1_billOfLading",
+        name: "bar1_billOfLading",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_billOfLading
+      },
+      {
+        path: "bar1_billOfLadingAdd/:orderId",
+        name: "bar1_billOfLadingAdd",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_billOfLadingAdd
+      },
+      {
+        path: "bar1_editSteel_restack/:resultId",
+        name: "bar1_editSteel_restack",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_editSteel_restack
+      },
+      {
+        path: "bar1_inboundDetails/:inboundId",
+        name: "bar1_inboundDetails",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_inboundDetails
+      },
+      {
+        path: "bar1_insertCheckInventory",
+        name: "bar1_insertCheckInventory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_insertCheckInventory
+      },
+      {
+        path: "bar1_insertTransfer",
+        name: "bar1_insertTransfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_insertTransfer
+      },
+      {
+        path: "bar1_steel_check",
+        name: "bar1_steel_check",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_check
+      },
+      {
+        path: "bar1_steel_close",
+        name: "bar1_steel_close",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_close
+      },
+      {
+        path: "bar1_steel_inbound",
+        name: "bar1_steel_inbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_inbound
+      },
+      {
+        path: "bar1_steel_inboundReal",
+        name: "bar1_steel_inboundReal",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_inboundReal
+      },
+      {
+        path: "bar1_steel_reserved",
+        name: "bar1_steel_reserved",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_reserved
+      },
+      {
+        path: "bar1_steel_outbound",
+        name: "bar1_steel_outbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_outbound
+      },
+      {
+        path: "bar1_steel_real",
+        name: "bar1_steel_real",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_real
+      },
+      {
+        path: "bar1_steel_realDown/gridId",
+        name: "bar1_steel_realDown",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_realDown
+      },
+      {
+        path: "bar1_steel_rebound",
+        name: "bar1_steel_rebound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_rebound
+      },
+      {
+        path: "bar1_steel_restack",
+        name: "bar1_steel_restack",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_restack
+      },
+      {
+        path: "bar1_steel_restackAdd",
+        name: "bar1_steel_restackAdd",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_restackAdd
+      },
+      {
+        path: "bar1_steel_sendreceive",
+        name: "bar1_steel_sendreceive",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_sendreceive
+      },
+      {
+        path: "bar1_steel_transfer",
+        name: "bar1_steel_transfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_transfer
+      },
+      {
+        path: "bar1_steel_checkWarehouse",
+        name: "bar1_steel_checkWarehouse",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_checkWarehouse
+      },
+      {
+        path: "bar1_steel_addCheckWarehouse",
+        name: "bar1_steel_addCheckWarehouse",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_addCheckWarehouse
+      },
+      {
+        path: "bar1_addSteelInbound",
+        name: "bar1_addSteelInbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_addSteelInbound
+      },
+      {
+        path: "bar1_addSteelReserved",
+        name: "bar1_addSteelReserved",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_addSteelReserved
+      },
+      {
+        path: "bar1_steel_inboundStatistics",
+        name: "bar1_steel_inboundStatistics",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_inboundStatistics
+      },
+      {
+        path: "bar1_steel_outboundStatistics",
+        name: "bar1_steel_outboundStatistics",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar1_steel_outboundStatistics
+      },
+      {
+        path: "bar2_addTransfer",
+        name: "bar2_addTransfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_addTransfer
+      },
+      {
+        path: "bar2_billOfLading",
+        name: "bar2_billOfLading",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_billOfLading
+      },
+      {
+        path: "bar2_billOfLadingAdd/:orderId",
+        name: "bar2_billOfLadingAdd",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_billOfLadingAdd
+      },
+      {
+        path: "bar2_editSteel_restack/:resultId",
+        name: "bar2_editSteel_restack",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_editSteel_restack
+      },
+      {
+        path: "bar2_inboundDetails/:inboundId",
+        name: "bar2_inboundDetails",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_inboundDetails
+      },
+      {
+        path: "bar2_insertCheckInventory",
+        name: "bar2_insertCheckInventory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_insertCheckInventory
+      },
+      {
+        path: "bar2_insertTransfer",
+        name: "bar2_insertTransfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_insertTransfer
+      },
+      {
+        path: "bar2_steel_check",
+        name: "bar2_steel_check",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_check
+      },
+      {
+        path: "bar2_steel_close",
+        name: "bar2_steel_close",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_close
+      },
+      {
+        path: "bar2_steel_inbound",
+        name: "bar2_steel_inbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_inbound
+      },
+      {
+        path: "bar2_steel_inboundReal",
+        name: "bar2_steel_inboundReal",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_inboundReal
+      },
+      {
+        path: "bar2_steel_reserved",
+        name: "bar2_steel_reserved",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_reserved
+      },
+      {
+        path: "bar2_steel_outbound",
+        name: "bar2_steel_outbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_outbound
+      },
+      {
+        path: "bar2_steel_real",
+        name: "bar2_steel_real",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_real
+      },
+      {
+        path: "bar2_steel_realDown/gridId",
+        name: "bar2_steel_realDown",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_realDown
+      },
+      {
+        path: "bar2_steel_rebound",
+        name: "bar2_steel_rebound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_rebound
+      },
+      {
+        path: "bar2_steel_restack",
+        name: "bar2_steel_restack",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_restack
+      },
+      {
+        path: "bar2_steel_restackAdd",
+        name: "bar2_steel_restackAdd",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_restackAdd
+      },
+      {
+        path: "bar2_steel_sendreceive",
+        name: "bar2_steel_sendreceive",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_sendreceive
+      },
+      {
+        path: "bar2_steel_transfer",
+        name: "bar2_steel_transfer",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_transfer
+      },
+      {
+        path: "bar2_steel_checkWarehouse",
+        name: "bar2_steel_checkWarehouse",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_checkWarehouse
+      },
+      {
+        path: "bar2_steel_addCheckWarehouse",
+        name: "bar2_steel_addCheckWarehouse",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_addCheckWarehouse
+      },
+      {
+        path: "bar2_addSteelInbound",
+        name: "bar2_addSteelInbound",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_addSteelInbound
+      },
+      {
+        path: "bar2_addSteelReserved",
+        name: "bar2_addSteelReserved",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_addSteelReserved
+      },
+      {
+        path: "bar2_steel_inboundStatistics",
+        name: "bar2_steel_inboundStatistics",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_inboundStatistics
+      },
+      {
+        path: "bar2_steel_outboundStatistics",
+        name: "bar2_steel_outboundStatistics",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bar2_steel_outboundStatistics
+      },
+      {
+        path: "editBill",
+        name: "editBill",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editBill
+      }
+    ]
+  }
+];
+
+const router = new Router({
+  routes: constantRouterMap
+});
+//  before
+routerBefore(router, constantRouterMap);
+
+export default router;
+//  constantRouterMap
+export const routes = constantRouterMap;

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -241,6 +241,9 @@
 
     <!-- 新增物资和生成一车 -->
     <div class="button-box">
+      <el-button type="primary" class="btn" @click="singleDistribute"
+        >单拼分配到每车</el-button
+      >
       <el-button type="primary" class="btn" @click="createACar"
         >添加到订单</el-button
       >
@@ -1216,20 +1219,104 @@ export default {
       //调用记录每一行的合并数的方法
       this.getSpanArr(this.selectionList);
     },
-    //准备生成部分订单
-    createACar() {
+    singleDistribute() {
+      let ml = this.materialList.length;
+      if (ml == 0) {
+        this.$message.warning("请至少填入一车物资");
+        return;
+      }
+      let singleArr = this.materialList;
+      this.$confirm(
+        `以上${ml}车物资将分配到不同的${ml}车,确定继续分配?`,
+        "提醒",
+        {
+          cancelButtonText: "取消",
+          confirmButtonText: "确定",
+          center: true
+        }
+      ).then(() => {
+        this.creatArtSingle(singleArr);
+      });
+    },
+    async creatArtSingle(singleArr) {
       let i = 0;
-      this.materialList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
+      singleArr.forEach(e => {
+        if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
+          e.orderPlanWeight = null;
           i++;
         }
       });
       if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
+        this.$message.error("件数必填且请输入正整数");
+        return;
+      }
+      singleArr.forEach(e => {
+        if (e.materialName.includes("定尺")) {
+          if (!e.meterNumber) {
+            i++;
+          }
+        }
+      });
+      if (i != 0) {
+        this.$message.error("定尺必须填写米数");
         return;
       }
+      if (
+        !this.saleOrderConsigneeTel &&
+        this.ignoreSaleOrderConsigneeTel == 0
+      ) {
+        this.$confirm(
+          "收货客户电话未填写会导致无法接收车辆发货短信, 是否继续?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        )
+          .then(() => {
+            this.ignoreSaleOrderConsigneeTel = 1;
+            this.addMaterialToSaleOrderSingle();
+          })
+          .catch(() => {
+            this.$message.info("已取消！");
+          });
+      } else {
+        this.addMaterialToSaleOrderSingle();
+      }
+    },
+    addMaterialToSaleOrderSingle() {
+      this.materialList.forEach(e => {
+        var addmap = {
+          cxh: this.maxCxh,
+          materialName: e.materialName,
+          Specification: e.Specification,
+          materialCode: e.materialCode,
+          orderPlanWeight: e.orderPlanWeight,
+          meterNumber: e.meterNumber,
+          isPound: e.isPound,
+          saleShipperAddressId: this.saleShipperAddressId,
+          place: this.place1,
+          saleShipperAddressName: this.saleShipperAddressName,
+          saleDateOfReceipt: this.saleDateOfReceipt,
+          saleOrderConsigneeTel: this.saleOrderConsigneeTel,
+          truckRemark: this.truckRemark,
+          materialId: e.materialId,
+          haveMeter: e.haveMeter,
+          isDisable: e.isDisable
+        };
+        console.log(addmap);
+        this.selectionList.push(addmap);
+        //最大车序号加1
+        this.maxCxh += 1;
+        this.onblur();
+      });
+      this.materialList = [];
+      this.getSpanArr(this.selectionList);
+    },
+    //准备生成部分订单
+    createACar() {
+      let i = 0;
       this.materialList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;
@@ -1340,8 +1427,8 @@ export default {
             haveMeter: e.haveMeter,
             isDisable: e.isDisable
           };
+          console.log(addmap);
           this.selectionList.push(addmap);
-          console.log(this.selectionList);
         });
         //清空materialList
         this.materialList = [];
@@ -1636,17 +1723,6 @@ export default {
         return;
       }
       let i = 0;
-      this.selectionList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
-          i++;
-        }
-      });
-      if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
-        return;
-      }
       this.selectionList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;
@@ -1720,7 +1796,9 @@ export default {
           //是否磅重销售
           isPoundSale: 0,
           //备注
-          truckRemark: ""
+          truckRemark: "",
+          //物资名称
+          materialName: ""
         };
         mapItem.truckNo = item.cxh;
         mapItem.shipperAddressId = item.saleShipperAddressId;
@@ -1732,6 +1810,7 @@ export default {
         mapItem.steelMeters = item.meterNumber;
         mapItem.isPoundSale = item.isPound;
         mapItem.truckRemark = item.truckRemark;
+        mapItem.materialName = item.materialName;
         mapList.push(mapItem);
       });
       let mapValue = {

src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -1245,17 +1245,6 @@ export default {
     createACar() {
       this.onblur();
       let i = 0;
-      this.materialList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
-          i++;
-        }
-      });
-      if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
-        return;
-      }
       this.materialList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;
@@ -1388,17 +1377,6 @@ export default {
     addMaterialToCxh(toCxh) {
       this.onblur();
       let i = 0;
-      this.materialList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
-          i++;
-        }
-      });
-      if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
-        return;
-      }
       this.materialList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;
@@ -1773,17 +1751,6 @@ export default {
         return;
       }
       let i = 0;
-      this.selectionList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
-          i++;
-        }
-      });
-      if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
-        return;
-      }
       this.selectionList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -201,7 +201,7 @@ export default {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option4: {
         // 表格请求数据的地址

src/views/appoint/components/saleContract/saleOrderSteelCar.vue

@@ -2,10 +2,28 @@
   <!-- 销售订单页面 -->
   <div class="salePlan">
     <div class="top">
+      <span>制单时间:</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
@@ -69,17 +87,31 @@
         </el-tab-pane>
         <!-- 已派车 -->
         <el-tab-pane label="已派车" name="first">
-          <mergeRowTable v-bind.sync="option" ref="table3"> </mergeRowTable>
+          <mergeRowTable v-bind.sync="option" ref="table3">
+            <el-table-column fixed="right" label="操作" width="160">
+              <template slot-scope="scope">
+                <el-button
+                  @click="updateDriverTel(scope)"
+                  type="text"
+                  size="small"
+                  >修改司机电话号码</el-button
+                >
+              </template>
+            </el-table-column>
+          </mergeRowTable>
         </el-tab-pane>
       </el-tabs>
     </div>
   </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "saleOrder",
   data() {
     return {
+      endTime: null,
+      startTime: null,
       carrierText: null,
       dialogTableVisible: false,
       activeName: "four",
@@ -91,8 +123,8 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getHaveCarTruckNoList?apiId=466",
-        comparison: "saleOrderMaterialId",
-        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+        comparison: "orderId",
+        columnIndexs: [0, 1, 2, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option2: {
         // 表格请求数据的地址
@@ -123,6 +155,40 @@ export default {
     };
   },
   methods: {
+    updateDriverTel(scope) {
+      console.log(scope.row);
+      this.$prompt(
+        `请输入--${scope.row.capacityNumber}--修改后的电话号码`,
+        `${scope.row.capacityNumber}--修改前的电话号码:${scope.row.drivelTel}`,
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          inputPlaceholder: "输入正确格式的电话号码",
+          center: true
+        }
+      )
+        .then(({ value }) => {
+          this.axios
+            .post("/api/v1/uc/updateDriverTel", {
+              orderId: parseInt(scope.row.orderId),
+              driverTel: value
+            })
+            .then(res => {
+              if (res.data.code == "200") {
+                this.$message.success("修改成功");
+                this.getRequestUrl();
+              } else {
+                this.$message.error("修改失败");
+              }
+            })
+            .catch(() => {
+              this.$message.error("修改失败");
+            });
+        })
+        .catch(() => {
+          this.$message.info("取消修改");
+        });
+    },
     getRequestUrl() {
       this.option.requestUrl =
         "/api/v1/ams/getHaveCarTruckNoList?apiId=466&i=" + new Date();
@@ -167,6 +233,12 @@ export default {
       console.log(tab, event);
     },
     onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
       if (this.activeName == "four") {
         this.option4.requestUrl =
           "/api/v1/ams/getSteelTruckNoList?apiId=411&con=" + this.input;
@@ -176,7 +248,14 @@ export default {
           "/api/v1/ams/getNoCarTruckNoList?apiId=466&con=" + this.input;
       } else if (this.activeName == "first") {
         this.option.requestUrl =
-          "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" + this.input;
+          "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" +
+          this.input +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       }
     },
     seeclick(saleOrderId) {

src/views/appoint/components/saleContract/updateSaleOrderSteel.vue

@@ -563,7 +563,6 @@ export default {
   mounted() {
     console.log(this.$route);
     console.log(this.$route.params.deleted);
-
     this.getOrderList();
     this.getAllProvince();
   },
@@ -575,6 +574,9 @@ export default {
     //车辆变更
     updateCapacity(scope) {
       this.oldCapacityNum = scope.row.capacityNumber;
+      this.saleOrderMaterialId = scope.row.saleOrderMaterialId;
+      this.lineSequence = scope.row.lineSequence;
+      this.orderId = scope.row.orderId;
       this.$confirm("确定变更车辆吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -611,6 +613,7 @@ export default {
           .then(res => {
             if (res.data.code == 200) {
               this.$message.success("变更成功");
+              this.getOrderList();
               this.capacityDialog = false;
             } else {
               this.$message.success("变更失败，请联系管理员");
@@ -1164,9 +1167,9 @@ export default {
           console.log(res.data.data);
           this.tableData = [];
           this.tableData = res.data.data;
-          this.orderId = this.tableData[0].orderId;
-          this.lineSequence = this.tableData[0].lineSequence;
-          this.saleOrderMaterialId = this.tableData[0].saleOrderMaterialId;
+          // this.orderId = this.tableData[0].orderId;
+          // this.lineSequence = this.tableData[0].lineSequence;
+          // this.saleOrderMaterialId = this.tableData[0].saleOrderMaterialId;
           this.getSpanArr(this.tableData);
         });
     },

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -258,12 +258,18 @@ export default {
   watch: {
     activeName() {}
   },
+  created() {
+    this.myWebsocket();
+  },
   mounted() {
     this.infomation();
     this.getSpellingArray();
     this.getNoSpellingArray();
   },
   methods: {
+    myWebsocket() {
+      let wss = new WebSocket("wss:wl.dasteel.cn:32322/websocket/socketServer");
+    },
     refresh() {
       this.getSpellingArray();
       this.getNoSpellingArray();

src/views/sale/components/transport_order/saleSteelOrder.vue

@@ -51,13 +51,6 @@
         >
           <el-table-column fixed="right" label="操作" width="180">
             <template slot-scope="scope">
-              <el-button
-                @click="updateCapacity(scope.row)"
-                type="text"
-                size="small"
-              >
-                修改运力
-              </el-button>
               <el-button
                 @click="detailclick2(scope.row)"
                 type="text"
@@ -65,13 +58,6 @@
               >
                 物资详情
               </el-button>
-              <el-button
-                @click="closeOrder(scope.row)"
-                type="text"
-                size="small"
-              >
-                关闭订单
-              </el-button>
             </template>
           </el-table-column>
           <!-- 物资详情抽屉 -->
@@ -113,13 +99,6 @@
               >
                 物资详情
               </el-button>
-              <el-button
-                @click="updateCapacity(scope.row)"
-                type="text"
-                size="small"
-              >
-                修改运力
-              </el-button>
             </template>
           </el-table-column>
           <!-- 物资详情抽屉 -->
@@ -202,13 +181,13 @@ export default {
         // option1请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
-          "",
+          ""
       },
       option2: {
         // option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
-          "",
+          ""
       },
       option3: {
         // option3请求数据的地址
@@ -216,11 +195,11 @@ export default {
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&&carrierSsoId=" +
           "",
         selectionType: "select",
-        mapList: [],
+        mapList: []
       },
       truck: {
         requestUrl: "",
-        selectionType: "radio",
+        selectionType: "radio"
       },
       activeName: "third",
       //记录旧的row对象(已接收)
@@ -239,30 +218,30 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150,
+          width: 150
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150,
+          width: 150
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100,
+          width: 100
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100,
-        },
+          width: 100
+        }
       ],
       tableData: [],
       tableData1: [],
       tableData2: [],
       capacityId: null,
       dialogTableVisible: false,
-      orderId: null,
+      orderId: null
     };
   },
 
@@ -361,34 +340,34 @@ export default {
       if (this.option3.mapList.length == 0) {
         this.$message({
           type: "warning",
-          message: "请先选择要关闭的订单!",
+          message: "请先选择要关闭的订单!"
         });
       } else {
         this.$confirm("是否关闭这些订单", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-          center: true,
+          center: true
         })
           .then(() => {
             //初始化maplist
             var mapList = [];
-            this.option3.mapList.forEach((item) => {
+            this.option3.mapList.forEach(item => {
               //初始化mapItem
               var mapItem = {
                 //销售订单物资中间表id
-                orderId: 0,
+                orderId: 0
               };
               mapItem.orderId = item.orderId;
               mapList.push(mapItem);
             });
             this.$message({
               type: "success",
-              message: "关闭成功!",
+              message: "关闭成功!"
             });
             this.axios
               .post("/api/v1/oms/batchCloseOrder", mapList)
-              .then((res) => {
+              .then(res => {
                 if (res.data.code == "200") {
                   this.getRequestUrl();
                 }
@@ -397,7 +376,7 @@ export default {
           .catch(() => {
             this.$message({
               type: "info",
-              message: "取消关闭!",
+              message: "取消关闭!"
             });
           });
       }
@@ -449,9 +428,9 @@ export default {
       this.axios
         .post("/api/v1/oms/updateCapacityId", {
           capacityId: this.capacityId,
-          orderId: this.orderId,
+          orderId: this.orderId
         })
-        .then((res) => {
+        .then(res => {
           if (res.data.code == "200") {
             this.$message.success("修改运力成功");
             this.getRequestUrl();
@@ -537,7 +516,7 @@ export default {
       // 根据销售订单id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then((res) => {
+        .then(res => {
           console.log("res.data.data", res.data.data);
           this.tableData = res.data.data;
         });
@@ -569,7 +548,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then((res) => {
+        .then(res => {
           console.log("res.data.data", res.data.data);
           this.tableData1 = res.data.data;
         });
@@ -601,7 +580,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then((res) => {
+        .then(res => {
           this.tableData2 = res.data.data;
         });
     },
@@ -611,17 +590,17 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios
             .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
-            .then((res) => {
+            .then(res => {
               if (res.data.code == "200") {
                 this.getRequestUrl();
                 this.$message({
                   type: "success",
-                  message: "关闭成功!",
+                  message: "关闭成功!"
                 });
               }
             });
@@ -629,11 +608,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消关闭!",
+            message: "取消关闭!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scode>

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelForm.vue

@@ -3,50 +3,53 @@
   <div class="purchasFuelNewMonitor">
     <el-form :inline="true" style="margin-top :5px">
       <el-form-item>
-        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
-            <el-date-picker
-            v-model="startTime"
-            type="datetime"
-            placeholder="选择日期时间"
-          >
-          </el-date-picker>
-          <span>至</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>
+        <label class="el-form-item__label" style="width: auto;"
+          >计毛时间：</label
+        >
+        <el-date-picker
+          v-model="startTime"
+          type="datetime"
+          placeholder="选择日期时间"
+        >
+        </el-date-picker>
+        <span>至</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>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+          ><i class="el-icon-download"></i>导出(Excel)</el-button
+        >
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="refresh">
-        <i class="el-icon-refresh"></i>刷新
-      </el-button>
+          <i class="el-icon-refresh"></i>刷新
+        </el-button>
       </el-form-item>
       <el-form-item>
         <span style="margin-left: 1rem;width:68px">合计净重：</span>
-      <el-input
-        v-model="totalNumber"
-        :disabled="true"
-        style="width: 150px;"
-      ></el-input>
+        <el-input
+          v-model="totalNumber"
+          :disabled="true"
+          style="width: 150px;"
+        ></el-input>
       </el-form-item>
       <el-form-item>
         <span style="margin-left: 1rem;width:68px">合计车数：</span>
-      <el-input
-        v-model="totalCapacity"
-        :disabled="true"
-        style="width: 150px;"
-      ></el-input>
+        <el-input
+          v-model="totalCapacity"
+          :disabled="true"
+          style="width: 150px;"
+        ></el-input>
       </el-form-item>
-    </el-form> 
+    </el-form>
     <div class="table">
       <!-- <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable> -->
       <mergeRowTable ref="excelDom" v-bind.sync="option"> </mergeRowTable>
@@ -67,7 +70,7 @@ export default {
       option: {
         requestUrl: "",
         comparison: "orderNumber",
-        columnIndexs: [0, 1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
+        columnIndexs: [0, 1, 2, 3, 4, 5, 6, 13, 14, 15, 16, 19, 24, 25, 26]
       },
       startTime: null,
       endTime: null,
@@ -200,5 +203,4 @@ export default {
 };
 </script>
 
-<style lang="scss">
-</style>
+<style lang="scss"></style>