From bc54f5be2e1d5ab26cbdc254cd390ce43fbd1140 Mon Sep 17 00:00:00 2001
From: zhouhy <zhouhy3@mesnac.com>
Date: Fri, 20 Oct 2023 08:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8D=95=E5=85=83=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/qualityInspectionItem/index.vue      | 14 +++++--------
 src/views/base/workUnit/index.vue             | 21 +++++++++----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/views/base/qualityInspectionItem/index.vue b/src/views/base/qualityInspectionItem/index.vue
index f160440..7cab936 100644
--- a/src/views/base/qualityInspectionItem/index.vue
+++ b/src/views/base/qualityInspectionItem/index.vue
@@ -181,7 +181,7 @@
             <el-radio
               v-for="dict in dict.type.material_categories"
               :key="dict.value"
-              :label="dict.value"
+              :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -190,7 +190,7 @@
             <el-radio
               v-for="dict in dict.type.material_subclass"
               :key="dict.value"
-              :label="dict.value"
+              :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -309,11 +309,11 @@ export default {
         qualityDefectCode: null,
         qualityDefectName: null,
         parentId: null,
-        materialCategories: null,
-        materialSubclass: null,
+        materialCategories: 0,
+        materialSubclass: 0,
         plantCode: null,
         remark: null,
-        isFlag: null,
+        isFlag: 0,
         createdBy: null,
         createdTime: null,
         updatedBy: null,
@@ -340,10 +340,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.form.parentId = 0;
-      this.form.materialCategories = 0;
-      this.form.materialSubclass = 0;
-      this.form.isFlag = 0;
       this.open = true;
       this.title = "添加质检项信息维护";
     },
diff --git a/src/views/base/workUnit/index.vue b/src/views/base/workUnit/index.vue
index da1d11e..99915f4 100644
--- a/src/views/base/workUnit/index.vue
+++ b/src/views/base/workUnit/index.vue
@@ -72,11 +72,11 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 
-      <el-table-column label="统计单元编号" prop="workUnitCode" />
+      <el-table-column width="90px" label="统计单元编号" prop="workUnitCode" />
       <el-table-column label="父级编号" align="center" prop="parentId" />
       <el-table-column label="统计单元名称" align="center" prop="workUnitName" />
       <el-table-column label="统计区域" align="center" prop="workUnitAddress" />
-      <el-table-column label="产线/工位" align="center" prop="productLineCode" />
+      <el-table-column label="产线/工位" align="center" prop="productLineName"/>
       <el-table-column label="统计单元类型" align="center" prop="workUnitType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.work_unit_type" :value="scope.row.workUnitType"/>
@@ -194,7 +194,7 @@ export default {
   },
   data() {
     return {
-      ProductLineCode:"",
+      ProductLineCode:[],
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -240,22 +240,21 @@ export default {
   },
   created() {
     this.getList();
-    this.getproductLine();
+    listProductLine(this.queryParams).then(response =>{
+      // console.log(response)
+      this.ProductLineCode = response.rows;
+    })
   },
   methods: {
-    /** 查询产线/工位 */
-    getproductLine(){
-      listProductLine(this.queryParams).then(response =>{
-        console.log(response.rows)
-        this.ProductLineCode = response.rows;
-      })
-    },
+
+
     /** 查询统计单元信息列表 */
     getList() {
       this.loading = true;
       listWorkUnit(this.queryParams).then(response => {
         this.workUnitList = this.handleTree(response.data, "workUnitCode", "parentId");
         this.loading = false;
+        console.log(response.data)
       });
     },
     /** 转换统计单元信息数据结构 */