From 13a95ea1b0defb096fda1dd617148eca075476b4 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 15 Sep 2023 09:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E8=83=9A=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A4=9A=E9=80=89=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/whiteOrder/index.vue                | 11 ++++++-----
 src/views/technology/proroute/routeprodproduct.vue |  6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue
index 8f3dd5cb..fb706f63 100644
--- a/src/views/plan/whiteOrder/index.vue
+++ b/src/views/plan/whiteOrder/index.vue
@@ -72,6 +72,7 @@
         >新增
         </el-button>
       </el-col>
+      <!--
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -82,7 +83,7 @@
           v-hasPermi="['mes:pro:order:import']"
         >导入
         </el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -979,16 +980,16 @@ export default {
       for (let i = 0; i < this.selectMaterielList.length; i++) {
         if(this.form.prodCode.indexOf(this.selectMaterielList[i].productCode)<0){
           code = code + this.selectMaterielList[i].productCode + ',';
-        }
-        
-        if(this.form.prodDesc.indexOf(this.selectMaterielList[i].productDescZh)<0){
-          desc = desc + this.selectMaterielList[i].productDescZh + ',';
         }else{
           this.$message({
             message: this.selectMaterielList[i].productDescZh+'已经选择',
             type: 'warning'
           })
         }
+        
+        if(this.form.prodDesc.indexOf(this.selectMaterielList[i].productDescZh)<0){
+          desc = desc + this.selectMaterielList[i].productDescZh + ',';
+        }
       }
       this.form.prodCode += code;
       this.form.prodDesc += desc;
diff --git a/src/views/technology/proroute/routeprodproduct.vue b/src/views/technology/proroute/routeprodproduct.vue
index 2124d65d..1f53a3b0 100644
--- a/src/views/technology/proroute/routeprodproduct.vue
+++ b/src/views/technology/proroute/routeprodproduct.vue
@@ -1,5 +1,8 @@
 <template>
-  <el-transfer v-model="rightList" :data="leftList" :titles="titles" :filterable=true
+  <div>
+  <el-input placeholder="请输入内容"  clearable > </el-input>
+  <el-transfer v-model="rightList" :data="leftList" :titles="titles" 
+  :filterable=false
   @change="handleChange"
   >
    <!-- 左侧栏分页 -->
@@ -74,6 +77,7 @@
         >下一页</el-button>
 
   </el-transfer>
+  </div>
 </template>
 
 <script>