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

src/views/ecw/box/query.vue

@@ -110,7 +110,7 @@
               <div class="status-line"></div>
               <div class="status-number">{{logList.length - index}}</div>
               <div class="status-info">
-                <div>{{$l(item, 'title')}}</div>
+                <div>{{$l(item, 'title')}} <el-button v-if="item.approvalId>0" type="text" @click="handleApproval(item.bpmProcessId)">{{$t('查看审批')}}</el-button></div>
                 <div>
                   <p>{{formatDate(item.createTime)}}</p>
                   <p>{{item.operator}}</p>
@@ -574,6 +574,9 @@ export default {
         );
       }
     },
+    handleApproval(id) {
+      this.$router.push({path: '/bpm/process-instance/detail', query: {id: id}})
+    }
   },
   computed: {
     visitedViews() {
@@ -636,7 +639,7 @@ export default {
       } else {
         return getTotlContent(secStatistics);
       }
-    },
+    }
   },
 };
 </script>

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

@@ -203,7 +203,6 @@ export default {
     };
   },
   created() {
-    this.queryAllData();
     this.getCountry()
   },
   methods: {
@@ -218,6 +217,7 @@ export default {
       if(warehouse){
         this.$set(this.queryParams,'destCountryId', warehouse.guojia)
       }
+      this.queryAllData();
     },
     /* 查询已预装 */
     getSecGoods() {

src/views/ecw/financial/components/CollectionWriteoff.vue

@@ -50,6 +50,7 @@
           {{ WriteOffProportion }}%
         </el-descriptions-item>
       </el-descriptions>
+      <div style="margin: 20px 0;font-size:16px" v-if="form.financeRemark">{{$t('备注')}}:{{form.financeRemark}}</div>
     <div class="btn">
       <el-button
         size="mini"

src/views/ecw/financial/creatCollection.vue

@@ -102,7 +102,7 @@
         </el-col>
         <el-table v-loading="loadings" :data="list" border :key="isUpdate">
           <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-           <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
+           <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
           <el-table-column :label="$t('唛头')" align="center" prop="marks" />
           <el-table-column :label="$t('品名')" align="center" prop="title">
             <template slot-scope="scope">
@@ -532,10 +532,10 @@
             />
           </el-form-item>
 
-          <el-form-item :label="$t('自编号')" prop="containerNumber">
+          <el-form-item :label="$t('提单号')" prop="tidanNo">
             <el-input
-              v-model="queryParams.containerNumber"
-              :placeholder="$t('请输入自编号')"
+              v-model="queryParams.tidanNo"
+              :placeholder="$t('请输入提单号')"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -558,7 +558,7 @@
         >
           <el-table-column type="selection" width="55" :reserve-selection="true"> </el-table-column>
           <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-          <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
+          <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
           <el-table-column :label="$t('唛头')" align="center" prop="marks" />
           <el-table-column :label="$t('品名')" align="center" prop="title">
             <template slot-scope="scope">

src/views/ecw/financial/receiptDetail.vue

@@ -18,7 +18,7 @@
       <div slot="header" class="card-title">{{ $t('应收明细') }}</div>
       <el-table :data="list" border>
         <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-        <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
+        <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
         <el-table-column :label="$t('唛头')" align="center" prop="marks" />
         <el-table-column :label="$t('品名')" align="center" prop="title">
           <template slot-scope="scope">
@@ -312,7 +312,7 @@
         </el-descriptions-item>
       </el-descriptions>
     </el-card>
-    <div style="margin: 20px 0;font-size:16px" v-if="form.finaceRemark">{{form.finaceRemark}}</div>
+    <div style="margin: 20px 0;font-size:16px" v-if="form.financeRemark">{{$t('备注')}}:{{form.financeRemark}}</div>
     <div slot="footer" style="margin: 20px 0">
       <el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6" type="primary" @click="toEdit" v-hasPermi="['ecw:payment:detail:edit']">{{ $t('编辑') }}</el-button>
       <el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6"  type="primary" @click="verificationAll" v-hasPermi="['ecw:payment:detail:allWriteOff']">{{ $t('全部核销') }}</el-button>
@@ -1164,12 +1164,15 @@ export default {
       }, 0)
     },
     editClick(row) {
+      this.getsurplusData()
       this.openAddDialog = true
       this.dialogTitle = this.$t('编辑银行实收明细')
       this.saveBtnText = this.$t('提交')
       this.isView = false
       setTimeout(() => {
         this.addForm = { ...row }
+        var bank = this.bankData.find(v=>v.baAccountNum==this.addForm.accountNo)
+        if(bank) this.addForm.accountId = bank.id
         this.setWriteOffAmount()
       }, 0)
     },

src/views/ecw/financial/selfNoReport.vue

@@ -42,8 +42,8 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('自编号状态')" prop="status">
-            <dict-selector :type="DICT_TYPE.BOX_ORDER_SHIPMENT_STATE" v-model="queryParams.status" clearable></dict-selector>
+          <el-form-item :label="$t('自编号状态')" prop="boxStatus">
+            <dict-selector :type="DICT_TYPE.BOX_ORDER_SHIPMENT_STATE" v-model="queryParams.boxStatus" clearable></dict-selector>
           </el-form-item>
           <el-form-item :label="$t('结算时间')"  prop="dateFilter">
             <el-date-picker v-model="dateFilter" type="datetimerange"  range-separator="-"
@@ -68,7 +68,15 @@
           </el-form-item>
       </el-form>
     </el-card>
-    <el-table v-loading="loading" :data="list" border class="card" :element-loading-text="$t('汇总计算中...')">
+    <el-table
+      v-loading="loading"
+      :data="list"
+      border
+      class="card"
+      :element-loading-text="$t('汇总计算中...')"
+      show-summary
+      :summary-method="getSummary"
+    >
       <el-table-column :label="$t('是否结算')" align="center">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.SETTLEMENT_STATUS" :value="scope.row.slStatus"></dict-tag>
@@ -80,55 +88,76 @@
           <span v-else>{{scope.row.selfNo}}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('应收款(Accounts receivable)')" align="center" prop="summaryInfo.receivableTotalFeeGroup"></el-table-column>
+      <el-table-column :label="$t('应收款(Accounts receivable)USD')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
+        <template slot-scope="{row}">
+          {{row.summaryInfo.receivableTotalFee}}{{row.summaryInfo.receivableTotalFeeCurrency}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('应收款 RECEIVABLE')" align="center" prop="summaryInfo.receivableTotalFeeGroup">
+        <el-table-column :label="$t('运费 FREIGHT') + ColumnCurrencyName('Freight')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
+          <template slot-scope="{row}">
+            {{row.summaryInfo.totalReceivableFreightFee}}{{row.summaryInfo.totalFreightFeeCurrency}}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('清关费 CLEARING FEE') + ColumnCurrencyName('Clearance')">
+          <template slot-scope="{row}">
+            {{row.summaryInfo.totalReceivableClearanceFee}}{{row.summaryInfo.totalClearanceFeeCurrency}}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('额外费用 EXTRAL FEE') + ColumnCurrencyName('Other')">
+          <template slot-scope="{row}">
+            {{row.summaryInfo.totalReceivableOtherFee}}{{row.summaryInfo.totalOtherFeeCurrency}}
+          </template>
+        </el-table-column>
+      </el-table-column>
       <el-table-column :label="'received in ' + (dstCountryName || $t('目的国')) + `(${$t('目的地实收')})`" align="center" prop="">
-        <el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
+        <el-table-column :label="$t('运费') + ColumnCurrencyName('Freight')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsCollectFreightFee}}{{row.summaryInfo.netReceiptsCollectFreightFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsCollectFreightFee}}{{row.summaryInfo.totalFreightFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsCollectClearanceFeeGroup">
+        <el-table-column :label="$t('清关费') + ColumnCurrencyName('Clearance')" prop="summaryInfo.netReceiptsCollectClearanceFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsCollectClearanceFee}}{{row.summaryInfo.netReceiptsCollectClearanceFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsCollectClearanceFee}}{{row.summaryInfo.totalClearanceFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsCollectOtherFeeGroup">
+        <el-table-column :label="$t('额外费用') + ColumnCurrencyName('Other')" prop="summaryInfo.netReceiptsCollectOtherFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsCollectOtherFee}}{{row.summaryInfo.netReceiptsCollectOtherFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsCollectOtherFee}}{{row.summaryInfo.totalOtherFeeCurrency}}
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column :label="$t('received in China(中国实收)')" align="center" prop="" >
-        <el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup">
+        <el-table-column :label="$t('运费') + ColumnCurrencyName('Freight')" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.netReceiptsAdvanceFreightFeeCurrency}}{{row.summaryInfo.netReceiptsAdvanceClearanceFeeCurrency}}
+            {{row.summaryInfo.netReceiptsAdvanceFreightFee}}{{row.summaryInfo.totalFreightFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsAdvanceClearanceFeeGroup">
+        <el-table-column :label="$t('清关费') + ColumnCurrencyName('Clearance')" prop="summaryInfo.netReceiptsAdvanceClearanceFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsAdvanceClearanceFee}}{{row.summaryInfo.netReceiptsAdvanceClearanceFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsAdvanceClearanceFee}}{{row.summaryInfo.totalClearanceFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsAdvanceOtherFeeGroup">
+        <el-table-column :label="$t('额外费用') + ColumnCurrencyName('Other')" prop="summaryInfo.netReceiptsAdvanceOtherFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsAdvanceOtherFee}}{{row.summaryInfo.netReceiptsAdvanceOtherFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsAdvanceOtherFee}}{{row.summaryInfo.totalOtherFeeCurrency}}
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column :label="$t('Discounts 折扣')" align="center" prop="">
-        <el-table-column :label="$t('运费')" prop="summaryInfo.discountFreightFeeGroup">
+        <el-table-column :label="$t('运费') + ColumnCurrencyName('Freight')" prop="summaryInfo.discountFreightFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.discountFreightFee}}{{row.summaryInfo.netReceiptsCollectFreightFeeCurrency}}
+            {{row.summaryInfo.discountFreightFee}}{{row.summaryInfo.totalFreightFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('清关费')" prop="summaryInfo.discountClearanceFeeGroup">
+        <el-table-column :label="$t('清关费') + ColumnCurrencyName('Clearance')" prop="summaryInfo.discountClearanceFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.discountClearanceFee}}{{row.summaryInfo.netReceiptsCollectClearanceFeeCurrency}}
+            {{row.summaryInfo.discountClearanceFee}}{{row.summaryInfo.totalClearanceFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('额外费用')" prop="summaryInfo.discountOtherFeeGroup">
+        <el-table-column :label="$t('额外费用') + ColumnCurrencyName('Other')" prop="summaryInfo.discountOtherFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.discountOtherFee}}{{row.summaryInfo.netReceiptsCollectOtherFeeCurrency}}
+            {{row.summaryInfo.discountOtherFee}}{{row.summaryInfo.totalOtherFeeCurrency}}
           </template>
         </el-table-column>
       </el-table-column>
@@ -154,7 +183,7 @@ import {getWarehouseList} from '@/api/ecw/warehouse'
 import store from "@/store";
 import {boxSettlementPage, exportSettlementExcel} from "@/api/ecw/box";
 import {getListTree} from "@/api/ecw/region";
-
+import Decimal from 'decimal.js'
 export default {
   name: 'EcwFinancialSelfnoreport',
   data() {
@@ -178,7 +207,10 @@ export default {
     };
   },
   activated(){
+    // 如果有必须的条件则查询
+    if(this.queryParams.startWarehouseIdList.length && this.queryParams.dstCountryId){
       this.getList();
+    }
   },
   created() {
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
@@ -222,6 +254,14 @@ export default {
       const country = this.countryList.find(item => item.id == this.queryParams.destCountryId)
       if(!country) return null
       return this.$l(country, 'title')
+    },
+    // 获取列的货币名称 columnName 取值为Other, Freight, Clearance
+    ColumnCurrencyName(){
+      return (columnName) => {
+        if(!this.list.length) return ''
+        let field = `total${columnName}FeeCurrency`
+        return `(${this.list[0]['summaryInfo'][field]})`
+      }
     }
   },
   methods: {
@@ -247,6 +287,48 @@ export default {
         this.loading = false;
       })
     },
+    getTotal(field){
+      let total = new Decimal(0)
+      this.list.forEach(item => {
+        total = total.plus(item.summaryInfo[field] || 0)
+      })
+      return total.toNumber()
+    },
+    // 返回汇总行数据
+    getSummary(){
+      const data = [
+        this.$t('合计'),
+        '',
+        // 应收款
+        this.getTotal('receivableTotalFee'),
+        // 应收运费
+        this.getTotal('totalReceivableFreightFee'),
+        // 应收清关费
+        this.getTotal('totalReceivableClearanceFee'),
+        // 应收其他费用
+        this.getTotal('totalReceivableOtherFee'),
+        // 目的地实收运费
+        this.getTotal('totalNetReceiptsCollectFreightFee'),
+        // 目的地实收清关费
+        this.getTotal('totalNetReceiptsCollectClearanceFee'),
+        // 目的地实收其他费用
+        this.getTotal('totalNetReceiptsCollectOtherFee'),
+        // 中国实收运费
+        this.getTotal('netReceiptsAdvanceFreightFee'),
+        // 中国实收清关费
+        this.getTotal('netReceiptsAdvanceClearanceFee'),
+        // 中国实收其他费用
+        this.getTotal('netReceiptsAdvanceOtherFee'),
+        // 运费折扣
+        this.getTotal('discountFreightFee'),
+        // 清关费折扣
+        this.getTotal('discountClearanceFee'),
+        // 其他费用折扣
+        this.getTotal('discountOtherFee')
+      ]
+      console.log('sum', {data})
+      return data
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.$refs.queryForm.validate().then(() => {

src/views/ecw/financial/selfNoReportDetail.vue

@@ -46,7 +46,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('目的仓')">
-            <el-select v-model="queryParams.dstWarehouseId" :placeholder="$t('请选择')" clearable>
+            <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择')" clearable>
               <el-option
                 v-for="item in importWarehouseList"
                 :key="item.id"
@@ -85,7 +85,7 @@
       <el-table-column :label="$t('运输方式') + '/' + $t('目的地')">
         <template slot-scope="{row}">
             <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
-            /{{row.objectiveName}}
+            /{{row.dstWarehouseName}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('仓库实测')">

src/views/ecw/financial/voucher.vue

@@ -64,6 +64,15 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-form-item :label="$t('编号')">
+            <el-input
+              style="max-width: 188px"
+              v-model="queryParams.receiptNo"
+              :placeholder="$t('请输入订单号和提单号、自编号')"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button>
           </el-form-item>

src/views/ecw/order/index.vue

@@ -113,7 +113,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
       </el-form-item>
     </el-form>