From 407d1be398638a119c1c47d5c0e090e3dd815d7d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 18 May 2024 19:14:08 +0800
Subject: [PATCH] md

---
 .../emis/emisWaybill/emisWaybillRecord.vue    | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index b82eaa8c..aa874002 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -290,11 +290,27 @@
 
                 <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
                     <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col>
+                    <el-col :span="24">
+                        <el-form-item label="货物大类" prop="goodsType" label-width="70px">
+                          <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="货物名称" prop="goodsType" label-width="70px">
+                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="总件数" prop="parcelQty" label-width="70px">
+                          <el-input v-model="form.parcelQty" style="text-align: right;" placeholder=""  />
+                        </el-form-item>
+                      </el-col>
                     <el-col :span="24">
                         <el-form-item label="" prop="goodsType" label-width="0px">
                           <!-- <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker> -->
-                          <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
-
+                          <!-- <div style="width:50%">
+                            <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
+                          </div> -->
                           <el-table
                             class="cargoList"
                             :cell-style="{
@@ -313,8 +329,6 @@
                             style="width: 100%"
                             max-height="300px"
                           >
-
-
                           <el-table-column prop="goodsName" label="描述" align="center" width="100">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.goodsName" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
@@ -357,7 +371,6 @@
 
                           </el-table>
 
-                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" disabled />
                         </el-form-item>
                     </el-col>
 
@@ -377,11 +390,7 @@
                           </div>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="总件数" prop="parcelQty" label-width="70px">
-                          <el-input v-model="form.parcelQty" style="text-align: right;" placeholder=""  />
-                        </el-form-item>
-                      </el-col>
+
 
                       <el-col :span="12">
                         <el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
@@ -1233,7 +1242,7 @@ methods: {
 
     });
 
-    this.form.goodsInfo = goodsInfo;
+
     this.form.parcelQty = totalCargoQty;
 
     this.handleGenSubbill();
@@ -1342,7 +1351,11 @@ methods: {
     this.form.dispatchUnderlingSite= item.siteName;
     this.form.dispatchSite= item.siteName;
   },
-  onGoodsChange(goodsName){
+  onGoodsChange(goodsList,selNameStr){
+    this.form.goodsInfo = selNameStr;
+  },
+
+  onGoodsChange_old(goodsName){
       if(goodsName&& goodsName!='') {
         // 旧map
         let nameOldMap = new Map();