From a565d53262fc7515f1ee9aece882b43d178295bd Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Sat, 8 Feb 2020 16:13:43 +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/api/Inventory/MaterialOut.js          |  4 ++--
 src/views/Inventory/MaterialOut/index.vue | 29 ++++++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index 797881b9..81fd68f8 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -35,14 +35,14 @@ export function searchgroup(num) {
   })
 }
 // 领料单查询
-export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, check1, time1, time2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_领料单_查询数据',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否审批=1',
+      param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&是否审批=1',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index b9199e7f..77f9a30e 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -2,11 +2,21 @@
   <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" />
-        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
+        <el-date-picker
+          v-model="startTime"
+          size="small"
+          type="daterange"
+          align="center"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          style="width:250px"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-input v-model="pickingListPeople" clearable size="small" placeholder="制单人" style="width:120px;margin-left: 10px" />
+        <el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
         <!--        <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>-->
-        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
+        <el-button :disabled="审批未通过===true" size="small" type="warning" plain style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
       </div>
     </el-card>
     <div style="width: 27%;float: left;margin-right: 16px">
@@ -264,6 +274,8 @@ export default {
       pickingListNumber: '',
       pickingListNumberShow: '',
       pickListTable1: [],
+      startTime: '',
+      pickingListPeople: '', // 制单人
       pageCurrent3: 1,
       pageSize3: 10000,
       total3: 0,
@@ -532,9 +544,10 @@ export default {
     },
     // 查询领料单列表
     searchList() {
-      let check
-      this.pickingListNumber ? check = 1 : check = 0
-      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+      let check, check1
+      this.pickingListPeople ? check = 1 : check = 0
+      this.startTime ? check1 = 1 : (check1 = 0, this.startTime = '')
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListPeople, check1, this.startTime[0], this.startTime[1]).then(response => {
         this.pickListTable1 = response.data.rows
         this.total3 = response.data.total
       })
@@ -569,7 +582,7 @@ export default {
       })
     },
     tableRowClassName({ row }) {
-      if (parseInt(row.是否审批) === 0) {
+      if (parseInt(row.是否审批) === 1) {
         return 'shenpi-row'
       } else {
         return ''