From 820cb30e56654e091cdd6dd7cd67afd703c5b52b Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 29 Nov 2023 15:01:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=B7=A5=E5=BA=8F/=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/processStation/index.vue       |  2 +-
 src/views/base/productStation/index.vue       | 18 +++++++++++---
 .../report/inventoryStatistics/index.vue      |  2 +-
 src/views/report/repairMeasures/index.vue     | 24 +++++++++++++------
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/views/base/processStation/index.vue b/src/views/base/processStation/index.vue
index 932da9d..2031ce9 100644
--- a/src/views/base/processStation/index.vue
+++ b/src/views/base/processStation/index.vue
@@ -273,7 +273,7 @@ export default {
     };
   },
   created() {
-    if (!this.$route.params){
+    if (this.$route.params != null){
       this.queryParams.productLineCode = this.$route.params && this.$route.params.productLineCode;
     }
     this.getList();
diff --git a/src/views/base/productStation/index.vue b/src/views/base/productStation/index.vue
index 6d4098b..d0a9048 100644
--- a/src/views/base/productStation/index.vue
+++ b/src/views/base/productStation/index.vue
@@ -2,7 +2,8 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="产线编号" prop="parentId" >
-        <el-select v-model="queryParams.parentId" placeholder="请选择产线" disabled>
+        <el-select v-model="queryParams.parentId" placeholder="请选择产线" >
+          <!--          disabled-->
           <el-option
             v-for="item in productLineList"
             :key="item.productLineCode"
@@ -27,6 +28,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="工位类型" prop="stationType">
+        <el-select v-model="queryParams.stationType" placeholder="请选择工位类型" >
+        <el-option
+          v-for="dict in dict.type.station_type"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -267,9 +278,10 @@ export default {
     };
   },
   created() {
-    console.log(this.$route.params)
-    if (this.$route.params != null){
+    if (this.$route.params.productLineCode != null){
       this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode;
+    }
+    if (this.$route.params.processCode != null){
       this.queryParams.processCode = this.$route.params && this.$route.params.processCode;
     }
     this.getList();
diff --git a/src/views/report/inventoryStatistics/index.vue b/src/views/report/inventoryStatistics/index.vue
index 490f875..b61e39b 100644
--- a/src/views/report/inventoryStatistics/index.vue
+++ b/src/views/report/inventoryStatistics/index.vue
@@ -122,7 +122,7 @@ export default {
     }
   },
   created() {
-    if (!this.$route.params){
+    if (this.$route.params != null){
       this.queryParams.storeCode = this.$route.params && this.$route.params.storeCode;
     }
     this.getList()
diff --git a/src/views/report/repairMeasures/index.vue b/src/views/report/repairMeasures/index.vue
index 669dc60..232fa74 100644
--- a/src/views/report/repairMeasures/index.vue
+++ b/src/views/report/repairMeasures/index.vue
@@ -68,7 +68,11 @@
       <el-table-column label="返修措施编码" align="center" prop="repairCode" v-if="columns[1].visible"/>
       <el-table-column label="返修措施名称" align="center" prop="repairName" v-if="columns[2].visible"/>
       <el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[3].visible"/>
-      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[4].visible"/>
+      <el-table-column label="返修结果" align="center" prop="isFlag" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.rework_result" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[5].visible"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[6].visible">
         <template slot-scope="scope">
@@ -121,10 +125,15 @@
 <!--        <el-form-item label="工序编号" prop="processCode">-->
 <!--          <el-input v-model="form.processCode" placeholder="请输入工序编号" />-->
 <!--        </el-form-item>-->
-<!--        <el-form-item label="启用标识" prop="isFlag">-->
-<!--          <el-input v-model="form.isFlag" placeholder="请输入启用标识" />-->
-<!--        </el-form-item>-->
-<!--  -->
+        <el-form-item label="返修结果" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.rework_result"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -139,6 +148,7 @@ import { listRepairMeasures, getRepairMeasures, delRepairMeasures, addRepairMeas
 
 export default {
   name: "RepairMeasures",
+  dicts: ['rework_result'],
   data() {
     return {
       // 遮罩层
@@ -182,7 +192,7 @@ export default {
             { key: 1, label: `返修措施编码`, visible: true },
             { key: 2, label: `返修措施名称`, visible: true },
             { key: 3, label: `工序编号`, visible: false },
-            { key: 4, label: `启用标识`, visible: false },
+            { key: 4, label: `返修结果`, visible: true },
             { key: 5, label: `创建人`, visible: false },
             { key: 6, label: `创建时间`, visible: false },
             { key: 7, label: `更新人`, visible: false },
@@ -215,7 +225,7 @@ export default {
         repairCode: null,
         repairName: null,
         processCode: null,
-        isFlag: null,
+        isFlag: 1,
         createdBy: null,
         createdTime: null,
         updatedBy: null,