2.25

src/views/WMS/app.js

@@ -11,6 +11,10 @@ import store from '@/store/index.js';
 // router
 import router from './router/index.js';
 
+// 导出Excel全局组件
+import tableToExcel from '@/components/exportExcel/exportExcel'
+Vue.use(tableToExcel)
+
 import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'

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

@@ -1,49 +1,73 @@
 //结转
 <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">
+    <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 v-bind.sync="options">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func">
       </dilTable>
     </div>
   </div>
 </template>
 
 <script>
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data(){
     return{
-      inputText:"",
-      options:{
+      value : null,
+      totalNumber: 0,
+      option:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95",
+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=1&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("点击事件");
+      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=1&value="+value;
     }
   }
 }
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
-    height: 5rem;
+.steel_inbound {
+  .sache {
+    width: 100%;
+    height: 100px;
     display: flex;
     align-items: center;
-    padding-left: 1.875rem;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
   }
 }
 </style>

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

@@ -31,7 +31,7 @@ export default {
   },
   methods:{
     onclick(){
-      this.option.requestUrl="/api/v1/wms/getWmspOutboundResult/152?con="+this.inputText;
+      this.option.requestUrl="/api/v1/wms/getWmspOutboundResult?apiId=152?con="+this.inputText;
     },
   }
 }

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

@@ -39,7 +39,7 @@ export default {
       this.$router.push("/steel_realDown/" + gridId);
     },
     onClick(){
-      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&&con="+this.inputText;
+      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&con="+this.inputText;
       console.log(this.inputText)
     }
   },

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&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&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&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
         }else{
           this.startTime = null;
           this.endTime = null;
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
       }
     },
   },

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

@@ -40,7 +40,7 @@ export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&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&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
         }else{
           this.startTime = null;
           this.endTime = null;
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
       }
     },
   },