Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/financial/creatCollection.vue

@@ -305,6 +305,7 @@
                 v-if="scope.row.type !== 'total'"
                 label=""
                 label-width="0"
+                required
                 style="margin-bottom: 0"
                 :prop="`receiptAccountList.${scope.$index}.platformAccountId`"
               >
@@ -718,7 +719,11 @@ export default {
       discountForm: {},
       selectListRow: {},
       selectListIndex: 0,
+<<<<<<< HEAD
+      flag: false,
+=======
       flag: false
+>>>>>>> 3347d8e14b3cd6aa37bc7fd0fc22c20d16f19a7f
     };
   },
   async created() {
@@ -908,8 +913,8 @@ export default {
             receivableAmount: dollar,
             writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? 1 : this.showCurrencyId === 2 ? this.UStoRMB() : this.UStoNAN()),
             platformAccountId: t?.platformAccountId || '',
-            collectionCurrencyId: t?.collectionCurrencyId || '',
-            collectionRate: t?.collectionRate || ''
+            collectionCurrencyId: t?.collectionCurrencyId || 1,
+            collectionRate: t?.collectionRate || 1
           }
         ]
         this.calculationCount(NP.minus(dollar, discountDollar), 1)
@@ -949,7 +954,8 @@ export default {
             writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? this.NANtoUS() : this.showCurrencyId === 2 ? this.NANtoRMB() : 1),
             platformAccountId: t?.platformAccountId || '',
             collectionCurrencyId: t?.collectionCurrencyId || '',
-            collectionRate: t?.collectionRate || ''
+            collectionRate: t?.collectionRate || '',
+            collectionAmount:discountNaira
           }
         ]
         this.calculationCount(NP.minus(naira, discountNaira), 3)
@@ -960,7 +966,7 @@ export default {
         this.form.receiptAccountList = [...this.form.receiptAccountList, {
           type: 'total',
           writeOffAmount: totalt,
-          collectionAmount: [0, 0, 0]
+          collectionAmount: [this.form.receiptAccountList.discountNaira, 0, 0]
         }]
 
         this.form.receivableTotalAmount = totalt
@@ -1135,6 +1141,10 @@ export default {
         this.$modal.msgError(this.$t('请添加未收客户款项'));
         return
       }
+      if(!params.platformAccountId){
+        this.$modal.msgError(this.$t('请选择期望收款账户'));
+        return
+      }
       // params.receiptAccountList.length = params.receiptAccountList.length - 1
       params.receiptAccountList.splice(params.receiptAccountList.length - 1,1)
       params.receiptAccountList.map(v => {

src/views/ecw/financial/printPaymentVoucher.vue

@@ -9,15 +9,18 @@
           </div>
           <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
             <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('申请日期') }}：</div> <span>{{ form.applicationAt || '-' }}</span></div>
-            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('结算方式') }}：</div><span>{{ form.settlementType || '-' }}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('结算方式') }}：</div><span>             <dict-tag
+                :type="DICT_TYPE.CUSTOMER_BALANCE"
+                v-model="form.settlementType"
+              /></span></div>
           </div>
           <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
             <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('付款公司') }}：</div><span>{{ form.supplierName || '-' }}</span></div>
-            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行户名') }}：</div><span>{{ findBank(form.supplierBankAccount).baAccountName || '-' }}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行户名') }}：</div><span>{{ form.supplierBankAccountName || '-' }}</span></div>
           </div>
           <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
-            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行名称') }}：</div><span>{{ findBank(form.supplierBankAccount).baBankName || '-' }}</span></div>
-            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行账号') }}：</div><span>{{ findBank(form.supplierBankAccount).baAccountNum || '-' }}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行名称') }}：</div><span>{{ form.supplierBank|| '-' }}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行账号') }}：</div><span>{{ form.supplierBankAccount || '-' }}</span></div>
           </div>
           <!-- <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
             <div style="flex:1"><div style="width: 120px;text-align: right;">水单号：</div><span>{{form?form.accountBank:'无'}}</span></div>
@@ -174,6 +177,7 @@
       },
       findBank(val) {
         const t = this.bankData.find(v => v.id == val)
+        console.log(t)
         return t || {}
       },
       totalMoney() {

src/views/ecw/financial/receivable.vue

@@ -193,7 +193,11 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('箱数')" align="center" prop="num" />
-      <el-table-column :label="$t('体积/重量')" align="center" prop="weight" />
+      <el-table-column :label="$t('体积/重量')" align="center" prop="weight" >
+        <template slot-scope="scope">
+            {{ scope.row.volume}}/ {{ scope.row.weight}}
+          </template>
+        </el-table-column>
       <el-table-column :label="$t('发货人')" align="center" prop="consignorName" />
       <el-table-column :label="$t('收货人')" align="center" prop="consigneeName" />
       <el-table-column :label="$t('订单状态')" align="center" prop="status">