update - 成品看板

src/views/board/scanDown/index.vue

@@ -129,7 +129,7 @@ export default {
       zhddhj: 0,
       title: [
         '成品产量',
-        '终检一次不合格率',
+        '终检一次返修率',
         'LOSS(分钟)',
         '入库标准节拍(秒)',
         'LOSS分类',
@@ -472,7 +472,7 @@ export default {
                   },
                 },
                 {
-                  name: '不合格率',
+                  name: '返修率',
                   type: 'line',
                   yAxisIndex: 1,
                   data: e.map(val => val.Y_VALUE_TWO),

src/views/report/qualityInspection/index.vue

@@ -43,15 +43,27 @@
           />
         </el-select>
       </el-form-item>
-
+      <el-form-item label="质检工位" prop="stationCode">
-<!--      <el-form-item label="检测时间" prop="inspectorTime">-->
+        <el-select v-model="queryParams.stationCode" placeholder="请选择质检工位">
-<!--        <el-date-picker clearable-->
+          <el-option
-<!--          v-model="queryParams.inspectorTime"-->
+            v-for="item in productLineList"
-<!--          type="date"-->
+            :key="item.productLineCode"
-<!--          value-format="yyyy-MM-dd"-->
+            :label="item.productLineName"
-<!--          placeholder="请选择检测时间">-->
+            :value="item.productLineCode"
-<!--        </el-date-picker>-->
+          ></el-option>
-<!--      </el-form-item>-->
+        </el-select>
+      </el-form-item>
+      <el-form-item label="检测时间" prop="inspectorTime">
+        <el-date-picker
+          v-model="daterangeBeginTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -90,7 +102,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['report:qualityInspection:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -100,7 +113,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['report:qualityInspection:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
@@ -204,7 +218,8 @@
               v-for="dict in dict.type.treatment_measures"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="处理结果" prop="processResult">
@@ -216,7 +231,8 @@
               v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="班组编号" prop="groupCode">
@@ -230,7 +246,8 @@
                           v-model="form.inspectorTime"
                           type="date"
                           value-format="yyyy-MM-dd"
-            placeholder="请选择检测时间">
+                          placeholder="请选择检测时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="返修次数" prop="reworkNumber">
@@ -241,7 +258,8 @@
                           v-model="form.finishTime"
                           type="date"
                           value-format="yyyy-MM-dd"
-            placeholder="请选择返修完成时间">
+                          placeholder="请选择返修完成时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="是否标识" prop="isFlag">
@@ -255,7 +273,8 @@
                           v-model="form.updatedTime"
                           type="date"
                           value-format="yyyy-MM-dd"
-            placeholder="请选择更新时间">
+                          placeholder="请选择更新时间"
+          >
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -268,10 +287,18 @@
 </template>
 
 <script>
-import { listQualityInspection, getQualityInspection, delQualityInspection, addQualityInspection, updateQualityInspection } from "@/api/report/qualityInspection";
+import {
+  listQualityInspection,
+  getQualityInspection,
+  delQualityInspection,
+  addQualityInspection,
+  updateQualityInspection
+} from '@/api/report/qualityInspection'
+import { parseTime } from '@//utils/ruoyi'
+import { findProductLineList } from '@//api/base/productLine'
 
 export default {
-  name: "QualityInspection",
+  name: 'QualityInspection',
   dicts: ['sys_yes_no', 'treatment_measures'],
   data() {
     return {
@@ -289,8 +316,10 @@ export default {
       total: 0,
       // 质检记录管理表格数据
       qualityInspectionList: [],
+      // 更新时间时间范围
+      daterangeBeginTime: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -318,8 +347,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
+      rules: {},
-      },
       columns: [
         { key: 0, label: `主键标识`, visible: false },
         { key: 1, label: `箱体码`, visible: true },
@@ -342,27 +370,41 @@ export default {
         { key: 18, label: `工序名称`, visible: true },
         { key: 19, label: `班组名称`, visible: true },
         { key: 20, label: `检测人员名称`, visible: true },
-            { key: 21, label: `工位名称`, visible: true },
+        { key: 21, label: `工位名称`, visible: true }
-        ]
+      ],
-    };
+      productLineList: []
+    }
   },
   created() {
-    this.getList();
+    findProductLineList({ productLineType: 2, stationType: 2 }).then(response => {
+      this.productLineList = response.data
+    })
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+    this.getList()
   },
   methods: {
     /** 查询质检记录管理列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+        this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
+        this.queryParams.endBeginTime = this.daterangeBeginTime[1]
+      } else {
+        this.queryParams.beginBeginTime = null
+        this.queryParams.endBeginTime = null
+      }
       listQualityInspection(this.queryParams).then(response => {
-        this.qualityInspectionList = response.rows;
+        this.qualityInspectionList = response.rows
-        this.total = response.total;
+        this.total = response.total
-        this.loading = false;
+        this.loading = false
-      });
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open = false
-      this.reset();
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -385,18 +427,21 @@ export default {
         isFlag: null,
         updatedBy: null,
         updatedTime: null
-      };
+      }
-      this.resetForm("form");
+      const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+      this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+      this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.pageNum = 1
-      this.getList();
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm')
-      this.handleQuery();
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -406,49 +451,50 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      this.reset()
-      this.open = true;
+      this.open = true
-      this.title = "添加质检记录管理";
+      this.title = '添加质检记录管理'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const objId = row.objId || this.ids
       getQualityInspection(objId).then(response => {
-        this.form = response.data;
+        this.form = response.data
-        this.open = true;
+        this.open = true
-        this.title = "修改质检记录管理";
+        this.title = '修改质检记录管理'
-      });
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.objId != null) {
             updateQualityInspection(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess('修改成功')
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           } else {
             addQualityInspection(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess('新增成功')
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const objIds = row.objId || this.ids;
+      const objIds = row.objId || this.ids
       this.$modal.confirm('是否确认删除质检记录管理编号为"' + objIds + '"的数据项？').then(function() {
-        return delQualityInspection(objIds);
+        return delQualityInspection(objIds)
       }).then(() => {
-        this.getList();
+        this.getList()
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {});
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -457,5 +503,5 @@ export default {
       }, `qualityInspection_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>