需求修改

src/views/ProductionProcess/qualityTest.vue

@@ -171,13 +171,13 @@
               <span>{{ scope.row.staName || '-' }}</span>
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" align="center" prop="deviceCode">
+          <el-table-column :show-overflow-tooltip="true" align="center" prop="testDevice">
             <template slot="header">
-              <div>测试工站代码</div>
+              <div>设备编码</div>
               <!--              <div>Line Beach No.</div>-->
             </template>
             <template slot-scope="scope">
-              <span>{{ scope.row.deviceCode || '-' }}</span>
+              <span>{{ scope.row.testDevice || '-' }}</span>
             </template>
           </el-table-column>
           <el-table-column :show-overflow-tooltip="true" align="center" prop="testDate">

src/views/productTraceability/packing.vue

@@ -28,9 +28,9 @@
             size="small"
           />
         </el-form-item>
-        <el-form-item label="计划开工时间">
+        <el-form-item label="实际开工时间">
           <div slot="label" class="labelClass">
-            <div>计划开工时间</div>
+            <div>实际开工时间</div>
             <!--            <div>Order No.</div>-->
           </div>
           <el-date-picker

src/views/repair/repairRecord.vue

@@ -53,7 +53,7 @@
             <div>Line Code</div>
           </div>
           <el-select v-model="queryParams.xtCode" placeholder="请选择线体" clearable size="small">
-            <el-option :value=" '' " label="全部"></el-option>
+            <el-option :value=" '' " label="全部" />
             <el-option
               v-for="(dict,index) in lineOptions"
               :key="index"
@@ -62,6 +62,21 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="状态" prop="state">
+          <div slot="label" class="labelClass">
+            <div>状态</div>
+            <div>State</div>
+          </div>
+          <el-select v-model="queryParams.state" 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 label="成品料号" prop="partNo">
           <div slot="label" class="labelClass">
             <div>成品料号</div>
@@ -77,7 +92,7 @@
             style="width: 200px"
           />
         </el-form-item>
-        <el-form-item label="报修时间" prop="createdDate">
+        <el-form-item label="报修时间">
           <div slot="label" class="labelClass">
             <div>报修时间</div>
             <div>Repair Time</div>
@@ -85,13 +100,24 @@
           <el-date-picker
             v-model="queryParams.createdDate"
             align="right"
-            type="date"
-            style="width: 150px"
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd"
-            format="yyyy-MM-dd"
+            type="datetime"
+            style="width: 250px"
+            placeholder="选择开始日期"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             :picker-options="pickerOptions"
           />
+          <span>-</span>
+          <el-date-picker
+            v-model="queryParams.endDate"
+            align="right"
+            type="datetime"
+            style="width: 250px"
+            placeholder="选择结束日期"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :picker-options="pickerOptionsEnd"
+          />
         </el-form-item>
         <el-form-item>
           <el-button class="redBtn" type="danger" size="small" @click="handleQuery">查询 Query</el-button>
@@ -210,6 +236,7 @@
               </template>
             </el-table-column>
             <el-table-column
+              fixed="right"
               align="center"
               width="150"
               class-name="small-padding fixed-width"
@@ -427,19 +454,36 @@ export default {
         orderNo: '',
         partNo: '',
         xtCode: '',
+        state: '',
         sn: '',
-        createdDate: moment(new Date()).format('YYYY-MM-DD')
+        createdDate: moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 6)).format('YYYY-MM-DD') + ' 00:00:00',
+        endDate: moment(new Date().getTime()).format('YYYY-MM-DD') + ' 23:59:59'
       },
+      // pickerOptions: {
+      //   disabledDate(time) {
+      //     return time.getTime() > Date.now()
+      //   },
+      //   shortcuts: [{
+      //     text: '今天',
+      //     onClick(picker) {
+      //       picker.$emit('pick', new Date())
+      //     }
+      //   }]
+      // },
       pickerOptions: {
-        disabledDate(time) {
-          return time.getTime() > Date.now()
-        },
-        shortcuts: [{
-          text: '今天',
-          onClick(picker) {
-            picker.$emit('pick', new Date())
+        disabledDate: time => {
+          if (this.queryParams.endDate) {
+            return time.getTime() > new Date(this.queryParams.endDate).getTime()
           }
-        }]
+        }
+      },
+      pickerOptionsEnd: {
+        disabledDate: time => {
+          if (this.queryParams.createdDate) {
+            return time.getTime() >= new Date(moment(new Date().getTime()).format('YYYY-MM-DD')).getTime() ||
+              time.getTime() < new Date(moment(new Date(this.queryParams.createdDate).getTime()).format('YYYY-MM-DD')).getTime()
+          }
+        }
       },
       openBad: false,
       form: {
@@ -480,7 +524,12 @@ export default {
       positionOption: [],
 
       // 线体下拉框
-      lineOptions: []
+      lineOptions: [],
+      stateOptions: [
+        { dictLabel: '全部', dictValue: '' },
+        { dictLabel: '待维修', dictValue: '0' },
+        { dictLabel: '已维修', dictValue: '1' }
+      ]
     }
   },
   /** 路由离开前存储筛选条件*/
@@ -531,8 +580,10 @@ export default {
       this.queryParams.orderNo = ''
       this.queryParams.partNo = ''
       this.queryParams.xtCode = ''
+      this.queryParams.state = ''
       this.queryParams.repairNo = ''
-      this.queryParams.createdDate = moment(new Date()).format('YYYY-MM-DD')
+      this.queryParams.createdDate = moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 6)).format('YYYY-MM-DD') + ' 00:00:00'
+      this.queryParams.endDate = moment(new Date().getTime()).format('YYYY-MM-DD') + ' 23:59:59'
       this.handleQuery()
     },
     /** 详情按钮操作 */