From 7eb0d4a45629a6f8cf26d03689da4f0f46ae4453 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Thu, 4 Jul 2019 09:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=90=88=E5=90=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseContractSearch.js                 |  4 +--
 .../PurchaseContractSearch/index.vue          | 28 +++++++++++++++++--
 .../PurchaseTaskAllocate/index.vue            |  6 ++--
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js
index ed3c83b8..30f3cc57 100644
--- a/src/api/PurchasingCenter/PurchaseContractSearch.js
+++ b/src/api/PurchasingCenter/PurchaseContractSearch.js
@@ -23,14 +23,14 @@ export function initBuyer() {
   })
 }
 // 采购合同查询
-export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval, numberCheck, number) {
+export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval, numberCheck, number, check6, review) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_合同_查询数据_采购部采购',
-      param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number,
+      param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number + '&审核情况流水号_check=' + check6 + '&审核情况流水号=' + review,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 12abc1cf..4fdf87ac 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -38,6 +38,14 @@
         </el-row>
 
         <el-row style="margin-top: 15px">
+          <span>审核情况:</span>
+          <el-select v-model="revieweValue" placeholder="审核情况" size="small" style="width: 100px">
+            <el-option
+              v-for="item in reviewe"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
           <span>审批情况:</span>
           <el-select v-model="approvalValue" placeholder="审批情况" size="small" style="width: 100px">
             <el-option
@@ -211,6 +219,20 @@ export default {
         label: '未审批'
       }],
       approvalValue: 0,
+      reviewe: [{
+        value: 0,
+        label: '全部'
+      }, {
+        value: 1,
+        label: '已通过'
+      }, {
+        value: 2,
+        label: '未通过'
+      }, {
+        value: 3,
+        label: '未审核'
+      }],
+      revieweValue: 0,
       RMB: '',
       TotalAmount: '',
       check1: 0,
@@ -337,13 +359,13 @@ export default {
       } else {
         this.check5 = 1
       }
-      let check
+      let check, check2
       this.contractNumber ? check = 1 : check = 0
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.personValue, this.check4, this.supplierName, this.check5, this.approvalValue, check, this.contractNumber).then(response => {
+      this.revieweValue ? check2 = 1 : check2 = 0
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.personValue, this.check4, this.supplierName, this.check5, this.approvalValue, check, this.contractNumber, check2, this.revieweValue).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           response.data.rows[i].审批情况内容 === '未审批' ? this.disable.push(false) : this.disable.push(true) // 删除按钮禁用
         }
-        console.log(response.data.rows)
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
         this.loading1 = false
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index fb6d3efc..dbcd374d 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -26,7 +26,7 @@
             type="success"
             size="small"
             icon="el-icon-search"
-            style="margin-left: 10px;margin-bottom:10px"
+            style="margin-left: 10px;"
             @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
           <div style="float:right;">
             <span style="margin-left: 0">采购员:</span>
@@ -240,7 +240,7 @@
             type="success"
             size="small"
             icon="el-icon-search"
-            style="margin-left: 10px;margin-bottom:10px"
+            style="margin-left: 10px;"
             @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
           <div style="float:right;">
             <span style="margin-left: 0">采购员:</span>
@@ -454,7 +454,7 @@
             type="success"
             size="small"
             icon="el-icon-search"
-            style="margin-left: 10px;margin-bottom:10px"
+            style="margin-left: 10px;"
             @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
           <div style="float:right">
             <span style="margin-left: 0">采购员:</span>