收款单打印

src/api/ecw/order.js

@@ -780,4 +780,18 @@ export  function getDestCountryByOrderId(params){
   })
 }
 
+// 订单费用汇总
+export function orderSummary(orderId){
+  return request({
+    url: '/ecw/orderCount/orderSummary/' + orderId,
+    method: 'get'
+  })
+}
 
+// 订单明细汇总
+export function orderDetailSummary(orderId){
+  return request({
+    url: '/ecw/orderCount/orderDetailSummary/' + orderId,
+    method: 'get'
+  })
+}

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

@@ -10,8 +10,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('装柜时间')" prop="ldBoxTime">
-        {{cabinetObj.ldBoxTime?new Date(cabinetObj.ldBoxTime).format('yyyy-MM-dd hh:mm:ss'):new Date().format('yyyy-MM-dd hh:mm:ss')}}
-        <!-- <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> -->
+        <!-- {{cabinetObj.ldBoxTime?new Date(cabinetObj.ldBoxTime).format('yyyy-MM-dd hh:mm:ss'):new Date().format('yyyy-MM-dd hh:mm:ss')}} -->
+        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('出仓时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>

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

@@ -585,30 +585,9 @@ export default {
         const list = this.warehouseInList.find(item => item.orderItemId == orderItemId)?.orderWarehouseInBackItemDoList || []
         return list.map(item => {
           let [boxGauge1, boxGauge2, boxGauge3] = item.boxGauge.split('*')
-          let labelArr = [
-            this.$t('{num}箱', {num: item.cartonsNum}),
-            this.$l(this.getDictDatas(this.DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE).find(dict => dict.value == item.specificationType), 'label'),
-            this.$t('长{boxGauge1}cm', {boxGauge1}),
-            this.$t('宽{boxGauge2}cm', {boxGauge2}),
-            this.$t('高{boxGauge3}cm', {boxGauge3}),
-            this.$t('方数{volume}m³', {volume: item.volume}),
-            this.$t('重量{weight}kg', {weight: item.weight})
-          ]
-          if (item.quantityAll) {
-            labelArr.push(this.$t('数量{n}', {n: item.quantityAll}))
-          }
-          if (item.expressNo) {
-            labelArr.push(this.$t('快递{expressNo}', {expressNo: item.expressNo}))
-          }
-          if (item.orderLocationBackVOList && item.orderLocationBackVOList.length) {
-            labelArr.push(this.$t('储位{location}', {
-              location: item.orderLocationBackVOList.map(v => v.code || v.areaName + (v.locationName || '')).join(',')
-            }))
-          }
           item.boxGauge1 = boxGauge1
           item.boxGauge2 = boxGauge2
           item.boxGauge3 = boxGauge3
-          item.text = labelArr.join(',')
           return item
         })
       }

src/views/ecw/currency/index.vue

@@ -42,8 +42,8 @@
                    v-hasPermi="['ecw:currency:create']">{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['ecw:currency:export']">{{ $t('导出') }}</el-button>
+<!--        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"-->
+<!--                   v-hasPermi="['ecw:currency:export']">{{ $t('导出') }}</el-button>-->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -179,6 +179,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+           titleZh:{required:true,message:'请输入中文名称',target:'blur'},
+           titleEn:{required:true,message:'请输入英文名称',target:'blur'},
+           fuhao:{required:true,message:'请输入货币符号  ',target:'blur'},
       },
       statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
 
@@ -228,7 +231,18 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+          pageNo: 1,
+          pageSize: 10,
+          titleZh: null,
+          titleEn: null,
+          fuhao: null,
+          status: null,
+          huilv: null,
+          aorder: null,
+          createAt: null,
+          updateAt: null,
+      };
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/exchangeRate/index.vue

@@ -94,7 +94,7 @@
                        :key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="币种2" prop="targetCurrencyId">
+        <el-form-item :label="$t('币种2')" prop="targetCurrencyId">
           <el-select v-model="form.targetCurrencyId" :placeholder="$t('请选择币种')">
             <el-option  :disabled="dict.status === 1"  @click.native="() => form.targetCurrencyCode = dict.fuhao" v-for="dict in currencyList"
                        :key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />

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

+<template>
+  <div>
+    <template v-if="charging">
+      {{$t('全包价')}}:{{freight}}{{currencyMap[freightCurrency]}}
+    </template>
+    <template v-else>
+      <div>{{$t('运费')}}：{{freight}}{{currencyMap[freightCurrency]}}</div>
+      <div>{{$t('清关费')}}：{{clearance}}{{currencyMap[clearanceCurrency]}}</div>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  props:{
+    // 货币映射
+    currencyMap:{
+      type:Object,
+      default(){
+        return {}
+      }
+    },
+    // 运费
+    freight: [String, Number],
+    // 运费货币
+    freightCurrency: Number,
+    // 清关费
+    clearance: [String, Number],
+    // 运费货币
+    clearanceCurrency: Number,
+    // 是否全包价
+    charging: Boolean
+  }
+}
+</script>

src/views/ecw/order/detail.vue

@@ -424,13 +424,17 @@
     <!-- 报关资料 -->
     <declaration-documents v-if="showDeclaration" :order-id="order.orderId" :order-no="order.orderNo" @close="showDeclaration=false" />
     <!--费用汇总-->
-    <fee-detail v-if="showFeeDetail" :order-id="order.orderId" @close="showFeeDetail=false" />
+    <fee-detail
+      v-if="showFeeDetail"
+      :order-id="order.orderId"
+      :currency-map="currencyMap"
+      @close="showFeeDetail=false" />
   </div>
 
 </template>
 
 <script>
-import { getOrder, operateLogPage } from '@/api/ecw/order'
+import {getOrder, operateLogPage} from '@/api/ecw/order'
 import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict';
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
@@ -440,7 +444,6 @@ import {getReceivableListByOrderId} from '@/api/ecw/receipt'
 import { getChannel } from '@/api/ecw/channel';
 import {listByIds} from '@/api/ecw/region'
 import WarehouseDetail from './components/WarehouseDetail';
-import {getProductBrank} from '@/api/ecw/productBrank'
 import { parseTime } from '@/utils/ruoyi';
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
 import {checkPermi} from '@/utils/permission'
@@ -500,7 +503,7 @@ export default {
       consigneeText:this.$t('更多'),
       showLogDetailId: null, // 显示日志详情的ID,
       showDeclaration:false, //显示报关资料
-      showFeeDetail: false // 是否显示费用汇总
+      showFeeDetail: false, // 是否显示费用汇总
     }
   },
   computed:{
@@ -556,6 +559,14 @@ export default {
         })
         this.region = region
       })
+    },
+    showFeeDetail(){
+      if(!this.orderSummary){
+        this.getOrderSummary()
+      }
+      if(!this.orderDetailSummary){
+        this.getOrderDetailSummary()
+      }
     }
   },
   created() {

src/views/ecw/order/splitApply/components/PutIn.vue

@@ -48,8 +48,8 @@
       <div>
         {{$t('可拆')}}：
         {{maxSplitNum}}{{$t('箱')}}，
-        {{$t('体积')}}：{{leftData('volume')}}{{$t('m³')}}，
-        {{$t('重量')}}：{{leftData('weight')}}{{$t('kg')}}，
+        {{$t('体积')}}：{{leftData('volume')}}m³，
+        {{$t('重量')}}：{{leftData('weight')}}kg，
         {{$t('数量')}}：{{leftData('quantity')}}{{$t('个')}}
       </div>
     </el-card>

src/views/ecw/order/splitApply/index.vue

@@ -716,30 +716,9 @@ export default {
         const list = this.warehouseInList.find(item => item.orderItemId == orderItemId)?.orderWarehouseInBackItemDoList || []
         return list.map(item => {
           let [boxGauge1, boxGauge2, boxGauge3] = item.boxGauge.split('*')
-          let labelArr = [
-            this.$t('{num}箱', {num: item.cartonsNum}),
-            this.$l(this.getDictDatas(this.DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE).find(dict => dict.value == item.specificationType), 'label'),
-            this.$t('长{boxGauge1}cm', {boxGauge1}),
-            this.$t('宽{boxGauge2}cm', {boxGauge2}),
-            this.$t('高{boxGauge3}cm', {boxGauge3}),
-            this.$t('方数{volume}m³', {volume: item.volume}),
-            this.$t('重量{weight}kg', {weight: item.weight})
-          ]
-          if (item.quantityAll) {
-            labelArr.push(this.$t('数量{n}', {n: item.quantityAll}))
-          }
-          if (item.expressNo) {
-            labelArr.push(this.$t('快递{expressNo}', {expressNo: item.expressNo}))
-          }
-          if (item.orderLocationBackVOList && item.orderLocationBackVOList.length) {
-            labelArr.push(this.$t('储位{location}', {
-              location: item.orderLocationBackVOList.map(v => v.code || v.areaName + (v.locationName || '')).join(',')
-            }))
-          }
           item.boxGauge1 = boxGauge1
           item.boxGauge2 = boxGauge2
           item.boxGauge3 = boxGauge3
-          item.text = labelArr.join(',')
           return item
         })
       }

src/views/ecw/warehouse/index.vue

@@ -324,7 +324,6 @@
           </el-form-item>
           <el-form-item :label="$t('是否支持控货')">
             <el-radio-group v-model="lineform.controlStatus">
-
               <el-radio :label="0">支持</el-radio>
               <el-radio :label="1">不支持</el-radio>
             </el-radio-group>
@@ -862,6 +861,8 @@ export default {
         this.serviceOpen = true;
         this.lineform.lineId = row.lineId;
         this.lineform.transportType = row.transportType;
+         this.lineform.currencyUnit =  row.currencyUnit === 0 ? '' : row.currencyUnit
+         this.lineform.controlStatus = row.controlStatus
     },
 
     submitLineForm() {