胡半仙 3 роки тому
батько
коміт
006a04e92a
3 змінених файлів з 36 додано та 12 видалено
  1. 2 2
      build/utils.js
  2. 2 2
      config/index.js
  3. 32 8
      src/views/WMS/components/steel/steel_real.vue

+ 2 - 2
build/utils.js

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

+ 2 - 2
config/index.js

@@ -65,8 +65,8 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
 
-    target: "http://172.16.33.166:8080",
-    // target: "http://localhost:8019",
+    // target: "http://172.16.33.166:8080",
+    target: "http://localhost:8019",
     // target: "http://localhost:8080",
     // target: "http://192.168.1.114:8019",
 

+ 32 - 8
src/views/WMS/components/steel/steel_real.vue

@@ -1,12 +1,25 @@
 <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">
@@ -28,6 +41,8 @@ export default {
  name:"steel_real",
   data(){
     return {
+      warehouseId:"0",
+      time: "0",
       mapList:[],
       rowClassName({row, rowIndex}) {
         
@@ -38,7 +53,7 @@ export default {
       },
       inputText:"",
       option: {
-        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+3,
+        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+"0"+"&time="+"0",
       },
       rowId:''
     };
@@ -75,7 +90,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 +104,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>