莫绍宝 3 лет назад
Родитель
Сommit
8ecb32ef40
2 измененных файлов с 9 добавлено и 3 удалено
  1. 2 1
      src/views/supply/deliver/sum_list.vue
  2. 7 2
      src/views/supply/retail/retail_list.vue

+ 2 - 1
src/views/supply/deliver/sum_list.vue

@@ -152,7 +152,8 @@
           <el-table-column align="center" label="月份" prop="month" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="项目编码" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="表头备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
     </div>

+ 7 - 2
src/views/supply/retail/retail_list.vue

@@ -149,7 +149,12 @@
                 {{ scope.row.price | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" sortable show-overflow-tooltip>
+            <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="110" sortable show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="110" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
               </template>
@@ -393,7 +398,7 @@ export default {
       getList(params).then((res) => {
         res.data.records.forEach(item => {
           item.sums1 = ['qty', 'directTransferQty', 'hasSendQty', 'refundableQty'];
-          item.sums2 = ['price', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount'];
+          item.sums2 = ['price', 'totalAmount', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount'];
         })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;