增加合同机床查询条件

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -9,9 +9,11 @@
           :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();param = 1" @clear="clear()"/>
-      <span style="margin-left: 10px">开始日期：</span>
+      <span style="margin-left: 10px">时间区间：</span>
       <el-date-picker
         v-model="startTime"
         style="width: 200px;"
@@ -19,7 +21,7 @@
         size="small"
         type="date"
         placeholder="请选择开始日期"/>
-      <span style="margin-left: 10px">结束日期：</span>
+      <span>-</span>
       <el-date-picker
         v-model="endTime"
         style="width: 200px;"
@@ -357,46 +359,6 @@
       </div>
     </el-dialog>
 
-    <!--<el-dialog title="人员信息" :visible.sync="dialogFormVisiblePeople" center width="750px">-->
-    <!--<div style="height: 500px">-->
-    <!--<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">-->
-    <!--<el-tree-->
-    <!--:data="dataPeople"-->
-    <!--node-key="id"-->
-    <!--style="width: 150px;float: left"-->
-    <!--height="400"-->
-    <!--accordion-->
-    <!--@node-click="handleNodeClick"-->
-    <!--&gt;-->
-    <!--</el-tree>-->
-    <!--</div>-->
-    <!--<el-table :data="ListPeople" highlight-current-row height="400" @row-click="handleChange" style="width: 400px;float: left;margin-left: 30px">-->
-    <!--<el-table-column label="考勤编号" align="center" >-->
-    <!--<template slot-scope="scope">-->
-    <!--{{scope.row.考勤编号}}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="姓名" align="center" >-->
-    <!--<template slot-scope="scope">-->
-    <!--{{scope.row.姓名}}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="性别" align="center">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{scope.row.性别}}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="工作岗位" align="center">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{scope.row.岗位名称}}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--</el-table>-->
-    <!--</div>-->
-    <!--<el-button style="margin-left: 260px" @click="offName">取消</el-button>-->
-    <!--<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>-->
-    <!--</el-dialog>-->
-
     <!--新增机床对话框-->
     <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="25%">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
@@ -586,6 +548,8 @@ export default {
       time6: '',
       time7: '',
       time8: '',
+      machine: '',
+      machine_check: '',
       disabledTime: false,
       dialogTimeVisible: false,
       executionProgressIDdisabled: false,
@@ -745,11 +709,12 @@ 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.ExecutionProgressShow = false
       this.uploader = false
       this.ExecutionProgress = null
       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'])
     },
     fetchExecutionProgressdata(row) {
       this.projectNum = row.项目流水号