From bb20faa94e1c40a611597fab792fc379f0bbef35 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 13 May 2024 19:35:49 +0800
Subject: [PATCH] md

---
 .../emis/emisWaybill/emisWaybillRecord.vue    | 418 +++++++++++-------
 1 file changed, 266 insertions(+), 152 deletions(-)

diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index 283ae12c..eebd209f 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -130,8 +130,8 @@
             </template>
             <el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;">
                 <el-col :span="12">
-                  <el-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px">
-                    <el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
+                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;background: #fdfdfd;padding:15px">
+                    <el-col :span="24" style="display:inline-flex; margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
                       <div class="form-group-title" style="width:50%">
                           <span style="border-radius: 15px;
                             padding: 5px 15px;
@@ -151,79 +151,70 @@
                       </div>
                     </el-col>
 
-                    <div class="form-row-group-panel">
-                      <el-col :span="12">
-                        <el-form-item label="寄件人" prop="sender.name">
-                          <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="寄件电话" prop="sender.phone">
-                          <el-input v-model="form.sender.phone" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <!-- <el-col :span="12">
-                        <el-form-item label="国家" prop="sender.country">
-                          <country-picker1 v-model="form.sender.country"></country-picker1>
-                        </el-form-item>
-                      </el-col> -->
-                      <el-col :span="24">
-                        <el-form-item label="国家地区" prop="sender.province"  >
-                          <div style="display:inline-flex">
-                            <country-picker1 v-model="form.sender.country" ></country-picker1>
-                            <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
-                            <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
-                            <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
-                          </div>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="寄件地址" prop="sender.address">
-                          <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="寄件公司" prop="sender.company">
-                          <el-input v-model="form.sender.company" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="寄件网点" prop="sendSiteName">
-                          <el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="" prop="blMessage">
-                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
-                        </el-form-item>
-                      </el-col>
-                  </div>
+                    <el-col :span="12">
+                      <el-form-item label="寄件人" prop="sender.name">
+                        <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="寄件电话" prop="sender.phone">
+                        <el-input v-model="form.sender.phone" placeholder="" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="国家地区" prop="sender.province"  >
+                        <div style="display:inline-flex">
+                          <country-picker1 v-model="form.sender.country" ></country-picker1>
+                          <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
+                          <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
+                          <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
+                        </div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="寄件地址" prop="sender.address">
+                        <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="寄件公司" prop="sender.company">
+                        <el-input v-model="form.sender.company" placeholder="" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="寄件网点" prop="sendSiteName">
+                        <el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="" prop="blMessage">
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
+                      </el-form-item>
+                    </el-col>
 
                   </el-row>
                 </el-col>
 
                 <el-col :span="12">
-                  <el-row :gutter="0" style="padding: 8px;">
-                    <el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
-                      <div class="form-group-title" style="width:50%">
-                        <span style="border-radius: 15px;
-                            padding: 5px 15px;
-                            background: #b12e29;
-                            font-size: 13px;
-                            color: white;">收件</span>
+                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
+                      <el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
+                        <div class="form-group-title" style="width:50%">
+                          <span style="border-radius: 15px;
+                              padding: 5px 15px;
+                              background: #b12e29;
+                              font-size: 13px;
+                              color: white;">收件</span>
+                          </div>
+                        <div style="width:50%;text-align:right;padding-right: 15px;">
+                          <el-button
+                          size="mini"
+                          type="text"
+                          style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
+                          class="iconfont icon-dizhibao"
+                          @click="handleSelectCustomerAddress(2)"
+                        >收件地址薄</el-button>
                         </div>
-                      <div style="width:50%;text-align:right;padding-right: 15px;">
-                        <el-button
-                        size="mini"
-                        type="text"
-                        style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
-                        class="iconfont icon-dizhibao"
-                        @click="handleSelectCustomerAddress(2)"
-                      >收件地址薄</el-button>
-                      </div>
-                    </el-col>
-
-                    <div class="form-row-group-panel">
+                      </el-col>
 
                       <!-- <el-col :span="12">
                         <el-form-item label="收件客户" prop="customerCode">
@@ -290,101 +281,224 @@
                           <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
                         </el-form-item>
                       </el-col> -->
-                    </div>
                   </el-row>
-
                 </el-col>
             </el-row>
           </el-collapse-item>
+          <el-row>
+             <el-col :span="12">
+
+             </el-col>
+             <el-col :span="12">
+            
+            </el-col>
+          </el-row>
           <el-collapse-item title="" name="3">
             <template slot="title">
-              <div class="form-group-title"><span class="title">{{ $t('货物信息') }}</span>
+              <div class="form-group-title"><span class="title">{{ $t('货物重量信息') }}</span>
               </div>
             </template>
             <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
               <el-col :span="12">
 
+                <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="0px">
+                        <GoodsPicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsPicker>
+                          <el-table
+                          class="cargoList"
+                          :cell-style="{
+                            'padding': '0px!important',
+                            'padding-left': '0px!important',
+                            'padding-right': '0px!important',
+                            'font-size':'11px'
+                          }"
+                          :header-cell-style="{
+                            'font-size':'11px'
+                          }"
+                          border
+                          stripe
+                          :data="form.cargoList"
+                          size="mini"
+                          style="width: 100%"
+                        >
+                        <!-- @cell-mouse-enter="handleCellEnter"
+                          @cell-mouse-leave="handleCellLeave" -->
+                          <!-- "goodsCode": "货物代码:eg 123",
+                            "goodsName": "货物名称",
+                            "cargoQty": "货物数量: 10",
+                            "unit": "件",
+                            "price": "1.2",
+                            "currency": "CNY",
+                            "nationArea": "中国",
+                            "taxNo": "行邮税号",
+                            "hscode": "海关编码",
+                            "brand": "品牌",
+                            "material": "材质",
+                            "purpose": "用途",
+                            "ingredients": "成分",
+                            "goodsModel": "规格",
+                            "orderNum": "序号",
+                            "supplier": "供应商",
+                            "isSave": "是否保存 1-保存"
+                            -->
+                          <el-table-column label="序号" align="center" width="50">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.$index+1 }} </span>
+                                </template>
+                          </el-table-column>
+                          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+                            <!-- v-if="scope.row.isEdit"  -->
+                              <!-- <div v-else class="txt">{{scope.row.goodsName}}</div> -->
+
+                          <el-table-column prop="length" label="长(cm)" align="center" width="60">
+                            <template slot-scope="scope">
+                              <el-input  v-model="scope.row.length" size="mini" placeholder=""></el-input>
+                            </template>
+                          </el-table-column>
+                          <el-table-column prop="width" label="宽(cm)" align="center" width="60">
+                            <template slot-scope="scope">
+                              <el-input  v-model="scope.row.width" size="mini" placeholder=""></el-input>
+                            </template>
+                          </el-table-column>
+                          <el-table-column prop="height" label="高(cm)" align="center" width="60">
+                            <template slot-scope="scope">
+                              <el-input  v-model="scope.row.height" size="mini" placeholder=""></el-input>
+                            </template>
+                          </el-table-column>
+                          <el-table-column prop="cargoQty" label="件数" align="center" width="60">
+                            <template slot-scope="scope">
+                              <el-input  v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
+                            </template>
+                          </el-table-column>
+                          <el-table-column prop="volumn" label="体积(m³)" align="center" width="80">
+                            <template slot-scope="scope">
+                              <el-input  v-model="scope.row.volumn" size="mini" placeholder="" disabled></el-input>
+                            </template>
+                          </el-table-column>
+                        <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
+                            <template slot-scope="scope">
+                              <el-input  v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
+                            </template>
+                          </el-table-column>
+                        </el-table>
+                        <el-input v-model="form.goodsInfo" type="textarea" placeholder="" disabled />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24" >
+
+
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="包装类型" prop="packType">
+                          <el-select v-model="form.packType" placeholder="请选择">
+                            <el-option
+                              v-for="dict in dict.type.emis_tab_packing_type"
+                              :key="dict.value"
+                              :label="dict.label"
+                              :value="dict.value"
+                            ></el-option>
+                          </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="件数" prop="parcelQty">
+                          <el-input v-model="form.parcelQty" style="text-align: right;" placeholder="请输入件数" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="8">
+                        <el-form-item label="实际重量" prop="billWeight">
+                          <el-input v-model="form.billWeight" @blur="calcSettlementWeightByRemote()" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="16">
+                        <el-form-item label="体积" prop="totalVolume" label-width="60px" >
+                          <div style="display:inline-flex">
+                            <el-input v-model="form.length" style="width:80px" placeholder="长" >
+                              <span slot="suffix">(cm)</span>
+                            </el-input>
+                            <el-input v-model="form.width" style="margin-left:5px;width:80px" placeholder="宽" >
+                              <span slot="suffix">(cm)</span>
+                            </el-input>
+                            <el-input v-model="form.height" style="margin-left:5px;width:80px" placeholder="高" >
+                              <span slot="suffix">(cm)</span>
+                            </el-input>
+                          </div>
+                          <div style="">
+                            <el-input v-model="form.totalVolume" @blur="calcSettlementWeightByRemote()" style="text-align: right;width: 120px" placeholder="体积" >
+                              <span slot="suffix">(m³)</span>
+                            </el-input>
+                          </div>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="体积重量" prop="volumeWeight">
+                          <el-input v-model="form.volumeWeight" placeholder="" disabled>
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="结算重量" prop="settlementWeight">
+                          <el-input v-model="form.settlementWeight" placeholder="" disabled >
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="" prop="blOverWeight">
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="超重件数" prop="overWeightNumber">
+                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="是否生成子单" prop="blGenSubbill" label-width="120px">
+                          <el-radio-group v-model="form.blGenSubbille">
+                            <el-radio  label="1">是</el-radio>
+                            <el-radio  label="0">否</el-radio>
+                          </el-radio-group>
+
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="子单号" prop="billCodeSub">
+                          <el-input v-model="form.billCodeSub" type="textarea" placeholder="" disabled />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="合同号" prop="custOrderId">
+                          <el-input v-model="form.custOrderId" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="进仓单" prop="warehouseInNo">
+                          <WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="运单备注" prop="remark">
+                          <el-input v-model="form.remark" type="textarea" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                  </el-row>
+
               </el-col>
-               <el-col :span="12" class="cargoList">
-                <div>体积信息</div>
-                <el-table
-                  :cell-style="{
-                    'padding': '0px!important',
-                    'padding-left': '0px!important',
-                    'padding-right': '0px!important',
-                    'font-size':'11px'
-                  }"
-                  :header-cell-style="{
-                    'font-size':'11px'
-                  }"
-                  border
-                  stripe
-                  :data="form.cargoList"
-                  size="mini"
-                  style="width: 100%"
-                >
-                <!-- @cell-mouse-enter="handleCellEnter"
-                  @cell-mouse-leave="handleCellLeave" -->
-                  <!-- "goodsCode": "货物代码:eg 123",
-                    "goodsName": "货物名称",
-                    "cargoQty": "货物数量: 10",
-                    "unit": "件",
-                    "price": "1.2",
-                    "currency": "CNY",
-                    "nationArea": "中国",
-                    "taxNo": "行邮税号",
-                    "hscode": "海关编码",
-                    "brand": "品牌",
-                    "material": "材质",
-                    "purpose": "用途",
-                    "ingredients": "成分",
-                    "goodsModel": "规格",
-                    "orderNum": "序号",
-                    "supplier": "供应商",
-                    "isSave": "是否保存 1-保存"
-                    -->
-                  <el-table-column label="序号" align="center" width="50">
-                        <template slot-scope="scope">
-                            <span>{{ scope.$index+1 }} </span>
-                        </template>
-                  </el-table-column>
-                  <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                    <!-- v-if="scope.row.isEdit"  -->
-                      <!-- <div v-else class="txt">{{scope.row.goodsName}}</div> -->
+               <el-col :span="12" >
 
-                  <el-table-column prop="length" label="长(cm)" align="center" width="60">
-                    <template slot-scope="scope">
-                      <el-input  v-model="scope.row.length" size="mini" placeholder=""></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="width" label="宽(cm)" align="center" width="60">
-                    <template slot-scope="scope">
-                      <el-input  v-model="scope.row.width" size="mini" placeholder=""></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="height" label="高(cm)" align="center" width="60">
-                    <template slot-scope="scope">
-                      <el-input  v-model="scope.row.height" size="mini" placeholder=""></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="cargoQty" label="件数" align="center" width="60">
-                    <template slot-scope="scope">
-                      <el-input  v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="volumn" label="体积(m³)" align="center" width="80">
-                    <template slot-scope="scope">
-                      <el-input  v-model="scope.row.volumn" size="mini" placeholder="" disabled></el-input>
-                    </template>
-                  </el-table-column>
-                 <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
-                    <template slot-scope="scope">
-                      <el-input  v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
-                    </template>
-                  </el-table-column>
+                <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
+
+
+
+                  </el-row>
 
 
-                </el-table>
                </el-col>
             </el-row>
           </el-collapse-item>
@@ -763,7 +877,7 @@ methods: {
             "supplier": "供应商",
             "isSave": "是否保存 1-保存"
          };
-         this.form.cargoList.push(cargo);
+        //  this.form.cargoList.push(cargo);
       }
 
   },
@@ -1085,8 +1199,8 @@ methods: {
 // }
 
  .form-row-group-panel{
-    margin-right: 5px;
-    padding: 8px;
+    // margin-right: 5px;
+    // padding: 8px;
     // border-right: 1px solid #ededed;
  }