2.24结转

build/utils.js

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

config/index.js

@@ -64,8 +64,12 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
+
     target: "http://172.16.33.166:8080",
     // target: "http://localhost:8019",
+    // target: "http://localhost:8080",
+    // target: "http://192.168.1.114:8019",
+
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
@@ -75,7 +79,6 @@ let proxyTable = {
     target: "http://172.16.33.166:8080",
     // target: "http://172.16.33.166:8080",
     // target: "http://192.168.1.115:8080",
-
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

package.json

@@ -40,7 +40,7 @@
     "sass-node": "^4.11.2",
     "sass-resources-loader": "^2.2.4",
     "script-loader": "^0.7.2",
-    "socket.io": "2.2.0",
+    "socket.io": "^2.2.0",
     "socket.io-stream": "^0.9.1",
     "sockjs-client": "^1.3.0",
     "uuid": "^3.3.2",

src/components/DilCommonUI/packages/table/src/table.vue

@@ -11,6 +11,7 @@
       :cell-class-name="cellClassName"
       :height="height"
       :highlight-current-row="highlightCurrentRow"
+      style="width:100%"
       @sort-change="sortChange"
       @selection-change="selectionChange"
       @filter-change="filterChange"
@@ -244,7 +245,12 @@ export default {
       if(val){
         this.dataRadioId = null;
       }
-    }
+    },
+    // dataTabel: function() {
+    //   this.$nextTick(function() {
+    //     this.$refs.mainTable.setCurrentRow(this.dataTabel[0])
+    //   })
+    // }
   },
   methods: {
     // 刷新表格数据
@@ -266,5 +272,14 @@ export default {
   .el-pagination {
     display: none;
   }
+  
 }
+ /deep/.el-table .success-row {
+    background: #fff !important;
+    color: #f56c6c;
+    height: 44px;
+    line-height: 46px;
+    font-size: 22px;
+    font-weight: 700;
+  }
 </style>

src/views/TMS/components/importedMine/addWagonPlease.vue

@@ -1,19 +1,14 @@
 <template>
   <!-- 新增请作业页面 -->
-  <div id="contractDetails">
-    <page-title>请车作业</page-title>
-    <div class="main">
-      <span class="text">新增请车作业</span>
-      <span class="a"></span>
+  <div class="trainTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="122" v-model="form1" ref="from1"></dil-form>
+      </div>   
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="122" v-model="form1" ></dil-form>
-        </div>
-      </div>
-    </div>
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm" >确认</el-button>
     </div>
@@ -91,6 +86,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.trainTransport{
+  .form{
+    display: flex;
+    .form_box{
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box{
+    margin-left: 45%;
+  }
+}
 </style>

src/views/TMS/components/importedMine/wagonPlease.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 请车作业页面 -->
-  <div class="homeworkPath">
+  <div class="trainTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -147,9 +147,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.trainTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedShip/addLoadShip.vue

@@ -1,29 +1,25 @@
 <template>
-  <!-- 船只信息页面 -->
-  <div class="homeworkPath">
-    <page-title>装船作业信息</page-title>
-    <div class="main">
-      <span class="text">装船作业新增</span>
-      <span class="a"></span>
-    </div>
-    <div>
-      <div class="form-box" style="margin-left: 5rem">
-        <el-form ><dil-form :formId="120" v-model="form"></dil-form>
-        <el-button type="primary" @click="makeSure">新增装船作业</el-button></el-form>
+  <!-- 新增装船作业 -->
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <!-- 第一部分 -->
+      <div class="top">
+        <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>   
+      </div>
+      <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
+      </dilTable>
+    <div class="form">
+      <!-- 第二部分 -->
+      <div class="form_box">
+          <dil-form :formId="120" v-model="form"></dil-form>
       </div>
     </div>
-     <div class="main">
-      <span class="text">选择船只</span>
-      <span class="a"></span>
-    </div>
-     <div class="top">
-      <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>   
+    <div class="button_box">
+        <el-button type="primary" @click="makeSure">新增装船作业</el-button>
     </div>
-    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-    </dilTable>
   </div>
 </template>
 
@@ -122,18 +118,44 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-.homeworkPath{
-    .main{
-    margin-bottom: 0.125rem;
-  }
-  .button-ins{
-    margin: 0 50rem; 
-    text-align: center
+<style lang='scss'>
+.shipTransport{
+  .form{
+    display: flex;
+    .form_box{
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .top {
-    margin: 0 auto;
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+  .button_box{
+    margin-left: 45%;
   }
 }
 </style>

src/views/TMS/components/importedShip/addShipmentInstructions.vue

@@ -1,28 +1,33 @@
 <template>
   <!-- 装船指令新增页面 -->
-  <div id="endMaintenance">
-    <page-title>装船指令新增</page-title>
-    <el-divider content-position="left">新增指令</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-        <el-form><dil-form :formId="114" v-model="form1" ref="from1"></dil-form></el-form>
-        <div class="buttonins"><el-button type="primary" @click="onDrawer()">浏览</el-button></div>
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="114" v-model="form1" ref="from1"></dil-form>
       </div>
-      <el-drawer
+      <div class="liulan">
+          <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
+      </div>     
+    </div>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态框 -->
+    <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="30%"
+      size="35%"
     >
-      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px;width:250px" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick()"  style="margin-bottom:15px">
         <i class="el-icon-search"></i>查询
       </el-button>
     <dilTable v-bind.sync="options" @radio-change="currentRadioChange1" ></dilTable>
     </el-drawer>
-    <div class="button-box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
   </div>
 </template>
 
@@ -99,8 +104,54 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-.buttonins{
-  height: auto;
+<style lang="scss">
+.shipTransport{
+  .form{
+    display: flex;
+    .form_box{
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .liulan{
+      width: 120px;
+      margin-top: 30px;
+      .el-button{
+        width: 100px !important;
+        margin: auto;
+      }
+      .btn{
+        margin-top: 0px;
+      }
+      .btn1{
+        margin-top: 13px;
+      }
+      .btn2{
+        margin-top: 67px;
+      }
+  }
+  .button_box{
+    margin-left: 45%;
+  }
 }
 </style>

src/views/TMS/components/importedShip/addUnloadShip.vue

@@ -1,39 +1,26 @@
 <template>
-  <!-- 船只信息页面 -->
-  <div class="homeworkPath">
-    <page-title>卸船作业信息</page-title>
-    <div class="main">
-      <span class="text">卸船作业新增</span>
-      <span class="a"></span>
-    </div>
-    <div>
-      <div class="form-box" style="margin:0 50rem">
-        <el-form >
+<!-- 新增卸船作业 -->
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <!-- 第一部分 -->
+      <div class="top">
+        <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>   
+      </div>
+      <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
+      </dilTable>
+    <div class="form">
+      <!-- 第二部分 -->
+      <div class="form_box">
           <dil-form :formId="121" v-model="form"></dil-form>
-          <div style="magin:0 auto">
-              <el-button type="primary" @click="makeSure" >新增卸船作业</el-button>
-          </div>
-          
-        </el-form>
-        
       </div>
     </div>
-  
-    <div class="main">
-      <span class="text">选择船只</span>
-      <span class="a"></span>
+    <div class="button_box">
+        <el-button type="primary" @click="makeSure" >新增卸船作业</el-button>
     </div>
-    <div class="top">
-      <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>   
-    </div>
-    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-    </dilTable>
-    
   </div>
-  
 </template>
 
 <script>
@@ -122,20 +109,44 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
-.homeworkPath {
-  .main{
-    margin-bottom: 0.125rem;
-  }
-  .button-ins{
-    margin: 0 50rem; 
-    text-align: center
+<style lang='scss'>
+.shipTransport{
+  .form{
+    display: flex;
+    .form_box{
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .top {
-    margin: 0 auto;
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+  .button_box{
+    margin-left: 45%;
   }
 }
-
 </style>

src/views/TMS/components/importedShip/addWaterQuality.vue

@@ -1,67 +1,56 @@
 <template>
-  <!-- 船只信息页面 -->
-  <div class="homeworkPath">
-    <page-title>水分质检信息</page-title>
-    <div class="main">
-      <span class="text">水分质检信息新增</span>
-      <span class="a"></span>
+  <!-- 新增水分质检信息 -->
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <!-- 第一部分 -->
+      <div class="top">
+        <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>   
+      </div>
+      <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
+      </dilTable>
+    <div class="form">
+      <!-- 第二部分 -->
+      <div class="form_box">
+          <dil-form :formId="128" v-model="form"></dil-form>
+      </div>
     </div>
-    <div>
- <div class="form-box" style="margin-left:0 50rem">
-        <el-form ><dil-form :formId="128" v-model="form"></dil-form>
-         <el-form>
-         <el-form-item>
+    <!-- 下方内容 -->
+    <div class="other">
+      <el-form :inline="true">
+        <el-form-item>
           <label class="el-form-item__label" style="width: auto;">含水率</label>
-          <el-input
-        placeholder=""
-        v-model="resultMoistureContent">
-      </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input  placeholder="" v-model="resultMoistureContent"></el-input>
         </el-form-item>
          
-          <el-form-item>
+         <el-form-item>
           <label class="el-form-item__label" style="width: auto;">合同水分值</label>
-          <el-input
-        placeholder=""
-        v-model="contractMoistureValue"
-        :disabled="true">
-      </el-input>
         </el-form-item>
-      <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">实装吨位</label>
-      <el-input
-        placeholder=""
-        v-model="realWeight"
-        :disabled="true">
-      </el-input>
-      </el-form-item>
-    <el-form-item>
-    <label class="el-form-item__label" style="width: auto;">水分吨位</label>
-      <el-input
-        placeholder=""
-        v-model="moistureTonnage"
-        :disabled="true">
-      </el-input>
-    </el-form-item>
-      </el-form>
-        <el-button type="primary" @click="makeSure">新增水分质检信息</el-button>
-        </el-form>
-      </div>
+        <el-form-item>
+          <el-input placeholder="" v-model="contractMoistureValue" :disabled="true"></el-input>
+        </el-form-item>
 
-     <div class="main">
-      <span class="text">选择船只</span>
-      <span class="a"></span>
-    </div>
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">实装吨位</label>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="" v-model="realWeight" :disabled="true"></el-input>
+        </el-form-item>
 
-     <div class="top">
-      <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-form-item>
+          <label class="el-form-item__label" style="width: auto;">水分吨位</label>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="" v-model="moistureTonnage" :disabled="true"></el-input>
+        </el-form-item>
+      </el-form>
+        <el-button type="primary" @click="makeSure">新增水分质检信息</el-button>
     </div>
-
-    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-    </dilTable>
-  </div>
+    
   </div>
 </template>
 
@@ -183,17 +172,66 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath{
-    .main{
-    margin-bottom: 0.125rem;
-  }
-  .button-ins{
-    margin: 0 50rem; 
-    text-align: center
+.shipTransport{
+  .form{
+    display: flex;
+    .form_box{
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .top {
-    margin: 0 auto;
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+  .button_box{
+    margin-left: 45%;
+  }
+  .other{
+    width: 320px;
+      margin-left: 35%;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
   }
 }
 </style>

src/views/TMS/components/importedShip/bargeShip.vue

@@ -1,13 +1,13 @@
 <template>
   <!-- 驳船作业页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <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" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
       <el-button type="primary" class="btn" @click="addclick">
-        新增
+        <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -97,9 +97,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedShip/loadShip.vue

@@ -1,13 +1,13 @@
 <template>
   <!-- 装船作业页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
      <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" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
       <el-button type="primary" class="btn" @click="addclick">
-        新增
+        <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -85,9 +85,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedShip/shipResult.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 水路货物运单页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <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" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">
     </dilTable>
@@ -38,9 +38,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedShip/shipmentInstructions.vue

@@ -1,12 +1,13 @@
 <template>
   <!-- 装船指令页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <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="btnclick(0)"> 新增 </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-circle-plus-outline"></i>新增</el-button>
     </div>
     <el-tabs v-model="activeName"  @tab-click="handleClick">
       <!-- 未下发 -->
@@ -44,8 +45,6 @@
         <dilTable v-bind.sync="option2"></dilTable>
       </el-tab-pane>
     </el-tabs>
-      
-    </dilTable>
   </div>
 </template>
 
@@ -141,9 +140,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedShip/unloadShip.vue

@@ -1,13 +1,13 @@
 <template>
   <!-- 卸船作业页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <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" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
       <el-button type="primary" class="btn" @click="addclick">
-        新增
+        <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -85,9 +85,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedShip/waterQuality.vue

@@ -1,13 +1,13 @@
 <template>
   <!-- 水分质检页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <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" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
       <el-button type="primary" class="btn" @click="addclick">
-        新增
+        <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -85,9 +85,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/WMS/app.js

@@ -8,10 +8,6 @@ import '@/config/include.js';
 // 通用store
 import store from '@/store/index.js';
 
-// 导出Excel全局组件
-import tableToExcel from '@/components/exportExcel/exportExcel'
-Vue.use(tableToExcel)
-
 // router
 import router from './router/index.js';
 
@@ -19,66 +15,19 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 
-Vue.use(VueApollo)
-
 // 注册表格的全局组件
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+Vue.use(VueApollo)
+
 const apolloProvider = new VueApollo({
     defaultClient: apollo
 })
-
- //把时间戳改为正常可读的时间
- export function renderTime(date) {
-  if(date !== null){
-      let dateee = new Date(date).toJSON();
-      return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
-  }
-  return null;
-}
-//把毫秒数转换分
-export function getDuration(my_time) {
-  if(my_time !== null){
-      return Math.floor(my_time / 1000 / 60);
-  }
-  return null;
-}
-export function sjTime(orderPlanInTime) {
-  var stringTime = renderTime(orderPlanInTime);
-  var timestamp1 = stringTime.replace(/-/g, "/");
-  return new Date(timestamp1).getTime();
-}
-//验证电话号码
-export function VerifyPhoneNumber(Phone) {
-  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
-  if (!myreg.test(Phone)) {
-      return false;
-  } else {
-      return true;
-  }
-}
-export function isNumber(value) {
-  //验证是否为数字
-  var patrn = /^(-)?\d+(\.\d+)?$/;
-  if (patrn.exec(value) == null || value == "") {
-    return false;
-  } else {
-    return true;
-  }
-}
-export function isIntegerNumber(value) {
-  //验证是否为整数
-  var patrn = /^\+?[1-9][0-9]*$/g;
-  if (patrn.exec(value) == null || value == "") {
-    return false;
-  } else {
-    return true;
-  }
-}
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

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

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

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

@@ -110,7 +110,7 @@ export default {
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/steel_checkWarehouse");
+      this.$router.push("/steel_inbound");
     },
     currentRadioChange1(selection) {
       console.log(selection);

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>
@@ -110,7 +110,7 @@ export default {
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/steel_checkWarehouse");
+      this.$router.push("/steel_reserved");
     },
     currentRadioChange1(selection) {
       console.log(selection);

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

@@ -0,0 +1,209 @@
+<template>
+  <!-- 新增盘库作业页面 -->
+  <div class="addCheckWarehouse">
+    <page-title>盘库作业</page-title>
+    <div class="material from">
+      <span class="text">仓库：</span>
+      <el-input class="input" v-model="warehouseName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <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>
+      <el-input class="input" v-model="materialNumber"> </el-input>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+      <div style="margin-bottom: 10px">
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-right: 10px; width: 250px"
+          clearable
+        ></el-input>
+        <el-button type="primary" class="btn" @click="onclick(a)">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="first"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="second"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>          
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      disabled:false,
+      //仓库名称
+      warehouseName:null,
+      //物资名称
+      materialName: null,
+      //物资编码
+      materialCode:null,
+      //盘点数量
+      materialNumber:null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      input: "",
+      first: {
+        requestUrl: "",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      second: {
+          requestUrl: "",
+          selectionType:"radio"
+      }
+    };
+  },
+  watch: {
+    drawer(val) {
+      if (!val) {
+        this.input = null;
+      }
+    },
+  },
+  created() {
+      
+  },
+  methods: {
+    onclick(a) {
+      if (a == 1) {
+        this.first.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if(num==1){
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=443"
+      }else{
+          this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/bar1_steel_checkWarehouse");
+    },
+    currentRadioChange1(selection) {
+      console.log(selection);
+      this.materialName = selection.materialName + selection.materialSpecification + '(' + selection.materialModel + ')' ;
+      this.materialId = selection.materialId;
+      this.materialCode = selection.materialCode
+    },
+    currentRadioChange2(selection) {
+      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/insertStockTaking?warehouseId=" + this.warehouseId + "&materialCode=" + this.materialCode + "&quantity=" + this.materialNumber ).then((res) => {
+          if (res.data.code == "200") {
+            this.$message({
+              message: "添加成功!",
+              type: "success",
+            });
+            this.disabled = false
+            this.onClickCancel()
+          }
+        });
+    },
+  },
+};
+</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;
+  }
+  .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 {
+    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;
+    }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100px;
+}
+}
+</style>

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

@@ -0,0 +1,218 @@
+<template>
+  <!-- 新增入库转预留作业页面 -->
+  <div class="addCheckWarehouse">
+    <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>
+      <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>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+      <div style="margin-bottom: 10px">
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-right: 10px; width: 250px"
+          clearable
+        ></el-input>
+        <el-button type="primary" class="btn" @click="onclick(a)">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="first"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="second"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>          
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      max:null,
+      disabled:false,
+      //仓库名称
+      warehouseName:null,
+      //物资名称
+      materialName: null,
+      //物资编码
+      materialCode:null,
+      //盘点数量
+      materialNumber:null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      input: "",
+      first: {
+        requestUrl: "",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      second: {
+          requestUrl: "",
+          selectionType:"radio"
+      }
+    };
+  },
+  watch: {
+    drawer(val) {
+      if (!val) {
+        this.input = null;
+      }
+    },
+  },
+  created() {
+      
+  },
+  methods: {
+    onclick(a) {
+      if (a == 1) {
+        this.first.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if(num==1){
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=443&warehouseId="+1+"&status="+1
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/bar1_steel_inbound");
+    },
+    currentRadioChange1(selection) {
+      console.log(selection);
+      this.materialName = selection.materialName + selection.materialSpecification + '(' + selection.materialModel + ')' ;
+      this.materialId = selection.materialId;
+      this.materialCode = selection.materialCode;
+      this.materialSpecification = selection.materialSpecification;
+      this.materialModel = selection.materialModel;
+      this.max = selection.max;
+    },
+    currentRadioChange2(selection) {
+      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)
+          if (res.data.code == "200") {
+            this.$message({
+              message: "预留成功!",
+              type: "success",
+            });
+            this.disabled = false
+            this.onClickCancel()
+            this.$router.go(-1)
+          }else if(res.data.code=="201"){
+            this.$message({
+              message:"预留的数量不正确",
+              type:"faile",
+            })
+          }
+          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;
+  }
+  .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 {
+    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;
+    }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100px;
+}
+}
+</style>

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

@@ -0,0 +1,218 @@
+<template>
+  <!-- 新增预留转入库作业页面 -->
+  <div class="addCheckWarehouse">
+    <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>
+      <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>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+      <div style="margin-bottom: 10px">
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-right: 10px; width: 250px"
+          clearable
+        ></el-input>
+        <el-button type="primary" class="btn" @click="onclick(a)">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="first"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="second"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>          
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      max:null,
+      disabled:false,
+      //仓库名称
+      warehouseName:null,
+      //物资名称
+      materialName: null,
+      //物资编码
+      materialCode:null,
+      //盘点数量
+      materialNumber:null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      input: "",
+      first: {
+        requestUrl: "",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      second: {
+          requestUrl: "",
+          selectionType:"radio"
+      }
+    };
+  },
+  watch: {
+    drawer(val) {
+      if (!val) {
+        this.input = null;
+      }
+    },
+  },
+  created() {
+      
+  },
+  methods: {
+    onclick(a) {
+      if (a == 1) {
+        this.first.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if(num==1){
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=443&warehouseId="+1+"&status="+2
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/bar1_steel_reserved");
+    },
+    currentRadioChange1(selection) {
+      console.log(selection);
+      this.materialName = selection.materialName + selection.materialSpecification + '(' + selection.materialModel + ')' ;
+      this.materialId = selection.materialId;
+      this.materialCode = selection.materialCode;
+      this.materialSpecification = selection.materialSpecification;
+      this.materialModel = selection.materialModel;
+      this.max = selection.max;
+    },
+    currentRadioChange2(selection) {
+      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)
+          if (res.data.code == "200") {
+            this.$message({
+              message: "入库成功!",
+              type: "success",
+            });
+            this.disabled = false
+            this.onClickCancel()
+            this.$router.go(-1)
+          }else if(res.data.code=="201"){
+            this.$message({
+              message:"入库的数量不正确",
+              type:"faile",
+            })
+          }
+          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;
+  }
+  .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 {
+    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;
+    }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100px;
+}
+}
+</style>

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

@@ -0,0 +1,212 @@
+// 新增倒库单
+<template>
+    <div class="steel_restackAdd">
+        <div class="search">
+            <div class="warehouse">
+                <span>仓库名称：</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位：</span>
+                <el-select v-model="value2" placeholder="请选择" @change ="onchange2()">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="gradationnumber">
+                <span>层次：</span>
+                <el-select v-model="value3" placeholder="请选择" @change="onchange3()">
+                    <el-option
+                    v-for="(item,i) in options3"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="newWarehouse">
+                <span>新仓库：</span>
+                <el-select v-model="value4" placeholder="请选择" @change="onchange4()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+        </div>
+        <div class="table" >
+            <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
+        </div>
+        <div class="button_box">
+            <el-button @click="cancel">取消</el-button>
+            <el-button type="primary" @click="onClickConfirm()">确定</el-button>
+        </div>
+    </div>  
+</template>
+
+<script>
+// import PageTitle from "@/components/Page/Title";
+export default {
+  data(){
+    return{
+      form1:{},
+      inputText:"",
+        options11:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      selectionType: "select",
+      mapList:[]
+      },
+
+        //仓库
+        options1:[],
+        // 选中的仓库
+        value1:'',
+        // 垛位
+        options2:[],
+        // 选中垛位
+        value2:'',
+        // 层次
+        options3:[],
+        // 选中的层次
+        value3:'',
+        //新仓库
+        value4:'',
+        // 新增下拉框
+        // 垛位
+        options5:[],
+        // 选中垛位
+        value5:'',
+        inf: {}
+    }
+  },
+    mounted(){
+        this.initialization();
+        //新增下拉框方法
+        this.initialization1();
+    },
+     methods: {
+         //初始化选择仓库垛位
+     initialization(){
+         this.axios.get('/api/v1/wms/selectWarehouse').then((res)=>{
+             this.options1 = res.data.data
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106',{
+                 warehouseid:this.value1
+             }) 
+         })
+     },
+     onchange1(){
+            console.log(1);
+            //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+             this.options2 = res.data.data;
+             this.options5=res.data.data;
+             this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1;
+             this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid=" + this.value1;       
+         })
+     },
+     onchange2(){
+        if(this.value1 == ''){
+            this.$message({
+                message: '请选择仓库之后！再选择',
+                type: 'warning'
+            });
+            this.value2 = ''
+        }else{
+            this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value2;        
+            //选择仓库层次号
+            this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value2).then((res)=>{
+            this.options3 = res.data.data;          
+         })
+    }},
+    onchange3(){
+        if(this.value2 == ''||this.value1==''){
+            this.$message({
+                message: '请选择仓库和垛位之后！再选择',
+                type: 'warning'
+            });
+            this.value3 = ''
+        }else{
+            console.log(this.value1,this.value2)
+            this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1 + 
+            "&stackingId="+this.value2+"&gradtionNumber="  + this.value3 
+        }
+    },
+     onclick(){
+      console.log("点击事件");
+     },
+       // 确认
+      onClickConfirm() {
+        let ivBoundResult = {
+            resultBeforeWarehouseId:this.value1,
+            resultAfterWarehouseId:this.value4,
+            mapList:this.mapList
+        };
+        console.log(ivBoundResult)
+       this.axios
+        .post("/api/v1/wms/addIvboundMakeResult", ivBoundResult)
+         .then((res) => {
+         if(res.data.code == 200){
+            this.$router.go(-1); 
+            this.$message({
+            type: "success",  
+            message: "新增成功!",
+           });
+         }
+         
+          
+        });
+    },
+    selectionChange(selection) {
+        this.mapList = selection
+        console.log(this.mapList)
+    },
+    
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_restackAdd{
+    .search{
+        height: 5rem;
+        display: flex;
+        align-items:center;
+        padding-left:0.625rem;
+        .warehouse,.stack,.gradationnumber,newWarehouse{
+            margin-left: 1.25rem;
+        }
+    }
+    .form{
+        display: inline;
+        justify-content: center;
+        margin-left: 1.25rem;
+        
+    }
+    .button_box{
+        width: 90%;
+        position: fixed;
+        bottom: 1.25rem;
+        display: flex;
+        justify-content: center;
+    }
+}
+</style>

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

@@ -0,0 +1,136 @@
+// 提货单
+<template>
+  <div class="billOfLading">
+    <div class="top">
+      <!-- 框计算 -->
+      <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>
+    </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option" ref="table">
+        <el-table-column label="操作" fixed="right" width="200">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detailclick(scope.row)">
+              物资详情
+            </el-button>
+            <el-button type="text" size="mini" @click="configure(scope.row.orderId)">
+              配置物资优先级
+            </el-button>
+          </template>
+        </el-table-column>
+        
+        <!-- 排队详情下拉框 -->
+        <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getSaleOrderOnQueue?apiId=227",
+      },
+      //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "orderMaterialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+      ],
+      tableData: [],
+    };
+  },
+  methods: {
+    //   框计算
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getSaleOrderOnQueue?apiId=227&con=" + this.inputText;
+    },
+    // 查看物资详情
+    detailclick(row) {
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.getMaterial(row.orderId);
+    },
+    // 根据运输订单id查询物资信息
+    getMaterial(orderId) {
+      this.axios
+        .get("api/v1/tms/getMaterial?orderId=" + orderId)
+        .then((res) => {
+          this.tableData = res.data.data;
+        });
+    },
+    // 跳转到配置物资优先顺序
+    configure(orderId){
+        this.$router.push("/bar1_billOfLadingAdd/"+orderId);
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.billOfLading {
+  .top {
+    width: 100%;
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 2.5rem;
+  }
+}
+</style>

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

@@ -0,0 +1,352 @@
+<template>
+  <div class="billOfLadingAdd">
+    <div class="top">
+      <div class="material">
+        <span> 物资名称： </span>
+        <el-select v-model="materialId" placeholder="请选择">
+          <el-option
+            v-for="item in materialOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="Warehouse">
+        <span> 仓库： </span>
+        <el-select
+          v-model="WarehouseId"
+          placeholder="请选择"
+          @change="onChange"
+        >
+          <el-option
+            v-for="item in WarehouseOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="platform">
+        <span> 月台： </span>
+        <!-- 可以选择 -->
+        <el-select v-if="disabled" v-model="platformId" placeholder="请选择">
+          <el-option
+            v-for="item in platformOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <!-- 不可选择 -->
+        <el-select v-else v-model="platformId" disabled placeholder="请选择">
+        </el-select>
+      </div>
+      <div class="btn">
+        <el-button type="primary" @click="ONclick">确认</el-button>
+      </div>
+    </div>
+    <div class="bottom">
+      <div class="table">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column
+            v-for="(item, i) in tableTop"
+            :key="i"
+            stripe="true"
+            :prop="item.prop"
+            :label="item.label"
+            :width="item.width"
+          >
+          </el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleDelete(scope.row.serialNumber)"
+                >删除</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="topClick(scope.row.serialNumber)"
+                v-if="scope.row.serialNumber == 1"
+                disabled
+                >上移</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="topClick(scope.row.serialNumber)"
+                v-else
+                >上移</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="bottomClick(scope.row.serialNumber)"
+                v-if="scope.row.serialNumber == tableNun"
+                disabled
+                >下移</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="bottomClick(scope.row.serialNumber)"
+                v-else
+                >下移</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="btn_bottom">
+      <el-button @click="open">返回</el-button>
+      <el-button type="primary" @click="addclick">提交</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      materialId: "",
+      WarehouseId: "",
+      platformId: "",
+      materialOptions: [],
+      WarehouseOptions: [],
+      platformOptions: [],
+      tableNun: 0,
+      materialOptionsnumber: 0,
+      disabled: false,
+      tableTop: [
+        {
+          prop: "serialNumber",
+          label: "序号",
+          width: "50",
+        },
+        {
+          prop: "material",
+          label: "物资名称",
+          width: "140",
+        },
+        {
+          prop: "ck",
+          label: "仓库",
+          width: "140",
+        },
+        {
+          prop: "yt",
+          label: "月台",
+          width: "140",
+        },
+      ],
+      tableData: [],
+    };
+  },
+  created() {
+    this.initialization();
+    this.getWarehouse();
+  },
+  methods: {
+    // 第一次进页面，根据运输订单号查询出所有的物资名称
+    initialization() {
+      this.axios
+        .get("/api/v1/tms/getOrderMaterial/" + this.$route.params.orderId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.materialOptions = res.data.data;
+            this.materialOptionsnumber = this.materialOptions.length;
+          }
+        });
+      
+    },
+    // 查询所有仓库
+    getWarehouse() {
+      this.axios.get("/api/v1/tms/getUnloadPoint/1").then((res) => {
+        if (res.data.code == "200") {
+          this.WarehouseOptions = res.data.data;
+        }
+      });
+    }, // 返回
+    open() {
+      // debugger
+      if (this.materialOptionsnumber == 1) {
+        if (this.materialOptions.length == 0) {
+          this.prompt();
+        } else {
+          this.$router.push("/billOfLading");
+        }
+      } else if (this.materialOptionsnumber !== this.materialOptions.length) {
+        this.prompt();
+      } else {
+        this.$router.push("/billOfLading");
+      }
+    },
+    // 提示
+    prompt() {
+      this.$confirm("退出页面，数据将会清空！", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$router.push("/billOfLading");
+        })
+        .catch(() => {});
+    },
+    // 提交物资次序给后端
+    addclick() {
+      if (this.materialOptions.length == 0) {
+        this.axios
+          .post("/api/v1/tms/updateLoadingIdAndLoadSq", {
+            orderId: this.$route.params.orderId,
+            list: this.tableData,
+          })
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                message: "提交成功！",
+                type: "success",
+              });
+              this.$router.push("/billOfLading");
+            }
+          });
+      } else {
+        this.$message({
+          message: "请选择完物资在提交！",
+          type: "warning",
+        });
+      }
+    },
+    // 点击确认后把选择框的数据添加到tableData
+    ONclick() {
+      if (this.materialId && this.WarehouseId && this.platformId) {
+        var materialName = null;
+        var WarehouseName = null;
+        var platformName = null;
+        this.materialOptions.forEach((e) => {
+          if (e.value == this.materialId) {
+            materialName = e.label;
+          }
+        });
+        this.WarehouseOptions.forEach((e) => {
+          if (e.value == this.WarehouseId) {
+            WarehouseName = e.label;
+          }
+        });
+        this.platformOptions.forEach((e) => {
+          if (e.value == this.platformId) {
+            platformName = e.label;
+          }
+        });
+        this.tableData.push({
+          serialNumber: this.tableData.length + 1,
+          materialId: this.materialId,
+          material: materialName,
+          WarehouseId: this.WarehouseId,
+          ck: WarehouseName,
+          platformId: this.platformId,
+          yt: platformName,
+        });
+        this.fornumber();
+        this.deletematerial();
+        this.materialId = "";
+        this.WarehouseId = "";
+        this.platformId = "";
+        this.disabled = false;
+      } else {
+        this.$message({
+          message: "请全部选择之后在确认！",
+          type: "warning",
+        });
+      }
+    },
+    // 选择仓库后，查询月台，
+    onChange() {
+      this.platformOptions = [];
+      this.axios
+        .get("/api/v1/tms/getPlatformIdByWarehouse/" + this.WarehouseId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.platformOptions = res.data.data;
+            console.log(this.platformOptions.length);
+            if (this.platformOptions.length !== 0) {
+              this.disabled = true;
+            }
+          }
+        });
+    },
+    //   上移
+    topClick(index) {
+      var kong = {};
+      kong = this.tableData[index - 2];
+      this.tableData[index - 2] = this.tableData[index - 1];
+      this.tableData[index - 1] = kong;
+      this.fornumber();
+    },
+    //   下移
+    bottomClick(index) {
+      var kong = {};
+      kong = this.tableData[index];
+      this.tableData[index] = this.tableData[index - 1];
+      this.tableData[index - 1] = kong;
+      this.fornumber();
+    },
+    //   删除当前
+    handleDelete(index) {
+      this.materialOptions.push({
+        value:this.tableData[index-1].materialId,
+        label:this.tableData[index-1].material
+      })
+      this.tableData.splice(index - 1, 1);
+      this.fornumber();
+    },
+    //使serialNumber 的值永远比下标多一
+    fornumber() {
+      this.tableNun = this.tableData.length;
+      for (var i = 0; i < this.tableData.length; i++) {
+        this.tableData[i].serialNumber = i + 1;
+      }
+    },
+    // 移除选过的物资
+    deletematerial() {
+      for (var i = 0; i < this.materialOptions.length; i++) {
+        if (this.materialOptions[i].value == this.materialId) {
+          this.materialOptions.splice(i, 1);
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.billOfLadingAdd {
+  .top {
+    width: 100%;
+    height: 6.25rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .bottom {
+    width: 37.5rem;
+    margin: auto;
+    padding-top: 3.125rem;
+  }
+  .btn_bottom {
+    width: 100%;
+    position: absolute;
+    bottom: 0px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>

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

@@ -0,0 +1,65 @@
+// 盘库作业
+<template>
+  <div class="steel_inbound">
+    <div class="top">
+      <!-- 框计算 -->
+      <el-input placeholder="请输入内容" class="input" 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="btn1" @click="AddClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 框计算的输入框的值
+      inputText: null,
+      // 表格渲染的表头及数据
+      option: {
+        requestUrl: "/api/v1/wms/getStockTakingList?apiId=442",
+      },
+    };
+  },
+  methods: {
+    // 框计算查询按钮
+    onclick() {
+      console.log(this.inputText)
+    },
+    // 跳转新增运输路线页面
+    AddClick() {
+      this.$router.push({
+        path: "/bar1_steel_addCheckWarehouse",
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.steel_inbound{
+  .top{
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+    .input{
+      width: 250px;
+    }
+    .btn{
+      margin: 20px;
+    }
+  }
+}
+
+</style>

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

@@ -0,0 +1,260 @@
+//修改倒垛作业
+<template>
+    <div class="steel_restackEdit">
+        <div class="search">
+            <div class="warehouse">
+                <span>仓库名称：</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位：</span>
+                <el-select v-model="value2" placeholder="请选择" @change ="onchange2()">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="gradationnumber">
+                <span>层次：</span>
+                <el-select v-model="value3" placeholder="请选择" @change="onchange3()">
+                    <el-option
+                    v-for="(item,i) in options3"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+        </div>
+        <div class="table" >
+            <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
+        </div>
+            <div class="search">
+            <div class="warehouse">
+                <span>仓库名称：</span>
+                <el-select v-model="value4" disabled  placeholder="请选择" @change="onchange4()">
+                    <el-option
+                    v-for="(item,i) in options4"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位：</span>
+                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
+                    <el-option
+                        v-for="(item,i) in options5"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+     
+        </div>
+         <div class="table">
+            <dilTable v-bind.sync="options" ></diltable>
+        </div>
+        <div class="button_box">
+            <el-button @click="cancel">取消</el-button>
+            <el-button type="primary" @click="onClickConfirm">确定</el-button>
+        </div>
+    </div>  
+</template>
+
+<script>
+// import PageTitle from "@/components/Page/Title";
+export default {
+  data(){
+    return{
+      form1:{},
+      inputText:"",
+        options11:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      selectionType: "select",
+      },
+      options:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      },
+        //仓库
+        options1:[],
+        // 选中的仓库
+        value1:'',
+        // 垛位
+        options2:[],
+        // 选中垛位
+        value2:'',
+        // 层次
+        options3:[],
+        // 选中的层次
+        value3:'',
+        // 新增下拉框
+        //仓库
+        options4:[],
+        // // 选中的仓库
+        value4:'',
+        // 垛位
+        options5:[],
+        // 选中垛位
+        value5:'',
+        inf: {}
+    }
+  },
+    mounted(){
+        this.initialization();
+        this.information();
+    },
+     methods: {
+
+   information() {
+      this.axios
+        .post("/api/v1/wms/selectAfterstackingByResultId/" + this.$route.params.resultId)
+        .then((res) => {
+          console.log(res.data.data);
+
+        });
+    },
+     initialization(){
+         this.axios.get('/api/v1/wms/selectWarehouse').then((res)=>{
+             this.options1 = res.data.data
+         })
+     },
+     onchange1(){
+            console.log(1);
+            //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+             this.options2 = res.data.data;
+             this.options5=res.data.data;
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1)
+             
+         })
+     },
+     onchange2(){
+        if(this.value1 == ''){
+            this.$message({
+                message: '请选择仓库之后！再选择',
+                type: 'warning'
+            });
+            this.value2 = ''
+        }else{
+            this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106'+this.value1)
+        }   
+            //选择仓库层次号
+            this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value2).then((res)=>{
+             this.options3 = res.data.data;
+            this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1+'&stackingId=')
+         })
+    },
+    onchange3(){
+        if(this.value2 == ''||this.value1==''){
+            this.$message({
+                message: '请选择仓库和垛位之后！再选择',
+                type: 'warning'
+            });
+            this.value3 = ''
+
+        }else{
+            this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106'+this.value1 +this.value2 )
+        }
+    },
+  
+         onchange4(){
+         console.log(1);
+        //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+              console.log( this.options5 = res.data.data)
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1)
+         })
+     },
+     onchange5(){     
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106'+this.value1)
+            //选择仓库层次号
+             this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value5).then((res)=>{
+             this.options6 = res.data.data;
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1 +'&stackingId=')
+         })
+    },
+
+     onclick(){
+      console.log("点击事件");
+     },
+       // 确认
+      onClickConfirm() { 
+        console.log(this.inf,"inf");
+       let wmspRestackMakeResult = {
+       //倒垛后的垛位id    
+       afterStackingId:this.value5,
+       //倒垛后的层次id
+       afterWarehouseId:this.value1, 
+       //实绩id
+       resultId:this.inf[0].resultId,
+      };
+       console.log(wmspRestackMakeResult,"aaaa");
+       this.axios
+        .post("/api/v1/wms/editRestackMakeResult/", wmspRestackMakeResult)
+         .then(() => {
+         this.$message({
+            type: "success",  
+         message: "修改成功!",
+           });
+          this.$router.go(-1);
+        });
+    },
+    selectionChange(row) {
+      console.log("当前选中行的数据：");
+      console.log(row);
+      this.inf = row;
+      console.log(this.inf);
+    },
+    
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_restackEdit{
+    .search{
+        height: 5rem;
+        display: flex;
+        align-items:center;
+        padding-left:0.625rem;
+        .warehouse,.stack,.gradationnumber{
+            margin-left: 1.25rem;
+        }
+    }
+    .form{
+        display: inline;
+        justify-content: center;
+        margin-left: 1.25rem;
+        
+    }
+    .button_box{
+        width: 90%;
+        position: fixed;
+        bottom: 1.25rem;
+        display: flex;
+        justify-content: center;
+    }
+}
+</style>

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

@@ -0,0 +1,41 @@
+//查看入库详情
+<template>
+	<div id="endMaintenance">
+		<page-title>入库详情</page-title>
+    <div class="main">
+			<span class="text">扫描实绩详情</span>
+			<span class="a"></span>
+		</div>
+    <dilTable v-bind.sync="first" >
+		</dilTable>
+	</div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+// import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  components: {
+    PageTitle,
+  },
+  data() {
+    return {
+      form: {},
+      first:{
+       requestUrl: "/api/v1/wms/selectScanResultByIboundResultId?apiId=373&inboundId="+this.$route.params.inboundId,
+      },
+    };
+  },
+  mounted() {
+    // this.information();
+  },
+
+  methods: {
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -0,0 +1,62 @@
+<template>
+  <div id="endMaintenance">
+    <page-title>库存盘点录入</page-title>
+    <div class="main">
+      <span class="text">新增信息</span>
+      <span class="a"></span>
+    </div>
+    <div class="body">
+      <div class="form-box">
+        <dil-form :formId="232" v-model="form1" ></dil-form>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    // 确定
+    makeSure() {
+      let inventoryCheck = {
+        warehouseId: this.form1.warehouseId,
+        materialId: this.form1.materialId,
+        totalBookNumber: this.form1.bookTotalNumber,
+        
+      };
+      console.log(inventoryCheck)
+      this.axios
+        .post(
+          "/api/v1/wms/inventoryCheck/inventoryCheck",
+          inventoryCheck
+        )
+        .then((res) => {
+          console.log(res);
+          console.log(this.form1);
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -0,0 +1,56 @@
+//盘点
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <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="toInsert">
+        <i class="el-icon-search"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInventoryCheck?apiId=94",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/bar1_insertCheckInventory");
+
+    },
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

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

@@ -0,0 +1,49 @@
+//结转
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <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>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

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

@@ -0,0 +1,108 @@
+//入库
+<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="选择日期">
+      </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-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>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from '@/utils/util.js';
+export default {
+  data(){
+    return{
+      inputText:"",
+      startTime: null,
+      endTime: null,
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&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) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      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();
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // 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(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
+    },
+    selectionChange(selection) {
+      this.options.mapList = selection;
+    },
+    onreserved(){
+      this.$router.push({
+        path: "/bar1_addSteelInbound",
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

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

@@ -0,0 +1,229 @@
+//真实入库作业
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <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="选择日期">
+      </el-date-picker>
+      <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
+        <el-option label="不选择班次" value="0"></el-option>
+        <el-option label="早班" value="1"></el-option>
+        <el-option label="中班" value="2"></el-option>
+        <el-option label="晚班" value="3"></el-option>
+      </el-select>
+      <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" @selection-change="selectionChange" ref="table">
+        <!-- <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>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from '@/utils/util.js';
+export default {
+  data(){
+    return{
+      inputText:"",
+      startTime: null,
+      endTime: null,
+      region: "0",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+1,
+        // selectionType: "select",
+        // mapList: [],
+      },
+    }
+  },
+  methods:{
+    // inboundDetails(scope){
+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
+    // },
+    onclick(){
+      let startTime = null;
+      let endTime = null;
+      
+      // 判断用户有没有班次，有班次则提供默认时间
+      if(this.region!=null){
+        let date =null;
+        let date2 =null;
+        let year = null;
+        let month =null;
+        let day = null;
+        let year2 = null;
+        let month2 =null;
+        let day2 = null;
+        // 判断当前日期输入框中是否选择了时间,并且开始日期和结束日期是否是同一天
+        if(this.startTime!=null){
+            date = this.startTime;
+            // 判断当前开始时间是标准时间还是字符串时间
+            
+           year = date.getFullYear(); // 年
+          month = date.getMonth() + 1; // 月
+          day = date.getDate(); // 日 
+        }
+        if(this.endTime!=null){
+           date2 = this.endTime;
+           year2 = date2.getFullYear(); // 年
+          month2 = date2.getMonth() + 1; // 月
+          day2 = date2.getDate(); // 日 // 日
+        }
+        if(this.startTime==null&&this.endTime==null){
+          // 获取当前的日期时间
+          date = new Date();
+          year = date.getFullYear(); // 年
+          month = date.getMonth() + 1; // 月
+          day = date.getDate(); // 日
+        }
+        // 判断开始日期和结束日期是否是同一天
+        if(!(year==year2&&month==month2&&day==day2)&&(this.startTime!=null||this.endTime!=null)&&this.region==null){
+          // 当不是同一天的时候，直接弹窗警告
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始日期和结束日期不是同一天");
+        }
+        // 判断当前用户选择的具体班次
+        if(this.region == 0){
+          this.startTime = year+"-"+month+"-"+day+" "+"00:00:00";
+          // 将结束时间加一
+          day =parseInt(day) + 1;
+          this.endTime = year+"-"+month+"-"+day+" "+"00:00:00";
+          
+        }else if(this.region == 1){
+          this.startTime = year+"-"+month+"-"+day+" "+"07:30:00";
+          this.endTime = year+"-"+month+"-"+day+" "+"15:30:00";
+        }else if(this.region == 2){
+          this.startTime = year+"-"+month+"-"+day+" "+"15:30:00";
+          this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
+        }else if(this.region == 3){
+          this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
+          // 将开始时间减一
+          day =parseInt(day)-1;
+          this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
+        }
+        this.startTime = new Date(this.startTime)
+        this.endTime = new Date(this.endTime)
+          console.log(this.startTime+"开始时间")
+          console.log(this.endTime+"结束时间")
+        // 将拼接好的日期转换为时间戳
+        startTime = Date.parse(this.startTime)
+        endTime = Date.parse(this.endTime)
+        console.log(startTime+"开始时间2")
+        console.log(endTime+"结束时间2")
+      }else{
+        if (this.startTime) {
+        startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+      }
+      
+      // console.log(startTime)
+      // console.log(endTime)
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResults?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        // this.getRequestUrl()
+      }
+    },
+    selectionChange(selection) {
+      this.options.mapList = selection;
+    },
+    onreserved(){
+      console.log("fahaahahahaha")
+      if (this.options.mapList.length == 0) {
+        this.$message({
+          type: "warning",
+          message: "请先选择入库单!",
+        });
+      } else {
+        this.$confirm("是否预留", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          center: true,
+        })
+          .then(() => {
+            //初始化maplist
+            var mapList = [];
+            this.options.mapList.forEach((item, i) => {
+              //初始化mapItem
+              var mapItem = {
+                //入库实绩表id
+                inboundId: 0,
+                // 给一个标记定义其为入库变为预留
+                status: 0,
+              };
+              mapItem.inboundId = item.inboundId;
+              mapList.push(mapItem);
+            });
+            this.$message({
+              type: "success",
+              message: "预留成功!",
+            });
+            console.log(mapList)
+            this.axios.post("/api/v1/wms/changeReserved", mapList).then((res) => {
+              console.log("res.data"+res.data)
+              if (res.data >= 1) {
+                //改变查询条件
+                this.$refs.table.setDataRequestQuery({
+                  
+                });  
+                this.$router.go(0);
+              }
+            });
+            console.log("fdagfaahh")
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "取消上传!",
+            });
+          });
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

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

@@ -0,0 +1,230 @@
+//入库统计
+<template>
+  <div class="steel_inboundStatistics">
+    <div class="sache">
+      <!-- <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+       -->
+      <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="选择日期">
+      </el-date-picker>
+      <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
+        <el-option label="不选择班次" value="0"></el-option>
+        <el-option label="早班" value="1"></el-option>
+        <el-option label="中班" value="2"></el-option>
+        <el-option label="晚班" value="3"></el-option>
+      </el-select>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div>
+      <span style="font-size:10px">炉号</span>
+      <el-input
+        v-model="input1"
+        :disabled="true" class="inputs" style="width:15%;">
+      </el-input>
+      <!-- <span>物资名称</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input2"
+        :disabled="true" style="width:13%">
+      </el-input> -->
+      <el-col :span="3" v-html="'\u2003'"/>
+      <span>生产总件数</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input3"
+        :disabled="true" class="inputs" style="width:10%">
+      </el-input>
+
+      <!-- <span>生产总重量</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input4"
+        :disabled="true" style="width:10%">
+      </el-input> -->
+      <!-- <span>第一件物资生产时间</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input5"
+        :disabled="true" style="width:13%">
+      </el-input> -->
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options" @func="func">
+        <!-- <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>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from '@/utils/util.js';
+export default {
+  data(){
+    return{
+      input1: '',
+      input2: '',
+      input3: '',
+      input4: '',
+      input5: '',
+      inputText:"",
+      startTime: null,
+      endTime: null,
+      region: "0",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+1,
+        // selectionType: "select",
+        // mapList: [],
+      },
+    }
+  },
+  created(){
+    console.log(this.options.data)
+  },
+  methods:{
+    func(res){
+      console.log(res.list[0])
+      this.input1 = res.list[0].furnaceNumber1,
+      this.input2 = res.list[0].materialName,
+      this.input3 = res.list[0].count,
+      this.input4 = res.list[0].weight,
+      this.input5 = res.list[0].onetime
+    },
+    // inboundDetails(scope){
+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
+    // },
+    onclick(){
+
+      let startTime = null;
+      let endTime = null;
+      // 判断用户有没有班次，有班次则提供默认时间
+      if(this.region!=null){
+        let date =null;
+        let date2 =null;
+        let year = null;
+        let month =null;
+        let day = null;
+        let year2 = null;
+        let month2 =null;
+        let day2 = null;
+        // 判断当前日期输入框中是否选择了时间,并且开始日期和结束日期是否是同一天
+        if(this.startTime!=null){
+            date = this.startTime;
+            // 判断当前开始时间是标准时间还是字符串时间
+            
+           year = date.getFullYear(); // 年
+          month = date.getMonth() + 1; // 月
+          day = date.getDate(); // 日 
+        }
+        if(this.endTime!=null){
+           date2 = this.endTime;
+           year2 = date2.getFullYear(); // 年
+          month2 = date2.getMonth() + 1; // 月
+          day2 = date2.getDate(); // 日 // 日
+        }
+        if(this.startTime==null&&this.endTime==null){
+          // 获取当前的日期时间
+          date = new Date();
+          year = date.getFullYear(); // 年
+          month = date.getMonth() + 1; // 月
+          day = date.getDate(); // 日
+        }
+        // 判断开始日期和结束日期是否是同一天
+        if(!(year==year2&&month==month2&&day==day2)&&(this.startTime!=null||this.endTime!=null)&&this.region==null){
+          // 当不是同一天的时候，直接弹窗警告
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始日期和结束日期不是同一天");
+        }
+        // 判断当前用户选择的具体班次
+        if(this.region == 0){
+          this.startTime = year+"-"+month+"-"+day+" "+"00:00:00";
+          // 将结束时间加一
+          day =parseInt(day) + 1;
+          this.endTime = year+"-"+month+"-"+day+" "+"00:00:00";
+          
+        }else if(this.region == 1){
+          this.startTime = year+"-"+month+"-"+day+" "+"07:30:00";
+          this.endTime = year+"-"+month+"-"+day+" "+"15:30:00";
+        }else if(this.region == 2){
+          this.startTime = year+"-"+month+"-"+day+" "+"15:30:00";
+          this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
+        }else if(this.region == 3){
+          this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
+          // 将开始时间减一
+          day =parseInt(day)-1;
+          this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
+        }
+        this.startTime = new Date(this.startTime)
+        this.endTime = new Date(this.endTime)
+          console.log(this.startTime+"开始时间")
+          console.log(this.endTime+"结束时间")
+        // 将拼接好的日期转换为时间戳
+        startTime = Date.parse(this.startTime)
+        endTime = Date.parse(this.endTime)
+        console.log(startTime+"开始时间2")
+        console.log(endTime+"结束时间2")
+      }else{
+        if (this.startTime) {
+        startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
+    },
+    selectionChange(selection) {
+      this.options.mapList = selection;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.steel_inboundStatistics {
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+.inputs el-input is-disabled /deep/ el-input__inner{
+    
+    color: #f80808;
+    background-color: #f80808;
+}
+</style>

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

@@ -0,0 +1,42 @@
+//出库
+<template>
+  <div class="steel_outbound">
+    <div class="sache">
+      <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>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.option.requestUrl="/api/v1/wms/getWmspOutboundResult/152?con="+this.inputText;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scode>
+// @import '../../../styles/WMS/steel/steel_outbound.scss';
+</style>

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

@@ -0,0 +1,108 @@
+//出库统计炉号生产数量
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <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="选择日期">
+      </el-date-picker>
+           <el-input
+        placeholder="请输入炉号"
+        v-model="textInput"
+        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> -->
+      <span style="margin-left: 1rem;">总件数：</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
+      <span style="margin-left: 1rem;">总重量：</span>
+      <el-input v-model="totalWeight" :disabled="true" style="width: 150px;"></el-input>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option" @func="func">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  data(){
+    return{
+      textInput:"",
+      startTime: null,
+      endTime: null,
+      totalNumber:0,
+      totalWeight:0,
+      option:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+1+"&startTime=null&endTime=null&i=" +new Date()+"&con="+this.textInput,
+      },
+    }
+  },
+  methods:{
+      refresh(){
+      this.$router.go(0);
+    },
+    func(res){
+      console.log(res)
+      var total1 = 0
+      var total2 = 0
+      res.list.forEach(e => {
+        total1 = total1+e.coun
+        total2 = total2+e.theoreticalWeight
+      });
+  
+      this.totalNumber = total1
+      this.totalWeight = total2
+    },
+   onclick() {
+     console.log("textInput",this.textInput);
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.textInput;
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.textInput;
+      }
+    },
+    selectionChange(selection) {
+      this.options.mapList = selection;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+     .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,58 @@
+<template>
+<!-- 实时库存 -->
+  <div class="steel_real">
+    		<div class="sache">
+			<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>
+		</div>
+  <dilTable v-bind.sync="option">
+      <!-- <el-table-column fixed="right" label="操作" width="110">
+        <template slot-scope="scope">
+          <el-button @click="demotionClick(scope.row.gridId)" type="text" size="small"
+            >物资不合格</el-button
+          >
+        </template>
+      </el-table-column> -->
+    </dilTable>
+    </div>
+</template>
+
+<script>
+export default {
+ name:"steel_real",
+  data(){
+    return {
+      inputText:"",
+      option: {
+        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167",
+        },
+      };
+    },
+  mounted(){
+
+  },
+  methods:{
+    demotionClick(gridId){
+      this.$router.push("/steel_realDown/" + gridId);
+    },
+    onClick(){
+      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&&con="+this.inputText;
+      console.log(this.inputText)
+    }
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_real{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,80 @@
+<template>
+<!-- 实时库存 -->
+  <div class="steel_real">
+    <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="308" v-model="form1"></dil-form>
+        </div>
+      </div>
+    
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+ name:"steel_real",
+data(){
+   return {
+     form1:{},
+     option: {
+      requestUrl: "/api/v1/wms/selectGridMaterialListByGridId?apiId=155&gridId="+this.$route.params.gridId,
+      },
+    };
+  },
+  mounted(){
+    this.information();
+  },
+  methods:{
+    information() {
+      //渲染数据
+      this.axios
+        .post(
+          "api/v1/wms/selectGridMaterialListByGridId?gridId=" +
+            this.$route.params.gridId
+        )
+        .then((res) => {
+            console.log(res.data.data)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let map = {
+        gridId: this.$route.params.gridId,
+        materialQualified: this.form1.materialQualified,
+      };
+      if (
+        map.materialQualified == null
+      )
+        this.$message.error("必填项存在空值！");
+      else
+        this.axios
+          .post(
+            "/api/v1/wms/updateRmsMaterialSteelDemotion",
+            map
+          )
+          .then((res) => {
+              console.log("res.data",res.data)
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+
+.steel_real {
+    padding: 1.25rem 1.875rem;
+}
+</style>

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

@@ -0,0 +1,49 @@
+//退库
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <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>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsReboundResult?apiId=161",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

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

@@ -0,0 +1,83 @@
+//预留转入库
+<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="选择日期">
+      </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-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>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from '@/utils/util.js';
+export default {
+  data(){
+    return{
+      inputText:"",
+      startTime: null,
+      endTime: null,
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371",
+        // selectionType: "select",
+        // mapList: [],
+      },
+    }
+  },
+  methods:{
+    // inboundDetails(scope){
+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
+    // },
+    onclick(){
+      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&con="+this.inputText;
+    },
+    selectionChange(selection) {
+      this.options.mapList = selection;
+    },
+    onreserved(){
+      this.$router.push({
+        path: "/bar1_addSteelReserved",
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

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

@@ -0,0 +1,157 @@
+// 倒垛
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <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="Addclick">
+         <i class="el-icon-circle-plus-outline"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+<!--       <dilTable v-bind.sync="options"> 
+      </dilTable> -->
+    </div>
+      <template>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="待下发" name="first">
+            <dilTable v-bind.sync="first">
+              <el-table-column label="操作" fixed="right" width="120">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini" @click="Issued(scope.row.resultId)">
+                    下发
+                  </el-button>
+                    <el-button type="text" size="mini" @click="deleteclick(scope.row.resultId)">
+                     删除
+                   </el-button>
+                   <el-button type="text" size="mini"   @click="editclick(scope.row.resultId)">
+                     修改
+                   </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已下发" name="second">
+            <dilTable v-bind.sync="second">    
+            </dilTable>
+          </el-tab-pane>     
+        </el-tabs>
+      </template>
+    </div>
+</template>
+<script>
+// import { first, values } from "xe-utils";
+export default {
+  data() {
+    return {
+      state: "",
+      inputText:"",
+      first: {
+        // 未分配地址
+        // 请求未下发的数据
+        requestUrl:
+          "/api/v1/wms/selectRestackList?apiId=438&DistrubtionStatus=0",
+      },
+      second: {
+        // second请求数据的地址
+        // 请求已下发的数据
+        requestUrl:
+          "/api/v1/wms/?apiId=440&DistrubtionStatus=1",
+      },
+      //默认显示待下发的标签页
+      activeName: "first",
+    };
+  },
+  methods: {
+    onclick() {
+       if(this.activeName == "first"){
+        this.option1.requestUrl = "/api/v1/wms/selectRestackList?apiId=119&DistrubtionStatus=0&con=" + this.inputText;
+      }else{
+        this.option2.requestUrl = "/api/v1/wms/selectRestackList?apiId=119&DistrubtionStatus=0&con=" + this.inputText;
+      }
+     
+    },
+    Addclick() {
+      this.$router.push("/bar1_steel_restackAdd");
+    },
+    //删除方法
+    deleteclick(scope) {
+      let resultId = scope;
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+              "/api/v1/wms/deleteByResultId/" + resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    //  handleClick(tab, event) {
+    //     console.log(tab, event);
+
+    //   },
+    //根据id进行修改
+    editclick(resultId) {
+      this.$router.push("/bar1_editSteel_restack/" + resultId);
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    Issued(resultId) {
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "下发成功!",
+          });
+          // console.log(this.arr[0].text_prop);
+          this.axios
+            .post(
+              "/api/v1/wms/dispatchDistrubtionStatus/" +
+                resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss"scode>
+
+</style>

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

@@ -0,0 +1,445 @@
+// 新增倒垛作业
+<template>
+    <div class="steel_restackAdd">
+        <page-title>返回</page-title>
+        <div class="search">
+            <div class="warehouse">
+                <span>仓库名称：</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位：</span>
+                <el-select v-model="value2" placeholder="请选择" @change ="onchange2()">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="gradationnumber">
+                <span>层次：</span>
+                <el-select v-model="value3" placeholder="请选择" @change="onchange3()">
+                    <el-option
+                    v-for="(item,i) in options3"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+
+                <el-button type="primary" class="btn" @click="selectMaterial()">新增倒垛单</el-button>
+            </div>
+        </div>
+        <el-drawer
+            :visible.sync="table"
+            direction="rtl"
+            size="50%"
+            :show-close="false"
+            >
+            <el-button @click="open">取消</el-button>
+            <el-button type="primary" @click="makeSure1">新增</el-button>
+            <div class="warehouse">
+                <span>仓库名称：</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位：</span>
+                <el-select v-model="value2" placeholder="请选择" @change ="onchange2()">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="gradationnumber">
+                <span>层次：</span>
+                <el-select v-model="value3" placeholder="请选择" @change="onchange3()">
+                    <el-option
+                    v-for="(item,i) in options3"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>新垛位：</span>
+                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
+                    <el-option
+                        v-for="(item,i) in options5"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="tablecls">
+                <!-- 查询所有的物资 -->
+                <dilTable v-bind.sync="option" @selection-change="selectionChange1">
+                    <!-- 操作列 -->
+                <el-table-column fixed="right" label="件数" prop="quantity" width="100">
+                <template slot-scope="scope">
+                    <el-input
+                    class="textinput1"
+                    v-model.number="scope.row.quantity"
+                    ></el-input>
+                </template>
+                </el-table-column>
+                </dilTable>
+            </div>
+        </el-drawer> 
+        <div class="table" >
+            <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
+        </div>
+           <!-- <div class="search">
+            <div class="warehouse">
+                <span>仓库名称：</span>
+                <el-select v-model="value1" disabled  placeholder="请选择" @change="onchange4()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>新垛位：</span>
+                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
+                    <el-option
+                        v-for="(item,i) in options5"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+     
+        </div>
+         <div class="table">
+            <dilTable v-bind.sync="options" ></diltable>
+        </div>  -->
+    </div>  
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data(){
+    return{
+      table:false,
+      sselectionList1: [],
+      form1:{},
+      inputText:"",
+      options11:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+        selectionType: "select",
+      },
+      options:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      },
+        //仓库
+        options1:[],
+        // 选中的仓库
+        value1:'',
+        // 垛位
+        options2:[],
+        // 选中垛位
+        value2:'',
+        // 层次
+        options3:[],
+        // 选中的层次
+        value3:'',
+        // 新增下拉框
+        // 垛位
+        options5:[],
+        // 选中垛位
+        value5:'',
+        inf: {},
+        // 每个物资型号的件数
+        quantity:[],
+        option: {
+            // 表格请求物资型号
+            requestUrl: "/api/v1/wms/getMaterialTypeList?warehouseid="+this.value1+"&stackingId="+this.value2+"&gradtionNumber="+this.value3+"&apiId=437",
+            // 控制显示多选列
+            selectionType: "select",
+        },
+    }
+  },
+    mounted(){
+        this.initialization();
+        //新增下拉框方法
+        // this.initialization1();
+    },
+     methods: {
+        //  创建选择物资型号的方法
+        selectMaterial(){
+            this.table =true
+            this.option.requestUrl="/api/v1/wms/getMaterialTypeList?warehouseid="+this.value1+"&stackingId="+this.value2+"&gradtionNumber="+this.value3+"&apiId=437";
+        },
+         // 返回选中的物资信息
+        selectionChange1(selection) {
+            this.selectionList1 = [];
+            this.selectionList1 = selection;
+        },
+         // 新增倒垛单
+        makeSure1() {
+            this.table = false;
+            let maps =this.selectionList1;
+            console.log("maps",maps)
+            if(
+                maps[0]==null 
+            )this.$message.error("存在空值！");
+            else
+            this.axios
+                .post("/api/v1/wms/createRestackMakeResult?keeperId=2&beforeLevel="+this.value3+"&afterStackingId="+this.value5+"&afterWarehouseId="+this.value1+"&afterBeforeStackingId="+this.value2+"&resultRemark="+"",maps)
+                .then((res) => {
+                    if (res.data.code == 200) {
+                        this.$message({
+                        type: "success",
+                        message: "新增成功!",
+                        });
+                        this.$router.go(-1);
+                    }else{
+                        this.$message.error("新增失败,可能存在重复！");
+                    }
+                    });
+        },
+         open() {
+            if (this.selectionList1.length != 0) {
+                this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                })
+                .then(() => {
+                    this.selectionList1 = [];
+                    this.table = false;
+                })
+                .catch(() => {});
+            } else {
+                this.table = false;
+            }
+        },
+        //  添加倒垛单
+        toInsert() {
+        this.$router.push({
+          name: 'steel_restackTransfer',
+          params: {
+              mapValue:{
+                valus:"ssss",
+                cangku:this.value1,
+                 duowei:this.value2,
+                 cengci:this.value3
+              }
+              
+          }
+        })
+        },
+         //初始化选择仓库垛位
+     initialization(){
+         this.axios.get('/api/v1/wms/selectWarehouse').then((res)=>{
+             this.options1 = res.data.data
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106',{
+                 warehouseid:this.value1
+             }) 
+         })
+     },
+     onchange1(){
+            console.log(1);
+            //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+             this.options2 = res.data.data;
+             this.options5=res.data.data;
+             this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1;
+             this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid=" + this.value1;       
+         })
+     },
+     onchange2(){
+        if(this.value1 == ''){
+            this.$message({
+                message: '请选择仓库之后！再选择',
+                type: 'warning'
+            });
+            this.value2 = ''
+        }else{
+            console.log('-----')
+            console.log(this.value2)
+        //     this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value2;        
+        //     this.options.requestUrl ="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value2;   
+        //    console.log(this.options11.requestUrl)
+            //选择仓库层次号
+            this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value2).then((res)=>{
+            this.options3 = res.data.data;
+            console.log("层次选择"+this.options3)})
+            console.log("fasdsaf")
+    }},
+    onchange3(){
+        console.log("change3")
+        if(this.value2 == ''||this.value1==''){
+            this.$message({
+                message: '请选择仓库和垛位之后！再选择',
+                type: 'warning'
+            });
+            this.value3 = ''
+
+        }else{
+            console.log(this.value1,this.value2)
+            this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1 + 
+            "&stackingId="+this.value2+"&gradtionNumber="  + this.value3 
+        }
+    },
+    onchange4(){
+        //  console.log(1);
+        //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+              console.log( this.options5 = res.data.data)
+            //  this.options5 = res.data.data;
+            
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1)
+         })
+     },
+     onchange5(){
+        this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value5;    
+    },
+
+     onclick(){
+      console.log("点击事件");
+     },
+
+       // 确认
+      onClickConfirm() {
+         //console.log("inf",this.inf);
+        let wmspRestackMakeResult={
+            //垛位id    
+            stackingId:this.inf[0].stackingId,
+            //层次    
+            // gridGradationNumber:that.value3,
+            //倒垛前网格id    
+            GridId:this.inf[0].GridId,
+            //仓库id    
+            warehouseid:this.value1,
+            //倒垛后的垛位id    
+            stackingId1:this.value5,
+            //倒垛后的层次id
+            // gridGradationNumber1:that.value6, 
+        };
+        //初始化maplist
+        var maplist=[];
+        this.inf.forEach((item,i)=>{
+            //初始化mapItem
+            var mapItem={
+                //物资编码
+                materialCode:"",
+                //物资炉号    
+                materialFurnaceNumber:"",
+                // 物资理重
+                materialTheoreticalWeight:0,
+                //物资名称    
+                materialName:"",
+                //物资件数   
+                makeMaterialNumber:0,
+                //物资id    
+                materialId:0,
+            };
+            mapItem.materialCode=item.materialCode;
+            mapItem.materialFurnaceNumber=item.materialFurnaceNumber;
+            mapItem.materialTheoreticalWeight=item.materialTheoreticalWeight;
+            mapItem.materialName=item.materialName;
+            mapItem.makeMaterialNumber=item.makeMaterialNumber;
+            mapItem.materialId=item.materialId;
+            maplist.push(mapItem);
+        });
+      
+       let map = {
+       wmspRestackMakeResult : wmspRestackMakeResult,
+       maplist: maplist
+      };
+        console.log(map)
+        // console.log("map",map);
+
+       this.axios
+        .post("/api/v1/wms/addRestackMakeResult/", map)
+         .then((res) => {
+         if(res.data.code == 200){
+                this.$router.push("/steel_restack")
+               this.$message({
+            type: "success",  
+            message: "新增成功!",
+           });
+         }
+         
+       
+          
+        });
+    },
+    selectionChange(row) {
+      console.log("当前选中行的数据：");
+      console.log(row);
+      this.inf = row;
+      console.log(this.inf);
+    },
+    
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_restackAdd{
+    .search{
+        height: 5rem;
+        display: flex;
+        align-items:center;
+        padding-left:0.625rem;
+        .warehouse,.stack,.gradationnumber{
+            margin-left: 1.25rem;
+        }
+    }
+
+
+    .form{
+        display: inline;
+        justify-content: center;
+        margin-left: 1.25rem;
+        
+    }
+    .button_box{
+        width: 90%;
+        position: fixed;
+        bottom: 1.25rem;
+        display: flex;
+        justify-content: center;
+    }
+}
+</style>

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

@@ -0,0 +1,106 @@
+//收发存报表
+<template>
+  <div class="sendReceive">
+    <div class="frameCalculation">
+      <span>库存时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <!-- <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker> -->
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <el-button type="primary" @click="refresh">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
+      <!-- <span style="margin-left: 1rem;">合计昨日库存：</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input> -->
+      <span style="margin-left: 1rem;">合计今日库存：</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
+    </div>
+    <div class="table">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from '@/utils/sharedJsFile'
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&startTime=null&endTime=null&i=" +new Date(),
+      },
+      startTime: null,
+      endTime: null,
+      //合计今日库存
+      totalNumber: 0,
+      tableTitle:'收发存报表'
+    };
+  },
+  methods: {
+    refresh(){
+      this.$router.go(0);
+    },
+    func(res){
+      console.log(res)
+      var lastDayTotal = 0
+      res.list.forEach(e => {
+        lastDayTotal = lastDayTotal+e.send_receive_thisday_inventory
+      });
+      this.totalNumber = lastDayTotal
+      //this.totalCapacity = res.total;
+      //获取总记录条数作为合计车数
+      // this.totalCapacity = res.total;
+      this.isKuang = false;
+    },
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.sendReceive {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,102 @@
+//倒库
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <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="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="240">
+          <template slot-scope="scope">
+             <el-button type="text" size="mini" @click="selectContract(scope)">
+              查看
+            </el-button>
+            <el-button type="text" size="mini" @click="deleted(scope)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getIvboundMakeResultList?apiId=372",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/bar1_addTransfer");
+    },
+    onclick(){
+      console.log("点击事件");
+    },
+    deleted(scope){   
+      console.log(scope.row)
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+      .then(() => {
+      this.axios
+            .post(
+              "/api/v1/wms/deleteIvboundMakeResult/" + scope.row.resultId
+            )
+            .then((res) => {
+              if(res.data.code == 200){   
+            this.$message({
+            type: "success",
+            message: "删除成功!",
+                          });
+          this.$router.go(0);
+            }else {
+									this.$message({
+										message: "删除失败",
+										type: "warning",
+									});
+								}
+              
+            })
+     })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    }
+  }
+}
+</script>
+
+<style lang="scss" >
+.steel_inbound {
+  .sache {
+    padding: 40px;
+    .el-input {
+      width: 250px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>

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

@@ -46,12 +46,13 @@ export default {
       endTime: null,
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371",
+        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+3,
         // selectionType: "select",
         // mapList: [],
       },
     }
   },
+  
   methods:{
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
@@ -69,7 +70,8 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+3+"&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(); 
           // }else{

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

@@ -1,6 +1,6 @@
 //真实入库作业
 <template>
-  <div class="steel_inbound">
+  <div class="steel_inbound_real">
     <div class="sache">
       <span>入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
@@ -8,7 +8,7 @@
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <el-select v-model="region" placeholder="请选择班次">
+      <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
         <el-option label="不选择班次" value="0"></el-option>
         <el-option label="早班" value="1"></el-option>
         <el-option label="中班" value="2"></el-option>
@@ -47,7 +47,7 @@ export default {
       region: "0",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=371",
+        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+3,
         // selectionType: "select",
         // mapList: [],
       },
@@ -142,7 +142,8 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+3+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
           // }else{
@@ -217,13 +218,21 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
-.steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+<style lang="scss" scoped>
+  .steel_inbound_real{
+    .sache{
+      display: flex;
+      justify-content: start;
+      align-items: center;
+      line-height: 40px;
+      height: 40px;
+      padding-left: 1.875rem;
+      .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
+    }
   }
-}
 </style>

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

@@ -1,20 +1,14 @@
 //入库统计
 <template>
-  <div class="steel_inbound">
+  <div class="steel_inboundStatistics">
     <div class="sache">
-      <!-- <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
-      </el-input>
-       -->
       <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="选择日期">
       </el-date-picker>
-      <el-select v-model="region" placeholder="请选择班次">
+      <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
         <el-option label="不选择班次" value="0"></el-option>
         <el-option label="早班" value="1"></el-option>
         <el-option label="中班" value="2"></el-option>
@@ -23,16 +17,22 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-col :span="3" v-html="'\u2003'"/>
+      <span>生产总件数</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input3"
+        :disabled="true" class="inputs" style="width:10%">
+      </el-input>
+      <span>生产总重量</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input4"
+        :disabled="true" style="width:10%">
+      </el-input>
     </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 v-bind.sync="options" @func="func" :rowClassName="rowClassName">
       </dilTable>
     </div>
   </div>
@@ -44,6 +44,17 @@ import { getCookie } from '@/utils/util.js';
 export default {
   data(){
     return{
+      rowClassName({row, rowIndex}) {
+        if (rowIndex === 0) {
+          return 'success-row';
+        }
+        return '';
+      },
+      input1: '',
+      input2: '',
+      input3: '',
+      input4: '',
+      input5: '',
       inputText:"",
       startTime: null,
       endTime: null,
@@ -56,7 +67,30 @@ export default {
       },
     }
   },
+  created(){
+    console.log(this.options.data)
+  },
   methods:{
+    func(res){
+      // console.log(res.list[0])
+      // this.input1 = this.input1 + e.furnaceNumber1,
+      let num1 = 0;
+      let num2 = 0;
+      res.list.forEach(e => {
+        console.log(e)
+        console.log(e.count)
+        console.log(e.weight)
+        num1 = num1 + e.count,
+        num2 = num2 + e.weight
+      });
+      this.input3 = num1;
+      this.input4 = num2;
+      // this.input1 = res.list[0].furnaceNumber1,
+      // this.input2 = res.list[0].materialName,
+      // this.input3 = res.list[0].count,
+      // this.input4 = res.list[0].weight,
+      // this.input5 = res.list[0].onetime
+    },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
@@ -164,13 +198,26 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
-.steel_inbound{
+<style lang="scss" scoped>
+.steel_inboundStatistics {
   .sache{
     height: 5rem;
     display: flex;
     align-items: center;
     padding-left: 1.875rem;
+    .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
+  }
+  .funcnum {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
   }
 }
+
 </style>

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

@@ -49,8 +49,8 @@ export default {
   methods:{
     onclick(){
        //改变查询条件
-      this.$refs.tab.setDataRequestQuery({"startTime":this.queryDate[0],
-                      "endTime": this.queryDate[1]
+      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.queryDate[0]),
+                      "endTime":sjTime(this.queryDate[1]) 
                       });         
     },
     getToday() {

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

@@ -43,7 +43,7 @@ export default {
       totalWeight:0,
       option:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+3+"&startTime=null&endTime=null&i=" +new Date()+"&con="+this.textInput,
+        requestUrl: "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+3+"&startTime=null&endTime=null&i=" +new Date(),
       },
     }
   },

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

@@ -8,7 +8,7 @@
 				<i class="el-icon-search"></i>查询
 			</el-button>
 		</div>
-  <dilTable v-bind.sync="option">
+    <dilTable v-bind.sync="option" @func="func" :rowClassName="rowClassName">
       <!-- <el-table-column fixed="right" label="操作" width="110">
         <template slot-scope="scope">
           <el-button @click="demotionClick(scope.row.gridId)" type="text" size="small"
@@ -17,6 +17,9 @@
         </template>
       </el-table-column> -->
     </dilTable>
+    <!-- <dilTable v-bind.sync="options" >
+
+    </dilTable> -->
     </div>
 </template>
 
@@ -25,21 +28,54 @@ export default {
  name:"steel_real",
   data(){
     return {
+      mapList:[],
+      rowClassName({row, rowIndex}) {
+        
+        if (rowIndex === 0) {
+          return 'success-row';
+        }
+        return '';
+      },
       inputText:"",
       option: {
-        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167",
-        },
-      };
-    },
+        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+3,
+      },
+      rowId:''
+    };
+  },
   mounted(){
-
+    
+  },
+  created(){
+    // 查询实时库存中已经超过库龄预警的数据
+    // mapList=this.option1
+    // console.log(this.mapList+"这是第一个")
+    // this.axios.post(
+    //       "/api/v1/wms/getGridMaterialAgeList?warehouseId="+3
+    //     )
+    //     .then((res) => {
+    //       this.mapList = res.data.data
+    //       // console.log(res.data.data)
+    //       // console.log(this.mapList)
+    //     });
   },
   methods:{
+    func(res){
+      // console.log(res)
+      res.list.forEach(e => {
+        console.log(e.status)
+        if(e.status == 0){
+          // 表示这个物资已经达到库龄预警
+          this.rowClassName(e,e.ROW_ID)
+        }
+        // console.log(this.mapList)
+      });
+    },
     demotionClick(gridId){
       this.$router.push("/steel_realDown/" + gridId);
     },
     onClick(){
-      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&&con="+this.inputText;
+      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+3+"&con="+this.inputText;
       console.log(this.inputText)
     }
   },

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

@@ -15,8 +15,8 @@
       </el-button>
     </div>
     <div class="table">
-<!--       <dilTable v-bind.sync="options"> 
-      </dilTable> -->
+      <dilTable v-bind.sync="options"> 
+      </dilTable>
     </div>
       <template>
         <el-tabs v-model="activeName" @tab-click="handleClick">

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

@@ -1,7 +1,7 @@
 // 新增倒垛作业
 <template>
     <div class="steel_restackAdd">
-        <PageTitle>返回</PageTitle>
+        <page-title>返回</page-title>
         <div class="search">
             <div class="warehouse">
                 <span>仓库名称：</span>
@@ -143,13 +143,14 @@
         </div>
          <div class="table">
             <dilTable v-bind.sync="options" ></diltable>
-        </div>
+        </div> 
     </div>  
 </template>
 
 <script>
-// import PageTitle from "@/components/Page/Title";
+import PageTitle from "@/components/Page/Title";
 export default {
+  components: { PageTitle },
   data(){
     return{
       table:false,

src/views/WMS/router/index.js

@@ -45,6 +45,33 @@ import steel_outboundStatistics from '../components/steel/steel_outboundStatisti
 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'
 Vue.use(Router)
 const constantRouterMap = [
 	{
@@ -90,8 +117,35 @@ const constantRouterMap = [
 		{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: 'steel_inboundStatistics', name: 'steel_inboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: steel_inboundStatistics}
+		{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},
+
 	  ]
 	}
   ];

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 添加汽运单价 -->
+  <!-- 添加汽运单价 111-->
   <div class="addTransportPrice">
     <page-title>新增</page-title>
     <div class="form">

src/views/appoint/components/ship/addCargoResult.vue

@@ -1,51 +1,46 @@
 <template>
   <!-- 添加货权转移实绩 -->
-  <div class="addWagonLoad">
-    <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">货权转移</el-divider>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="109" v-model="form1" ref="from1"></dil-form>
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="109" v-model="form1" ref="from1"></dil-form>
+      </div>        
     </div>
-    <div class="form-box f1">
-      <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="物资">
-          <el-input v-model="materialName" disabled> </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
-        </el-form-item>
-      </el-form>
+    <!-- 物资 -->
+    <div class="mofrom">
+      <span class="motext">物资</span>
+      <el-input class="moinput" v-model="materialName" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-    <div class="form-box f2">
-      <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="货权转移送达单位">
-          <el-input v-model="cargo" disabled> </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
-        </el-form-item>
-      </el-form>
+    <!-- 货权转移送达单位 -->
+    <div class="mofrom">
+      <span class="motext">货权转移送达单位</span>
+      <el-input class="moinput" v-model="cargo" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
-    <div class="form-box f3">
-      <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="收货人">
-          <el-input v-model="receiver" disabled> </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
-        </el-form-item>
-      </el-form>
+    <!-- 货权转移送达单位 -->
+    <div class="mofrom">
+      <span class="motext">收货人</span>
+      <el-input class="moinput" v-model="receiver" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(3)">浏览</el-button>
     </div>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态框 -->
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="30%"
+      size="50%"
     >
       <el-input
         placeholder="请输入内容"
         v-model="input"
-        style="margin-top: 10px; margin-left: 20px"
+        style="margin-top: 10px; margin-left: 20px; width:250px"
         clearable
       >
       </el-input>
@@ -76,10 +71,6 @@
         ></dilTable>
       </div>
     </el-drawer>
-    <div class="button-box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
   </div>
 </template>
 <script>
@@ -196,64 +187,53 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-.form-box {
-  padding: 20px 30px;
-  margin-left: 330px;
-}
-.button-box {
-  padding: 20px 30px;
-  margin-left: 460px;
-}
-.btn-left {
-  margin-left: 470px;
-}
-.input {
-  margin-left: 90px;
-}
-.label {
-  margin-left: 445px;
-  margin-bottom: -30px;
-  font: bold;
-  font-size: 1rem;
-  padding-left: -30px;
-  font-family: Arial, Helvetica, sans-serif;
-  margin-bottom: 20px;
-}
-.label2 {
-  margin-left: 425px;
-  margin-bottom: -30px;
-  font: bold;
-  font-size: 1rem;
-  font-family: Arial, Helvetica, sans-serif;
-}
-.label1 {
-  margin-left: 345px;
-  margin-bottom: -30px;
-  font: bold;
-}
-.common {
-  font-weight: 700;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
-    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  font-size: 1rem;
-  cursor: default;
-  color: #2c3e50;
-}
-.f1 {
-  margin-top: -2.5rem;
-  margin-left: 26rem;
-}
-.f11 {
-  margin-top: -3rem;
-  // margin-left: 29rem;
-}
-.f2 {
-  margin-top: -2.5rem;
-  margin-left: 20.7rem;
-}
-.f3 {
-  margin-top: -2.5rem;
-  margin-left: 25rem;
+<style lang='scss'>
+.shipTransport{
+  .form{
+    display: flex;
+    .form_box{
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .mofrom {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
+    .motext{
+      width: 70px;
+    }
+    .moinput{
+      width: 250px;
+    }
+    .mobutton{
+      margin-left: 5px;
+    }
+  }
+  .button_box{
+    margin-left: 45%;
+  }
 }
 </style>

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -1,28 +1,33 @@
 <template>
   <!-- 添加发货通知 -->
-  <div class="addWagonLoad">
-    <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">发货通知单</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-       <el-form><dil-form :formId="112" v-model="form1" ref="from1" @change="onchange"></dil-form></el-form>
-       <div class="buttonins"><el-button type="primary" @click="onDrawer">浏览</el-button></div> 
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="112" v-model="form1" ref="from1" @change="onchange"></dil-form>
+      </div>
+      <div class="liulan">
+          <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
+      </div>     
     </div>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态框 -->
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="30%"
+      size="50%"
     >
-      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px;width:250px" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick()"  style="margin-bottom:15px">
         <i class="el-icon-search"></i>查询
       </el-button>
     <dilTable v-bind.sync="options" @radio-change="currentRadioChange1" ></dilTable>
     </el-drawer>
-    <div class="button-box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
   </div>
 </template>
 
@@ -121,9 +126,54 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
-.buttonins{
-  height: auto;
+<style lang='scss'>
+.shipTransport{
+  .form{
+    display: flex;
+    .form_box{
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .liulan{
+      width: 120px;
+      margin-top: 30px;
+      .el-button{
+        width: 100px !important;
+        margin: auto;
+      }
+      .btn{
+        margin-top: 0px;
+      }
+      .btn1{
+        margin-top: 13px;
+      }
+      .btn2{
+        margin-top: 67px;
+      }
+  }
+  .button_box{
+    margin-left: 45%;
+  }
 }
 </style>

src/views/appoint/components/ship/cargoResult.vue

@@ -1,6 +1,6 @@
 <template>
-  <!-- 作业路径页面 -->
-  <div class="homeworkPath">
+  <!-- 货权转移页面 -->
+  <div class="shipTransport">
     <div class="top">
      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
  <el-button type="primary" class="btn" @click="onclick">
@@ -84,9 +84,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/appoint/components/ship/deliveryAttorney.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 提货委托页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       
@@ -182,9 +182,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 20px 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/appoint/components/ship/deliveryNotice.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 发货通知页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       
@@ -170,9 +170,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 20px 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/inward/components/truckAppoint/purInwardRequirement.vue

@@ -96,9 +96,6 @@ export default {
   },
   methods: {
     func(res){
-        console.log("-----");
-        console.log(res.list)
-        console.log("-----");
         res.list.forEach(e => {
             if(e.enable == "未启用"){
                this.startStop = "停用"

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

@@ -2,14 +2,6 @@
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
       <span>计毛时间：</span>
-      <!-- <el-date-picker
-        v-model="Time"
-        :editable="true"
-        type="datetimerange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期">
-      </el-date-picker> -->
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -41,6 +33,7 @@
 
 <script>
 import { sjTime } from '@/utils/sharedJsFile'
+import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
@@ -49,7 +42,7 @@ export default {
       pageSize:100,
       isKuang:false,
       option: {
-        requestUrl: "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl: "",
       },
       startTime:null,
       endTime:null,
@@ -61,10 +54,19 @@ export default {
     };
   },
   created(){
-      const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
-      var startTime = this.dataFormat(sjTime(start));
-      var endTime = this.dataFormat(sjTime(new Date()));
-      this.tableTitle = startTime + ' 至 ' + endTime;
+    //初始化表头
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&carrierSsoId=" + null +"&i=" +new Date();
+    }
+    //时间段初始化
+    const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
+    var startTime = this.dataFormat(sjTime(start));
+    var endTime = this.dataFormat(sjTime(new Date()));
+    this.tableTitle = startTime + ' 至 ' + endTime;
   },
   methods: {
     refresh(){
@@ -82,10 +84,6 @@ export default {
       // this.totalCapacity = res.total;
       this.isKuang = false;
     },
-    // requestQuery(q){
-    //   //调用获取总净重方法
-    //   this.calculationTotalNumber(q);
-    // },
     onclick() {
       let startTime = null;
       let endTime = null;
@@ -94,42 +92,30 @@ export default {
         endTime = sjTime(this.endTime);
         //修改报表名称
         this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
-        this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        //加上时间重置表头
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&carrierSsoId=" + null +"&i=" +new Date();
+        }
       }else{
         if(this.startTime){
           startTime = sjTime(this.startTime);
         }else if(this.endTime){
           endTime = sjTime(this.endTime);
         }
-        this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        //加上时间重置表头
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&carrierSsoId=" + null +"&i=" +new Date();
+        }
       }
     },
-    // //获取当前条件下的总净重
-    // calculationTotalNumber(dataRequestQuery){
-    //   //初始化时间
-    //   let startTime = null;
-    //   let endTime = null;
-    //   if(this.Time != null){
-    //     startTime = sjTime(this.Time[0]);
-    //     endTime = sjTime(this.Time[1]);
-    //   }
-    //   //放入子组件筛选的值
-    //   let mapValue = undefined;
-    //       for (const key in dataRequestQuery) {
-         
-    //         const val = dataRequestQuery[key];
-    //         if (val||val==0) {
-             
-    //           if (!mapValue) mapValue = {};
-            
-    //           mapValue[key] = val;
-    //         }
-    //       }
-    //   this.axios.post("/api/v1/tms/getAllSaleReportTotal?startTime=" + startTime +"&endTime="+ endTime +"&i=" +new Date(),mapValue)
-    //   .then((res) => {
-    //       this.totalNumber = res.data.data;
-    //     });  
-    // },
     //格式化日期
     dataFormat(value){
       let date = new Date(value);