From c2df4859204bc2f2a50c8178d7d021d80e4841ea Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 19 Oct 2023 14:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E6=96=B9=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/technology/process/singleBom.vue | 51 +++-------------------
 src/views/technology/recipe/content.vue    | 40 ++++++++++++++++-
 src/views/technology/recipe/singleBom.vue  | 16 +++----
 3 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/src/views/technology/process/singleBom.vue b/src/views/technology/process/singleBom.vue
index e62d83a5..c52c7f0e 100644
--- a/src/views/technology/process/singleBom.vue
+++ b/src/views/technology/process/singleBom.vue
@@ -26,7 +26,7 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
           <el-form-item label="BOM物料编码" prop="itemCode">
             <el-input
-              v-model="queryParams.itemCode"
+              v-model="queryParams.component"
               placeholder="请输入BOM物料编码"
               clearable
               style="width: 240px"
@@ -35,7 +35,7 @@
           </el-form-item>
           <el-form-item label="产品名称" prop="itemName">
             <el-input
-              v-model="queryParams.itemName"
+              v-model="queryParams.componentName"
               placeholder="请输入产品名称"
               clearable
               style="width: 240px"
@@ -55,9 +55,6 @@
           </el-table-column>
           <!-- 序号 -->
           <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="产品名称"  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>
@@ -112,10 +109,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
         itemName: undefined,
-        bomCode: undefined,
-        itemTypeId: 0,
+        component: '',
+        //itemTypeId: 0,
         itemCodeGet: '',
-        productDescZh : undefined,
+        componentName : ''
       },
       // 列信息
       columns: [
@@ -203,51 +200,15 @@ export default {
       this.handleQuery();
     },
 
-    // handleCurrent(row){
-    //     if(row){
-    //         this.selectedRows = row;
-    //     }
-    // },
-
-    // handleRowDbClick(row){
-    //   if(row){
-    //     this.selectedRows = row;
-    //     this.$emit('onSelected',this.selectedRows);
-    //     this.showFlag = false;
-    //   }
-    // },
 
     // 多选框选中数据
 		handleBomSelectionChange(selection) {
-			this.ids = selection.map(item => item.bomCode);
+			this.ids = selection.map(item => item.component);
 			this.single = selection.length!==1;
 			this.multiple = !selection.length;
 			console.log("多选框",this.ids);
 		},
 
-    // 单选选中数据
-    // handleRowChange(row) {
-    //   debugger;
-    //   if(row){
-    //     this.selectedRows = row;
-    //   }
-    // },
-
-    //确定选中
-    // confirmSelect(){
-    //     if(this.selectedItemId ==null || this.selectedItemId==0){
-    //         this.$notify({
-    //             title:'提示',
-    //             type:'warning',
-    //             message: '请至少选择一条数据!'
-    //         });
-    //         return;
-    //     }
-    //     this.$emit('onSelected',this.selectedRows);
-    //     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 df3f4950..79d80cdc 100644
--- a/src/views/technology/recipe/content.vue
+++ b/src/views/technology/recipe/content.vue
@@ -183,6 +183,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      idsName:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -227,7 +228,7 @@ export default {
   },
   methods: {
     /** 查询生产工序内容列表 */
-    getList() {
+    getList() { 
       this.loading = true;
       listProcesscontent(this.queryParams).then(response => {
         this.recipecontentList = response.rows;
@@ -391,3 +392,40 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.tagbox {
+  display: flex;
+  /* overflow: scroll; */
+  position: relative;
+  width: 100%;
+  // padding-left: 26px;
+  margin-bottom: 15px;
+  .tagboxlabel {
+    width: 100px;
+    text-align: right;
+    vertical-align: middle;
+    font-size: 14px;
+    color: black;
+    line-height: 40px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    margin-right: 12px;
+  }
+  .tag {
+    width: 82%;
+    border: 1px #dcdfe6 solid;
+    height: 70px;
+    padding: 5px 15px;
+    overflow-y: scroll;
+    .tagitem {
+      margin-left: 5px;
+    }
+  }
+  .button1 {
+    width: 57px;
+    height: 35px;
+    margin-left: 10px;
+    background: #F5F7FA;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/technology/recipe/singleBom.vue b/src/views/technology/recipe/singleBom.vue
index e62d83a5..e973688f 100644
--- a/src/views/technology/recipe/singleBom.vue
+++ b/src/views/technology/recipe/singleBom.vue
@@ -26,7 +26,7 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
           <el-form-item label="BOM物料编码" prop="itemCode">
             <el-input
-              v-model="queryParams.itemCode"
+              v-model="queryParams.component"
               placeholder="请输入BOM物料编码"
               clearable
               style="width: 240px"
@@ -35,7 +35,7 @@
           </el-form-item>
           <el-form-item label="产品名称" prop="itemName">
             <el-input
-              v-model="queryParams.itemName"
+              v-model="queryParams.componentName"
               placeholder="请输入产品名称"
               clearable
               style="width: 240px"
@@ -55,9 +55,6 @@
           </el-table-column>
           <!-- 序号 -->
           <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="产品名称"  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>
@@ -112,10 +109,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
         itemName: undefined,
-        bomCode: undefined,
-        itemTypeId: 0,
+        component: '',
+        //itemTypeId: 0,
         itemCodeGet: '',
-        productDescZh : undefined,
+        componentName : ''
       },
       // 列信息
       columns: [
@@ -219,7 +216,8 @@ export default {
 
     // 多选框选中数据
 		handleBomSelectionChange(selection) {
-			this.ids = selection.map(item => item.bomCode);
+			this.ids = selection.map(item => item.component);
+      this.idsName = selection.map(item => item.componentName);
 			this.single = selection.length!==1;
 			this.multiple = !selection.length;
 			console.log("多选框",this.ids);