Merge remote-tracking branch 'origin/release2.2' into release2.2

src/api/ecw/order.js

@@ -795,3 +795,12 @@ export function orderDetailSummary(orderId){
     method: 'get'
   })
 }
+
+// 自编号的订单费用汇总
+export function orderSummaryByContainerNumber(params){
+  return request({
+    url: '/ecw/orderCount/containerNumber/orderSummary',
+    method: 'get',
+    params
+  })
+}

src/i18n/languages/en_US.json

@@ -1181,7 +1181,7 @@
     "待收款": "Payment Unreceived",
     "请输入唛头": "Please enter shipping mark",
     "收款": "Receipt",
-    "收款单": "receipt",
+    "收款单": "Collection Note",
     "商品名称": "product name",
     "请输入商品名称": "Please enter a product name",
     "收款类型": "Receipt Type",
@@ -4040,5 +4040,6 @@
     "码头": "wharf",
     "保费币种": "Premium Currency",
     "是否支持控货": "Does it support controlling goods",
-    "默认送货上门": "Default door-to-door delivery"
+    "默认送货上门": "Default door-to-door delivery",
+    "广州市捷道国际货运代理有限公司": "E&C LOGISTICS LIMITED"
 }

src/utils/dict.js

@@ -120,6 +120,7 @@ export const DICT_TYPE = {
   ECW_CUSTOMER_TRANSPORT_TYPE: 'customer_transport_type', // 客户出货渠道（跟运输方式相同，但是显示全部）
   ECW_ORDER_APPROVAL_TYPE: 'order_approval_type', // 订单相关审批类型
   ECW_FEE_SOURCE: 'fee_source', // 费用来源
+  RECEIPT_FEE_TYPE:'receipt_fee_type',
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -370,7 +370,7 @@ export default {
                     });
                   });
                 })
-                .catch((_) => {
+                .catch((action) => {
                   if(action =='cancel'){
                     createGoods({ ...params, relationStatus: 2, singleLoad: true }).then((res) => {
                       serviceMsg(res, this).then(() => {

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -724,7 +724,7 @@ export default {
                     });
                   });
                 })
-                .catch((_) => {
+                .catch((action) => {
                   if(action =='cancel'){
                     createGoods({ ...params, relationStatus: 2, singleLoad: true }).then((res) => {
                       serviceMsg(res, this).then(() => {

src/views/ecw/financial/printVoucher.vue

@@ -2,7 +2,11 @@
   <div class="app-container" >
       <div id="print" style="font-size: 18px;">
 
-        <div style="text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">{{$t('捷道货运收款单')}}</div>
+        <div style="position:relative;text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">
+          <div style="position:absolute;left:4px;top:4px">{{$t('广州市捷道国际货运代理有限公司')}}
+          </div>
+          <span>{{$t('收款单')}}</span>
+        </div>
           <table border="1" style="width: 100%;text-align: center;border-collapse: collapse; ">
             <tr>
               <td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
@@ -27,20 +31,20 @@
             <th style="width: 12.5%;">{{$t('序号')}}</th>
             <th style="width: 12.5%;">{{$t('提单号')}}</th>
             <th style="width: 12.5%;">{{$t('订单号')}}</th>
-            <th style="width: 12.5%;">{{$t('品名')}}</th>
+            <!-- <th style="width: 12.5%;">{{$t('品名')}}</th> -->
             <th style="width: 12.5%;">{{$t('收入类型')}}</th>
-            <th style="width: 12.5%;">{{$t('金额')}}</th>
             <th style="width: 12.5%;">{{$t('币种')}}</th>
+            <th style="width: 12.5%;">{{$t('金额')}}</th>
             <th style="width: 12.5%;">{{$t('优惠金额')}}</th>
           </tr>
-          <tr v-for="(item, index) in list" :key="index">
+          <tr v-for="(item, index) in list" :key="item.id">
             <td>{{ index + 1 }}</td>
             <td>{{ orderData.tidanNo||''}}</td>
             <td>{{ item.orderNo }}</td>
-            <td>{{ $i18n.locale=='zh_CN'?item.titleZh:item.titleEn }}</td>
-            <td><dict-tag :value="item.feeType" :type="DICT_TYPE.FEE_TYPE"></dict-tag></td>
-            <td> {{item.totalAmount}}</td>
+            <!-- <td>{{ $i18n.locale=='zh_CN'?item.titleZh:item.titleEn }}</td> -->
+            <td><dict-tag :value="item.feeType" :type="DICT_TYPE.RECEIPT_FEE_TYPE"></dict-tag></td>
             <td>{{getCurrencyLabel(item.currencyId)}}</td>
+            <td> {{item.totalAmount}}</td>
             <td>{{ item.discountTotal||0 }}</td>
           </tr>
           <tr v-for="(items, indexs) in receiptAccountList" :key="indexs">

src/views/ecw/order/components/PrintTag.vue

@@ -77,7 +77,8 @@ import lodop from '@/utils/lodop'
 export default {
     filters: {parseTime},
     props:{
-        orderId: [String, Number]
+        orderId: [String, Number],
+        warehouseInNum: Number
     },
     data(){
         return {
@@ -116,7 +117,9 @@ export default {
         loadData(){
             printTag(this.orderId).then(res => {
                 this.$set(this, 'tags', res.data)
-                this.form.start = res.data[0].num
+                // this.form.start = res.data[0].num
+                // 起始标签为入仓数 + 1
+                this.form.start = this.warehouseInNum + 1
                 this.form.end = res.data[res.data.length-1].num
             })
         },
@@ -126,9 +129,10 @@ export default {
             this.$emit('close');
         },
         showPreview(){
+            /* 2023-07-17 要求不限制范围
             if(this.form.end > this.tags[this.tags.length-1].num){
                 return this.$message.error(this.$t('结束标签不对'))
-            }
+            }*/
             if(!this.printTags.length){
                 return this.$message.error(this.$t('指定区域无可打印标签'))
             }

src/views/ecw/order/detail.vue

@@ -253,7 +253,7 @@
           <el-button v-hasPermi="['ecw:order:show_customs']"  type="text" @click="showDeclaration=true">{{$t('查看报关资料')}}</el-button>
         </el-tab-pane>
         <el-tab-pane :label="$t('费用明细')" name="four">
-          <el-button type="primary" @click="showFeeDetail=true">{{$t('费用汇总')}}</el-button>
+          <el-button type="primary" @click="showFeeSummary=true">{{$t('费用汇总')}}</el-button>
           <el-table :data="feeList">
             <el-table-column :label="$t('订单号')" prop="orderNo">
               <template slot-scope="{row}">
@@ -425,10 +425,10 @@
     <declaration-documents v-if="showDeclaration" :order-id="order.orderId" :order-no="order.orderNo" @close="showDeclaration=false" />
     <!--费用汇总-->
     <fee-detail
-      v-if="showFeeDetail"
+      v-if="showFeeSummary"
       :order-id="order.orderId"
       :currency-map="currencyMap"
-      @close="showFeeDetail=false" />
+      @close="showFeeSummary=false" />
   </div>
 
 </template>
@@ -503,7 +503,7 @@ export default {
       consigneeText:this.$t('更多'),
       showLogDetailId: null, // 显示日志详情的ID,
       showDeclaration:false, //显示报关资料
-      showFeeDetail: false, // 是否显示费用汇总
+      showFeeSummary: false, // 是否显示费用汇总
     }
   },
   computed:{
@@ -559,14 +559,6 @@ export default {
         })
         this.region = region
       })
-    },
-    showFeeDetail(){
-      if(!this.orderSummary){
-        this.getOrderSummary()
-      }
-      if(!this.orderDetailSummary){
-        this.getOrderDetailSummary()
-      }
     }
   },
   created() {

src/views/ecw/order/index.vue

@@ -430,7 +430,7 @@
                   exclude(scope.row.status, [0]) &&
                   exclude(scope.row.abnormalState, [5,6,7,8])
                 ">
-                  <el-dropdown-item @click.native="printTagOrderId=scope.row.orderId" v-hasPermi="['ecw:order:print_tag']">{{$t('打印标签')}}</el-dropdown-item>
+                  <el-dropdown-item @click.native="printTag(scope.row)" v-hasPermi="['ecw:order:print_tag']">{{$t('打印标签')}}</el-dropdown-item>
                 </template>
 
                 <!-- 打印入仓单 -->
@@ -456,7 +456,7 @@
       @pagination="getList" />
 
     <special-needs :orderNo="orderNo" :show.sync="isShow" :currency="JSON.stringify(currencyList)" :order-id="orderId" @determine="getList" ></special-needs>
-    <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" />
+    <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" :warehouse-in-num="printTagWarehouseInNum" />
     <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
     <print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" />
     <batch-pickup v-if="showBatchPickup" @close="onBatchClose" @success="onBatchClose"/>
@@ -567,6 +567,7 @@ export default {
       dateFilter: [], //筛选日期
 
       printTagOrderId: null, // 显示打印标签的订单ID
+      printTagWarehouseInNum: 0, // 打印标签的订单入仓箱数
       printWarehouseReceiptOrderId: null, // 打印入仓单的订单ID
       printLadingBillOrderId: null, // 打印提单的订单ID
       showBatchPickup: false, // 是否显示批量提货弹窗
@@ -881,6 +882,11 @@ export default {
     onBatchClose(){
       this.showBatchPickup = false
       this.handleQuery()
+    },
+    // 打印标签
+    printTag(order){
+      this.printTagOrderId=order.orderId
+      this.printTagWarehouseInNum = order.sumNum
     }
   }
 };

src/views/ecw/supplier/detail.vue

@@ -44,8 +44,8 @@
         </el-form-item>
       </div>
       
-      <div v-if="formData.areaType==0">
-        <el-form-item :label="$t('供应商类别')" prop="companyType">
+      <div>
+        <el-form-item v-if="formData.areaType==0" :label="$t('供应商类别')" prop="companyType">
           <dict-selector v-model="formData.companyTypeArr" type="company_type" multiple disabled />
         </el-form-item>
         <el-form-item :label="$t('目的港码头')" prop="dockIds">

src/views/ecw/supplier/edit.vue

@@ -56,11 +56,6 @@
         <el-form-item :label="$t('供应商类别')" prop="companyType">
           <dict-selector v-model="formData.companyTypeArr" type="company_type" multiple />
         </el-form-item>
-        <el-form-item :label="$t('目的港码头')" prop="dockIds">
-          <el-select v-model="formData.dockIds" filterable multiple clearable>
-                <el-option v-for="(item) in allDocks" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
-            </el-select>
-        </el-form-item>
       </div>
 
       <div>
@@ -68,6 +63,13 @@
           <dict-selector v-model="formData.cooperationType" type="cooperation_type" />
         </el-form-item>
       </div>
+      <div>
+        <el-form-item :label="$t('目的港码头')" prop="dockIds">
+          <el-select v-model="formData.dockIds" filterable multiple clearable>
+              <el-option v-for="(item) in allDocks" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+      </div>
       <div v-if="formData.areaType==1">
         <el-form-item :label="$t('国家')" prop="cooperationType">
           <el-select v-model="formData.country" :placeholder="$t('请选择国家')">