From 88b87976b6282f70c75f2752ca3b62dddd8b3b1a Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Tue, 14 Jun 2022 14:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=8C=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/stockSelect/single.vue |  8 ++++++--
 src/views/mes/wm/rtvendor/index.vue   | 22 ++++++++++++++++------
 src/views/mes/wm/rtvendor/line.vue    |  8 ++++++--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/components/stockSelect/single.vue b/src/components/stockSelect/single.vue
index aef0af4..87a2f90 100644
--- a/src/components/stockSelect/single.vue
+++ b/src/components/stockSelect/single.vue
@@ -192,7 +192,7 @@ export default {
         itemName: null,
         specification: null,
         unitOfMeasure: null,
-        batchCode: null,
+        batchCode: this.batchCode,
         warehouseId: null,
         warehouseCode: null,
         warehouseName: null,
@@ -202,7 +202,7 @@ export default {
         areaId: null,
         areaCode: null,
         areaName: null,
-        vendorId: null,
+        vendorId: this.vendorId,
         vendorCode: null,
         vendorName: null,
         vendorNick: null,
@@ -213,6 +213,10 @@ export default {
       form: {},
     };
   },
+  props:{
+    vendorId: null,
+    batchCode: null
+  },
   created() {
     this.getList();
     this.getTreeselect();
diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue
index 96b39f4..2f4f964 100644
--- a/src/views/mes/wm/rtvendor/index.vue
+++ b/src/views/mes/wm/rtvendor/index.vue
@@ -110,7 +110,7 @@
           <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>      
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -124,15 +124,17 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wm:rtvendor:edit']"
+            v-hasPermi="['mes:wm:rtvendor:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
+            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['wm:rtvendor:remove']"
+            v-hasPermi="['mes:wm:rtvendor:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -171,12 +173,12 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="采购订单编号" prop="poCode">
               <el-input v-model="form.poCode" placeholder="请输入采购订单编号" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="供应商" prop="vendorName">
               <el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" >
                 <el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
@@ -184,6 +186,11 @@
               <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="批次号" prop="batchCode">
+              <el-input v-model="form.batchCode" placeholder="请输入批次号" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -219,7 +226,7 @@
       </el-form>
       <el-divider v-if="form.rtId !=null" content-position="center">物料信息</el-divider> 
       <el-card shadow="always" v-if="form.rtId !=null" class="box-card">
-        <Rtvendorline ref=line :rtId="form.rtId"  :optType="optType"></Rtvendorline>
+        <Rtvendorline ref=line :rtId="form.rtId" :batchCode="form.batchCdoe" :vendorId="form.vendorId" :optType="optType"></Rtvendorline>
       </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
@@ -287,6 +294,9 @@ export default {
         rtName: [
           { required: true, message: "退货单名称不能为空", trigger: "blur" }
         ],
+        vendorName: [
+          { required: true, message: "供应商不能为空", trigger: "blur" }
+        ],
       }
     };
   },
diff --git a/src/views/mes/wm/rtvendor/line.vue b/src/views/mes/wm/rtvendor/line.vue
index 7fe5de9..1ec4eae 100644
--- a/src/views/mes/wm/rtvendor/line.vue
+++ b/src/views/mes/wm/rtvendor/line.vue
@@ -75,7 +75,7 @@
                       <el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
                     </el-input>
                 </el-form-item>
-                <StockSelect ref="stockSelect" @onSelected="onStockSelected"></StockSelect>
+                <StockSelect ref="stockSelect" :batchCode="batchCdoe" :vendorId="vendorId" @onSelected="onStockSelected"></StockSelect>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="产品物料名称" prop="itemName">
@@ -151,7 +151,9 @@ export default {
   components:{StockSelect},
   props:{
     optType: null,
-    rtId: null
+    rtId: null,
+    batchCode: null,
+    vendorId: null
   },
   data() {
     return {
@@ -325,10 +327,12 @@ export default {
     },
     handleSelectStock(){
       this.$refs.stockSelect.showFlag = true;
+      this.$refs.stockSelect.getList();
     },
     //物料选择弹出框
     onStockSelected(obj){
         if(obj != undefined && obj != null){
+          this.form.materialStockId = obj.materialStockId;
           this.form.itemId = obj.itemId;
           this.form.itemCode = obj.itemCode;
           this.form.itemName = obj.itemName;