From 2364cb7806ef1ee9600f3b6c75dcdcd94d3afa3b Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Sat, 12 Jan 2019 09:03:22 +0800
Subject: [PATCH] bug

---
 src/api/MarketingCenter/ComprehensiveInquiryMS.js          | 4 ++--
 src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/api/MarketingCenter/ComprehensiveInquiryMS.js b/src/api/MarketingCenter/ComprehensiveInquiryMS.js
index 55e5258e..92319fb9 100644
--- a/src/api/MarketingCenter/ComprehensiveInquiryMS.js
+++ b/src/api/MarketingCenter/ComprehensiveInquiryMS.js
@@ -31,14 +31,14 @@ export function SelectMarketingManager(code) {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 83ecf558..397ed59d 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -9,6 +9,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
+      <span style="margin-left: 10px">机床型号：</span>
+      <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
       <span style="margin-left: 10px">销售经理：</span>
       <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
       <span style="margin-left: 10px">开始日期：</span>
@@ -660,6 +662,8 @@ export default {
       MarketingManagerValue: '',
       peopleid_check: '',
       startTime: '',
+      machine: '',
+      machine_check: '',
       startTime_check: null,
       endTime: '',
       endTime_check: null,
@@ -722,8 +726,9 @@ export default {
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading'])
       this.tableDataInvoiceRecord = []
       this.tableDataContractCapitalManagement = []
       this.tableDataSafetyMargin = []