Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue

@@ -24,6 +24,22 @@
         </el-select>
         <span>零件号:</span>
         <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
+        <span class="demonstration">计划下达时间:</span>
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
+        <span class="demonstration">-</span>
+        <el-date-picker
+          v-model="endTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
       </el-row>
     </el-card>
@@ -366,6 +382,10 @@ export default {
       person: '',
       title: '',
       Num: '',
+      startTime: '',
+      endTime: '',
+      startTime_check: 0,
+      endTime_check: 0,
       form: {
         人员: '',
         考勤编号: '',
@@ -525,6 +545,16 @@ export default {
       } else {
         this.checkbox_number = true
       }
+      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
+      }
       this.tableData1 = []
       this.零件图号 = []
       this.零件名称 = []
@@ -538,7 +568,7 @@ export default {
       this.colorCode = [[]]
       this.realDate = [[]]
       this.length = 0
-      getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
+      getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
         if (response.data.rows.length === 0) {
           this.listLoading1 = false
         } else {