Merge branch 'release2.2' of...

Merge branch 'release2.2' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2

src/api/ecw/order.js

@@ -822,3 +822,23 @@ export function orderDetailSummary(orderId){
     method: 'get'
   })
 }
+
+// 自编号的订单费用汇总
+export function orderSummaryByContainerNumber(params){
+  return request({
+    url: '/ecw/orderCount/containerNumber/orderSummary',
+    method: 'get',
+    params
+  })
+}
+
+// 导出自编号订单汇总列表
+export function exportOrderSummaryByContainerNumber(params){
+  return request({
+    url: '/ecw/order/export/export-order-summary',
+    method: 'get',
+    params,
+    timeout: 5 * 60000,
+    responseType: 'blob'
+  })
+}

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/currency/index.vue

@@ -323,6 +323,36 @@ export default {
           this.exportLoading = false;
         }).catch(() => {});
     }
+  },
+  watch:{
+    'queryParams.titleZh':{
+       handler(value){
+         if(value === ''){
+           this.queryParams.titleZh = undefined
+         }
+       }
+    },
+    'queryParams.titleEn':{
+      handler(value){
+        if(value === ''){
+          this.queryParams.titleEn = undefined
+        }
+      },
+    },
+    'queryParams.fuhao':{
+       handler(value){
+          if(value === ''){
+            this.queryParams.fuhao = undefined
+          }
+        },
+    },
+    'queryParams.status':{
+      handler(value){
+        if(value === ''){
+          this.queryParams.status = undefined
+        }
+      }
+    }
   }
 };
 </script>

src/views/ecw/exchangeRate/index.vue

@@ -109,6 +109,12 @@
             {{$t('例子：1RMB = 0.138611USD')}}
           </p>
         </el-form-item>
+        <el-form-item :label="$t('有效期')" prop="expireDate">
+          <el-date-picker v-model="form.expireDate" type="datetime" format="yyyy-MM-dd HH:mm:ss"  value-format="yyyy-MM-dd HH:mm:ss"  ></el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="form.id" :label="$t('状态')">
+          <div> {{status ? '已过期' : '正常'}}</div>
+        </el-form-item>
         <el-form-item :label="$t('备注')">
         <el-input type="textarea" v-model="form.note"></el-input>
         </el-form-item>
@@ -167,6 +173,7 @@ export default {
   },
   data() {
     return {
+      status:0,
       currencyList:[],
       allSimplList:[],
       listLog:[],
@@ -202,6 +209,7 @@ export default {
         targetCurrencyId: [{ required: true, message: this.$t('币种2不能为空'), trigger: "change" }],
         targetCurrencyCode: [{ required: true, message: this.$t('目标种代码不能为空'), trigger: "blur" }],
         currencyRate: [{ required: true, message: this.$t('汇率不能为空'), trigger: "blur" }],
+        expireDate: [{ required: true, message: this.$t('有效期不能为空'), trigger: "blur" }],
       },
       formLog:{
         rows:10,
@@ -287,6 +295,7 @@ export default {
         "targetCurrencyCode": "",
         "targetCurrencyId": '',
         id: null,
+        expireDate:""
       };
       this.resetForm("form");
     },
@@ -305,7 +314,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "新增";
+      this.title = this.$t('新增');
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -313,9 +322,19 @@ export default {
       const id = row.id;
       getExchangeRate(id).then(response => {
         this.form = {...this.form,...response.data};
-        console.log( this.form,' this.form')
+        this.form.expireDate = this.parseTime(this.form.expireDate);
+
+        if(this.form.expireDate){
+          if(new Date(this.form.expireDate).getTime() >= new Date().getTime()){
+            this.status = 0
+          }else {
+            this.status = 1
+          }
+        }else {
+          this.status = 1
+        }
         this.open = true;
-        this.title = "修改";
+        this.title = this.$t('修改');
       });
     },
     /** 提交按钮 */
@@ -334,6 +353,7 @@ export default {
             sourceCurrencyId: this.form.sourceCurrencyId ,
             targetCurrencyCode:  this.form.targetCurrencyCode,
             targetCurrencyId:  this.form.targetCurrencyId,
+            expireDate:this.form.expireDate
 
           }
           updateExchangeRate(p).then(response => {

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('请选择国家')">