结算和副产品上线

config/index.js

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

package.json

@@ -106,7 +106,7 @@
     "less-loader": "~4.1.0",
     "mocha": "^5.2.0",
     "mocha-webpack": "^1.1.0",
-    "moment": "^2.22.2",
+    "moment": "^2.29.1",
     "nightwatch": "^0.9.12",
     "node-notifier": "^5.1.2",
     "node-sass": "^4.7.2",

src/components/DilCommonUI/packages/table/src/table.js

@@ -190,6 +190,7 @@ export default {
     },
     // 更新请求参数
     setDataRequestQuery(value) {
+      console.log(value);
       let q = this.dataRequestQuery;
       for (const key in value) {
         q[key] = value[key];

src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -2,34 +2,42 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="orderType from">
-      <!-- <span class="text">订单类别：</span>
-      <el-select
-        class="select"
-        v-model="orderType"
-        placeholder="请选择"
-      >
-        <el-option
-          v-for="item in orderTypeList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+    <div class="supplieUnit">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
         >
-        </el-option>
-      </el-select> -->
-      <span class="span"></span>
+        <el-form-item label="发货单位:">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入发货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+     </el-form>
     </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>
+<<<<<<< HEAD
 
     <div class="forwardingUnit from">
       <span class="text">发货单位：</span>
       <el-input class="input" v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
+=======
+>>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
     <div class="remark from">
       <span class="text">船名：</span>
       <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
@@ -61,11 +69,14 @@
         >
       </div>
     </div>
+<<<<<<< HEAD
     <div class="lineId from">
       <span class="text">该批车辆是否一车多趟：</span>
       <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
       </el-switch>
     </div>
+=======
+>>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
     <div class="truckListTable">
       <el-table
         :data="selectionList"
@@ -264,6 +275,10 @@ export default {
           slot: true,
         },
       ],
+      //发货单位名称
+      supplierName: "",
+      stateSupplier:null,
+      restaurantsSupplier:null,
       //车辆表格数据
       selectionList: [],
       // 表单
@@ -342,6 +357,27 @@ export default {
     onBlur() {
       this.getPurchaseOrderNo();
     },
+      //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      this.supplierName = item.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
     getPurchaseOrderNo() {
       let map = {
         materialId: this.materialId,
@@ -384,7 +420,11 @@ export default {
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl =
             "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+<<<<<<< HEAD
             this.input;
+=======
+            this.input + "&supplierId=" + this.supplierId;
+>>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
         } else if (this.onDrawerNumber == 2) {
           this.secend.requestUrl =
             "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -425,7 +465,11 @@ export default {
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl =
             "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i=" +
+<<<<<<< HEAD
             new Date();
+=======
+            new Date() + "&supplierId=" + this.supplierId;
+>>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
         } else if (this.onDrawerNumber == 2) {
           this.secend.requestUrl =
             "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -463,12 +507,27 @@ export default {
       }
     },
     ondrawer(num) {
+      if(this.supplierId == null){
+          this.$message.warning("请先选择发货单位")
+          return
+      }
+      console.log(num)
+      if(num != 1 && this.materialId == null){
+          this.$message.warning("请先选择物资")
+          return
+      }
       this.drawer = true;
       this.onDrawerNumber = num;
       if (num == 1) {
+<<<<<<< HEAD
         this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
           this.input;
+=======
+          this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input + "&supplierId=" + this.supplierId;   
+>>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
       } else if (num == 2) {
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -511,11 +570,6 @@ export default {
       this.materialId = selection.materialId;
       this.getPurchaseOrderNo();
     },
-    currentRadioChange2(selection) {
-      this.supplierName = selection.supplierName;
-      this.supplierId = selection.supplierId;
-      this.getPurchaseOrderNo();
-    },
     currentRadioChange4(selection) {
       this.unloadPointId = selection.warehouseId;
       this.unloadPointName = selection.warehouseName;
@@ -698,6 +752,18 @@ export default {
     width: 70px;
     height: 1px;
   }
+<<<<<<< HEAD
+=======
+}
+.supplieUnit {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
+  .el-input {
+    width: 250px;
+  }
+>>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
 }
 .material {
   display: flex;

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

@@ -9,6 +9,7 @@
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <el-select v-model="region" placeholder="请选择班次">
+        <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>
@@ -43,7 +44,7 @@ export default {
       inputText:"",
       startTime: null,
       endTime: null,
-      region: '',
+      region: "0",
       options:{
         // first请求数据的地址
         requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=371",
@@ -62,13 +63,51 @@ export default {
       
       // 判断用户有没有班次，有班次则提供默认时间
       if(this.region!=null){
-        // 获取当前的日期时间
-        let date = new Date();
-        let year = date.getFullYear(); // 年
-        let month = date.getMonth() + 1; // 月
-        let day = date.getDate(); // 日
+        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 == 1){
+        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){
@@ -77,14 +116,18 @@ export default {
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
           // 将开始时间减一
-          day =day-1;
+          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(new Date(this.startTime))
-        endTime = Date.parse(new Date(this.endTime))
-        console.log(startTime)
-        console.log(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);

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

@@ -1,4 +1,4 @@
-//入库
+//入库统计
 <template>
   <div class="steel_inbound">
     <div class="sache">
@@ -14,6 +14,12 @@
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
+      <el-select v-model="region" placeholder="请选择班次">
+        <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>
@@ -41,9 +47,10 @@ export default {
       inputText:"",
       startTime: null,
       endTime: null,
+      region: "0",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResultStatistics?apiId=371&warehouseId="+3,
+        requestUrl: "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3,
         // selectionType: "select",
         // mapList: [],
       },
@@ -57,20 +64,89 @@ export default {
 
       let startTime = null;
       let endTime = null;
-      if (this.startTime) {
+      // 判断用户有没有班次，有班次则提供默认时间
+      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 (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=371&warehouseId="+3+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=371&warehouseId="+3+"&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          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=371&warehouseId="+3+"&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          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;

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

@@ -2,36 +2,62 @@
 <template>
   <div class="steel_outbound">
     <div class="sache">
-      <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
-      </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      
+      <div 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>
+     
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable v-bind.sync="options" ref="tab">
       </dilTable>
     </div>
   </div>
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
+import moment from "moment";
 export default {
   data(){
     return{
+      queryDate:[],
       inputText:"",
       options:{
-        // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152",
+        //first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152"
       },
     }
   },
+  created(){
+      this.queryDate=this.getToday();
+  },
   methods:{
     onclick(){
-      this.option.requestUrl="/api/v1/wms/getWmspOutboundResult/152?con="+this.inputText;
+       //改变查询条件
+      this.$refs.tab.setDataRequestQuery({"startTime":this.queryDate[0],
+                      "endTime": 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
     },
   }
 }

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

@@ -0,0 +1,90 @@
+//出库统计炉号生产数量
+<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> -->
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option" >
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  data(){
+    return{
+      textInput:"",
+      startTime: null,
+      endTime: null,
+      option:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+3+"&startTime=null&endTime=null&i=" +new Date()+"&con="+this.textInput,
+      },
+    }
+  },
+  methods:{
+      refresh(){
+      this.$router.go(0);
+    },
+   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="+3+"&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="+3+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.textInput;
+      }
+    },
+    selectionChange(selection) {
+      this.options.mapList = selection;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+     .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/WMS/router/index.js

@@ -41,6 +41,10 @@ import steel_checkWarehouse from '../components/steel/checkWarehouse.vue'
 import steel_addCheckWarehouse from '../components/steel/addCheckWarehouse.vue'
 import addSteelInbound from '../components/steel/addSteelInbound.vue'
 import addSteelReserved from '../components/steel/addSteelReserved.vue'
+import steel_outboundStatistics from '../components/steel/steel_outboundStatistics.vue'
+import steel_inboundStatistics from '../components/steel/steel_inboundStatistics.vue'
+
+
 Vue.use(Router)
 const constantRouterMap = [
 	{
@@ -86,6 +90,8 @@ const constantRouterMap = [
 		{path: 'steel_addCheckWarehouse', name: 'steel_addCheckWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: steel_addCheckWarehouse},
 		{path: 'addSteelInbound', name: 'addSteelInbound', meta: {code: 'xtpzgl-yhgl'}, component: addSteelInbound},
 		{path: 'addSteelReserved', name: 'addSteelReserved', meta: {code: 'xtpzgl-yhgl'}, component: addSteelReserved},
+		{path: 'steel_outboundStatistics',name: 'steel_outboundStatistics',meta: {code: 'xtpzgl-yhgl'},component: steel_outboundStatistics},
+		{path: 'steel_inboundStatistics', name: 'steel_inboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: steel_inboundStatistics}
 	  ]
 	}
   ];

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

@@ -25,7 +25,7 @@
         </el-autocomplete>
         </el-form-item>
     </el-form>
-    </div>
+      </div>
       <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>