From bdbe03ddb43b79e692a0e86ab791d4a99648d839 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 9 Mar 2020 17:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/MaterialOut/index.vue | 28 ++++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 6eddb914..4c12e471 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -2,13 +2,25 @@
   <div class="app-container">
     <el-card>
       <div style="margin-top: 8px;margin-bottom: 8px">
-        <span style="margin: 5px">领料单编号:</span>
-        <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
+        <!--<span style="margin: 5px">领料单编号:</span>-->
+        <el-input v-model="pickingListNumber" placeholder="领料单编号或领料人" clearable size="small" style="width:200px" />
+        <span style="margin: 5px">创建时间:</span>
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;margin: 3px 0"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
         <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
         <el-button :disabled="审批未通过===true" size="small" style="float: right; margin-right: 30px" type="distribution" @click="inputPassword()">领料确认</el-button>
       </div>
     </el-card>
-    <div style="width: 27%;float: left;margin-right: 16px">
+    <div style="width: 29%;float: left;margin-right: 10px">
       <el-card>
         <el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="570px" @row-click="clickList">
           <el-table-column prop="领料单编号" label="领料单编号" show-overflow-tooltip align="center" width="100px">
@@ -256,6 +268,7 @@ export default {
   name: 'MaterialOut',
   data() {
     return {
+      dateRange: '',
       multipleSelection1: [],
       multipleSelection: [],
       pickingListNum: '', // 领料单流水号
@@ -531,9 +544,10 @@ export default {
     },
     // 查询领料单列表
     searchList() {
-      let check
+      let check, check1
       this.pickingListNumber ? check = 1 : check = 0
-      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+      this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, check1, this.dateRange[0], this.dateRange[1]).then(response => {
         this.pickListTable1 = response.data.rows
         this.total3 = response.data.total
       })
@@ -562,9 +576,11 @@ export default {
           if (res.data[i].请购单明细流水号 !== 0 && res.data[i].请购单明细流水号 !== '' && res.data[i].请购单明细流水号 !== null) {
             res.data[i].货位存量1 = res.data[i].货位存量
           }
+          if (res.data[i].货位存量1 > res.data[i].总数量) {
+            res.data[i].出库数量 = res.data[i].总数量
+          }
         }
         this.pickListTable2 = res.data
-        console.log(this.pickListTable2, 111)
       })
     },
     tableRowClassName({ row }) {