From 6f744f7537866f7d7caa266688e4525be7995ada Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Mon, 12 Sep 2022 22:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E8=89=BA=E4=B8=ADBO?=
 =?UTF-8?q?M=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/pro/proroute/product.vue        | 21 ++++++++++++++++++-
 .../mes/pro/proroute/routeproductbom.vue      |  7 ++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/views/mes/pro/proroute/product.vue b/src/views/mes/pro/proroute/product.vue
index b836429..886979a 100644
--- a/src/views/mes/pro/proroute/product.vue
+++ b/src/views/mes/pro/proroute/product.vue
@@ -168,6 +168,11 @@
             </el-col>
         </el-row>
       </el-form>
+      <el-tabs type="border-card" v-if="form.recordId != null">
+        <el-tab-pane v-for="(process,index) in processList" :key="index" :label="process.processName">
+          <Routeproductbom :routeId="form.routeId" :productId="form.productId" :processId="process.processId" :optType="optType"></Routeproductbom>
+        </el-tab-pane>
+      </el-tabs>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
@@ -179,11 +184,13 @@
 
 <script>
 import { listRouteproduct, getRouteproduct, delRouteproduct, addRouteproduct, updateRouteproduct, moveRouteproduct } from "@/api/mes/pro/routeproduct";
+import { listRouteprocess} from "@/api/mes/pro/routeprocess";
+import Routeproductbom from "./routeproductbom.vue"
 import ItemSelect  from "@/components/itemSelect/single.vue";
 export default {
   name: "Routeproduct",
   dicts: ['mes_time_type'],
-  components: {ItemSelect},
+  components: {ItemSelect,Routeproductbom},
   data() {
     return {
       // 遮罩层
@@ -200,6 +207,8 @@ export default {
       total: 0,
       // 产品制程表格数据
       routeproductList: [],
+      //当前工艺中配置的工序清单
+      processList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -245,6 +254,15 @@ export default {
         this.loading = false;
       });
     },
+    //查询当前配置的工序
+    getProcess(){
+      let param = {
+        routeId: this.form.routeId
+      };
+      listRouteprocess(param).then(response => {
+        this.processList = response.rows;
+      });
+    },
     //物料选择弹出框
     handleSelectProduct(){
       this.$refs.itemSelect.showFlag = true;
@@ -283,6 +301,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
+      this.getProcess();//重新获取一次工序的配置
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
diff --git a/src/views/mes/pro/proroute/routeproductbom.vue b/src/views/mes/pro/proroute/routeproductbom.vue
index f86354e..4e2ca46 100644
--- a/src/views/mes/pro/proroute/routeproductbom.vue
+++ b/src/views/mes/pro/proroute/routeproductbom.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" v-if="optType!='view'" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAdd"
+          @click="handleAdd"          
           v-hasPermi="['mes:pro:proroute:add']"
         >新增</el-button>
       </el-col>
@@ -32,7 +32,7 @@
       <el-table-column label="规格型号" align="center" prop="specification" />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="用料比例" align="center" prop="quantity" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" v-if="optType!='view'" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -112,6 +112,7 @@ export default {
     routeId: null,
     productId: null,
     processId: null,
+    optType: null
   },
   data() {
     return {