From 4091c0e839e24cb6814fe5032ef9e8ace2f2bd46 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 15 Sep 2023 17:59:51 +0800
Subject: [PATCH] =?UTF-8?q?bom=E8=AE=BE=E5=A4=87=E5=9B=9E=E6=98=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/technology/process/content.vue   |  4 +-
 src/views/technology/process/singleBom.vue | 43 ++++++++--------------
 src/views/technology/recipe/content.vue    |  4 +-
 src/views/technology/recipe/singleBom.vue  | 43 ++++++++--------------
 4 files changed, 34 insertions(+), 60 deletions(-)

diff --git a/src/views/technology/process/content.vue b/src/views/technology/process/content.vue
index 176350f..cfd5f40 100644
--- a/src/views/technology/process/content.vue
+++ b/src/views/technology/process/content.vue
@@ -202,7 +202,7 @@ export default {
   methods: {
     //新增 设备选择弹出框
     onItemSelectedEquipment(obj){
-      if(this.form.device == null){
+      if(this.form.device == null || this.form.device == ""){
         console.log("device是空，if获取的obj",obj);
         console.log("device是空，if获取的device",this.form.device);
         this.form.device = obj;
@@ -227,7 +227,7 @@ export default {
 
     //新增 设备选择弹出框
     onItemSelectedBom(obj){
-      if(this.form.material == null){
+      if(this.form.material == null ||this.form.material == ""){
         console.log("material是空，if获取的obj",obj);
         console.log("material是空，if获取的material",this.form.material);
         this.form.material = obj;
diff --git a/src/views/technology/process/singleBom.vue b/src/views/technology/process/singleBom.vue
index df5011b..e62d83a 100644
--- a/src/views/technology/process/singleBom.vue
+++ b/src/views/technology/process/singleBom.vue
@@ -33,10 +33,10 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="BOM物料名称" prop="itemName">
+          <el-form-item label="产品名称" prop="itemName">
             <el-input
               v-model="queryParams.itemName"
-              placeholder="请输入BOM物料名称"
+              placeholder="请输入产品名称"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -57,7 +57,9 @@
           <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
           <el-table-column label="BOM物料编码" align="center" key="itemCode" prop="bomCode" v-if="columns[0].visible" >
           </el-table-column>
-          <el-table-column label="BOM物料名称"  align="left" key="itemName" prop="bomName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="产品名称"  align="left" key="itemName" prop="productDescZh" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="BOM物料组件编码"  align="left" key="component" prop="component" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="BOM物料组件名称"  align="left" key="componentName" prop="componentName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
         </el-table>
 
         <pagination
@@ -75,35 +77,14 @@
        </div>
   </el-dialog>
 </template>
-
 <script>
+
 import {listBom} from "@/api/technology/process";
 export default {
   name: "ItemSingleBom",
   // components: { Treeselect },
   data() {
     return {
-      // treeData: [{
-      //     id: '1',
-      //     label: 'BOM物料类别',
-      //     children: [{
-      //       id: 'equ_type_lg',
-      //       label: '料罐'
-      //     }, {
-      //       id: 'equ_type_cxj',
-      //       label: '成型机'
-      //     }, {
-      //       id: 'equ_type_hf',
-      //       label: '烘房'
-      //     }, {
-      //       id: 'equ_type_spj',
-      //       label: '收坯机'
-      //     }, {
-      //       id: 'equ_type_bzx',
-      //       label: '包装线'
-      //     }
-      //   ]
-      //   }],
       showFlag:false,
       // 选中数组
       selectedItemId: undefined,
@@ -116,7 +97,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 设备产品表格数据
+      // BOM产品表格数据
       itemList: null,
       // 树选项
       itemTypeOptions: undefined,
@@ -134,11 +115,14 @@ export default {
         bomCode: undefined,
         itemTypeId: 0,
         itemCodeGet: '',
+        productDescZh : undefined,
       },
       // 列信息
       columns: [
         { key: 0, label: `BOM物料编码`, visible: true },
-        { key: 1, label: `BOM物料名称`, visible: true }
+        { key: 1, label: `产品名称`, visible: true },
+        { key: 2, label: `BOM物料组件编码`, visible: true },
+        { key: 3, label: `BOM物料组件名称`, visible: true }
       ]
     };
   },
@@ -158,9 +142,11 @@ export default {
         },
     //
 
-    /** 查询设备编码列表*/
+    /** 查询BOM列表*/
     getList() {
       this.loading = true;
+      this.queryParams.bomCode = this.queryParams.itemCode;
+      this.queryParams.productDescZh = this.queryParams.itemName;
       listBom(this.queryParams).then(response => {
           this.itemList = response.rows;
           this.total = response.total;
@@ -261,6 +247,7 @@ export default {
     //     this.showFlag = false;
     // }
     //
+
     submitBomForm() {
       const data = this.ids;
       console.log("数据",data);
diff --git a/src/views/technology/recipe/content.vue b/src/views/technology/recipe/content.vue
index a01af63..9f322e9 100644
--- a/src/views/technology/recipe/content.vue
+++ b/src/views/technology/recipe/content.vue
@@ -313,7 +313,7 @@ export default {
     },
     //新增 设备选择弹出框
     onItemSelectedEquipment(obj){
-      if(this.form.device == null){
+      if(this.form.device == null || this.form.device == ""){
         console.log("device是空，if获取的obj",obj);
         console.log("device是空，if获取的device",this.form.device);
         this.form.device = obj;
@@ -338,7 +338,7 @@ export default {
 
     //新增 设备选择弹出框
     onItemSelectedBom(obj){
-      if(this.form.material == null){
+      if(this.form.material == null || this.form.material == ""){
         console.log("material是空，if获取的obj",obj);
         console.log("material是空，if获取的material",this.form.material);
         this.form.material = obj;
diff --git a/src/views/technology/recipe/singleBom.vue b/src/views/technology/recipe/singleBom.vue
index df5011b..e62d83a 100644
--- a/src/views/technology/recipe/singleBom.vue
+++ b/src/views/technology/recipe/singleBom.vue
@@ -33,10 +33,10 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="BOM物料名称" prop="itemName">
+          <el-form-item label="产品名称" prop="itemName">
             <el-input
               v-model="queryParams.itemName"
-              placeholder="请输入BOM物料名称"
+              placeholder="请输入产品名称"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -57,7 +57,9 @@
           <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
           <el-table-column label="BOM物料编码" align="center" key="itemCode" prop="bomCode" v-if="columns[0].visible" >
           </el-table-column>
-          <el-table-column label="BOM物料名称"  align="left" key="itemName" prop="bomName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="产品名称"  align="left" key="itemName" prop="productDescZh" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="BOM物料组件编码"  align="left" key="component" prop="component" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="BOM物料组件名称"  align="left" key="componentName" prop="componentName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
         </el-table>
 
         <pagination
@@ -75,35 +77,14 @@
        </div>
   </el-dialog>
 </template>
-
 <script>
+
 import {listBom} from "@/api/technology/process";
 export default {
   name: "ItemSingleBom",
   // components: { Treeselect },
   data() {
     return {
-      // treeData: [{
-      //     id: '1',
-      //     label: 'BOM物料类别',
-      //     children: [{
-      //       id: 'equ_type_lg',
-      //       label: '料罐'
-      //     }, {
-      //       id: 'equ_type_cxj',
-      //       label: '成型机'
-      //     }, {
-      //       id: 'equ_type_hf',
-      //       label: '烘房'
-      //     }, {
-      //       id: 'equ_type_spj',
-      //       label: '收坯机'
-      //     }, {
-      //       id: 'equ_type_bzx',
-      //       label: '包装线'
-      //     }
-      //   ]
-      //   }],
       showFlag:false,
       // 选中数组
       selectedItemId: undefined,
@@ -116,7 +97,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 设备产品表格数据
+      // BOM产品表格数据
       itemList: null,
       // 树选项
       itemTypeOptions: undefined,
@@ -134,11 +115,14 @@ export default {
         bomCode: undefined,
         itemTypeId: 0,
         itemCodeGet: '',
+        productDescZh : undefined,
       },
       // 列信息
       columns: [
         { key: 0, label: `BOM物料编码`, visible: true },
-        { key: 1, label: `BOM物料名称`, visible: true }
+        { key: 1, label: `产品名称`, visible: true },
+        { key: 2, label: `BOM物料组件编码`, visible: true },
+        { key: 3, label: `BOM物料组件名称`, visible: true }
       ]
     };
   },
@@ -158,9 +142,11 @@ export default {
         },
     //
 
-    /** 查询设备编码列表*/
+    /** 查询BOM列表*/
     getList() {
       this.loading = true;
+      this.queryParams.bomCode = this.queryParams.itemCode;
+      this.queryParams.productDescZh = this.queryParams.itemName;
       listBom(this.queryParams).then(response => {
           this.itemList = response.rows;
           this.total = response.total;
@@ -261,6 +247,7 @@ export default {
     //     this.showFlag = false;
     // }
     //
+
     submitBomForm() {
       const data = this.ids;
       console.log("数据",data);