From f2655eae1c8a91dfc76171edf0bc99e3442f2473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Wed, 19 Apr 2023 11:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=BB=86=E8=8A=82=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/mes/md/mditem/index.vue              |  2 +-
 src/views/mes/pro/proroute/product.vue         |  8 ++++----
 src/views/mes/pro/proroute/routeprocess.vue    |  2 +-
 src/views/mes/pro/proroute/routeproductbom.vue |  6 +++---
 src/views/mes/pro/workorder/index.vue          | 14 ++++----------
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue
index 2b25486..cb0b27e 100644
--- a/src/views/mes/md/mditem/index.vue
+++ b/src/views/mes/md/mditem/index.vue
@@ -242,7 +242,7 @@
           <el-col :span="12">
             <el-form-item  label="物料/产品分类" prop="itemTypeId">
               <treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" disabled v-if="optType=='view'"  />
-              <treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" placeholder="请选择所属分类" v-else />
+              <treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" placeholder="请选择所属分类" v-else :disable-branch-nodes="true"/>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/mes/pro/proroute/product.vue b/src/views/mes/pro/proroute/product.vue
index 374cbb6..f4c8926 100644
--- a/src/views/mes/pro/proroute/product.vue
+++ b/src/views/mes/pro/proroute/product.vue
@@ -118,7 +118,7 @@
         <el-row>
             <el-col :span="8">
                 <el-form-item label="产品物料编码" prop="itemCode">
-                    <el-input v-model="form.itemCode" placeholder="请输入产品编号" >
+                    <el-input v-model="form.itemCode" placeholder="请选择产品" >
                         <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
                     </el-input>
                     <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
@@ -126,19 +126,19 @@
             </el-col>        
             <el-col :span="8">
                 <el-form-item label="产品物料名称" prop="itemName">
-                    <el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
+                    <el-input v-model="form.itemName" placeholder="请选择产品" disabled/>
                 </el-form-item>
             </el-col>    
             <el-col :span="8">
                 <el-form-item label="单位" prop="unitOfMeasure">
-                    <el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
+                    <el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/>
                 </el-form-item>
             </el-col>    
         </el-row>
         <el-row>
             <el-col :span="24">
                 <el-form-item label="规格型号" prop="specification">
-                    <el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
+                    <el-input v-model="form.specification" type="textarea" placeholder="请选择产品" disabled/>
                 </el-form-item>
             </el-col>
         </el-row>
diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue
index f14a8d5..f9b3c75 100644
--- a/src/views/mes/pro/proroute/routeprocess.vue
+++ b/src/views/mes/pro/proroute/routeprocess.vue
@@ -88,7 +88,7 @@
     />
 
     <!-- 添加或修改工艺组成对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row>
             <el-col :span="12">
diff --git a/src/views/mes/pro/proroute/routeproductbom.vue b/src/views/mes/pro/proroute/routeproductbom.vue
index 18f7e65..8dc2164 100644
--- a/src/views/mes/pro/proroute/routeproductbom.vue
+++ b/src/views/mes/pro/proroute/routeproductbom.vue
@@ -74,21 +74,21 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="产品物料名称" prop="itemName">
-              <el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
+              <el-input v-model="form.itemName" placeholder="请选择物料/产品" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="规格型号" prop="specification">
-              <el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.specification" type="textarea" placeholder="请选择物料/产品" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="单位" prop="unitOfMeasure">
-              <el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
+              <el-input v-model="form.unitOfMeasure" placeholder="请选择物料/产品" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index c007990..3f44e0e 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -264,7 +264,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="产品编号" prop="productCode">
-              <el-input v-model="form.productCode" placeholder="请输入产品编号" >
+              <el-input v-model="form.productCode" placeholder="请选择产品" >
                 <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
               </el-input>
               <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
@@ -272,19 +272,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="产品名称" prop="productName">
-              <el-input v-model="form.productName" placeholder="请输入产品名称" />
+              <el-input v-model="form.productName" placeholder="请选择产品" disabled/>
             </el-form-item>
           </el-col>          
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="规格型号" prop="productSpc">
-              <el-input v-model="form.productSpc" placeholder="请输入规格型号" />
+              <el-input v-model="form.productSpc" placeholder="请选择产品" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单位" prop="unitOfMeasure">
-              <el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
+              <el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/>
             </el-form-item>
           </el-col>          
         </el-row>
@@ -447,9 +447,6 @@ export default {
         productName: [
           { required: true, message: "产品名称不能为空", trigger: "blur" }
         ],
-        unitOfMeasure: [
-          { required: true, message: "单位不能为空", trigger: "blur" }
-        ],
         quantity: [
           { required: true, message: "生产数量不能为空", trigger: "blur" }
         ],
@@ -540,7 +537,6 @@ export default {
     },
     //从BOM行中直接新增
     handleSubAdd(row){
-      debugger;
       this.open = false;
       this.reset();
       this.getTreeselect();
@@ -652,7 +648,6 @@ export default {
     },
     //物料选择弹出框
     onItemSelected(obj){
-        debugger;
         if(obj != undefined && obj != null){
           this.form.productId = obj.itemId;
           this.form.productCode = obj.itemCode;
@@ -671,7 +666,6 @@ export default {
     },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
-      debugger;
       if(autoGenFlag){
         genCode('WORKORDER_CODE').then(response =>{
           this.form.workorderCode = response;