From 6ee62274178ac2f2ab341ba61e3d0ab0c6e427a5 Mon Sep 17 00:00:00 2001
From: zhouhy <zhouhy3@mesnac.com>
Date: Thu, 19 Oct 2023 15:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E9=A1=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/qualityInspectionItem/childIndex.vue | 11 +++++-----
 src/views/base/workUnit/index.vue             | 22 +++++++++++++++++--
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/views/base/qualityInspectionItem/childIndex.vue b/src/views/base/qualityInspectionItem/childIndex.vue
index d8331bf..bc2cfbd 100644
--- a/src/views/base/qualityInspectionItem/childIndex.vue
+++ b/src/views/base/qualityInspectionItem/childIndex.vue
@@ -141,16 +141,15 @@
 
     <!-- 添加或修改质检项信息维护对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="质量缺陷编号" prop="qualityDefectCode">
-          <el-input v-model="form.qualityDefectCode" placeholder="请输入质检项/质量缺陷编号" />
+          <el-input v-model="form.qualityDefectCode" placeholder="请输入质量缺陷编号" />
         </el-form-item>
         <el-form-item label="质量缺陷描述" prop="qualityDefectName">
-          <el-input v-model="form.qualityDefectName" placeholder="请输入质检项/质量缺陷描述" />
+          <el-input v-model="form.qualityDefectName" placeholder="请输入质量缺陷描述" />
         </el-form-item>
-        <el-form-item label="父级编号" prop="parentId">
-
-        <el-select v-model="form.parentId" placeholder="请选择父">
+        <el-form-item label="质检项名称" prop="parentId">
+        <el-select v-model="form.parentId" placeholder="请选择质检项">
           <el-option
             v-for="item in Parents"
             :key="item.qualityDefectCode"
diff --git a/src/views/base/workUnit/index.vue b/src/views/base/workUnit/index.vue
index 1ac8b8b..da1d11e 100644
--- a/src/views/base/workUnit/index.vue
+++ b/src/views/base/workUnit/index.vue
@@ -142,8 +142,15 @@
           <el-input v-model="form.workUnitAddress" placeholder="请输入统计区域" />
         </el-form-item>
         <el-form-item label="产线/工位" prop="productLineCode">
-          <el-input v-model="form.productLineCode" placeholder="请输入产线/工位" />
-        </el-form-item>
+            <el-select v-model="form.productLineCode" placeholder="请输入产线/工位">
+              <el-option
+                v-for="item in ProductLineCode"
+                :key="item.productLineCode"
+                :label="item.productLineName"
+                :value="item.productLineCode">
+              </el-option>
+            </el-select>
+          </el-form-item>
         <el-form-item label="统计单元类型" prop="workUnitType">
           <el-select v-model="form.workUnitType" placeholder="请选择统计单元类型">
             <el-option
@@ -176,6 +183,8 @@
 import { listWorkUnit, getWorkUnit, delWorkUnit, addWorkUnit, updateWorkUnit } from "@/api/base/workUnit";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getQualityInspectionItemParent } from '@/api/base/qualityInspectionItem'
+import { listProductLine } from '@/api/base/productLine'
 
 export default {
   name: "WorkUnit",
@@ -185,6 +194,7 @@ export default {
   },
   data() {
     return {
+      ProductLineCode:"",
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -230,8 +240,16 @@ export default {
   },
   created() {
     this.getList();
+    this.getproductLine();
   },
   methods: {
+    /** 查询产线/工位 */
+    getproductLine(){
+      listProductLine(this.queryParams).then(response =>{
+        console.log(response.rows)
+        this.ProductLineCode = response.rows;
+      })
+    },
     /** 查询统计单元信息列表 */
     getList() {
       this.loading = true;