3 年之前 · b692316907
--- a/build/utils.js
+++ b/build/utils.js
@@ -15,9 +15,10 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
				 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
			
 
				 //       统计报表       组织机构/系统管理 采购  仓储
			
 
				 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
			
 
				-// let devModules = ['all']
			
 
				-let devModules = ['index','TMS','statisticalReport','RMS','sale','appoint'];
			
 
				+let devModules = ['all']
			
 
				+// let devModules = ['index','TMS','statisticalReport','RMS','sale','appoint','inward'];
			
 
				 // let devModules = ['index','appoint','WMS'];
			
 
				+
			
 
				 if (pathSrc.indexOf('node_modules') > -1) {
			
 
				     devModules = require('../../../cors.js').devModules;
			
 
				 }
			
--- a/config/index.js
+++ b/config/index.js
@@ -64,20 +64,25 @@ let proxyTable = {
 
				   },
			
 
				   // 所有数据的请求域名地址
			
 
				   "/api/v1": {
			
 
				-
			
 
				     target: "http://172.16.33.166:8080",
			
 
				-    // target: "http://localhost:8019",
			
 
				-    // target: "http://localhost:8080",
			
 
				-    // target: "http://192.168.1.111:8019",
			
 
				-
			
 
				+    // target: "http://192.168.1.107:8019",
			
 
				     ws: true,
			
 
				     pathRewrite: {
			
 
				       "^/api/v1": "/api/v1"
			
 
				     }
			
 
				   },
			
 
				+  "/api/v1/join": {
			
 
				+    target: "http://172.16.33.166:8080",
			
 
				+    // target: "http://192.168.1.108:8066",
			
 
				+    ws: true,
			
 
				+    pathRewrite: {
			
 
				+      "^api/v1/join": "/api/v1/join"
			
 
				+    }
			
 
				+  },
			
 
				   "/views/api/v1": {
			
 
				-    // target: "http://192.168.1.110:8019",
			
 
				     target: "http://172.16.33.166:8080",
			
 
				+    // target: "http://172.16.33.166:8080",
			
 
				+
			
 
				     // target: "http://192.168.1.115:8080",
			
 
				     ws: true,
			
 
				     pathRewrite: {
			
--- a/src/views/ADMINISTRATORS/app.html
+++ b/src/views/ADMINISTRATORS/app.html
@@ -0,0 +1,21 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+  <head>
			
 
				+    <meta charset="utf-8">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				+    <meta name="renderer" content="webkit">
			
 
				+    <meta content="智慧物流平台" name="keywords">
			
 
				+    <meta content="智慧物流平台" name="description">
			
 
				+    <title>后台管理 - 智慧物流平台</title>
			
 
				+    <link href="../static/css/common.css" rel="stylesheet"/>
			
 
				+    <link href="../static/img/favicon.ico" rel="shortcut icon"/>
			
 
				+    <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
			
 
				+    <script src="../static/lib/jquery/jquery.PrintArea.js" type="text/javascript"></script>
			
 
				+    <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>
			
 
				+    <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
			
 
				+    <script src="../static/js/common.js" type="text/javascript"></script>
			
 
				+  </head>
			
 
				+  <body>
			
 
				+    <div id="app"></div>
			
 
				+  </body>
			
 
				+</html>
			
--- a/src/views/ADMINISTRATORS/app.js
+++ b/src/views/ADMINISTRATORS/app.js
@@ -0,0 +1,109 @@
 
				+// The Vue build version to load with the `import` command
			
 
				+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
			
 
				+import Vue from 'vue';
			
 
				+import App from '@/components/App.vue';
			
 
				+// include
			
 
				+import '@/config/include.js';
			
 
				+
			
 
				+// 通用store
			
 
				+import store from '@/store/index.js';
			
 
				+
			
 
				+// router
			
 
				+import router from './router/index.js';
			
 
				+
			
 
				+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);
			
 
				+
			
 
				+import vuescroll from "vuescroll";//引入vuescroll
			
 
				+import "vuescroll/dist/vuescroll.css";//引入vuescroll样式
			
 
				+Vue.use(vuescroll);//使用
			
 
				+
			
 
				+// 导出Excel全局组件
			
 
				+import tableToExcel from '@/components/exportExcel/exportExcel'
			
 
				+Vue.use(tableToExcel)
			
 
				+
			
 
				+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;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+//写一个方法封装date对象转换为时间字符串
			
 
				+export function toDateString(value){
			
 
				+    if(value==null){
			
 
				+        return
			
 
				+    }
			
 
				+    var Year = value.getFullYear();
			
 
				+    var Month = ("0" + (value.getMonth() + 1)).slice(-2)
			
 
				+    var Day = ("0" + (value.getDate())).slice(-2)
			
 
				+    var Hours = ("0" + (value.getHours())).slice(-2)
			
 
				+    var Minutes = ("0" + (value.getMinutes())).slice(-2)
			
 
				+    var Seconds = ("0" + (value.getSeconds())).slice(-2)
			
 
				+    var DATE = Year + "-" + Month + "-" + Day + " " + Hours + ":" + Minutes + ":" + Seconds
			
 
				+    return DATE
			
 
				+}
			
 
				+/* eslint-disable no-new */
			
 
				+new Vue({
			
 
				+  el: '#app',
			
 
				+  router,
			
 
				+  store,
			
 
				+  components: { App },
			
 
				+  provide: apolloProvider.provide(),
			
 
				+  template: '<App/>'
			
 
				+});
			
--- a/src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue
+++ b/src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue
@@ -0,0 +1,500 @@
 
				+// 采购内转需求
			
 
				+<template>
			
 
				+  <div class="admin">
			
 
				+    <template>
			
 
				+      <div class="admin1">
			
 
				+        <el-tabs v-model="activeName">
			
 
				+          <el-tab-pane label="补录计量实绩" name="first">
			
 
				+            <div class="switch">
			
 
				+                <el-switch
			
 
				+                v-model="switchValue"
			
 
				+                active-text="二次过磅"
			
 
				+                inactive-text="首次过磅"
			
 
				+                @change = "onchange">
			
 
				+                </el-switch>
			
 
				+            </div>
			
 
				+          <div class="admin2">
			
 
				+            <div class="carrier from">
			
 
				+                <el-form
			
 
				+                    :inline="true"
			
 
				+                    class="demo-form-inline"
			
 
				+                    label-width="80px"
			
 
				+                    >
			
 
				+                    <el-form-item label="车牌号:">
			
 
				+                    <el-autocomplete
			
 
				+                    class="inline-input"
			
 
				+                    v-model="capacityName"
			
 
				+                    :fetch-suggestions="querySearchCapacity"
			
 
				+                    placeholder="车牌号"
			
 
				+                    :trigger-on-focus="false"
			
 
				+                    @select="handleSelectCapacity"
			
 
				+                    >
			
 
				+                    <template slot-scope="{ item }">
			
 
				+                    <div class="name">{{ item.capacityNumber }}</div>
			
 
				+                    </template>
			
 
				+                    </el-autocomplete>
			
 
				+                    </el-form-item>
			
 
				+                </el-form>
			
 
				+            </div>
			
 
				+            <div class="material from">
			
 
				+                <span class="text">物资:</span>
			
 
				+                <el-select v-model="materialId" placeholder="请选择">
			
 
				+                <el-option
			
 
				+                    v-for="item in materialList"
			
 
				+                    :key="item.materialId"
			
 
				+                    :label="item.materialName" 
			
 
				+                    :value="item.materialId"
			
 
				+                >
			
 
				+                </el-option>
			
 
				+                </el-select>
			
 
				+            </div>
			
 
				+
			
 
				+            <div class="poundNo from">
			
 
				+                <span class="text">磅单号:</span>
			
 
				+                <el-input v-model="poundNo"></el-input>
			
 
				+            </div>
			
 
				+            <div class="block" v-if="first">
			
 
				+                <span class="text">首次称重时间:</span>
			
 
				+                <el-date-picker
			
 
				+                v-model="value1"
			
 
				+                type="datetime"
			
 
				+                placeholder="选择日期时间">
			
 
				+                </el-date-picker>
			
 
				+            </div>
			
 
				+            <div class="firstWeight from " v-if="first">
			
 
				+                <span class="text">首次称重重量(吨):</span>
			
 
				+                <el-input v-model="firstWeight"></el-input>
			
 
				+            </div>
			
 
				+            <div class="truckCalFirst from" v-if="first">
			
 
				+                <span class="text">首次汽车衡:</span>
			
 
				+                <el-select v-model="truckCalFirst" placeholder="请选择" @change="onchange1">
			
 
				+                <el-option
			
 
				+                    v-for="item in truckCalFirstList"
			
 
				+                    :key="item.value"
			
 
				+                    :label="item.label" 
			
 
				+                    :value="item.value"
			
 
				+                >
			
 
				+                </el-option>
			
 
				+                </el-select>
			
 
				+            </div>
			
 
				+            <div class="block" v-if="second">
			
 
				+                <span class="text">二次称重时间:</span>
			
 
				+                <el-date-picker
			
 
				+                v-model="value2"
			
 
				+                type="datetime"
			
 
				+                placeholder="选择日期时间">
			
 
				+                </el-date-picker>
			
 
				+            </div>
			
 
				+            <div class="secondWeight from" v-if="second">
			
 
				+                <span class="text">二次称重重量(吨):</span>
			
 
				+                <el-input v-model="secondWeight"></el-input>
			
 
				+            </div>
			
 
				+            <div class="truckCalSecond from" v-if="second">
			
 
				+                <span class="text">二次汽车衡:</span>
			
 
				+                <el-select v-model="truckCalSecond" placeholder="请选择" @change="onchange2">
			
 
				+                <el-option
			
 
				+                    v-for="item in truckCalSecondList"
			
 
				+                    :key="item.value"
			
 
				+                    :label="item.label" 
			
 
				+                    :value="item.value"
			
 
				+                >
			
 
				+                </el-option>
			
 
				+                </el-select>
			
 
				+            </div>
			
 
				+            <div class="netWeight from" v-if="second">
			
 
				+                <span class="text">净重(吨):</span>
			
 
				+                <el-input v-model="netWeight"></el-input>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+          <div class="button_box">
			
 
				+            <el-button @click="onClickCancel">返回</el-button>
			
 
				+            <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
			
 
				+          </div>
			
 
				+          </el-tab-pane>
			
 
				+          <el-tab-pane label="修改路段顺序" name="second">
			
 
				+              <div class="admin2">
			
 
				+            <div class="carrier from">
			
 
				+                <el-form
			
 
				+                    :inline="true"
			
 
				+                    class="demo-form-inline"
			
 
				+                    label-width="80px"
			
 
				+                    >
			
 
				+                    <el-form-item label="车牌号:">
			
 
				+                    <el-autocomplete
			
 
				+                    class="inline-input"
			
 
				+                    v-model="capacityName"
			
 
				+                    :fetch-suggestions="querySearchCapacity"
			
 
				+                    placeholder="车牌号"
			
 
				+                    :trigger-on-focus="false"
			
 
				+                    @select="handleSelectCapacity"
			
 
				+                    >
			
 
				+                    <template slot-scope="{ item }">
			
 
				+                    <div class="name">{{ item.capacityNumber }}</div>
			
 
				+                    </template>
			
 
				+                    </el-autocomplete>
			
 
				+                    </el-form-item>
			
 
				+                </el-form>
			
 
				+            </div>
			
 
				+            <div class="poundNo from">
			
 
				+                <span class="text">运输订单号:</span>
			
 
				+                <el-input v-model="orderNumber" disabled></el-input>
			
 
				+            </div>
			
 
				+            <div class="poundNo from">
			
 
				+                <span class="text">路段顺序号:</span>
			
 
				+                <el-input v-model="lineQuence" @input="oninput"></el-input>
			
 
				+            </div>
			
 
				+            <div class="button_box">
			
 
				+            <el-button type="primary" @click="updateLineSqe" :disabled = "disabled">确认</el-button>
			
 
				+          </div>
			
 
				+          </div>
			
 
				+          </el-tab-pane>
			
 
				+        </el-tabs>
			
 
				+      </div>
			
 
				+    </template>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<script>
			
 
				+import { toDateString } from "../app.js"
			
 
				+export default {
			
 
				+  data() {
			
 
				+    return {
			
 
				+        orderNumber:null,
			
 
				+        first:true,
			
 
				+        second:true,
			
 
				+        activeName:"first",
			
 
				+        capacityName:null,
			
 
				+        stateCapacity:null,
			
 
				+        materialList:[],
			
 
				+        capacityId:null,
			
 
				+        materialId:null,
			
 
				+        value1:null,
			
 
				+        value2:null,
			
 
				+        disabled:false,
			
 
				+        orderId:null,
			
 
				+        firstWeight:null,
			
 
				+        secondWeight:null,
			
 
				+        netWeight:null,
			
 
				+        poundNo:null,
			
 
				+        truckCalFirstList:[],
			
 
				+        truckCalSecondList:[],
			
 
				+        truckCalFirst:null,
			
 
				+        truckCalSecond:null,
			
 
				+        switchValue:true,
			
 
				+        truckCalFirstNum:null,
			
 
				+        truckCalSecondNum:null,
			
 
				+        lineQuence:null
			
 
				+    };
			
 
				+  },
			
 
				+  created(){ 
			
 
				+  },
			
 
				+  mounted(){
			
 
				+      this.information()
			
 
				+  },
			
 
				+  methods: {
			
 
				+    updateLineSqe(){
			
 
				+        let map = {
			
 
				+            orderId:this.orderId,
			
 
				+            orderLineSqe:this.lineQuence
			
 
				+        }
			
 
				+        this.axios.post("/api/v1/uc/updateLineSqe",map).then((res) =>{
			
 
				+            console.log(res.data);
			
 
				+             if(res.data.code == "200"){
			
 
				+                this.$message.success("修改路段顺序号成功")
			
 
				+                this.$router.go(-1)
			
 
				+            }
			
 
				+           
			
 
				+        })
			
 
				+    },
			
 
				+    oninput(){
			
 
				+
			
 
				+    },
			
 
				+    onchange(){
			
 
				+        console.log(this.switchValue)
			
 
				+        console.log(typeof(this.switchValue))
			
 
				+        if(this.switchValue){
			
 
				+            this.first = true
			
 
				+            this.second = true
			
 
				+        }else{
			
 
				+            this.second = false
			
 
				+        }
			
 
				+    },
			
 
				+    onchange1(){
			
 
				+        console.log(this.truckCalFirst)
			
 
				+        this.truckCalFirstList.forEach(e => {
			
 
				+            if(this.truckCalFirst == e.value){
			
 
				+                this.truckCalFirstNum = e.label
			
 
				+            }
			
 
				+        });
			
 
				+    },
			
 
				+    onchange2(){
			
 
				+        console.log(this.truckCalSecond)
			
 
				+        this.truckCalSecondList.forEach(e => {
			
 
				+            if(this.truckCalSecond == e.value){
			
 
				+                this.truckCalSecondNum = e.label
			
 
				+            }
			
 
				+        });
			
 
				+    },        
			
 
				+    //运力弹出层
			
 
				+    handleSelectCapacity(item){
			
 
				+      console.log(item)
			
 
				+      this.capacityId = item.capacityId
			
 
				+      this.capacityName = item.capacityNumber
			
 
				+      this.axios.get("/api/v1/uc/getOrderNumber?capacityId=" + this.capacityId).then((res) =>{
			
 
				+          if(res.data.code == "200"){
			
 
				+              console.log("----");
			
 
				+              console.log(res.data)
			
 
				+              console.log("----");
			
 
				+              this.orderId = res.data.data.orderId
			
 
				+              this.orderNumber = res.data.data.orderNumber
			
 
				+              this.axios.get("/api/v1/uc/getMaterialIdByOrderId?orderId=" + this.orderId).then((res) =>{
			
 
				+                  if(res.data.code == "200"){
			
 
				+                      this.materialList = res.data.data
			
 
				+                  }
			
 
				+              })
			
 
				+          }
			
 
				+      })
			
 
				+    },
			
 
				+    //以下是运力边输边查搜索
			
 
				+    querySearchCapacity(queryString, cb) {
			
 
				+        if(queryString.length < 3){
			
 
				+            return
			
 
				+        }
			
 
				+        this.axios.get('/api/v1/uc/getCapacityNumber?index='+queryString).then((res)=>{
			
 
				+        if(res.data.code == "200"){
			
 
				+          var restaurantsCarrier = res.data.data
			
 
				+          console.log(restaurantsCarrier,"restaurantsCarrier");
			
 
				+          var results = queryString ? restaurantsCarrier.filter(this.createFilterCarrier(queryString)) :restaurantsCarrier;
			
 
				+           // 调用 callback 返回建议列表的数据
			
 
				+          cb(results);
			
 
				+        }
			
 
				+        })     
			
 
				+      },
			
 
				+    createFilterCarrier(queryString) {
			
 
				+        return (restaurantsCarrier)  =>  {
			
 
				+          return (restaurantsCarrier.capacityNumber.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
			
 
				+        };
			
 
				+      },
			
 
				+    //以上是承运商边输边查搜索
			
 
				+    information(){
			
 
				+        this.axios.get("/api/v1/uc/getAllCalculateMes").then((res) =>{
			
 
				+            
			
 
				+            this.truckCalFirstList = res.data
			
 
				+            this.truckCalSecondList = res.data
			
 
				+        })
			
 
				+    },
			
 
				+    onClickConfirm(){
			
 
				+        if(this.switchValue){
			
 
				+            if(this.orderNumber==null||this.truckCalFirst==null||this.truckCalSecond==null||
			
 
				+            this.firstWeight==null||this.secondWeight==null||this.netWeight==null||this.value1==null
			
 
				+            ||this.value2==null||this.poundNo==null||this.materialId==null){
			
 
				+                this.$message.warning("请填写所有值!!!")
			
 
				+                return
			
 
				+            }
			
 
				+        }else{
			
 
				+            if(this.orderNumber==null||this.truckCalFirst==null||
			
 
				+            this.firstWeight==null||this.value1==null
			
 
				+            ||this.poundNo==null||this.materialId==null){
			
 
				+                this.$message.warning("请填写所有值!!!")
			
 
				+                return
			
 
				+            }
			
 
				+        }
			
 
				+        let mapFirst = {
			
 
				+            orderNumber:this.orderNumber,
			
 
				+            resultTareCalculateNumber: this.truckCalFirstNum,
			
 
				+            resultTareWeight: this.firstWeight + "",
			
 
				+            resultTareWeightTime: toDateString(this.value1),
			
 
				+            resultPoundNo: this.poundNo,
			
 
				+            materialId: this.materialId + ""
			
 
				+        }
			
 
				+        let mapSecond = {
			
 
				+            orderNumber:this.orderNumber,
			
 
				+            resultTareCalculateNumber: this.truckCalFirstNum,
			
 
				+            resultCrossCalculateNumber: this.truckCalSecondNum,
			
 
				+            resultTareWeight: this.firstWeight + "",
			
 
				+            resultCrossWeight: this.secondWeight + "",
			
 
				+            resultNetWeight: this.netWeight + "",
			
 
				+            resultTareWeightTime: toDateString(this.value1),
			
 
				+            resultCrossWeightTime: toDateString(this.value2),
			
 
				+            resultPoundNo: this.poundNo,
			
 
				+            materialId: this.materialId + ""
			
 
				+        }
			
 
				+        var arr = []
			
 
				+        if(this.switchValue){
			
 
				+            arr.push(mapSecond)
			
 
				+        }else{
			
 
				+            arr.push(mapFirst)
			
 
				+        }
			
 
				+        this.axios.post("http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult",arr).then((res) =>{
			
 
				+            if(res.data.code == "200"){
			
 
				+                this.$message.success("补录计量实绩成功")
			
 
				+                this.$router.go(0)
			
 
				+            }
			
 
				+        })
			
 
				+    },
			
 
				+    onClickCancel(){
			
 
				+    },
			
 
				+    
			
 
				+  },
			
 
				+};
			
 
				+</script>
			
 
				+<style lang="scss">
			
 
				+.admin{
			
 
				+  .admin1 {
			
 
				+
			
 
				+      margin-top: 40px;
			
 
				+      margin-left: 40px;
			
 
				+      .switch {
			
 
				+          display: flex;
			
 
				+          justify-content: center;
			
 
				+          align-items: center;
			
 
				+          margin-top: 20px;
			
 
				+          color: aqua;
			
 
				+      }
			
 
				+      .button_box {
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            align-items: center;
			
 
				+            width: 100%;
			
 
				+            height: 100px;
			
 
				+        }
			
 
				+      .admin2 {    
			
 
				+        margin-top: 40px; 
			
 
				+        .from {
			
 
				+        display: flex;
			
 
				+        align-items: center;
			
 
				+        justify-content: center;
			
 
				+        margin-top: 20px;
			
 
				+        margin-bottom: 20px;
			
 
				+        }
			
 
				+        .carrier{
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            align-items: center;
			
 
				+            .el-form-item {
			
 
				+                text-align: right;
			
 
				+            }
			
 
				+            .el-autocomplete{
			
 
				+            width: 250px;
			
 
				+            }
			
 
				+        }
			
 
				+        .material {
			
 
				+        display: flex;
			
 
				+        justify-content: center;
			
 
				+        margin-top: 20px;
			
 
				+        margin-right: 100px;
			
 
				+        .text {
			
 
				+            display: inline-block;
			
 
				+            width: 170px;
			
 
				+            text-align: right;
			
 
				+        }
			
 
				+        .el-input {
			
 
				+            width: 250px;
			
 
				+        }
			
 
				+        }
			
 
				+        .poundNo {
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            align-items: center;
			
 
				+            margin-top: 20px;
			
 
				+            margin-right: 100px;
			
 
				+            .text {
			
 
				+            display: inline-block;
			
 
				+            width: 170px;
			
 
				+            text-align: right;
			
 
				+                  }
			
 
				+            .el-input {
			
 
				+            width: 250px;
			
 
				+                    }
			
 
				+        }  
			
 
				+        .block {
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            align-items: center;
			
 
				+            margin-top: 20px;
			
 
				+            margin-right: 100px;
			
 
				+            .el-input {
			
 
				+                width: 250px;
			
 
				+            }
			
 
				+            .text {
			
 
				+            display: inline-block;
			
 
				+            width: 170px;
			
 
				+            text-align: right;
			
 
				+            }
			
 
				+        }
			
 
				+        .truckCalFirst {
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            margin-top: 20px;
			
 
				+            margin-right: 100px;
			
 
				+            .text {
			
 
				+                display: inline-block;
			
 
				+                width: 170px;
			
 
				+                text-align: right;
			
 
				+            }
			
 
				+            .el-input {
			
 
				+                width: 250px;
			
 
				+            }
			
 
				+        }
			
 
				+        .truckCalSecond {
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            margin-top: 20px;
			
 
				+            margin-right: 100px;
			
 
				+            .text {
			
 
				+                display: inline-block;
			
 
				+                width: 170px;
			
 
				+                text-align: right;
			
 
				+            }
			
 
				+            .el-input {
			
 
				+                width: 250px;
			
 
				+            }
			
 
				+        }
			
 
				+        .secondWeight {
			
 
				+           display: flex;
			
 
				+            justify-content: center;
			
 
				+            align-items: center;
			
 
				+            margin-top: 20px;
			
 
				+            margin-right: 100px;
			
 
				+            .text {
			
 
				+            display: inline-block;
			
 
				+            width: 170px;
			
 
				+            text-align: right;
			
 
				+                  }
			
 
				+            .el-input {
			
 
				+            width: 250px;
			
 
				+                    } 
			
 
				+        }
			
 
				+        .firstWeight {
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            align-items: center;
			
 
				+            margin-top: 20px;
			
 
				+            margin-right: 100px;
			
 
				+            .text {
			
 
				+            display: inline-block;
			
 
				+            width: 170px;
			
 
				+            text-align: right;
			
 
				+                  }
			
 
				+            .el-input {
			
 
				+            width: 250px;
			
 
				+                    }
			
 
				+        }
			
 
				+        .netWeight {
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            align-items: center;
			
 
				+            margin-top: 20px;
			
 
				+            margin-right: 100px;
			
 
				+            .text {
			
 
				+            display: inline-block;
			
 
				+            width: 170px;
			
 
				+            text-align: right;
			
 
				+                  }
			
 
				+            .el-input {
			
 
				+            width: 250px;
			
 
				+                    }
			
 
				+        }
			
 
				+      }      
			
 
				+  }
			
 
				+  }
			
 
				+</style>
			
--- a/src/views/ADMINISTRATORS/router/index.js
+++ b/src/views/ADMINISTRATORS/router/index.js
@@ -0,0 +1,32 @@
 
				+import Vue from 'vue'
			
 
				+import Router from 'vue-router'
			
 
				+import routerBefore from '@/config/routerBefore.js'
			
 
				+// 主要
			
 
				+import main from '@/components/main.vue'
			
 
				+// 系统配置管理
			
 
				+import ADMINISTRATORS1 from '../components/ADMINISTRATORS1.vue'
			
 
				+
			
 
				+Vue.use(Router)
			
 
				+
			
 
				+const constantRouterMap = [
			
 
				+  {
			
 
				+    path: '/',
			
 
				+    name: 'main',
			
 
				+    meta: {title: '首页', code: 'xtpzgl'},
			
 
				+    component: main,
			
 
				+    redirect: {name: 'ADMINISTRATORS1'},
			
 
				+    children: [
			
 
				+      {path: 'ADMINISTRATORS1', name: 'ADMINISTRATORS1', meta: {code: 'xtpzgl-jggl'}, component: ADMINISTRATORS1}
			
 
				+    ]
			
 
				+  }
			
 
				+];
			
 
				+
			
 
				+const router = new Router({
			
 
				+  routes: constantRouterMap
			
 
				+})
			
 
				+//  before
			
 
				+routerBefore(router, constantRouterMap);
			
 
				+
			
 
				+export default router;
			
 
				+//  constantRouterMap
			
 
				+export const routes = constantRouterMap;
			
--- a/src/views/WMS/components/steel/addCheckWarehouse.vue
+++ b/src/views/WMS/components/steel/addCheckWarehouse.vue
@@ -97,15 +97,15 @@ export default {
 
				     onclick(a) {
			
 
				       if (a == 1) {
			
 
				         this.first.requestUrl =
			
 
				-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
			
 
				-          this.input;
			
 
				+         "/api/v1/wms/getSteelMaterialModelList?apiId=448&warehouseId="+3+"&con="+this.input;   
			
 
				       }
			
 
				     },
			
 
				     ondrawer(num) {
			
 
				       this.drawer = true;
			
 
				       this.a = num;
			
 
				+      console.log("jlll");
			
 
				       if(num==1){
			
 
				-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=443&warehouseId="+3
			
 
				+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=448&warehouseId="+3
			
 
				       }else{
			
 
				           this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
			
 
				       }
			
--- a/src/views/WMS/components/steel/addSteelInbound.vue
+++ b/src/views/WMS/components/steel/addSteelInbound.vue
@@ -96,16 +96,15 @@ export default {
 
				   methods: {
			
 
				     onclick(a) {
			
 
				       if (a == 1) {
			
 
				-        this.first.requestUrl =
			
 
				-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
			
 
				-          this.input;
			
 
				+        console.log(this.input)
			
 
				+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+this.input
			
 
				       }
			
 
				     },
			
 
				     ondrawer(num) {
			
 
				       this.drawer = true;
			
 
				       this.a = num;
			
 
				       if(num==1){
			
 
				-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=443&warehouseId="+3+"&status="+1
			
 
				+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+""
			
 
				       }
			
 
				     },
			
 
				     // 返回
			
@@ -114,11 +113,7 @@ export default {
 
				     },
			
 
				     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.materialName = selection.materialName;
			
 
				       this.max = selection.max;
			
 
				     },
			
 
				     currentRadioChange2(selection) {
			
--- a/src/views/WMS/components/steel/addSteelReserved.vue
+++ b/src/views/WMS/components/steel/addSteelReserved.vue
@@ -96,16 +96,14 @@ export default {
 
				   methods: {
			
 
				     onclick(a) {
			
 
				       if (a == 1) {
			
 
				-        this.first.requestUrl =
			
 
				-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
			
 
				-          this.input;
			
 
				+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+2+"&con="+this.input
			
 
				       }
			
 
				     },
			
 
				     ondrawer(num) {
			
 
				       this.drawer = true;
			
 
				       this.a = num;
			
 
				       if(num==1){
			
 
				-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=443&warehouseId="+3+"&status="+2
			
 
				+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+2+"&con="+""
			
 
				       }
			
 
				     },
			
 
				     // 返回
			
--- a/src/views/WMS/components/steel/bar1_steel/bar1_addSteelInbound.vue
+++ b/src/views/WMS/components/steel/bar1_steel/bar1_addSteelInbound.vue
@@ -96,16 +96,14 @@ export default {
 
				   methods: {
			
 
				     onclick(a) {
			
 
				       if (a == 1) {
			
 
				-        this.first.requestUrl =
			
 
				-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
			
 
				-          this.input;
			
 
				+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+1+"&con="+this.input
			
 
				       }
			
 
				     },
			
 
				     ondrawer(num) {
			
 
				       this.drawer = true;
			
 
				       this.a = num;
			
 
				       if(num==1){
			
 
				-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=443&warehouseId="+1+"&status="+1
			
 
				+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+1+"&con="+""
			
 
				       }
			
 
				     },
			
 
				     // 返回
			
--- a/src/views/WMS/components/steel/bar1_steel/bar1_addSteelReserved.vue
+++ b/src/views/WMS/components/steel/bar1_steel/bar1_addSteelReserved.vue
@@ -96,16 +96,14 @@ export default {
 
				   methods: {
			
 
				     onclick(a) {
			
 
				       if (a == 1) {
			
 
				-        this.first.requestUrl =
			
 
				-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
			
 
				-          this.input;
			
 
				+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+2+"&con="+this.input
			
 
				       }
			
 
				     },
			
 
				     ondrawer(num) {
			
 
				       this.drawer = true;
			
 
				       this.a = num;
			
 
				       if(num==1){
			
 
				-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=443&warehouseId="+1+"&status="+2
			
 
				+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+1+"&status="+2+"&con="+""
			
 
				       }
			
 
				     },
			
 
				     // 返回
			
@@ -114,11 +112,7 @@ export default {
 
				     },
			
 
				     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.materialName = selection.materialName;
			
 
				       this.max = selection.max;
			
 
				     },
			
 
				     currentRadioChange2(selection) {
			
--- a/src/views/WMS/components/steel/bar1_steel/bar1_steel_close.vue
+++ b/src/views/WMS/components/steel/bar1_steel/bar1_steel_close.vue
@@ -31,7 +31,7 @@ export default {
 
				       totalNumber: 0,
			
 
				       option:{
			
 
				         // first请求数据的地址
			
 
				-        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=1&value="+ (sjTime(new Date() + "")),
			
 
				+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&value="+ (sjTime(new Date() + "")),
			
 
				       },
			
 
				     }
			
 
				   },
			
--- a/src/views/WMS/components/steel/bar1_steel/bar1_steel_outbound.vue
+++ b/src/views/WMS/components/steel/bar1_steel/bar1_steel_outbound.vue
@@ -1,42 +1,107 @@
 
				-//出库
			
 
				+//出库作业
			
 
				 <template>
			
 
				-  <div class="steel_outbound">
			
 
				+  <div class="steel_inbound_real">
			
 
				     <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">
			
 
				+      <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,
			
 
				       options:{
			
 
				         // first请求数据的地址
			
 
				-        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152",
			
 
				+        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152&warehouseId="+1
			
 
				+        // selectionType: "select",
			
 
				+        // mapList: [],
			
 
				       },
			
 
				     }
			
 
				   },
			
 
				   methods:{
			
 
				+    // inboundDetails(scope){
			
 
				+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
			
 
				+    // },
			
 
				     onclick(){
			
 
				-      this.option.requestUrl="/api/v1/wms/getWmspOutboundResult?apiId=152?con="+this.inputText;
			
 
				+      let startTime = null;
			
 
				+      let endTime = null;
			
 
				+      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/getWmspOutboundResult?apiId=152&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;
			
 
				+    }
			
 
				   }
			
 
				 }
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss" scode>
			
 
				-// @import '../../../styles/WMS/steel/steel_outbound.scss';
			
 
				+<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>
			
--- a/src/views/WMS/components/steel/bar1_steel/bar1_steel_restack.vue
+++ b/src/views/WMS/components/steel/bar1_steel/bar1_steel_restack.vue
@@ -30,9 +30,9 @@
 
				                     <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 type="text" size="mini"   @click="editclick(scope.row.resultId)">
			
 
				                      修改
			
 
				-                   </el-button>
			
 
				+                   </el-button> -->
			
 
				                 </template>
			
 
				               </el-table-column>
			
 
				             </dilTable>
			
@@ -62,7 +62,7 @@ export default {
 
				         // second请求数据的地址
			
 
				         // 请求已下发的数据
			
 
				         requestUrl:
			
 
				-          "/api/v1/wms/?apiId=440&DistrubtionStatus=1",
			
 
				+          "/api/v1/wms/selectRestackList2?apiId=440&DistrubtionStatus=1",
			
 
				       },
			
 
				       //默认显示待下发的标签页
			
 
				       activeName: "first",
			
@@ -114,9 +114,9 @@ export default {
 
				 
			
 
				     //   },
			
 
				     //根据id进行修改
			
 
				-    editclick(resultId) {
			
 
				-      this.$router.push("/bar1_editSteel_restack/" + resultId);
			
 
				-    },
			
 
				+    // editclick(resultId) {
			
 
				+    //   this.$router.push("/bar1_editSteel_restack/" + resultId);
			
 
				+    // },
			
 
				     handleClick(tab, event) {
			
 
				       console.log(tab, event);
			
 
				     },
			
--- a/src/views/WMS/components/steel/bar1_steel/bar1_steel_restackAdd.vue
+++ b/src/views/WMS/components/steel/bar1_steel/bar1_steel_restackAdd.vue
@@ -86,7 +86,7 @@
 
				             </div>
			
 
				             <div class="stack">
			
 
				                 <span>新垛位：</span>
			
 
				-                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
			
 
				+                <el-select v-model="value5" placeholder="请选择">
			
 
				                     <el-option
			
 
				                         v-for="(item,i) in options5"
			
 
				                         :key="i"
			
@@ -112,7 +112,7 @@
 
				             </div>
			
 
				         </el-drawer> 
			
 
				         <div class="table" >
			
 
				-            <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
			
 
				+            <dilTable v-bind.sync="options11"></diltable>
			
 
				         </div>
			
 
				            <!-- <div class="search">
			
 
				             <div class="warehouse">
			
@@ -160,12 +160,12 @@ export default {
 
				       options11:{
			
 
				         // first请求数据的地址
			
 
				         requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
			
 
				-        selectionType: "select",
			
 
				+      
			
 
				       },
			
 
				-      options:{
			
 
				-        // first请求数据的地址
			
 
				-      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
			
 
				-      },
			
 
				+//       options:{
			
 
				+//         // first请求数据的地址
			
 
				+//       requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
			
 
				+//       },
			
 
				         //仓库
			
 
				         options1:[],
			
 
				         // 选中的仓库
			
@@ -194,6 +194,7 @@ export default {
 
				         },
			
 
				     }
			
 
				   },
			
 
				+    
			
 
				     mounted(){
			
 
				         this.initialization();
			
 
				         //新增下拉框方法
			
@@ -214,23 +215,28 @@ export default {
 
				         makeSure1() {
			
 
				             this.table = false;
			
 
				             let maps =this.selectionList1;
			
 
				-            console.log("maps",maps)
			
 
				+            console.log(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) => {
			
 
				+                    console.log(res);
			
 
				                     if (res.data.code == 200) {
			
 
				                         this.$message({
			
 
				-                        type: "success",
			
 
				-                        message: "新增成功!",
			
 
				+                            type: "success",
			
 
				+                            message: "新增成功!",
			
 
				                         });
			
 
				-                        this.$router.go(-1);
			
 
				-                    }else{
			
 
				-                        this.$message.error("新增失败,可能存在重复！");
			
 
				+                    }else if(res.data.code == 201){
			
 
				+                        this.$message({
			
 
				+                            type:"faile",
			
 
				+                            message:res.data.data
			
 
				+                        })
			
 
				                     }
			
 
				+                    this.$router.go(-1);
			
 
				                     });
			
 
				         },
			
 
				          open() {
			
@@ -280,7 +286,7 @@ export default {
 
				              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;       
			
 
				+            //  this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid=" + this.value1;       
			
 
				          })
			
 
				      },
			
 
				      onchange2(){
			
@@ -327,9 +333,9 @@ export default {
 
				              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;    
			
 
				-    },
			
 
				+    //  onchange5(){
			
 
				+    //     this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value5;    
			
 
				+    // },
			
 
				 
			
 
				      onclick(){
			
 
				       console.log("点击事件");
			
--- a/src/views/WMS/components/steel/bar1_steel/bar1_steel_sendreceive.vue
+++ b/src/views/WMS/components/steel/bar1_steel/bar1_steel_sendreceive.vue
@@ -40,7 +40,7 @@ export default {
 
				   data() {
			
 
				     return {
			
 
				       option: {
			
 
				-        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=null&endTime=null&i=" +new Date(),
			
 
				+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&startTime=null&endTime=null&i=" +new Date(),
			
 
				       },
			
 
				       startTime: null,
			
 
				       endTime: null,
			
@@ -76,14 +76,14 @@ export default {
 
				       }
			
 
				       if(startTime && endTime){
			
 
				         if(startTime < endTime){
			
 
				-          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				         }else{
			
 
				           this.startTime = null;
			
 
				           this.endTime = null;
			
 
				           this.$message.warning('开始时间要比结束时间早')
			
 
				         }
			
 
				       }else{
			
 
				-        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				       }
			
 
				     },
			
 
				   },
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_addCheckWarehouse.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_addSteelInbound.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_addSteelInbound.vue
@@ -0,0 +1,216 @@
 
				+<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/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+1+"&con="+this.input
			
 
				+      }
			
 
				+    },
			
 
				+    ondrawer(num) {
			
 
				+      this.drawer = true;
			
 
				+      this.a = num;
			
 
				+      if(num==1){
			
 
				+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+1+"&con="+""
			
 
				+      }
			
 
				+    },
			
 
				+    // 返回
			
 
				+    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=" + 2 + "&materialCode=" + this.materialCode+"&materialSpecification="+this.materialSpecification+"&materialModel="+this.materialModel+ "&quantity=" + this.materialNumber ).then((res) => {
			
 
				+        console.log(res.data)
			
 
				+          if (res.data.code == "200") {
			
 
				+            this.$message({
			
 
				+              message: "预留成功!",
			
 
				+              type: "success",
			
 
				+            });
			
 
				+            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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_addSteelReserved.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_addSteelReserved.vue
@@ -0,0 +1,216 @@
 
				+<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/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+2+"&con="+this.input
			
 
				+      }
			
 
				+    },
			
 
				+    ondrawer(num) {
			
 
				+      this.drawer = true;
			
 
				+      this.a = num;
			
 
				+      if(num==1){
			
 
				+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+2+"&status="+2+"&con="+""
			
 
				+      }
			
 
				+    },
			
 
				+    // 返回
			
 
				+    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=" + 2 + "&materialCode=" + this.materialCode+"&materialSpecification="+this.materialSpecification+"&materialModel="+this.materialModel+ "&quantity=" + this.materialNumber ).then((res) => {
			
 
				+        console.log(res.data)
			
 
				+          if (res.data.code == "200") {
			
 
				+            this.$message({
			
 
				+              message: "入库成功!",
			
 
				+              type: "success",
			
 
				+            });
			
 
				+            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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_addTransfer.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_billOfLading.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_billOfLadingAdd.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_checkWarehouse.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_editSteel_restack.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_inboundDetails.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_insertCheckInventory.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_insertTransfer.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_insertTransfer.vue
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_check.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_close.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_steel_close.vue
@@ -0,0 +1,73 @@
 
				+//结转
			
 
				+<template>
			
 
				+  <div class="steel_inbound">
			
 
				+    <div class="sache">     
			
 
				+    <span class="demonstration">月</span>
			
 
				+    <el-date-picker
			
 
				+      v-model="value"
			
 
				+      type="month"
			
 
				+      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>        
			
 
				+      <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{
			
 
				+      value : null,
			
 
				+      totalNumber: 0,
			
 
				+      option:{
			
 
				+        // first请求数据的地址
			
 
				+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=2&value="+ (sjTime(new Date() + "")),
			
 
				+      },
			
 
				+    }
			
 
				+  },
			
 
				+  methods:{
			
 
				+       func(res){
			
 
				+      console.log(res)
			
 
				+      var total = 0
			
 
				+      res.list.forEach(e => {
			
 
				+        total = total+e.close_thismonth_inventory
			
 
				+      });
			
 
				+      this.totalNumber = total
			
 
				+    
			
 
				+    },
			
 
				+    onclick(){
			
 
				+      console.log("value",this.value)
			
 
				+      var value = null;
			
 
				+      if(this.value){
			
 
				+        value = sjTime(this.value)
			
 
				+      }
			
 
				+      this.option.requestUrl = "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=2&value="+value;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scode>
			
 
				+.steel_inbound {
			
 
				+  .sache {
			
 
				+    width: 100%;
			
 
				+    height: 100px;
			
 
				+    display: flex;
			
 
				+    align-items: center;
			
 
				+    padding-left: 50px;
			
 
				+    .el-date-editor{
			
 
				+      margin: 20px;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+</style>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_inbound.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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="+2,
			
 
				+        // 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="+2+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
			
 
				+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
			
 
				+          // }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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundReal.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundReal.vue
@@ -0,0 +1,237 @@
 
				+//真实入库作业
			
 
				+<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="+2,
			
 
				+        // 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="+2+"&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" 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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundStatistics.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundStatistics.vue
@@ -0,0 +1,223 @@
 
				+//入库统计
			
 
				+<template>
			
 
				+  <div class="steel_inboundStatistics">
			
 
				+    <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-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" @func="func" :rowClassName="rowClassName">
			
 
				+      </dilTable>
			
 
				+    </div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import { sjTime } from "@/utils/sharedJsFile";
			
 
				+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,
			
 
				+      region: "0",
			
 
				+      options:{
			
 
				+        // first请求数据的地址
			
 
				+        requestUrl: "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+2,
			
 
				+        // selectionType: "select",
			
 
				+        // mapList: [],
			
 
				+      },
			
 
				+    }
			
 
				+  },
			
 
				+  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)
			
 
				+    // },
			
 
				+    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="+2+"&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;
			
 
				+    .el-select {
			
 
				+      width: 100%;
			
 
				+      .el-input__inner {
			
 
				+        width: 150px;
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+  .funcnum {
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    align-items: center;
			
 
				+
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+</style>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_outbound.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_steel_outbound.vue
@@ -0,0 +1,107 @@
 
				+//出库作业
			
 
				+<template>
			
 
				+  <div class="steel_inbound_real">
			
 
				+    <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-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,
			
 
				+      options:{
			
 
				+        // first请求数据的地址
			
 
				+        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152&warehouseId="+2
			
 
				+        // selectionType: "select",
			
 
				+        // mapList: [],
			
 
				+      },
			
 
				+    }
			
 
				+  },
			
 
				+  methods:{
			
 
				+    // inboundDetails(scope){
			
 
				+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
			
 
				+    // },
			
 
				+    onclick(){
			
 
				+      let startTime = null;
			
 
				+      let endTime = null;
			
 
				+      if (this.startTime) {
			
 
				+        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/getWmspOutboundResult?apiId=152&warehouseId="+2+"&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;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_outboundStatistics.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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="+2+"&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="+2+"&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="+2+"&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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_real.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_realDown.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_rebound.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_reserved.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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&warehouseId="+2,
			
 
				+        // selectionType: "select",
			
 
				+        // mapList: [],
			
 
				+      },
			
 
				+    }
			
 
				+  },
			
 
				+  methods:{
			
 
				+    // inboundDetails(scope){
			
 
				+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
			
 
				+    // },
			
 
				+    onclick(){
			
 
				+      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+2+"&con="+this.inputText;
			
 
				+    },
			
 
				+    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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_restack.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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/selectRestackList2?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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_restackAdd.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_sendreceive.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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&warehouseId=2&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&warehouseId=2&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				+        }else{
			
 
				+          this.startTime = null;
			
 
				+          this.endTime = null;
			
 
				+          this.$message.warning('开始时间要比结束时间早')
			
 
				+        }
			
 
				+      }else{
			
 
				+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=2&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>
			
--- a/src/views/WMS/components/steel/bar2_steel/bar2_steel_transfer.vue
+++ b/src/views/WMS/components/steel/bar2_steel/bar2_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>
			
--- a/src/views/WMS/components/steel/steel_close.vue
+++ b/src/views/WMS/components/steel/steel_close.vue
@@ -31,7 +31,7 @@ export default {
 
				       totalNumber: 0,
			
 
				       option:{
			
 
				         // first请求数据的地址
			
 
				-        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=3&value="+ (sjTime(new Date() + "")),
			
 
				+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&value="+ (sjTime(new Date() + "")),
			
 
				       },
			
 
				     }
			
 
				   },
			
@@ -51,7 +51,7 @@ export default {
 
				       if(this.value){
			
 
				         value = sjTime(this.value)
			
 
				       }
			
 
				-      this.option.requestUrl = "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=3&value="+value;
			
 
				+      this.option.requestUrl = "/api/v1/wms/getInventoryClose?apiId=95&value="+value;
			
 
				     }
			
 
				   }
			
 
				 }
			
--- a/src/views/WMS/components/steel/steel_inbound.vue
+++ b/src/views/WMS/components/steel/steel_inbound.vue
@@ -1,17 +1,11 @@
 
				-//入库
			
 
				+//入库转预留
			
 
				 <template>
			
 
				   <div class="steel_inbound">
			
 
				     <div class="sache">
			
 
				-      <!-- <el-input
			
 
				-        placeholder="请输入内容"
			
 
				-        v-model="inputText"
			
 
				-        clearable>
			
 
				-      </el-input>
			
 
				-       -->
			
 
				-      <span>入库时间：</span>
			
 
				+      <span class="text">入库时间：</span>
			
 
				       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
			
 
				       </el-date-picker>
			
 
				-      <span>至</span>
			
 
				+      <span class="text">至</span>
			
 
				       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
			
 
				       </el-date-picker>
			
 
				       <el-button type="primary" class="btn" @click="onclick">
			
@@ -23,13 +17,6 @@
 
				     </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>
			
@@ -100,11 +87,29 @@ export default {
 
				 
			
 
				 <style lang="scss" scode>
			
 
				 .steel_inbound{
			
 
				-  .sache{
			
 
				-    height: 5rem;
			
 
				-    display: flex;
			
 
				-    align-items: center;
			
 
				-    padding-left: 1.875rem;
			
 
				-  }
			
 
				+  margin-top: 30px;
			
 
				+  margin-left: 20px;
			
 
				+    .sache{
			
 
				+      display: flex;
			
 
				+      margin-bottom: 10px;
			
 
				+      padding-right: 10px;
			
 
				+      .text {
			
 
				+        text-align: left;
			
 
				+        line-height: 40px;
			
 
				+      }
			
 
				+      .el-date-editor {
			
 
				+        margin-right: 5px;
			
 
				+        margin-left: 5px;
			
 
				+      }
			
 
				+      .btn {
			
 
				+        margin-left: 10px;
			
 
				+      }
			
 
				+      .el-select {
			
 
				+      width: 100%;
			
 
				+      .el-input__inner {
			
 
				+        width: 150px;
			
 
				+      }
			
 
				+    }
			
 
				+    }
			
 
				 }
			
 
				 </style>
			
--- a/src/views/WMS/components/steel/steel_inboundReal.vue
+++ b/src/views/WMS/components/steel/steel_inboundReal.vue
@@ -2,10 +2,10 @@
 
				 <template>
			
 
				   <div class="steel_inbound_real">
			
 
				     <div class="sache">
			
 
				-      <span>入库时间：</span>
			
 
				+      <span class="text">入库时间：</span>
			
 
				       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
			
 
				       </el-date-picker>
			
 
				-      <span>至</span>
			
 
				+      <span class="text">至</span>
			
 
				       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
			
 
				       </el-date-picker>
			
 
				       <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
			
@@ -17,19 +17,9 @@
 
				       <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>
			
@@ -220,13 +210,23 @@ export default {
 
				 
			
 
				 <style lang="scss" scoped>
			
 
				   .steel_inbound_real{
			
 
				+     margin-top: 40px;
			
 
				+     margin-left: 20px;
			
 
				     .sache{
			
 
				       display: flex;
			
 
				-      justify-content: start;
			
 
				-      align-items: center;
			
 
				-      line-height: 40px;
			
 
				-      height: 40px;
			
 
				-      padding-left: 1.875rem;
			
 
				+      margin-bottom: 10px;
			
 
				+      padding-right: 10px;
			
 
				+      .text {
			
 
				+        text-align: left;
			
 
				+        line-height: 40px;
			
 
				+      }
			
 
				+      .el-date-editor {
			
 
				+        margin-right: 5px;
			
 
				+        margin-left: 5px;
			
 
				+      }
			
 
				+      .btn {
			
 
				+        margin-left: 10px;
			
 
				+      }
			
 
				       .el-select {
			
 
				       width: 100%;
			
 
				       .el-input__inner {
			
--- a/src/views/WMS/components/steel/steel_inboundStatistics.vue
+++ b/src/views/WMS/components/steel/steel_inboundStatistics.vue
@@ -2,10 +2,10 @@
 
				 <template>
			
 
				   <div class="steel_inboundStatistics">
			
 
				     <div class="sache">
			
 
				-      <span>入库时间：</span>
			
 
				+      <span class="text">入库时间：</span>
			
 
				       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
			
 
				       </el-date-picker>
			
 
				-      <span>至</span>
			
 
				+      <span class="text1">至</span>
			
 
				       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
			
 
				       </el-date-picker>
			
 
				       <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
			
@@ -18,13 +18,13 @@
 
				         <i class="el-icon-search"></i>查询
			
 
				       </el-button>
			
 
				       <el-col :span="3" v-html="'\u2003'"/>
			
 
				-      <span>生产总件数</span>
			
 
				+      <span class="text">生产总件数</span>
			
 
				       <el-input
			
 
				         placeholder="请输入内容"
			
 
				         v-model="input3"
			
 
				         :disabled="true" class="inputs" style="width:10%">
			
 
				       </el-input>
			
 
				-      <span>生产总重量</span>
			
 
				+      <span class="text">生产总重量</span>
			
 
				       <el-input
			
 
				         placeholder="请输入内容"
			
 
				         v-model="input4"
			
@@ -200,24 +200,35 @@ export default {
 
				 
			
 
				 <style lang="scss" scoped>
			
 
				 .steel_inboundStatistics {
			
 
				-  .sache{
			
 
				-    height: 5rem;
			
 
				-    display: flex;
			
 
				-    align-items: center;
			
 
				-    padding-left: 1.875rem;
			
 
				-    .el-select {
			
 
				+    margin-top: 30px;
			
 
				+    margin-left: 20px;
			
 
				+    .sache{
			
 
				+      display: flex;
			
 
				+      margin-bottom: 10px;
			
 
				+      padding-right: 10px;
			
 
				+      .text {
			
 
				+        text-align: left;
			
 
				+        line-height: 40px;
			
 
				+        width: 70px;
			
 
				+      }
			
 
				+      .text1 {
			
 
				+        text-align: left;
			
 
				+        line-height: 40px;
			
 
				+      }
			
 
				+      .el-date-editor {
			
 
				+        margin-right: 5px;
			
 
				+        margin-left: 5px;
			
 
				+      }
			
 
				+      .btn {
			
 
				+        margin-left: 10px;
			
 
				+      }
			
 
				+      .el-select {
			
 
				       width: 100%;
			
 
				       .el-input__inner {
			
 
				         width: 150px;
			
 
				       }
			
 
				     }
			
 
				-  }
			
 
				-  .funcnum {
			
 
				-    display: flex;
			
 
				-    justify-content: center;
			
 
				-    align-items: center;
			
 
				-
			
 
				-  }
			
 
				+    }
			
 
				 }
			
 
				 
			
 
				 </style>
			
--- a/src/views/WMS/components/steel/steel_outbound.vue
+++ b/src/views/WMS/components/steel/steel_outbound.vue
@@ -1,29 +1,19 @@
 
				-//出库
			
 
				+//出库作业
			
 
				 <template>
			
 
				-  <div class="steel_outbound">
			
 
				+  <div class="gaoxian_outbound">
			
 
				     <div class="sache">
			
 
				-      
			
 
				-      <div class="block">
			
 
				-        <span class="demonstration">选择时间</span>
			
 
				-        <el-date-picker
			
 
				-          v-model="queryDate"
			
 
				-          type="datetimerange"
			
 
				-          align="right"
			
 
				-          unlink-panels
			
 
				-          range-separator="至"
			
 
				-          start-placeholder="开始日期"
			
 
				-          end-placeholder="结束日期"
			
 
				-          value-format="yyyy-MM-dd HH:mm:ss"
			
 
				-          >
			
 
				-        </el-date-picker>
			
 
				-         <el-button type="primary" class="btn" @click="onclick">
			
 
				-          <i class="el-icon-search"></i>查询
			
 
				-        </el-button>
			
 
				-      </div>
			
 
				-     
			
 
				+      <span class="text">出库时间：</span>
			
 
				+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
			
 
				+      </el-date-picker>
			
 
				+      <span class="text">至</span>
			
 
				+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
			
 
				+      </el-date-picker>
			
 
				+      <el-button type="primary" class="btn" @click="onclick">
			
 
				+        <i class="el-icon-search"></i>查询
			
 
				+      </el-button>
			
 
				     </div>
			
 
				     <div class="table">
			
 
				-      <dilTable v-bind.sync="options" ref="tab">
			
 
				+      <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
			
 
				       </dilTable>
			
 
				     </div>
			
 
				   </div>
			
@@ -31,38 +21,87 @@
 
				 
			
 
				 <script>
			
 
				 import { sjTime } from "@/utils/sharedJsFile";
			
 
				-import moment from "moment";
			
 
				+import { getCookie } from '@/utils/util.js';
			
 
				 export default {
			
 
				   data(){
			
 
				     return{
			
 
				-      queryDate:[],
			
 
				       inputText:"",
			
 
				+      startTime: null,
			
 
				+      endTime: null,
			
 
				       options:{
			
 
				-        //first请求数据的地址
			
 
				-        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152"
			
 
				+        // first请求数据的地址
			
 
				+        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152&warehouseId="+3
			
 
				+        // selectionType: "select",
			
 
				+        // mapList: [],
			
 
				       },
			
 
				     }
			
 
				   },
			
 
				-  created(){
			
 
				-      this.queryDate=this.getToday();
			
 
				-  },
			
 
				   methods:{
			
 
				+    // inboundDetails(scope){
			
 
				+    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
			
 
				+    // },
			
 
				     onclick(){
			
 
				-       //改变查询条件
			
 
				-      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.queryDate[0]),
			
 
				-                      "endTime":sjTime(this.queryDate[1]) 
			
 
				-                      });         
			
 
				-    },
			
 
				-    getToday() {
			
 
				-        let obj = [];
			
 
				-        obj[0] = moment(moment().startOf("day").valueOf()).format("YYYY-MM-DD HH:mm:ss");
			
 
				-        obj[1]  = moment(moment().valueOf()).format("YYYY-MM-DD HH:mm:ss");
			
 
				-        return obj
			
 
				+      let startTime = null;
			
 
				+      let endTime = null;
			
 
				+      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/getWmspOutboundResult?apiId=152&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{
			
 
				+          // 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;
			
 
				+    }
			
 
				   }
			
 
				 }
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss" scode>
			
 
				-// @import '../../../styles/WMS/steel/steel_outbound.scss';
			
 
				+<style lang="scss" scoped>
			
 
				+  .gaoxian_outbound{
			
 
				+    margin-top: 40px;
			
 
				+    margin-left: 20px;
			
 
				+    .sache{
			
 
				+      display: flex;
			
 
				+      margin-bottom: 10px;
			
 
				+      padding-right: 10px;
			
 
				+      .text {
			
 
				+        text-align: left;
			
 
				+        line-height: 40px;
			
 
				+      }
			
 
				+      .el-date-editor {
			
 
				+        margin-right: 5px;
			
 
				+        margin-left: 5px;
			
 
				+      }
			
 
				+      .btn {
			
 
				+        margin-left: 10px;
			
 
				+      }
			
 
				+      .el-select {
			
 
				+      width: 100%;
			
 
				+      .el-input__inner {
			
 
				+        width: 150px;
			
 
				+      }
			
 
				+    }
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/WMS/components/steel/steel_outboundStatistics.vue
+++ b/src/views/WMS/components/steel/steel_outboundStatistics.vue
@@ -2,10 +2,10 @@
 
				 <template>
			
 
				   <div class="steel_inbound">
			
 
				     <div class="sache">
			
 
				-      <span>出库时间：</span>
			
 
				+      <span class="text">出库时间：</span>
			
 
				       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
			
 
				       </el-date-picker>
			
 
				-      <span>至</span>
			
 
				+      <span class="text1">至</span>
			
 
				       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
			
 
				       </el-date-picker>
			
 
				            <el-input
			
@@ -19,9 +19,9 @@
 
				       <!-- <el-button type="primary" @click="refresh">
			
 
				         <i class="el-icon-refresh"></i>刷新
			
 
				       </el-button> -->
			
 
				-      <span style="margin-left: 1rem;">总件数：</span>
			
 
				+      <span style="margin-left: 1rem;" class="text">总件数：</span>
			
 
				       <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
			
 
				-      <span style="margin-left: 1rem;">总重量：</span>
			
 
				+      <span style="margin-left: 1rem;" class="text">总重量：</span>
			
 
				       <el-input v-model="totalWeight" :disabled="true" style="width: 150px;"></el-input>
			
 
				     </div>
			
 
				     <div class="table">
			
@@ -92,17 +92,39 @@ export default {
 
				 }
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss" scode>
			
 
				+<style lang="scss" scope>
			
 
				 .steel_inbound{
			
 
				-  .sache{
			
 
				-    height: 5rem;
			
 
				-    display: flex;
			
 
				-    align-items: center;
			
 
				-    padding-left: 1.875rem;
			
 
				-     .el-input {
			
 
				-      width: 20%;
			
 
				-      margin-right: 1.25rem;
			
 
				+  margin-top: 30px;
			
 
				+  margin-left: 20px;
			
 
				+    .sache{
			
 
				+      display: flex;
			
 
				+      margin-bottom: 10px;
			
 
				+      padding-right: 10px;
			
 
				+      .text {
			
 
				+        text-align: left;
			
 
				+        line-height: 40px;
			
 
				+        width: 70px;
			
 
				+      }
			
 
				+      .text1 {
			
 
				+        text-align: left;
			
 
				+        line-height: 40px;
			
 
				+      }
			
 
				+      .el-date-editor {
			
 
				+        margin-right: 5px;
			
 
				+        margin-left: 5px;
			
 
				+      }
			
 
				+      .btn {
			
 
				+        margin-left: 10px;
			
 
				+      }
			
 
				+      .el-input {
			
 
				+        width: 250px;
			
 
				+      }
			
 
				+      .el-select {
			
 
				+      width: 100%;
			
 
				+      .el-input__inner {
			
 
				+        width: 150px;
			
 
				+      }
			
 
				+    }
			
 
				     }
			
 
				-  }
			
 
				 }
			
 
				 </style>
			
--- a/src/views/WMS/components/steel/steel_real.vue
+++ b/src/views/WMS/components/steel/steel_real.vue
@@ -1,21 +1,28 @@
 
				 <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 class="sache">
			
 
				+        <el-input placeholder="请输入内容" v-model="inputText" clearable>
			
 
				+        </el-input>
			
 
				+        <el-select v-model="warehouseId" 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-option label="配送库" value="4"></el-option>
			
 
				+        </el-select>
			
 
				+        <el-select v-model="time" 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>
			
 
				     <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"
			
 
				-            >物资不合格</el-button
			
 
				-          >
			
 
				-        </template>
			
 
				-      </el-table-column> -->
			
 
				+
			
 
				     </dilTable>
			
 
				     <!-- <dilTable v-bind.sync="options" >
			
 
				 
			
@@ -28,17 +35,13 @@ export default {
 
				  name:"steel_real",
			
 
				   data(){
			
 
				     return {
			
 
				+      warehouseId:"",
			
 
				+      time:'',
			
 
				+      rowIndex:null,
			
 
				       mapList:[],
			
 
				-      rowClassName({row, rowIndex}) {
			
 
				-        
			
 
				-        if (rowIndex === 0) {
			
 
				-          return 'success-row';
			
 
				-        }
			
 
				-        return '';
			
 
				-      },
			
 
				       inputText:"",
			
 
				       option: {
			
 
				-        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+3,
			
 
				+        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+"0"+"&time="+"0",
			
 
				       },
			
 
				       rowId:''
			
 
				     };
			
@@ -47,26 +50,22 @@ export default {
 
				     
			
 
				   },
			
 
				   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:{
			
 
				+    rowClassName({row, rowIndex}) {
			
 
				+        if (row.status === 1) {
			
 
				+          return 'success-row';
			
 
				+        }
			
 
				+        return '';
			
 
				+    },
			
 
				     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)
			
 
				       });
			
@@ -75,7 +74,7 @@ export default {
 
				       this.$router.push("/steel_realDown/" + gridId);
			
 
				     },
			
 
				     onClick(){
			
 
				-      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+3+"&con="+this.inputText;
			
 
				+      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+this.warehouseId+"&time="+this.time+"&con="+this.inputText;
			
 
				       console.log(this.inputText)
			
 
				     }
			
 
				   },
			
@@ -89,6 +88,15 @@ export default {
 
				       width: 20%;
			
 
				       margin-right: 1.25rem;
			
 
				     }
			
 
				+    .el-select {
			
 
				+      width: 100%;
			
 
				+      .el-input__inner {
			
 
				+        width: 150px;
			
 
				+      }
			
 
				+      .el-input__suffix{
			
 
				+        padding-left: 100px;
			
 
				+      }
			
 
				+    }
			
 
				   }
			
 
				 }
			
 
				 </style>
			
--- a/src/views/WMS/components/steel/steel_reserved.vue
+++ b/src/views/WMS/components/steel/steel_reserved.vue
@@ -7,13 +7,6 @@
 
				         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>
			
@@ -23,13 +16,6 @@
 
				     </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>
			
@@ -71,13 +57,24 @@ export default {
 
				 }
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss" scode>
			
 
				+<style lang="scss" scope>
			
 
				 .steel_inbound{
			
 
				-  .sache{
			
 
				-    height: 5rem;
			
 
				-    display: flex;
			
 
				-    align-items: center;
			
 
				-    padding-left: 1.875rem;
			
 
				-  }
			
 
				+  margin-top: 30px;
			
 
				+  margin-left: 20px;
			
 
				+    .sache{
			
 
				+      display: flex;
			
 
				+      margin-bottom: 10px;
			
 
				+      padding-right: 10px;
			
 
				+      .text {
			
 
				+        text-align: left;
			
 
				+        line-height: 40px;
			
 
				+      }
			
 
				+      .btn {
			
 
				+        margin-left: 10px;
			
 
				+      }
			
 
				+      .el-input {
			
 
				+        width: 250px;
			
 
				+      }
			
 
				+    }
			
 
				 }
			
 
				 </style>
			
--- a/src/views/WMS/components/steel/steel_restackAdd.vue
+++ b/src/views/WMS/components/steel/steel_restackAdd.vue
@@ -114,7 +114,7 @@
 
				         <div class="table" >
			
 
				             <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
			
 
				         </div>
			
 
				-            <div class="search">
			
 
				+            <!-- <div class="search">
			
 
				             <div class="warehouse">
			
 
				                 <span>仓库名称：</span>
			
 
				                 <el-select v-model="value1" disabled  placeholder="请选择" @change="onchange4()">
			
@@ -138,12 +138,12 @@
 
				                     >
			
 
				                     </el-option>
			
 
				                 </el-select>
			
 
				-            </div>
			
 
				+            </div> -->
			
 
				      
			
 
				-        </div>
			
 
				-         <div class="table">
			
 
				+        <!-- </div> -->
			
 
				+         <!-- <div class="table">
			
 
				             <dilTable v-bind.sync="options" ></diltable>
			
 
				-        </div> 
			
 
				+        </div>  -->
			
 
				     </div>  
			
 
				 </template>
			
 
				 
			
@@ -162,10 +162,10 @@ export default {
 
				         requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
			
 
				         selectionType: "select",
			
 
				       },
			
 
				-      options:{
			
 
				-        // first请求数据的地址
			
 
				-      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
			
 
				-      },
			
 
				+//       options:{
			
 
				+//         // first请求数据的地址
			
 
				+//       requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
			
 
				+//       },
			
 
				         //仓库
			
 
				         options1:[],
			
 
				         // 选中的仓库
			
@@ -280,7 +280,7 @@ export default {
 
				              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;       
			
 
				+            //  this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid=" + this.value1;       
			
 
				          })
			
 
				      },
			
 
				      onchange2(){
			
@@ -327,9 +327,9 @@ export default {
 
				              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;    
			
 
				-    },
			
 
				+    //  onchange5(){
			
 
				+    //     this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value5;    
			
 
				+    // },
			
 
				 
			
 
				      onclick(){
			
 
				       console.log("点击事件");
			
--- a/src/views/WMS/components/steel/steel_sendreceive.vue
+++ b/src/views/WMS/components/steel/steel_sendreceive.vue
@@ -40,7 +40,7 @@ export default {
 
				   data() {
			
 
				     return {
			
 
				       option: {
			
 
				-        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=null&endTime=null&i=" +new Date(),
			
 
				+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&startTime=null&endTime=null&i=" +new Date(),
			
 
				       },
			
 
				       startTime: null,
			
 
				       endTime: null,
			
@@ -76,14 +76,14 @@ export default {
 
				       }
			
 
				       if(startTime && endTime){
			
 
				         if(startTime < endTime){
			
 
				-          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				         }else{
			
 
				           this.startTime = null;
			
 
				           this.endTime = null;
			
 
				           this.$message.warning('开始时间要比结束时间早')
			
 
				         }
			
 
				       }else{
			
 
				-        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
			
 
				       }
			
 
				     },
			
 
				   },
			
--- a/src/views/WMS/router/index.js
+++ b/src/views/WMS/router/index.js
@@ -72,6 +72,34 @@ import bar1_addSteelInbound from '../components/steel/bar1_steel/bar1_addSteelIn
 
				 import bar1_addSteelReserved from '../components/steel/bar1_steel/bar1_addSteelReserved.vue'
			
 
				 import bar1_steel_inboundStatistics from '../components/steel/bar1_steel/bar1_steel_inboundStatistics.vue'
			
 
				 import bar1_steel_outboundStatistics from '../components/steel/bar1_steel/bar1_steel_outboundStatistics.vue'
			
 
				+
			
 
				+// 二棒库路径配置
			
 
				+import bar2_addTransfer from '../components/steel/bar2_steel/bar2_addTransfer.vue'
			
 
				+import bar2_billOfLading from '../components/steel/bar2_steel/bar2_billOfLading.vue'
			
 
				+import bar2_billOfLadingAdd from '../components/steel/bar2_steel/bar2_billOfLadingAdd.vue'
			
 
				+import bar2_editSteel_restack from '../components/steel/bar2_steel/bar2_editSteel_restack.vue'
			
 
				+import bar2_inboundDetails from '../components/steel/bar2_steel/bar2_inboundDetails.vue'
			
 
				+import bar2_insertCheckInventory from '../components/steel/bar2_steel/bar2_insertCheckInventory.vue'
			
 
				+import bar2_insertTransfer from '../components/steel/bar2_steel/bar2_insertTransfer.vue'
			
 
				+import bar2_steel_check from '../components/steel/bar2_steel/bar2_steel_check.vue'
			
 
				+import bar2_steel_close from '../components/steel/bar2_steel/bar2_steel_close.vue'
			
 
				+import bar2_steel_inbound from '../components/steel/bar2_steel/bar2_steel_inbound.vue'
			
 
				+import bar2_steel_inboundReal from '../components/steel/bar2_steel/bar2_steel_inboundReal.vue'
			
 
				+import bar2_steel_reserved from '../components/steel/bar2_steel/bar2_steel_reserved.vue'
			
 
				+import bar2_steel_outbound from '../components/steel/bar2_steel/bar2_steel_outbound.vue'
			
 
				+import bar2_steel_real from '../components/steel/bar2_steel/bar2_steel_real.vue'
			
 
				+import bar2_steel_realDown from '../components/steel/bar2_steel/bar2_steel_realDown.vue'
			
 
				+import bar2_steel_rebound from '../components/steel/bar2_steel/bar2_steel_rebound.vue'
			
 
				+import bar2_steel_restack from '../components/steel/bar2_steel/bar2_steel_restack.vue'
			
 
				+import bar2_steel_restackAdd from '../components/steel/bar2_steel/bar2_steel_restackAdd.vue'
			
 
				+import bar2_steel_sendreceive from '../components/steel/bar2_steel/bar2_steel_sendreceive.vue'
			
 
				+import bar2_steel_transfer from '../components/steel/bar2_steel/bar2_steel_transfer.vue'
			
 
				+import bar2_steel_checkWarehouse from '../components/steel/bar2_steel/bar2_checkWarehouse.vue'
			
 
				+import bar2_steel_addCheckWarehouse from '../components/steel/bar2_steel/bar2_addCheckWarehouse.vue'
			
 
				+import bar2_addSteelInbound from '../components/steel/bar2_steel/bar2_addSteelInbound.vue'
			
 
				+import bar2_addSteelReserved from '../components/steel/bar2_steel/bar2_addSteelReserved.vue'
			
 
				+import bar2_steel_inboundStatistics from '../components/steel/bar2_steel/bar2_steel_inboundStatistics.vue'
			
 
				+import bar2_steel_outboundStatistics from '../components/steel/bar2_steel/bar2_steel_outboundStatistics.vue'
			
 
				 Vue.use(Router)
			
 
				 const constantRouterMap = [
			
 
				 	{
			
@@ -145,6 +173,32 @@ const constantRouterMap = [
 
				 		{path: 'bar1_addSteelReserved', name: 'bar1_addSteelReserved', meta: {code: 'xtpzgl-yhgl'}, component: bar1_addSteelReserved},
			
 
				 		{path: 'bar1_steel_inboundStatistics', name: 'bar1_steel_inboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_inboundStatistics},
			
 
				 		{path: 'bar1_steel_outboundStatistics', name: 'bar1_steel_outboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar1_steel_outboundStatistics},
			
 
				+		{path: 'bar2_addTransfer', name: 'bar2_addTransfer', meta: {code: 'xtpzgl-yhgl'}, component: bar2_addTransfer},
			
 
				+		{path: 'bar2_billOfLading', name: 'bar2_billOfLading', meta: {code: 'xtpzgl-yhgl'}, component: bar2_billOfLading},
			
 
				+		{path: 'bar2_billOfLadingAdd/:orderId', name: 'bar2_billOfLadingAdd', meta: {code: 'xtpzgl-yhgl'}, component: bar2_billOfLadingAdd},
			
 
				+		{path: 'bar2_editSteel_restack/:resultId', name: 'bar2_editSteel_restack', meta: {code: 'xtpzgl-yhgl'}, component: bar2_editSteel_restack},
			
 
				+		{path: 'bar2_inboundDetails/:inboundId', name: 'bar2_inboundDetails', meta: {code: 'xtpzgl-yhgl'}, component: bar2_inboundDetails},
			
 
				+		{path: 'bar2_insertCheckInventory', name: 'bar2_insertCheckInventory', meta: {code: 'xtpzgl-yhgl'}, component: bar2_insertCheckInventory},
			
 
				+		{path: 'bar2_insertTransfer', name: 'bar2_insertTransfer', meta: {code: 'xtpzgl-yhgl'}, component: bar2_insertTransfer},
			
 
				+		{path: 'bar2_steel_check', name: 'bar2_steel_check', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_check},
			
 
				+		{path: 'bar2_steel_close', name: 'bar2_steel_close', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_close},
			
 
				+		{path: 'bar2_steel_inbound', name: 'bar2_steel_inbound', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_inbound},
			
 
				+		{path: 'bar2_steel_inboundReal', name: 'bar2_steel_inboundReal', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_inboundReal},
			
 
				+		{path: 'bar2_steel_reserved', name: 'bar2_steel_reserved', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_reserved},
			
 
				+		{path: 'bar2_steel_outbound', name: 'bar2_steel_outbound', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_outbound},
			
 
				+		{path: 'bar2_steel_real', name: 'bar2_steel_real', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_real},
			
 
				+		{path: 'bar2_steel_realDown/gridId', name: 'bar2_steel_realDown', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_realDown},
			
 
				+		{path: 'bar2_steel_rebound', name: 'bar2_steel_rebound', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_rebound},
			
 
				+		{path: 'bar2_steel_restack', name: 'bar2_steel_restack', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_restack},
			
 
				+		{path: 'bar2_steel_restackAdd', name: 'bar2_steel_restackAdd', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_restackAdd},
			
 
				+		{path: 'bar2_steel_sendreceive', name: 'bar2_steel_sendreceive', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_sendreceive},
			
 
				+		{path: 'bar2_steel_transfer', name: 'bar2_steel_transfer', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_transfer},
			
 
				+		{path: 'bar2_steel_checkWarehouse', name: 'bar2_steel_checkWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_checkWarehouse},
			
 
				+		{path: 'bar2_steel_addCheckWarehouse', name: 'bar2_steel_addCheckWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_addCheckWarehouse},
			
 
				+		{path: 'bar2_addSteelInbound', name: 'bar2_addSteelInbound', meta: {code: 'xtpzgl-yhgl'}, component: bar2_addSteelInbound},
			
 
				+		{path: 'bar2_addSteelReserved', name: 'bar2_addSteelReserved', meta: {code: 'xtpzgl-yhgl'}, component: bar2_addSteelReserved},
			
 
				+		{path: 'bar2_steel_inboundStatistics', name: 'bar2_steel_inboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_inboundStatistics},
			
 
				+		{path: 'bar2_steel_outboundStatistics', name: 'bar2_steel_outboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_outboundStatistics},
			
 
				 
			
 
				 	  ]
			
 
				 	}
			
--- a/src/views/appoint/router/index.js
+++ b/src/views/appoint/router/index.js
@@ -1,8 +1,6 @@
 
				 import Vue from 'vue'
			
 
				 import Router from 'vue-router'
			
 
				-
			
 
				 import routerBefore from '@/config/routerBefore.js'
			
 
				-
			
 
				 // 主要
			
 
				 import main from '@/components/main.vue'
			
 
				 // 系统配置管理
			
--- a/src/views/inward/components/truckAppoint/addRequirement2.vue
+++ b/src/views/inward/components/truckAppoint/addRequirement2.vue
@@ -324,8 +324,8 @@ export default {
 
				   watch: {
			
 
				     value() {
			
 
				       if (this.value) {
			
 
				-        console.log(this.value)
			
 
				-        console.log(this.tableTop.length)
			
 
				+        // console.log(this.value)
			
 
				+        // console.log(this.tableTop.length)
			
 
				         this.tableTop.splice(this.tableTop.length - 1, 1);
			
 
				         this.tableTop.push({
			
 
				           prop: "orderMaterialNumber",
			
@@ -360,7 +360,7 @@ export default {
 
				         this.axios.post('/api/v1/uc/getRequireUnitName?index='+queryString).then((res)=>{
			
 
				         if(res.data.code == "200"){
			
 
				           var restaurantsCarrier = res.data.data
			
 
				-          console.log(restaurantsCarrier,"restaurantsCarrier");
			
 
				+          // console.log(restaurantsCarrier,"restaurantsCarrier");
			
 
				           var results = queryString ? restaurantsCarrier.filter(this.createFilterCarrier(queryString)) :restaurantsCarrier;
			
 
				            // 调用 callback 返回建议列表的数据
			
 
				           cb(results);
			
@@ -378,13 +378,13 @@ export default {
 
				       this.selectionList1 = selection;
			
 
				     },
			
 
				     unloadPoint(index) {
			
 
				-      console.log(index)
			
 
				+      // console.log(index)
			
 
				       this.index= index
			
 
				       this.a = 3
			
 
				       this.drawer = true;
			
 
				     },
			
 
				     loadPoint(index) {
			
 
				-      console.log(index)
			
 
				+      // console.log(index)
			
 
				       this.index = index
			
 
				       this.a = 4
			
 
				       this.drawer = true;
			
@@ -404,14 +404,14 @@ export default {
 
				     },
			
 
				     //删除行
			
 
				     deleteRow(index, rows) {
			
 
				-      console.log(index)
			
 
				-      console.log("这里")
			
 
				+      // console.log(index)
			
 
				+      // console.log("这里")
			
 
				       rows.splice(index, 1);
			
 
				     },
			
 
				      // 返回主界面
			
 
				     makeSure1() {
			
 
				         this.selectionList1.forEach((e) => {
			
 
				-          console.log(e.materialModel,e.materialSpecification)
			
 
				+          // console.log(e.materialModel,e.materialSpecification)
			
 
				         if(e.materialSpecification == null){
			
 
				           e.materialSpecification = ''
			
 
				         }
			
@@ -461,7 +461,7 @@ export default {
 
				     },
			
 
				     currentRadioChange1(selection) {
			
 
				       this.mapList1 = selection;
			
 
				-      console.log(selection)
			
 
				+      // console.log(selection)
			
 
				       if(selection.materialSpecification==null||selection.materialModel==null){
			
 
				         this.materialName = this.mapList1.materialName
			
 
				       }else{
			
@@ -474,12 +474,12 @@ export default {
 
				         this.truckPoint = selection.wareHouseName;
			
 
				         this.requiremntUnitId = selection.wareHouseId;
			
 
				       } else if (this.a == 3) {
			
 
				-        console.log(this.tableData[this.index])
			
 
				+        // console.log(this.tableData[this.index])
			
 
				         this.tableData[this.index].requirementUnloadUnitId = selection.wareHouseId;
			
 
				         this.tableData[this.index].truckPoint1 = selection.wareHouseName
			
 
				         this.refreshTable()
			
 
				       } else if (this.a == 4) {
			
 
				-        console.log(this.tableData[this.index])
			
 
				+        // console.log(this.tableData[this.index])
			
 
				         this.tableData[this.index].requirementPlatformId = selection.wareHouseId;
			
 
				         this.tableData[this.index].requirementPlatformName = selection.wareHouseName;
			
 
				         this.refreshTable()
			
@@ -487,8 +487,8 @@ export default {
 
				     },
			
 
				     // 新增
			
 
				     makeSure() {
			
 
				-      console.log(this.tableData)
			
 
				-      console.log(typeof(this.form.requirementEstimatedDuration))
			
 
				+      // console.log(this.tableData)
			
 
				+      // console.log(typeof(this.form.requirementEstimatedDuration))
			
 
				       if(this.shipperId == null){
			
 
				         this.$message.error("请选择用车单位")
			
 
				         return
			
@@ -518,8 +518,13 @@ export default {
 
				          this.$message.error("请选择装卸点")
			
 
				          return
			
 
				       }
			
 
				-      console.log(this.tableData)
			
 
				-      debugger
			
 
				+      // console.log(this.tableData)
			
 
				+      var DueTime;
			
 
				+      if(this.DueTime==null){
			
 
				+        DueTime = null;
			
 
				+      }else{
			
 
				+        DueTime = sjTime(this.DueTime);
			
 
				+      }
			
 
				       let requiremnet = {
			
 
				         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
			
 
				         requirementOverlimit: this.form.requirementOverlimit,
			
@@ -530,11 +535,11 @@ export default {
 
				         requirementWorkType: this.form.requirementWorkType,
			
 
				         requirementShipperId: this.shipperId,
			
 
				         // 用车截日期
			
 
				-        DueTime:sjTime(this.DueTime),
			
 
				+        DueTime:DueTime,
			
 
				         mapList:this.tableData,
			
 
				         orgCode:getCookie("orgCode")
			
 
				       };
			
 
				-      console.log("requirement",requiremnet);
			
 
				+      // console.log("requirement",requiremnet);
			
 
				       this.axios
			
 
				         .post("/api/v1/ams/addTruckRequirement", requiremnet)
			
 
				         .then(res => {
			
--- a/src/views/inward/components/truckOrder/addPurInwardOrder.vue
+++ b/src/views/inward/components/truckOrder/addPurInwardOrder.vue
@@ -151,6 +151,7 @@
 
				         <!-- 查询所有的车辆 -->
			
 
				         <dilTable
			
 
				           v-bind.sync="truck"
			
 
				+          :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang"
			
 
				           @selection-change="currentRadioChange1"
			
 
				         ></dilTable>
			
 
				       </div>
			
@@ -169,6 +170,9 @@ export default {
 
				   components: { PageTitle },
			
 
				   data() {
			
 
				     return {
			
 
				+      shiyHeigth:140,
			
 
				+      isHeigth:true,
			
 
				+      isKuang:false,
			
 
				       planId : null ,
			
 
				       disabled:false,
			
 
				       //线路名称
			
--- a/src/views/inward/components/truckOrder/decomposePlan.vue
+++ b/src/views/inward/components/truckOrder/decomposePlan.vue
@@ -58,7 +58,7 @@
 
				       </el-button>
			
 
				    <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1" ></dilTable>    
			
 
				     </el-drawer>
			
 
				-    <el-drawer
			
 
				+    <!-- <el-drawer
			
 
				       :visible.sync="drawer"
			
 
				       :direction="direction"
			
 
				       :before-close="handleClose"
			
@@ -72,7 +72,51 @@
 
				         <i class="el-icon-plus"></i>确认
			
 
				       </el-button>
			
 
				    <dilTable v-bind.sync="second" @selection-change="currentRadioChange" ></dilTable>    
			
 
				+    </el-drawer> -->
			
 
				+
			
 
				+    <el-drawer 
			
 
				+      :visible.sync="drawer" 
			
 
				+      :with-header="false"
			
 
				+      :destroy-on-close="true"
			
 
				+      direction="rtl"
			
 
				+      size="40%"
			
 
				+      :show-close="true"
			
 
				+      :wrapperClosable="false"
			
 
				+      close-on-press-escape
			
 
				+    >
			
 
				+      <el-input
			
 
				+        placeholder="请输入内容"
			
 
				+        v-model="truckText"
			
 
				+        style="margin-top: 10px; margin-left: 20px; width: 250px"
			
 
				+        clearable
			
 
				+      >
			
 
				+      </el-input>
			
 
				+      <el-button
			
 
				+        type="primary"
			
 
				+        class="btn"
			
 
				+        @click="onclick"
			
 
				+        style="margin-left: 5px"
			
 
				+      >
			
 
				+        <i class="el-icon-search"></i>查询
			
 
				+      </el-button>
			
 
				+      <el-button
			
 
				+        type="primary"
			
 
				+        class="btn"
			
 
				+        @click="onConfirm"
			
 
				+        style="margin-left: 5px"
			
 
				+      >
			
 
				+        <i class="el-icon-check"></i>确定
			
 
				+      </el-button>
			
 
				+      <div class="tablecls">
			
 
				+        <!-- 查询所有的车辆 -->
			
 
				+        <dilTable
			
 
				+          v-bind.sync="second"
			
 
				+          :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang"
			
 
				+          @selection-change="currentRadioChange"
			
 
				+        ></dilTable>
			
 
				+      </div>
			
 
				     </el-drawer>
			
 
				+
			
 
				 		<vxe-table v-model="tableData" keep-source border resizable show-overflow show-footer ref="xTable"
			
 
				 			max-height="400" :footer-method="footerMethod" :data="tableData"
			
 
				 			:edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
			
@@ -140,6 +184,9 @@ export default {
 
				   },
			
 
				   data() {
			
 
				     return {
			
 
				+      shiyHeigth:140,
			
 
				+      isHeigth:true,
			
 
				+      isKuang:false,
			
 
				       lineId:null,
			
 
				       requirementId:null,
			
 
				       capacityNumber:null,