From 26fae6a00e4e7c80f8d837a7ef08f33b26754b1f Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Wed, 10 Jul 2019 16:46:50 +0800
Subject: [PATCH] f

---
 debug.log                                              |  1 +
 src/api/PurchasingCenter/SupplierManagement.js         |  4 ++--
 .../PurchasingCenter/SupplierManagement/index.vue      | 10 +++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debug.log b/debug.log
index d69cf9be..4faf2275 100644
--- a/debug.log
+++ b/debug.log
@@ -2,3 +2,4 @@
 [0515/102246.688:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
 [0531/081503.881:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
 [0605/094355.406:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
+[0710/121232.515:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
diff --git a/src/api/PurchasingCenter/SupplierManagement.js b/src/api/PurchasingCenter/SupplierManagement.js
index d67616dd..71620895 100644
--- a/src/api/PurchasingCenter/SupplierManagement.js
+++ b/src/api/PurchasingCenter/SupplierManagement.js
@@ -1,13 +1,13 @@
 import request from '@/utils/request'
 
-export function searchData(check1, supplierName, check2, businessNature, check3, creationDate, check4, registeredCapital, check5, taxNumber, check6, bank, check7, account, check8, email, check9, address, check10, telephone, check11, fax, check12, deliveryPeriod, pageCurrent, pageSize) {
+export function searchData(check1, supplierName, check2, businessNature, check3, creationDate, check4, registeredCapital, check5, taxNumber, check6, bank, check7, account, check8, email, check9, address, check10, telephone, check11, fax, check12, deliveryPeriod, pageCurrent, pageSize, check13, mainProduction) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '閲囪喘绠＄悊_渚涘簲鍟哶鏌ヨ鏁版嵁_鏍规嵁鏉′欢',
-      param: '渚涘簲鍟嗗悕绉癬check=' + check1 + '=int&渚涘簲鍟嗗悕绉�=' + supplierName + '&浼佷笟鎬ц川_check=' + check2 + '=int&浼佷笟鎬ц川=' + businessNature + '&鍒涚珛鏃ユ湡_check=' + check3 + '=int&鍒涚珛鏃ユ湡=' + creationDate + '&娉ㄥ唽璧勬湰_check=' + check4 + '=int&娉ㄥ唽璧勬湰=' + registeredCapital + '&绋庡彿_check=' + check5 + '=int&绋庡彿=' + taxNumber + '&寮�鎴疯_check=' + check6 + '=int&寮�鎴疯=' + bank + '&甯愬彿_check=' + check7 + '=int&甯愬彿=' + account + '&鐢靛瓙淇＄_check=' + check8 + '=int&鐢靛瓙淇＄=' + email + '&鍦板潃_check=' + check9 + '=int&鍦板潃=' + address + '&鐢佃瘽鍙风爜_check=' + check10 + '=int&鐢佃瘽鍙风爜=' + telephone + '&浼犵湡_check=' + check11 + '=int&浼犵湡=' + fax + '&璐ф湡_check=' + check12 + '=int&璐ф湡=' + deliveryPeriod,
+      param: '渚涘簲鍟嗗悕绉癬check=' + check1 + '=int&渚涘簲鍟嗗悕绉�=' + supplierName + '&浼佷笟鎬ц川_check=' + check2 + '=int&浼佷笟鎬ц川=' + businessNature + '&鍒涚珛鏃ユ湡_check=' + check3 + '=int&鍒涚珛鏃ユ湡=' + creationDate + '&娉ㄥ唽璧勬湰_check=' + check4 + '=int&娉ㄥ唽璧勬湰=' + registeredCapital + '&绋庡彿_check=' + check5 + '=int&绋庡彿=' + taxNumber + '&寮�鎴疯_check=' + check6 + '=int&寮�鎴疯=' + bank + '&甯愬彿_check=' + check7 + '=int&甯愬彿=' + account + '&鐢靛瓙淇＄_check=' + check8 + '=int&鐢靛瓙淇＄=' + email + '&鍦板潃_check=' + check9 + '=int&鍦板潃=' + address + '&鐢佃瘽鍙风爜_check=' + check10 + '=int&鐢佃瘽鍙风爜=' + telephone + '&浼犵湡_check=' + check11 + '=int&浼犵湡=' + fax + '&璐ф湡_check=' + check12 + '=int&璐ф湡=' + deliveryPeriod + '&涓昏浜у搧_check=' + check13 + '&涓昏浜у搧=' + mainProduction,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index 7a11c065..94231b8f 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -58,6 +58,11 @@
               <el-input v-model="fax" placeholder="浼犵湡" size="small" clearable/>
             </el-form-item>
           </el-col>
+          <el-col style="width: 250px">
+            <el-form-item label="涓昏浜у搧">
+              <el-input v-model="mainProduction" placeholder="涓昏浜у搧" size="small" clearable/>
+            </el-form-item>
+          </el-col>
           <el-col style="width: 250px;margin:2px 0 0 15px">
             <el-button type="success" size="small" icon="el-icon-search" @click="pageCurrent = 1;fetchData()">鏌ヨ</el-button>
             <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">澧炲姞</el-button>
@@ -339,6 +344,7 @@ import { searchData, addTable, editTable, deleteData, getName, addPerson, editPe
 export default {
   data() {
     return {
+      mainProduction: '', // 涓昏浜у搧
       form1: {},
       supplierName: '',
       businessNature: '',
@@ -410,6 +416,7 @@ export default {
   },
   methods: {
     fetchData() {
+      let check1
       this.List1 = []
       this.supplierName ? this.check1 = 1 : this.check1 = 0
       this.businessNature ? this.check2 = 1 : this.check2 = 0
@@ -423,7 +430,8 @@ export default {
       this.telephone ? this.check10 = 1 : this.check10 = 0
       this.fax ? this.check11 = 1 : this.check11 = 0
       this.deliveryPeriod ? this.check12 = 1 : this.check12 = 0
-      searchData(this.check1, this.supplierName, this.check2, this.businessNature, this.check3, this.creationDate, this.check4, this.registeredCapital, this.check5, this.taxNumber, this.check6, this.bank, this.check7, this.account, this.check8, this.email, this.check9, this.address, this.check10, this.telephone, this.check11, this.fax, this.check12, this.deliveryPeriod, this.pageCurrent, this.pageSize).then(response => {
+      this.mainProduction ? check1 = 1 : check1 = 0
+      searchData(this.check1, this.supplierName, this.check2, this.businessNature, this.check3, this.creationDate, this.check4, this.registeredCapital, this.check5, this.taxNumber, this.check6, this.bank, this.check7, this.account, this.check8, this.email, this.check9, this.address, this.check10, this.telephone, this.check11, this.fax, this.check12, this.deliveryPeriod, this.pageCurrent, this.pageSize, check1, this.mainProduction).then(response => {
         this.List = response.data.rows
         this.total = response.data.total
       })