收款单优化

src/views/ecw/financial/receiptDetail.vue

@@ -25,7 +25,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="feeType">
           <template slot-scope="scope">
             <dict-tag
@@ -120,7 +124,8 @@
         <!-- <el-table-column label="应收金额" align="center" prop="receivableAmount" /> -->
         <el-table-column :label="$t('应收金额')" align="center" prop="receivableAmount">
           <template slot-scope="scope" v-if="scope.row.type !== 'total'">
-            {{ `${scope.row.receivableAmount - scope.row.discountTotal}(${scope.row.receivableAmount} - ${scope.row.discountTotal})` }}
+           <span v-if="scope.row.discountTotal>0">{{ `${scope.row.receivableAmount - scope.row.discountTotal }(${scope.row.receivableAmount} - ${scope.row.discountTotal})` }}</span>
+           <span v-else>{{ `${scope.row.receivableAmount - scope.row.discountTotal }` }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" width="220">

src/views/ecw/financial/voucher.vue

@@ -140,7 +140,7 @@
       <!-- <el-table-column label="汇率" align="center" prop="totalAmount" /> -->
       <el-table-column :label="$t('实收日期')" align="center" prop="payedAt">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payedAt, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.writeOffAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('业务员')" align="center" prop="salesmanName" />