From 4c3d0e077002183b7ceb9071621020d80fd55e31 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 20:51:53 +0800
Subject: [PATCH] =?UTF-8?q?BOM=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/technology/process/content.vue | 49 +++++++++++++-----------
 src/views/technology/recipe/content.vue  | 47 +++++++++++++----------
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/src/views/technology/process/content.vue b/src/views/technology/process/content.vue
index 157fe11..381c602 100644
--- a/src/views/technology/process/content.vue
+++ b/src/views/technology/process/content.vue
@@ -106,13 +106,18 @@
                     <ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
                 </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
                 <el-form-item label="BOM材料" prop="material">
                     <el-input v-model="form.material" placeholder="请选择BOM材料" >
                       <el-button slot="append" @click="handleSelectBom" icon="el-icon-search"></el-button>
                     </el-input>
                     <ItemSelectBom ref="itemSelectBom" @onSelected="onItemSelectedBom" ></ItemSelectBom>
                 </el-form-item>
+            </el-col> -->
+            <el-col :span="12">
+                <el-form-item label="BOM材料" prop="material">
+                    <el-input v-model="form.material"  placeholder="请BOM材料" />
+                </el-form-item>
             </el-col>
         </el-row>
         <el-row>
@@ -141,10 +146,10 @@
 <script>
 import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/processcontent";
 import ItemSelect  from "./single.vue";
-import ItemSelectBom  from "./singleBom.vue";
+// import ItemSelectBom  from "./singleBom.vue";
 export default {
   name: "Processcontent",
-  components: {ItemSelect,ItemSelectBom},
+  components: {ItemSelect},
   data() {
     return {
       // 遮罩层
@@ -210,29 +215,29 @@ export default {
       }
     }
     },
-    onItemSelectedBom(obj){
-      if(obj != undefined && obj != null){
-        console.log('返回',obj);
-        if(this.form.material == null){
-          //obj = obj.slice(1);
-          console.log("if获取的",obj);
-          console.log("if获取的material",this.form.material);
-          this.form.material = obj;
-        }else{
-          console.log("else获取的",obj);
-          console.log("else获取的material",this.form.material);
-          this.form.material = this.form.material +","+obj;
-        }
-      }
-    },
+    // onItemSelectedBom(obj){
+    //   if(obj != undefined && obj != null){
+    //     console.log('返回',obj);
+    //     if(this.form.material == null){
+    //       //obj = obj.slice(1);
+    //       console.log("if获取的",obj);
+    //       console.log("if获取的material",this.form.material);
+    //       this.form.material = obj;
+    //     }else{
+    //       console.log("else获取的",obj);
+    //       console.log("else获取的material",this.form.material);
+    //       this.form.material = this.form.material +","+obj;
+    //     }
+    //   }
+    // },
     //新增 设备选择弹出框
     handleSelectEquipment(){
       this.$refs.itemSelect.showFlag = true;
     },
-    //新增 设备选择弹出框
-    handleSelectBom(){
-      this.$refs.itemSelectBom.showFlag = true;
-    },
+    // //新增 设备选择弹出框
+    // handleSelectBom(){
+    //   this.$refs.itemSelectBom.showFlag = true;
+    // },
     /** 查询生产工序内容列表 */
     getList() {
       this.loading = true;
diff --git a/src/views/technology/recipe/content.vue b/src/views/technology/recipe/content.vue
index 58a4f7a..4c93ad9 100644
--- a/src/views/technology/recipe/content.vue
+++ b/src/views/technology/recipe/content.vue
@@ -110,13 +110,18 @@
                     <ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
                 </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
                 <el-form-item label="BOM材料" prop="material">
                     <el-input v-model="form.material" placeholder="请选择BOM材料" >
                       <el-button slot="append" @click="handleSelectBom" icon="el-icon-search"></el-button>
                     </el-input>
                     <ItemSelectBom ref="itemSelectBom" @onSelected="onItemSelectedBom" ></ItemSelectBom>
                 </el-form-item>
+            </el-col> -->
+            <el-col :span="12">
+                <el-form-item label="BOM材料" prop="material">
+                    <el-input v-model="form.material" placeholder="请输入BOM材料" />
+                </el-form-item>
             </el-col>
         </el-row>
         <el-row>
@@ -169,10 +174,10 @@
 <script>
 import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/recipecontent";
 import ItemSelect  from "./single.vue";
-import ItemSelectBom  from "./singleBom.vue";
+// import ItemSelectBom  from "./singleBom.vue";
 export default {
   name: "Processcontent",
-  components: {ItemSelect,ItemSelectBom},
+  components: {ItemSelect},
   data() {
     return {
       // 遮罩层
@@ -322,29 +327,29 @@ export default {
       }
     }
     },
-    onItemSelectedBom(obj){
-      if(obj != undefined && obj != null){
-        console.log('返回',obj);
-        if(this.form.material == null){
-          //obj = obj.slice(1);
-          console.log("if获取的",obj);
-          console.log("if获取的material",this.form.material);
-          this.form.material = obj;
-        }else{
-          console.log("else获取的",obj);
-          console.log("else获取的material",this.form.material);
-          this.form.material = this.form.material +","+obj;
-        }
-      }
-    },
+    // onItemSelectedBom(obj){
+    //   if(obj != undefined && obj != null){
+    //     console.log('返回',obj);
+    //     if(this.form.material == null){
+    //       //obj = obj.slice(1);
+    //       console.log("if获取的",obj);
+    //       console.log("if获取的material",this.form.material);
+    //       this.form.material = obj;
+    //     }else{
+    //       console.log("else获取的",obj);
+    //       console.log("else获取的material",this.form.material);
+    //       this.form.material = this.form.material +","+obj;
+    //     }
+    //   }
+    // },
     //新增 设备选择弹出框
     handleSelectEquipment(){
       this.$refs.itemSelect.showFlag = true;
     },
     //新增 设备选择弹出框
-    handleSelectBom(){
-      this.$refs.itemSelectBom.showFlag = true;
-    },
+    // handleSelectBom(){
+    //   this.$refs.itemSelectBom.showFlag = true;
+    // },
     /** 删除按钮操作 */
     handleDelete(row) {
       const contentIds = row.contentId || this.ids;