From f7fa095b7387833134b68a8e43a083079c4371e2 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 12 Oct 2019 10:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/ArrivalStateSearch.js    | 28 +++++++++++++-
 .../PurchasingCenter/ArrivalEnquiry/index.vue | 37 +++++++++++++++----
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/api/PurchasingCenter/ArrivalStateSearch.js b/src/api/PurchasingCenter/ArrivalStateSearch.js
index 6951df1f..363279c4 100644
--- a/src/api/PurchasingCenter/ArrivalStateSearch.js
+++ b/src/api/PurchasingCenter/ArrivalStateSearch.js
@@ -1,13 +1,14 @@
 import request from '@/utils/request'
 
 // 初始化合同
-export function initArrivalStateContact() {
+export function initArrivalStateContact(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购请款表_查询数据'
+      name: '采购管理_采购请款表_查询数据',
+      param: `供应商流水号_check=1&供应商流水号=${num}`
     }
   })
 }
@@ -61,3 +62,26 @@ export function submit(num) {
     }
   })
 }
+// 查询仓库到货情况
+export function searchArrivalState12(pageCurrent, pageSize, check1, num, check2, name) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_仓库到货情况_查询数据_NEW',
+      param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商流水号_check=${check2}&供应商流水号=${name}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function searchgongyings() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_仓库到货情况_供货商查询数据'
+    }
+  })
+}
diff --git a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
index 0ba900a8..d826b790 100644
--- a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
+++ b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
@@ -2,8 +2,16 @@
   <div class="app-container">
     <el-card>
       <div slot="header">
+        <span>供应商:</span>
+        <el-select v-model="gongyingsValue" placeholder="供应商" size="small" filterable clearable @change="fetchData();searchTable1()">
+          <el-option
+            v-for="item in gongyings"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
         <span>合同号:</span>
-        <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
+        <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="searchTable1()">
           <el-option
             v-for="item in contractNum"
             :key="item.value"
@@ -13,8 +21,6 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <span>供应商:</span>
-        <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
         <el-button
           type="success"
           size="small"
@@ -129,7 +135,7 @@
 </template>
 
 <script>
-import { initArrivalStateContact, searchArrivalState1, searchArrivalNum, submit } from '@/api/PurchasingCenter/ArrivalStateSearch'
+import { initArrivalStateContact, searchArrivalState12, searchArrivalNum, submit, searchgongyings } from '@/api/PurchasingCenter/ArrivalStateSearch'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -138,6 +144,8 @@ export default {
     return {
       check1: 0,
       check2: 0,
+      gongyingsValue: '',
+      gongyings: [],
       contractNumValue: '',
       contractNum: [],
       supplierName: '',
@@ -157,12 +165,15 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    // this.fetchData()
+    this.searchgongyings()
     this.searchTable1()
   },
   methods: {
     fetchData() {
-      initArrivalStateContact().then(response => {
+      this.contractNumValue = ''
+      this.contractNum = []
+      initArrivalStateContact(this.gongyingsValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.contractNum.push({
             label: response.data[i].采购合同编号,
@@ -172,10 +183,20 @@ export default {
         }
       })
     },
+    searchgongyings() {
+      searchgongyings().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.gongyings.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
+        }
+      })
+    },
     searchTable1() {
       this.contractNumValue ? this.check1 = 1 : this.check1 = 0
-      this.supplierName ? this.check2 = 1 : this.check2 = 0
-      searchArrivalState1(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
+      this.gongyingsValue ? this.check2 = 1 : this.check2 = 0
+      searchArrivalState12(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.gongyingsValue).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })