新增 工单作业时间区间、结果条件查询

src/views/ProductionProcess/workOrder.vue

@@ -28,6 +28,46 @@
             size="small"
           />
         </el-form-item>
+        <el-form-item label="需要时间">
+          <div slot="label" class="labelClass">
+            <div>需要时间</div>
+            <div>Need Date</div>
+          </div>
+          <el-date-picker
+            v-model="queryParams.beginDate"
+            type="date"
+            placeholder="选择日期"
+            :clearable="false"
+            :editable="false"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
+          <span>-</span>
+          <el-date-picker
+            v-model="queryParams.endDate"
+            type="date"
+            placeholder="选择日期"
+            :clearable="false"
+            :editable="false"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <div slot="label" class="labelClass">
+            <div>状态</div>
+            <div>Status</div>
+          </div>
+          <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+            <el-option :value=" '' " label="全部" />
+            <el-option
+              v-for="(dict,index) in stateOptions"
+              :key="index"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button
             class="redBtn"
@@ -1218,6 +1258,7 @@ import moment from 'moment'
 import { formAssembling, getSnsVague, queryBatch, queryTestInfo } from '@/api/assembling'
 import { listRepairRecordDetails } from '@/api/repairRecord'
 import { getDicts } from '@/api/system/dict/data'
+import Data from "@/views/system/dict/data";
 
 export default {
   name: 'WorkOrder',
@@ -1228,6 +1269,7 @@ export default {
     }
   },
   data() {
+    const date = new Date()
     return {
       // 测试结果详情数据
       testInfoTable: [],
@@ -1323,8 +1365,17 @@ export default {
         page: 1,
         rows: 10,
         orderNo: undefined,
-        partNo: undefined
+        partNo: undefined,
+        status: '',
+        beginDate: moment(date.setTime(date.getTime() - 3600 * 1000 * 24 * 29)).format('YYYY-MM-DD'),
+        endDate: moment(new Date()).format('YYYY-MM-DD')
       },
+      // 状态下拉框
+      stateOptions: [
+        { dictLabel: '待生产', dictValue: '0' },
+        { dictLabel: '生产中', dictValue: '1' },
+        { dictLabel: '已完成', dictValue: '2' }
+      ],
       // po弹窗标志
       poDialog: false,
       // 备注弹窗标志
@@ -1332,6 +1383,7 @@ export default {
       // 遮罩标志
       Loading: true,
       Loading1: true,
+      Loading1: true,
       Loading2: true,
       Loading3: true,
       // 生产工单表格数据
@@ -1572,6 +1624,9 @@ export default {
     resetQuery() {
       this.queryParams.orderNo = undefined
       this.queryParams.partNo = undefined
+      this.queryParams.status = ''
+      this.queryParams.beginDate = moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 29)).format('YYYY-MM-DD'),
+      this.queryParams.endDate = moment(new Date()).format('YYYY-MM-DD')
       this.getOrderTable()
     },
 
@@ -1854,7 +1909,17 @@ export default {
     /** 获取表格数据方法 */
     getOrderTable() {
       this.Loading = true
-      listOrder(this.queryParams).then(response => {
+      const queryParam = {
+        page: this.queryParams.page,
+        rows: this.queryParams.rows,
+        orderNo: this.queryParams.orderNo,
+        partNo: this.queryParams.partNo,
+        status: this.queryParams.status,
+        beginDate: this.queryParams.beginDate + ' 00:00:00',
+        endDate: this.queryParams.endDate + ' 23:59:59'
+      }
+      console.log('**', queryParam)
+      listOrder(queryParam).then(response => {
         this.orderList = response.rows
         this.total = response.total
         this.Loading = false