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

build/utils.js

@@ -15,10 +15,12 @@ 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 = ['index','WMS']
- let devModules = ['all'];
-// let devModules = ['index','appoint','sale','statisticalReport','RMS'];
-// let devModules = ['index','inward','TMS'];
+
+let devModules = ['all']
+// let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
+
+// let devModules = ['index','appoint','WMS'];
+
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

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

@@ -217,13 +217,21 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
-.steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+<style lang="scss" scoped>
+.steel_inbound_real{
+    .sache{
+      display: flex;
+      justify-content: start;
+      align-items: center;
+      line-height: 40px;
+      height: 40px;
+      padding-left: 1.875rem;
+      .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
+    }
   }
-}
 </style>

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

@@ -2,12 +2,6 @@
 <template>
   <div class="steel_inboundStatistics">
     <div class="sache">
-      <!-- <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
-      </el-input>
-       -->
       <span>入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
@@ -23,19 +17,6 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-    </div>
-    <div>
-      <span style="font-size:10px">炉号</span>
-      <el-input
-        v-model="input1"
-        :disabled="true" class="inputs" style="width:15%;">
-      </el-input>
-      <!-- <span>物资名称</span>
-      <el-input
-        placeholder="请输入内容"
-        v-model="input2"
-        :disabled="true" style="width:13%">
-      </el-input> -->
       <el-col :span="3" v-html="'\u2003'"/>
       <span>生产总件数</span>
       <el-input
@@ -43,29 +24,15 @@
         v-model="input3"
         :disabled="true" class="inputs" style="width:10%">
       </el-input>
-
-      <!-- <span>生产总重量</span>
+      <span>生产总重量</span>
       <el-input
         placeholder="请输入内容"
         v-model="input4"
         :disabled="true" style="width:10%">
-      </el-input> -->
-      <!-- <span>第一件物资生产时间</span>
-      <el-input
-        placeholder="请输入内容"
-        v-model="input5"
-        :disabled="true" style="width:13%">
-      </el-input> -->
+      </el-input>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" @func="func">
-        <!-- <el-table-column fixed="right" label="操作" width="150">
-								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
-									</el-button>
-								</template>
-				</el-table-column> -->
+      <dilTable v-bind.sync="options" @func="func" :rowClassName="rowClassName">
       </dilTable>
     </div>
   </div>
@@ -77,6 +44,12 @@ import { getCookie } from '@/utils/util.js';
 export default {
   data(){
     return{
+      rowClassName({row, rowIndex}) {
+        if (rowIndex === 0) {
+          return 'success-row';
+        }
+        return '';
+      },
       input1: '',
       input2: '',
       input3: '',
@@ -99,12 +72,24 @@ export default {
   },
   methods:{
     func(res){
-      console.log(res.list[0])
-      this.input1 = res.list[0].furnaceNumber1,
-      this.input2 = res.list[0].materialName,
-      this.input3 = res.list[0].count,
-      this.input4 = res.list[0].weight,
-      this.input5 = res.list[0].onetime
+      // 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)
@@ -220,11 +205,19 @@ export default {
     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;
+
   }
 }
-.inputs el-input is-disabled /deep/ el-input__inner{
-    
-    color: #f80808;
-    background-color: #f80808;
-}
+
 </style>

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

@@ -46,7 +46,7 @@ export default {
       endTime: null,
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371",
+        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+1,
         // selectionType: "select",
         // mapList: [],
       },
@@ -57,7 +57,7 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick(){
-      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&con="+this.inputText;
+      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+1+"&con="+this.inputText;
     },
     selectionChange(selection) {
       this.options.mapList = selection;

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

@@ -46,7 +46,7 @@ export default {
       endTime: null,
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371",
+        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+3,
         // selectionType: "select",
         // mapList: [],
       },
@@ -57,7 +57,7 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick(){
-      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&con="+this.inputText;
+      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+3+"&con="+this.inputText;
     },
     selectionChange(selection) {
       this.options.mapList = selection;