From 55fda92e9ab86be67a9038f5e86059aba9f93fc0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 1 Dec 2024 21:16:38 +0800
Subject: [PATCH] md

---
 src/views/oms/EmisBaseTools/GoodsInput.vue    |  1 +
 src/views/oms/emisWaybill/OrderRecord.vue     | 82 +++++++++++--------
 .../oms/emisWaybill/SendOrderbillList.vue     |  8 +-
 3 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/src/views/oms/EmisBaseTools/GoodsInput.vue b/src/views/oms/EmisBaseTools/GoodsInput.vue
index dbde1ab..cdc8504 100644
--- a/src/views/oms/EmisBaseTools/GoodsInput.vue
+++ b/src/views/oms/EmisBaseTools/GoodsInput.vue
@@ -36,6 +36,7 @@
         </div>
 
           <el-input
+            size="mini"
           slot="reference"
           ref="inputValue"
           :value="svalue"
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index 10bf6f3..c6b0cfe 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -434,10 +434,11 @@
                 <div style="display:inline-flex">
                     <!-- <div>申报货物列表</div> -->
                     <div>
+                      <!-- style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;font-size: 12px;" -->
+
                       <el-button
                         size="mini"
-                        type="text"
-                        style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;font-size: 12px;"
+                        type="primary"
                         class="iconfont icon-add"
                         @click="handleAddGoods"
                       >{{ $t('添加申报货物') }}
@@ -448,13 +449,18 @@
 
                 </div>
                 <div >
-                    <el-table
-                            class="cargoList"
-                            :cell-style="{
+                  <!-- :cell-style="{
                               'padding': '0px!important',
                               'padding-left': '0px!important',
                               'padding-right': '0px!important',
                               'font-size':'13px'
+                            }" -->
+
+                            <!-- class="cargoList" -->
+                    <el-table
+
+                            :cell-style="{
+                              'font-size':'13px'
                             }"
                             :header-cell-style="{
                               'font-size':'13x'
@@ -578,7 +584,7 @@
 
           <el-collapse-item title="" name="4" >
             <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;">
@@ -939,6 +945,8 @@ watch: {
           // 选择产品后报价
           if(this.$route.query.action=="preOrderByProd"){
             this.reset();
+            this.initData();
+
             let routeParams=this.$route.query.routeParams;
             let postForm=JSON.parse(routeParams);
 
@@ -977,9 +985,14 @@ created() {
   }
   else if(this.$route.query.action=="preOrderByProd"){
     this.reset();
+
+    this.initData();
+
     let routeParams=this.$route.query.routeParams;
     let postForm=JSON.parse(routeParams);
 
+    console.log("==preOrderByProd=>",postForm);
+
     this.form.sendDate =parseTime(new Date());
 
     this.form.transLine=postForm.transLine;
@@ -988,13 +1001,15 @@ created() {
     this.form.productType=postForm.productType;
 
 
-    this.form.reciever.country=postForm.reciever.country;
-    this.form.reciever.province=postForm.reciever.province;
-
-
-    this.form.sender.country=postForm.sender.country;
-    this.form.sender.province=postForm.sender.province;
+    if(postForm.reciever!=null){
+      this.form.reciever.country=postForm.reciever.country;
+      this.form.reciever.province=postForm.reciever.province;
+    }
 
+    if(postForm.sender!=null){
+      this.form.sender.country=postForm.sender.country;
+      this.form.sender.province=postForm.sender.province;
+    }
 
     this.form.customsClear=postForm.customsClear;
     this.form.customsEclaration=postForm.customsEclaration;
@@ -1003,13 +1018,8 @@ created() {
     this.form.dispatchUnderlingSiteCode=postForm.dispatchUnderlingSiteCode;
 
 
-
-
-
     this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
 
-
-
   }
   else{
     this.initData();
@@ -1064,19 +1074,31 @@ methods: {
 
           // 获取默认专属业务员
           this.initPrivSalesmen();
+
+           // 默认的收寄件地址
           this.initDefaultAddress();
 
-          // 默认的收寄件地址
+          // 默认申报产品
+          this.handleAddGoods();
 
-          // 月结客户OMS登录
-          let customerType=this.$store.getters.customerType;
-          if(customerType==2){
+          // 初始化月结账号
+          this.initMonthpayAccount();
+
+          this.productFeeList=[];
+      }
+
+
+  },
+  initMonthpayAccount(){
+      // 月结客户OMS登录
+      let customerType=this.$store.getters.customerType;
+      if(customerType==2){
             // 获取默认的月结账号
             this.form.paymentType='2';
             this.form.custNo=this.$store.getters.userName;
 
               let qParams = {
-                pageNumber:1,
+                pageNum:1,
                 pageSize:10
               };
               listSimpleEmisMonthpayAccount(qParams).then(response => {
@@ -1089,11 +1111,7 @@ methods: {
                 }
 
               });
-          }
-          this.productFeeList=[];
       }
-
-
   },
   handlePrivSalesmen(row) {
        this.$router.push({ path: '/BaseMgnt/PrivSalesmen', query: { }})
@@ -1605,13 +1623,13 @@ methods: {
     border-bottom: none!important;
 }
 
-.el-table .el-table__cell:first-child .cell {
-  padding: 0px;
-}
+// .el-table .el-table__cell:first-child .cell {
+//   padding: 0px;
+// }
 
-.el-table .cell {
-    padding: 0px;
-}
+// .el-table .cell {
+//     padding: 0px;
+// }
 
 .cargoList{
   .el-input__inner {
diff --git a/src/views/oms/emisWaybill/SendOrderbillList.vue b/src/views/oms/emisWaybill/SendOrderbillList.vue
index a5756c2..2476c9a 100644
--- a/src/views/oms/emisWaybill/SendOrderbillList.vue
+++ b/src/views/oms/emisWaybill/SendOrderbillList.vue
@@ -113,7 +113,7 @@
                 <el-option label="订单取消" :value="6"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="确认状态" prop="blSign">
+            <!-- <el-form-item label="确认状态" prop="blSign">
               <el-select clearable v-model="queryParams.orderStatus" placeholder="请选择">
                 <el-option label="未确认" :value="0"></el-option>
                 <el-option label="已确认" :value="1"></el-option>
@@ -121,14 +121,14 @@
                 <el-option label="异常单" :value="3"></el-option>
                 <el-option label="已取消" :value="4"></el-option>
               </el-select>
-            </el-form-item>
-            <el-form-item label="进仓状态" prop="blSign">
+            </el-form-item> -->
+            <!-- <el-form-item label="进仓状态" prop="blSign">
               <el-select clearable v-model="queryParams.warehouseInStatus" placeholder="请选择">
                 <el-option label="未进仓" :value="0"></el-option>
                 <el-option label="已进仓" :value="1"></el-option>
                 <el-option label="部分进仓" :value="2"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="付款方式" prop="paymentType" >
             <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
                 <el-option