瀏覽代碼

修改价格类型

chenrui 2 年之前
父節點
當前提交
fdffb4778f
共有 40 個文件被更改,包括 643 次插入603 次删除
  1. 7 6
      src/views/allocationManagement/transferOut/detail.vue
  2. 8 6
      src/views/allocationManagement/transferOut/edit.vue
  3. 3 2
      src/views/allocationManagement/transferOut/list.vue
  4. 2 1
      src/views/allocationManagement/transferReturn/check.vue
  5. 4 3
      src/views/allocationManagement/transferReturn/detail.vue
  6. 5 4
      src/views/allocationManagement/transferReturn/edit.vue
  7. 5 3
      src/views/allocationManagement/transferReturn/editGrp.vue
  8. 2 1
      src/views/allocationManagement/transferReturn/list.vue
  9. 5 4
      src/views/allocationManagement/transfersPrint/list.vue
  10. 4 3
      src/views/expenseManagement/expenseReimbursement/add.vue
  11. 4 3
      src/views/expenseManagement/expenseReimbursement/detail.vue
  12. 2 1
      src/views/expenseManagement/expenseReimbursement/list.vue
  13. 5 5
      src/views/expenseManagement/expenseReimbursement/previewModal.vue
  14. 5 4
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  15. 4 3
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  16. 4 3
      src/views/inventoryManagement/inventoryQuery/list.vue
  17. 8 7
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  18. 73 72
      src/views/reportData/actualSalesReport/list.vue
  19. 13 12
      src/views/reportData/allCountryCostReport/list.vue
  20. 8 7
      src/views/reportData/allocationDetails/list.vue
  21. 5 4
      src/views/reportData/allocationOrderTotal/list.vue
  22. 4 3
      src/views/reportData/billingReturnReport/list.vue
  23. 11 10
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  24. 7 6
      src/views/reportData/priceDifferenceDetailReport/list.vue
  25. 29 28
      src/views/reportData/regionTypeSalesReport/list.vue
  26. 3 2
      src/views/reportData/returnGoodsPresentation/list.vue
  27. 58 57
      src/views/reportData/returnSlipReport/list.vue
  28. 67 66
      src/views/reportData/salesAmountReport/list.vue
  29. 15 14
      src/views/reportData/salesDetails/list.vue
  30. 20 19
      src/views/reportData/salesOrderTotal/list.vue
  31. 77 76
      src/views/reportData/salesPresentation/list.vue
  32. 17 16
      src/views/reportData/salesReturnDetailReport/list.vue
  33. 74 73
      src/views/reportData/salesReturnReport/list.vue
  34. 14 13
      src/views/reportData/salesReturnsReport/list.vue
  35. 53 52
      src/views/reportData/salesSlipReport/list.vue
  36. 6 5
      src/views/reportData/transferReturnDetailReport/list.vue
  37. 5 4
      src/views/reportData/transferReturnReport/list.vue
  38. 1 1
      src/views/reportData/urchaseReturn/list.vue
  39. 3 2
      src/views/reportData/warehousingOrder/list.vue
  40. 3 2
      src/views/reportData/warehousingOrderDetail/list.vue

+ 7 - 6
src/views/allocationManagement/transferOut/detail.vue

@@ -107,8 +107,8 @@
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
             总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
-            <span v-if="$hasPermissions('B_isShowCost')">总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong> ,</span>
-            <span v-if="$hasPermissions('B_isShowPrice')">总售价(¥):<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong></span>
+            <span v-if="$hasPermissions('B_isShowCost')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ,</span>
+            <span v-if="$hasPermissions('B_isShowPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -183,6 +183,7 @@ export default {
       return this.basicInfoData && ((this.basicInfoData.state == 'WAIT_SUBMIT') || (this.basicInfoData.state == 'WAIT_AUDIT') || (this.basicInfoData.state == 'AUDIT_REJECT')) && this.$hasPermissions('M_transferOut_edit')
     },
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -192,13 +193,13 @@ export default {
         { title: '调出数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
-        arr.splice(5, 0, { title: '成本价', dataIndex: 'cost', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(8, 0, { title: '成本小计(¥)', dataIndex: 'totalCost', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(5, 0, { title: '成本价', dataIndex: 'cost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '成本小计(¥)', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         const ind = this.$hasPermissions('B_isShowCost') ? 6 : 5
-        arr.splice(ind, 0, { title: '售价', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 3, 0, { title: '售价小计(¥)', dataIndex: 'totalPrice', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '售价', dataIndex: 'price', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 3, 0, { title: '售价小计(¥)', dataIndex: 'totalPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       arr.push({ title: '费用归属部门', dataIndex: 'departmentName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })
       return arr

+ 8 - 6
src/views/allocationManagement/transferOut/edit.vue

@@ -176,8 +176,8 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
-                <span v-if="$hasPermissions('B_isShowCost')">总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong> ,</span>
-                <span v-if="$hasPermissions('B_isShowPrice')">总售价(¥):<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong></span>
+                <span v-if="$hasPermissions('B_isShowCost')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ,</span>
+                <span v-if="$hasPermissions('B_isShowPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
               </div>
             </a-alert>
             <!-- 筛选条件 -->
@@ -433,6 +433,7 @@ export default {
       return this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys.length || 0
     },
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -446,15 +447,16 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action1' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         const ind = this.$hasPermissions('B_isShowCost') ? 5 : 4
-        arr.splice(ind, 0, { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     },
     chooseColumns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -469,11 +471,11 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'cost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         const ind = this.$hasPermissions('B_isShowCost') ? 5 : 4
-        arr.splice(ind, 0, { title: '售价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'center' })
+        arr.splice(ind, 0, { title: '售价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'right' })
       }
       return arr
     }

+ 3 - 2
src/views/allocationManagement/transferOut/list.vue

@@ -250,6 +250,7 @@ export default {
   computed: {
     // dataIndex: 'printStateDictValue',
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -271,11 +272,11 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(8, 0, { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(8, 0, { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         const ind = this.$hasPermissions('B_isShowCost') ? 10 : 9
-        arr.splice(ind, 0, { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 2 - 1
src/views/allocationManagement/transferReturn/check.vue

@@ -119,6 +119,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', align: 'center', width: '23%', customRender: function (text) { return text || '--' } },
@@ -127,7 +128,7 @@ export default {
         { title: '坏件数量', dataIndex: 'badQty', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'backStockQty', width: '10%', align: 'center', scopedSlots: { customRender: 'backStockQty' } },
         { title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '退货单价', dataIndex: 'price', align: 'right', width: '10%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       console.log(this.grabFlag)
       if (this.grabFlag == 1) { //  抓单

+ 4 - 3
src/views/allocationManagement/transferReturn/detail.vue

@@ -48,7 +48,7 @@
             退货总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong> ,
             坏件总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalBadQty || basicInfoData.totalBadQty==0)) ? basicInfoData.totalBadQty : '--' }}</strong> ,
             返库总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalBackStockQty || basicInfoData.totalBackStockQty==0)) ? basicInfoData.totalBackStockQty : '--' }}</strong> ,
-            <span>退货总金额(¥):<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? basicInfoData.totalPrice : '--' }}</strong></span>;
+            <span>退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>;
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -117,16 +117,17 @@ export default {
       return this.basicInfoData && ((this.basicInfoData.state == 'WAIT_SUBMIT') || (this.basicInfoData.state == 'FINANCIAL_REJECT') || (this.basicInfoData.state == 'AUDIT_REJECT')) && this.$hasPermissions('B_transferReturnEdit')
     },
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '27%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'product.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单价(¥)', dataIndex: 'price', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货单价(¥)', dataIndex: 'price', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '退货数量', dataIndex: 'returnQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'backStockQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额(¥)', dataIndex: 'totalReturnPrice', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '退货金额(¥)', dataIndex: 'totalReturnPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
 
       if (this.basicInfoData && this.basicInfoData.grabFlag == '1') {

+ 5 - 4
src/views/allocationManagement/transferReturn/edit.vue

@@ -126,7 +126,7 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 退货总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong> ,
-                <span>退货总金额(¥):<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? basicInfoData.totalPrice : '--' }}</strong></span>
+                <span>退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>
               </div>
             </a-alert>
             <!-- 筛选条件 -->
@@ -265,6 +265,7 @@ export default {
   mixins: [commonMixin],
   components: { STable, VSelect, print, AllocateType },
   data () {
+    const _this = this
     return {
       spinning: false,
       queryParam: {
@@ -304,7 +305,7 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'center' },
+        { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
         { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
@@ -313,9 +314,9 @@ export default {
         { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'center' },
+        { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
         { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
-        { title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 5 - 3
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -129,7 +129,7 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 退货总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong> ,
-                <span>退货总金额(¥):<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? basicInfoData.totalPrice : '--' }}</strong></span>
+                <span>退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>
               </div>
             </a-alert>
             <!-- 筛选条件 -->
@@ -322,13 +322,14 @@ export default {
       return this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys.length || 0
     },
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '调拨单号', dataIndex: 'allocateNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨单价', dataIndex: 'price', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调拨单价', dataIndex: 'price', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '调拨数量', dataIndex: 'qty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '剩余可退数量', dataIndex: 'refundableQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'center' },
@@ -338,6 +339,7 @@ export default {
       return arr
     },
     chooseColumns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '调拨单号', dataIndex: 'allocateNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -346,7 +348,7 @@ export default {
         { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'center' },
         { title: '退货数量', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       return arr

+ 2 - 1
src/views/allocationManagement/transferReturn/list.vue

@@ -201,6 +201,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -213,7 +214,7 @@ export default {
         { title: '退货总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货总金额', dataIndex: 'totalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货总金额', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }

+ 5 - 4
src/views/allocationManagement/transfersPrint/list.vue

@@ -231,6 +231,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -250,10 +251,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(7, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(8, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(9, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(10, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(9, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(10, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 4 - 3
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -18,7 +18,7 @@
             <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
             <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
             <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? detailData.applyExpenseTotal+' 元' : '--' }}</a-descriptions-item>
+            <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
             <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
@@ -45,7 +45,7 @@
         </div>
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
-            共{{ total }}条费用明细,合计金额¥{{ detailData&&detailData.applyExpenseTotal||0 }}元
+            共{{ total }}条费用明细,合计金额{{ detailData&&detailData.applyExpenseTotal?toThousands(detailData.applyExpenseTotal) :'¥0.00' }}元
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -159,6 +159,7 @@ export default {
   mixins: [commonMixin],
   components: { VSelect, Upload, STable, epenseDetailModal, productInfoModal, baseDataModal, ImportGuideModal, chooseDepartUserModal },
   data () {
+    const _this = this
     return {
       spinning: false,
       detailData: null,
@@ -200,7 +201,7 @@ export default {
         { title: '所属区域', dataIndex: 'subareaNames', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '记账费用', dataIndex: 'expense', align: 'center', width: '10%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
+        { title: '记账费用', dataIndex: 'expense', align: 'center', width: '10%', customRender: function (text) { return (text == 0 || text) ? _this.toThousands(text) : '--' } },
         { title: '费用承担方', scopedSlots: { customRender: 'fycdf' }, align: 'center', width: '20%' },
         { title: '产品信息', scopedSlots: { customRender: 'cpxx' }, align: 'center', width: '15%' },
         { title: '备注', dataIndex: 'remarks', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },

+ 4 - 3
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -37,7 +37,7 @@
               <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
               <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? detailData.applyExpenseTotal+' 元' : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
               <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
               <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
@@ -57,7 +57,7 @@
       <a-card size="small" :bordered="false" class="pages-wrap">
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
-            共<strong> {{ count }} </strong> 条费用明细,合计金额¥<strong v-if="detailData"> {{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? detailData.applyExpenseTotal+' 元' : '--' }} </strong>
+            共<strong> {{ count }} </strong> 条费用明细,合计金额¥<strong v-if="detailData"> {{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }} </strong>
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -114,6 +114,7 @@ export default {
   mixins: [commonMixin],
   components: { STable, previewModal },
   data () {
+    let _this=this
     return {
       spinning: false,
       disabled: false,
@@ -145,7 +146,7 @@ export default {
         { title: '所属区域', dataIndex: 'subareaNames', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '记账费用', dataIndex: 'expense', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
+        { title: '记账费用', dataIndex: 'expense', align: 'right', width: '10%', customRender: function (text) { return (text||text==0)?_this.toThousands(text):'--' } },
         { title: '费用承担方', scopedSlots: { customRender: 'fycdf' }, align: 'center', width: '15%' },
         { title: '产品信息', scopedSlots: { customRender: 'cpxx' }, align: 'center', width: '15%' },
         { title: '备注', dataIndex: 'remarks', align: 'center', width: '10%', customRender: function (text) { return text || '--' } }

+ 2 - 1
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -162,6 +162,7 @@ export default {
   mixins: [commonMixin],
   components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType },
   data () {
+    let _this=this
     return {
       locale,
       spinning: false,
@@ -212,7 +213,7 @@ export default {
         { title: '费用类型', scopedSlots: { customRender: 'expenseType' }, width: '6%', align: 'center' },
         { title: '费用发生月份', dataIndex: 'expenseDate', width: '6%', align: 'center', customRender: function (text) { return moment(text).format('YYYY年MM月') || '--' } },
         { title: '主题', dataIndex: 'title', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '合计金额', dataIndex: 'applyExpenseTotal', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '合计金额', dataIndex: 'applyExpenseTotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'finishDate', width: '8%', align: 'center', customRender: function (text, record) { return record.state == 'AUDIT_REJECT' || record.state == 'AUDIT_PASS' ? text : '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 5 - 5
src/views/expenseManagement/expenseReimbursement/previewModal.vue

@@ -62,20 +62,20 @@
                 <div>{{ item.provinceName }}</div>
                 <div>{{ item.cityName }}</div>
               </td> -->
-              <td style="text-align: right;width:10%;padding:5px 10px;">{{ item.expense||item.expense==0?item.expense.toFixed(2):'' }}</td>
+              <td style="text-align: right;width:10%;padding:5px 10px;">{{ item.expense||item.expense==0?toThousands(item.expense):'' }}</td>
               <td style="text-align: left;width:26%;padding:5px 10px;vertical-align: top;">
                 <div v-for="(ditem,index) in item.detailSplitList" :key="ditem.id+'-'+index" style="padding: 3px 0;" >
                   {{ ditem.splitObjName }}
                   <span v-if="ditem.splitObjFnumber">({{ ditem.splitObjFnumber }})</span>
                   <span v-if="ditem.childDetailSplit&&ditem.childDetailSplit.splitObjName">/</span>
-                  {{ ditem.childDetailSplit?ditem.childDetailSplit.splitObjName:'' }}: {{ ditem.childDetailSplit?ditem.childDetailSplit.splitAmount:ditem.splitAmount }}
+                  {{ ditem.childDetailSplit?ditem.childDetailSplit.splitObjName:'' }}: {{ ditem.childDetailSplit?toThousands(ditem.childDetailSplit.splitAmount):toThousands(ditem.splitAmount) }}
                 </div>
               </td>
               <td style="text-align: left;width:20%;padding:5px 10px;vertical-align: top;">
                 <div v-for="ditem in item.detailProductsList" :key="ditem.id" style="padding: 3px 0;">
-                  <div v-if="ditem.productCode">{{ ditem.productCode }}: {{ ditem.expense }}</div>
-                  <div v-else-if="ditem.productBrandName">{{ ditem.productBrandName }}<span v-if="ditem.productTypeShowName">/</span>{{ ditem.productTypeShowName }}: {{ ditem.expense.toFixed(2) }}</div>
-                  <div v-else>{{ ditem.productTypeShowName }}: {{ ditem.expense }}</div>
+                  <div v-if="ditem.productCode">{{ ditem.productCode }}: {{ toThousands(ditem.expense) }}</div>
+                  <div v-else-if="ditem.productBrandName">{{ ditem.productBrandName }}<span v-if="ditem.productTypeShowName">/</span>{{ ditem.productTypeShowName }}: {{ toThousands(ditem.expense) }}</div>
+                  <div v-else>{{ ditem.productTypeShowName }}: {{ toThousands(ditem.expense) }}</div>
                 </div>
               </td>
             </tr>

+ 5 - 4
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -155,7 +155,7 @@
         <div slot="message">
           <div>
             总单数:<strong>{{ countData&&(countData.detailNum || countData.detailNum==0) ? countData.detailNum : '--' }}</strong>;
-            总费用金额:<strong>{{ countData&&(countData.expense || countData.expense==0) ? countData.expense : '--' }}</strong>;
+            总费用金额:<strong>{{ countData&&(countData.expense || countData.expense==0) ? toThousands(countData.expenses) : '--' }}</strong>;
           </div>
         </div>
       </a-alert>
@@ -199,6 +199,7 @@ export default {
   mixins: [commonMixin],
   components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType },
   data () {
+    const _this = this
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
@@ -277,12 +278,12 @@ export default {
         { title: '所属区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '记账费用', dataIndex: 'expense', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '记账费用', dataIndex: 'expense', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '费用承担方', dataIndex: 'splitObjName', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '财务编码', dataIndex: 'splitObjFnumber', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '费用承担金额', dataIndex: 'splitAmount', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '费用承担金额', dataIndex: 'splitAmount', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '费用承担人', dataIndex: 'childSplitObjName', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '人员平摊费用', dataIndex: 'childSplitAmount', width: 120, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '人员平摊费用', dataIndex: 'childSplitAmount', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
     }
   },

+ 4 - 3
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -11,8 +11,8 @@
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
-        可用库存总数量(个):<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}</strong>;
-        <span v-if="$hasPermissions('B_isShowCost')">可用库存总成本(¥):<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? currentStock.currentStockCost : '--' }}</strong>。</span>
+        可用库存总数量:<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}</strong>;
+        <span v-if="$hasPermissions('B_isShowCost')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
       </div>
     </a-alert>
     <!-- 库存详情 -->
@@ -88,6 +88,7 @@ export default {
       return ((currentStockCost * 1000 + freezeStockCost * 1000) / 1000).toFixed(2)
     },
     columns () {
+      let _this=this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -100,7 +101,7 @@ export default {
         { title: '库存数量', dataIndex: 'currentQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
-        arr.splice(9, 0, { title: '成本单价', dataIndex: 'putCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(9, 0, { title: '成本单价', dataIndex: 'putCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 4 - 3
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -70,8 +70,8 @@
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
-          可用库存总数量(个):<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}</strong>;
-          <span v-if="$hasPermissions('B_isShowCost')">可用库存总成本(¥):<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? currentStock.currentStockCost : '--' }}</strong>。</span>
+          可用库存总数量:<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}</strong>;
+          <span v-if="$hasPermissions('B_isShowCost')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -202,6 +202,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -214,7 +215,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
-        arr.splice(7, 0, { title: '可用库存成本', dataIndex: 'currentStockCost', width: '10%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '可用库存成本', dataIndex: 'currentStockCost', width: '10%', align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 8 - 7
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -97,10 +97,10 @@
         <!-- 合计 -->
         <a-alert type="info" style="margin-bottom:10px">
           <div class="ftext" slot="message">
-            当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong>;
-            入库总数量(个):<strong>{{ (productTotal&&(productTotal.totalPutQty || productTotal.totalPutQty==0)) ? productTotal.totalPutQty : '--' }}</strong>;
-            出库总数量(个):<strong>{{ (productTotal&&(productTotal.totalOutQty || productTotal.totalOutQty==0)) ? productTotal.totalOutQty : '--' }}</strong>;
-            <span v-if="$hasPermissions('B_isShowCost')">当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong>。</span>
+            当前库存总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong>;
+            入库总数量:<strong>{{ (productTotal&&(productTotal.totalPutQty || productTotal.totalPutQty==0)) ? productTotal.totalPutQty : '--' }}</strong>;
+            出库总数量:<strong>{{ (productTotal&&(productTotal.totalOutQty || productTotal.totalOutQty==0)) ? productTotal.totalOutQty : '--' }}</strong>;
+            <span v-if="$hasPermissions('B_isShowCost')">当前库存总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong>。</span>
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -124,7 +124,7 @@
           </template>
           <!-- 总售价 -->
           <template slot="totalAmount" slot-scope="text, record">
-            <span v-if="record.bizType!='SPARE_PARTS_RETURN'"> {{ record.totalPrice }}</span>
+            <span v-if="record.bizType!='SPARE_PARTS_RETURN'"> {{ toThousands(record.totalPrice) }}</span>
             <span v-else>--</span>
           </template>
         </s-table>
@@ -193,6 +193,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -212,10 +213,10 @@ export default {
         // { title: '总售价', dataIndex: 'totalPrice', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
-        arr.splice(13, 0, { title: '总成本', dataIndex: 'totalCost', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(13, 0, { title: '总成本', dataIndex: 'totalCost', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { // 售价权限
-        arr.splice(arr.length, 0, { title: '总售价', width: '4%', align: 'center', scopedSlots: { customRender: 'totalAmount' } })
+        arr.splice(arr.length, 0, { title: '总售价', width: '4%', align: 'right', scopedSlots: { customRender: 'totalAmount' } })
       }
       return arr
     }

+ 73 - 72
src/views/reportData/actualSalesReport/list.vue

@@ -103,30 +103,30 @@
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
-                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
-                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? totalData.jpGyxAmount : '--' }}</a-col>
-                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
-                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
-                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
-                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
-                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
-                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
-                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
-                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
-                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
-                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
-                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
-                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? totalData.wetAmount : '--' }}</a-col>
-                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
-                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
-                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">实售销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? toThousands(totalData.jpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? toThousands(totalData.jpBsxLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? toThousands(totalData.jpLbAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? toThousands(totalData.jpScpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? toThousands(totalData.jpGyxAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? toThousands(totalData.gpScpAmount) : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? toThousands(totalData.wsDhxqAmount) : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? toThousands(totalData.wsDpAmount) : '--' }}</a-col>
+                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? toThousands(totalData.hjAmount) : '--' }}</a-col>
+                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? toThousands(totalData.dlsAmount) : '--' }}</a-col>
+                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? toThousands(totalData.tbuAmount) : '--' }}</a-col>
+                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? toThousands(totalData.tbupAmount) : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? toThousands(totalData.brsAmount) : '--' }}</a-col>
+                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? toThousands(totalData.ngkAmount) : '--' }}</a-col>
+                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? toThousands(totalData.flpAmount) : '--' }}</a-col>
+                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? toThousands(totalData.cpAmount) : '--' }}</a-col>
+                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? toThousands(totalData.wetAmount) : '--' }}</a-col>
+                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
+                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
+                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">实售销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -212,6 +212,7 @@ export default {
   },
   computed: {
     columns () {
+      let _this=this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 90, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
@@ -227,44 +228,44 @@ export default {
                 {
                   title: '滤清器',
                   dataIndex: 'jpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 },
                 {
                   title: '变速箱滤清器',
                   dataIndex: 'jpBsxLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 },
                 {
                   title: '喇叭',
                   dataIndex: 'jpLbAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'jpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 },
                 {
                   title: '感应线',
                   dataIndex: 'jpGyxAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -275,23 +276,23 @@ export default {
                 {
                   title: '滤清器',
                   dataIndex: 'gpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'gpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'gpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -302,53 +303,53 @@ export default {
                 {
                   title: '点火线圈',
                   dataIndex: 'wsDhxqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 },
                 {
                   title: '灯泡',
                   dataIndex: 'wsDpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: '德路斯',
               dataIndex: 'dlsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU',
               dataIndex: 'tbuAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU-P',
               dataIndex: 'tbupAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: '布瑞斯',
               dataIndex: 'brsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             }
           ]
         },
@@ -358,58 +359,58 @@ export default {
             {
               title: 'NGK',
               dataIndex: 'ngkAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: '飞利浦',
               dataIndex: 'flpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: '车仆',
               dataIndex: 'cpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: '瓦尔塔',
               dataIndex: 'wetAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: '雷贝斯托',
               dataIndex: 'lbstAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: '德尔福',
               dataIndex: 'defAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             },
             {
               title: '巴诺德',
               dataIndex: 'bndAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
             }
           ]
         }
-        // { title: '实售销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
+        // { title: '实售销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '实售销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } })
+        arr.splice(arr.length, 0, { title: '实售销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr
     }

+ 13 - 12
src/views/reportData/allCountryCostReport/list.vue

@@ -186,6 +186,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         {
           title: '区域',
@@ -327,19 +328,19 @@ export default {
           title: '1-12月费用合计',
           dataIndex: '',
           width: 140,
-          align: 'center',
+          align: 'right',
           customRender: function (text) {
-            return ((text || text == 0) ? text : '--')
+            return ((text || text == 0) ? _this.toThousands(text) : '--')
           }
         },
         {
           title: '实际销售额合计',
           dataIndex: '',
           width: 140,
-          align: 'center',
+          align: 'right',
           customRender: (value, row, index) => {
             const obj = {
-              children: value,
+              children: _this.toThousands(value),
               attrs: {}
             }
             if (index === 0) {
@@ -403,36 +404,36 @@ export default {
           title: '正常配送品费用',
           dataIndex: '',
           width: 120,
-          align: 'center',
+          align: 'right',
           customRender: function (text) {
-            return ((text || text == 0) ? text : '--')
+            return ((text || text == 0) ? _this.toThousands(text) : '--')
           }
         },
         {
           title: '正常促销品费用',
           dataIndex: '',
           width: 120,
-          align: 'center',
+          align: 'right',
           customRender: function (text) {
-            return ((text || text == 0) ? text : '--')
+            return ((text || text == 0) ? _this.toThousands(text) : '--')
           }
         },
         {
           title: '特殊申请配送品费用',
           dataIndex: '',
           width: 120,
-          align: 'center',
+          align: 'right',
           customRender: function (text) {
-            return ((text || text == 0) ? text : '--')
+            return ((text || text == 0) ? _this.toThousands(text) : '--')
           }
         },
         {
           title: '特殊申请促销品费用',
           dataIndex: '',
           width: 120,
-          align: 'center',
+          align: 'right',
           customRender: function (text) {
-            return ((text || text == 0) ? text : '--')
+            return ((text || text == 0) ? _this.toThousands(text) : '--')
           }
         }
       ]

+ 8 - 7
src/views/reportData/allocationDetails/list.vue

@@ -137,9 +137,9 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? totalData.totalGrossProfit : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">总售价:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? totalData.totalPrice : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? toThousands(totalData.totalGrossProfit) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">总售价:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -256,6 +256,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', dataIndex: 'allocateNo', width: 160, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
@@ -285,13 +286,13 @@ export default {
         { title: '费用归属部门', dataIndex: 'departmentName', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(12, 0, { title: '成本价', dataIndex: 'cost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(14, 0, { title: '总成本价', dataIndex: 'totalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(15, 0, { title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(12, 0, { title: '成本价', dataIndex: 'cost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(14, 0, { title: '总成本价', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(15, 0, { title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         const ind = this.$hasPermissions('B_isShowCost') ? 13 : 12
-        arr.splice(ind, 0, { title: '售价', dataIndex: 'price', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '售价', dataIndex: 'price', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 5 - 4
src/views/reportData/allocationOrderTotal/list.vue

@@ -75,8 +75,8 @@
         <template slot="footer" slot-scope="currentPageData">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? totalData.totalGrossProfit : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? toThousands(totalData.totalGrossProfit) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -150,6 +150,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '调拨单号', dataIndex: 'allocateNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨开单日期', dataIndex: 'allocateDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -160,8 +161,8 @@ export default {
         { title: '操作员', dataIndex: 'creatorName', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'totalCost', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(5, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 4 - 3
src/views/reportData/billingReturnReport/list.vue

@@ -124,7 +124,7 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -209,10 +209,11 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealer.dealerName',width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌',
           align: 'center',
@@ -386,7 +387,7 @@ export default {
         // { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } })
+        arr.splice(arr.length, 0, { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr
     }

+ 11 - 10
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -111,11 +111,11 @@
         bordered>
         <template slot="footer">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">分公司金额:{{ (totalData && (totalData.wholesalePrice1 || totalData.wholesalePrice1==0)) ? totalData.wholesalePrice1 : '--' }}</a-col>
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">加盟商金额:{{ (totalData && (totalData.wholesalePrice2 || totalData.wholesalePrice2==0)) ? totalData.wholesalePrice2 : '--' }}</a-col>
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">特约加盟店金额:{{ (totalData && (totalData.wholesalePrice3 || totalData.wholesalePrice3==0)) ? totalData.wholesalePrice3 : '--' }}</a-col>
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">直接差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? totalData.directRebateAmount : '--' }}</a-col>
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">间接差价金额:{{ (totalData && (totalData.indirectRebateAmount || totalData.indirectRebateAmount==0)) ? totalData.indirectRebateAmount : '--' }}</a-col>
+            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">分公司金额:{{ (totalData && (totalData.wholesalePrice1 || totalData.wholesalePrice1==0)) ? toThousands(totalData.wholesalePrice1) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">加盟商金额:{{ (totalData && (totalData.wholesalePrice2 || totalData.wholesalePrice2==0)) ? toThousands(totalData.wholesalePrice2) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">特约加盟店金额:{{ (totalData && (totalData.wholesalePrice3 || totalData.wholesalePrice3==0)) ? toThousands(totalData.wholesalePrice3) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">直接差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">间接差价金额:{{ (totalData && (totalData.indirectRebateAmount || totalData.indirectRebateAmount==0)) ? toThousands(totalData.indirectRebateAmount) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -213,6 +213,7 @@ export default {
   },
   computed: {
     columns () {
+      let _this=this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '订单号', dataIndex: 'bizNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
@@ -233,11 +234,11 @@ export default {
         { title: '类型', dataIndex: 'bizTypeValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(11, 0, { title: '分公司金额', dataIndex: 'wholesalePrice1', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(12, 0, { title: '加盟商金额', dataIndex: 'wholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(13, 0, { title: '特约加盟店金额', dataIndex: 'wholesalePrice3', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(14, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(15, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(11, 0, { title: '分公司金额', dataIndex: 'wholesalePrice1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(12, 0, { title: '加盟商金额', dataIndex: 'wholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(13, 0, { title: '特约加盟店金额', dataIndex: 'wholesalePrice3', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(14, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(15, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 7 - 6
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -71,13 +71,13 @@
             <tr>
               <td width="51%" colspan="4"></td>
               <td width="8%">
-                <div v-if="$hasPermissions('B_isShowPrice')">实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? totalData.totalRealAmount : '--' }}</div>
+                <div v-if="$hasPermissions('B_isShowPrice')">实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</div>
               </td>
               <td width="8%">
-                <div v-if="$hasPermissions('B_isShowPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</div>
+                <div v-if="$hasPermissions('B_isShowPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</div>
               </td>
               <td width="8%">
-                <div v-if="$hasPermissions('B_isShowPrice')">差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? totalData.rebateAmount : '--' }}</div>
+                <div v-if="$hasPermissions('B_isShowPrice')">差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</div>
               </td>
               <td width="25%" colspan="2"></td>
             </tr>
@@ -152,6 +152,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '月份', dataIndex: 'month', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -161,9 +162,9 @@ export default {
         { title: '类型', dataIndex: 'bizType', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(4, 0, { title: '实售金额', dataIndex: 'totalRealAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(5, 0, { title: '开单金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(6, 0, { title: '差价金额', dataIndex: 'rebateAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '实售金额', dataIndex: 'totalRealAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '开单金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '差价金额', dataIndex: 'rebateAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 29 - 28
src/views/reportData/regionTypeSalesReport/list.vue

@@ -137,6 +137,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域',
           dataIndex: 'subareaNames',
@@ -145,34 +146,34 @@ export default {
           customRender: function (text) { return text || '--' }
         },
         { title: '销售状态', dataIndex: 'salesStatus', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '箭牌滤清器', dataIndex: 'jpLqqAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '冠牌滤清器', dataIndex: 'gpLqqAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '滤清器合计', dataIndex: 'lqqAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '箭牌雨刮片', dataIndex: 'jpYgpAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '冠牌雨刮片', dataIndex: 'gpYgpAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '雨刮片合计', dataIndex: 'ygpAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '箭牌刹车片', dataIndex: 'jpScpAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '箭牌感应线', dataIndex: 'jpGyxAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '冠牌刹车片', dataIndex: 'gpScpAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: 'TBU刹车片', dataIndex: 'tbuScpAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: 'TBU刹车油', dataIndex: 'tbuScyAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: 'TBU感应线', dataIndex: 'tbuGyxAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '刹车片合计', dataIndex: 'scpAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: 'TBU-P', dataIndex: 'tbupAmount', align: 'center', width: 50, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '德路斯机油', dataIndex: 'dlsJyAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '德路斯刹车油', dataIndex: 'dlsScyAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '德路斯变速箱油', dataIndex: 'dlsBsxyAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '德路斯汽车养护产品', dataIndex: 'dlsQcyhAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '德路斯合计', dataIndex: 'dlsAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '稳升点火线圈', dataIndex: 'wsDhxqAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '稳升灯泡', dataIndex: 'wsDpAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '稳升合计', dataIndex: 'wsAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '汇箭', dataIndex: 'hjAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '布瑞斯', dataIndex: 'brsAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '箭牌喇叭', dataIndex: 'jpLbAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '品牌合计', dataIndex: 'ppAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: 'NGK', dataIndex: 'ngkAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '品牌+NGK总合计', dataIndex: 'ppAndNgkAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '箭牌滤清器', dataIndex: 'jpLqqAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '冠牌滤清器', dataIndex: 'gpLqqAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '滤清器合计', dataIndex: 'lqqAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '箭牌雨刮片', dataIndex: 'jpYgpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '冠牌雨刮片', dataIndex: 'gpYgpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '雨刮片合计', dataIndex: 'ygpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '箭牌刹车片', dataIndex: 'jpScpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '箭牌感应线', dataIndex: 'jpGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '冠牌刹车片', dataIndex: 'gpScpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: 'TBU刹车片', dataIndex: 'tbuScpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: 'TBU刹车油', dataIndex: 'tbuScyAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: 'TBU感应线', dataIndex: 'tbuGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '刹车片合计', dataIndex: 'scpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: 'TBU-P', dataIndex: 'tbupAmount', align: 'right', width: 50, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '德路斯机油', dataIndex: 'dlsJyAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '德路斯刹车油', dataIndex: 'dlsScyAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '德路斯变速箱油', dataIndex: 'dlsBsxyAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '德路斯汽车养护产品', dataIndex: 'dlsQcyhAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '德路斯合计', dataIndex: 'dlsAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '稳升点火线圈', dataIndex: 'wsDhxqAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '稳升灯泡', dataIndex: 'wsDpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '稳升合计', dataIndex: 'wsAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '汇箭', dataIndex: 'hjAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '布瑞斯', dataIndex: 'brsAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '箭牌喇叭', dataIndex: 'jpLbAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '品牌合计', dataIndex: 'ppAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: 'NGK', dataIndex: 'ngkAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '品牌+NGK总合计', dataIndex: 'ppAndNgkAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       if (this.activeKey == 0) {
         arr.splice(1, 0, { title: '省份', dataIndex: 'dealerProvinceName', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })

+ 3 - 2
src/views/reportData/returnGoodsPresentation/list.vue

@@ -132,7 +132,7 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -209,6 +209,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
@@ -420,7 +421,7 @@ export default {
         // { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } })
+        arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr
     }

+ 58 - 57
src/views/reportData/returnSlipReport/list.vue

@@ -132,7 +132,7 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单退货单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单退货单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -217,218 +217,219 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'dealer.dealerName',width: 120,align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌',
-          align: 'center',
+          align: 'right',
           children: [
             {
               title: '箭牌',
-              align: 'center',
+              align: 'right',
               children: [
                 {
                   title: '滤清器',
                   dataIndex: 'jpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '变速箱滤清器',
                   dataIndex: 'jpBsxLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '喇叭',
                   dataIndex: 'jpLbAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'jpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '感应线',
                   dataIndex: 'jpGyxAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: '冠牌',
-              align: 'center',
+              align: 'right',
               children: [
                 {
                   title: '滤清器',
                   dataIndex: 'gpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'gpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'gpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: '稳升',
-              align: 'center',
+              align: 'right',
               children: [
                 {
                   title: '点火线圈',
                   dataIndex: 'wsDhxqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '灯泡',
                   dataIndex: 'wsDpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德路斯',
               dataIndex: 'dlsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU',
-              align: 'center',
+              align: 'right',
               children: [
                 {
                   title: '刹车片',
                   dataIndex: 'tbuScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车油',
                   dataIndex: 'tbuScyAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: 'TBU-P',
               dataIndex: 'tbupAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '布瑞斯',
               dataIndex: 'brsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ]
         },
         { title: '代理品牌',
-          align: 'center',
+          align: 'right',
           children: [
             {
               title: 'NGK',
               dataIndex: 'ngkAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '飞利浦',
               dataIndex: 'flpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '车仆',
               dataIndex: 'cpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '瓦尔塔',
               dataIndex: 'wetAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '雷贝斯托',
               dataIndex: 'lbstAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德尔福',
               dataIndex: 'defAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '巴诺德',
               dataIndex: 'bndAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ]
         }
         // { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } })
+        arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr
     }

+ 67 - 66
src/views/reportData/salesAmountReport/list.vue

@@ -103,28 +103,28 @@
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
-                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
-                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? totalData.jpGyxAmount : '--' }}</a-col>
-                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
-                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
-                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
-                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
-                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
-                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
-                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
-                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
-                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
-                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
-                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? totalData.wetAmount : '--' }}</a-col>
-                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
-                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
-                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? toThousands(totalData.jpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? toThousands(totalData.jpLbAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? toThousands(totalData.jpScpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? toThousands(totalData.jpGyxAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? toThousands(totalData.gpScpAmount) : '--' }}</a-col>
+                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? toThousands(totalData.hjAmount) : '--' }}</a-col>
+                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? toThousands(totalData.dlsAmount) : '--' }}</a-col>
+                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? toThousands(totalData.wsAmount) : '--' }}</a-col>
+                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? toThousands(totalData.tbuAmount) : '--' }}</a-col>
+                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? toThousands(totalData.tbupAmount) : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? toThousands(totalData.brsAmount) : '--' }}</a-col>
+                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? toThousands(totalData.ngkAmount) : '--' }}</a-col>
+                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? toThousands(totalData.flpAmount) : '--' }}</a-col>
+                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? toThousands(totalData.cpAmount) : '--' }}</a-col>
+                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? toThousands(totalData.wetAmount) : '--' }}</a-col>
+                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
+                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
+                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -210,10 +210,11 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealer.dealerName',width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌',
           align: 'center',
@@ -225,37 +226,37 @@ export default {
                 {
                   title: '滤清器',
                   dataIndex: 'jpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '喇叭',
                   dataIndex: 'jpLbAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'jpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '感应线',
                   dataIndex: 'jpGyxAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -266,67 +267,67 @@ export default {
                 {
                   title: '滤清器',
                   dataIndex: 'gpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'gpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'gpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德路斯',
               dataIndex: 'dlsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '稳升',
               dataIndex: 'wsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU',
               dataIndex: 'tbuAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU-P',
               dataIndex: 'tbupAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '布瑞斯',
               dataIndex: 'brsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ]
         },
@@ -336,58 +337,58 @@ export default {
             {
               title: 'NGK',
               dataIndex: 'ngkAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '飞利浦',
               dataIndex: 'flpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '车仆',
               dataIndex: 'cpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '瓦尔塔',
               dataIndex: 'wetAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '雷贝斯托',
               dataIndex: 'lbstAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德尔福',
               dataIndex: 'defAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '巴诺德',
               dataIndex: 'bndAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ]
         }
         // { title: '开单销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } })
+        arr.splice(arr.length, 0, { title: '开单销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr
     }

+ 15 - 14
src/views/reportData/salesDetails/list.vue

@@ -146,11 +146,11 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">数量:{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? totalData.totalRealSaleAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">成本:{{ (totalData && (totalData.totalRealCost || totalData.totalRealCost==0)) ? totalData.totalRealCost : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折后金额:{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? totalData.discountedAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折扣金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? totalData.discountAmount : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">成本:{{ (totalData && (totalData.totalRealCost || totalData.totalRealCost==0)) ? toThousands(totalData.totalRealCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折后金额:{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? toThousands(totalData.discountedAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折扣金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -240,11 +240,12 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'dealerName', width: 100,align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -267,17 +268,17 @@ export default {
         { title: '操作员', dataIndex: 'operatorName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(15, 0, { title: '成本价', dataIndex: 'totalRealCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(15, 0, { title: '成本价', dataIndex: 'totalRealCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         const ind = this.$hasPermissions('B_isShowCost') ? 16 : 15
-        arr.splice(ind, 0, { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 1, 0, { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 2, 0, { title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 3, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 4, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 5, 0, { title: '折后单价', dataIndex: 'discountedPrice', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 6, 0, { title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 1, 0, { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 2, 0, { title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 3, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 4, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 5, 0, { title: '折后单价', dataIndex: 'discountedPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 6, 0, { title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 20 - 19
src/views/reportData/salesOrderTotal/list.vue

@@ -108,13 +108,13 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? totalData.totalRealSaleAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? totalData.grossProfit : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? totalData.rebateAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? totalData.totalDiscountAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折后金额:{{ (totalData && (totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0)) ? totalData.totalDiscountedAmount : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? toThousands(totalData.totalDiscountAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折后金额:{{ (totalData && (totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0)) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -192,6 +192,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '开单日期', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
@@ -217,21 +218,21 @@ export default {
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
         const ind = this.$hasPermissions('B_isShowPrice') ? 10 : 8
-        arr.splice(ind, 0, { title: '成本价', dataIndex: 'totalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 1, 0, { title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '成本价', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 1, 0, { title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         const ind = this.$hasPermissions('B_isShowCost') ? 12 : 10
-        arr.splice(8, 0, { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(9, 0, { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind, 0, { title: '省级价', dataIndex: 'totalProvinceAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 1, 0, { title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 2, 0, { title: '特约加盟店价', dataIndex: 'totalSpecialAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 3, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 4, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 5, 0, { title: '返利', dataIndex: 'rebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 6, 0, { title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 7, 0, { title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(8, 0, { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(9, 0, { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind, 0, { title: '省级价', dataIndex: 'totalProvinceAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 1, 0, { title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 2, 0, { title: '特约加盟店价', dataIndex: 'totalSpecialAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 3, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 4, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 5, 0, { title: '返利', dataIndex: 'rebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 6, 0, { title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 7, 0, { title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 77 - 76
src/views/reportData/salesPresentation/list.vue

@@ -108,31 +108,31 @@
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
-                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
-                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? totalData.jpGyxAmount : '--' }}</a-col>
-                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
-                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
-                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
-                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
-                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
-                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
-                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">TBU刹车片:{{ (totalData && (totalData.tbuScpAmount || totalData.tbuScpAmount==0)) ? totalData.tbuScpAmount : '--' }}</a-col>
-                <a-col span="4">TBU刹车油:{{ (totalData && (totalData.tbuScyAmount || totalData.tbuScyAmount==0)) ? totalData.tbuScyAmount : '--' }}</a-col>
-                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
-                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
-                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
-                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
-                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? totalData.wetAmount : '--' }}</a-col>
-                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
-                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
-                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? toThousands(totalData.jpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? toThousands(totalData.jpBsxLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? toThousands(totalData.jpLbAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? toThousands(totalData.jpScpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? toThousands(totalData.jpGyxAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? toThousands(totalData.gpScpAmount) : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? toThousands(totalData.wsDhxqAmount) : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? toThousands(totalData.wsDpAmount) : '--' }}</a-col>
+                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? toThousands(totalData.hjAmount) : '--' }}</a-col>
+                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? toThousands(totalData.dlsAmount) : '--' }}</a-col>
+                <a-col span="4">TBU刹车片:{{ (totalData && (totalData.tbuScpAmount || totalData.tbuScpAmount==0)) ? toThousands(totalData.tbuScpAmount) : '--' }}</a-col>
+                <a-col span="4">TBU刹车油:{{ (totalData && (totalData.tbuScyAmount || totalData.tbuScyAmount==0)) ? toThousands(totalData.tbuScyAmount) : '--' }}</a-col>
+                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? toThousands(totalData.tbupAmount) : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? toThousands(totalData.brsAmount) : '--' }}</a-col>
+                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? toThousands(totalData.ngkAmount) : '--' }}</a-col>
+                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? toThousands(totalData.flpAmount) : '--' }}</a-col>
+                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? toThousands(totalData.cpAmount) : '--' }}</a-col>
+                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? toThousands(totalData.wetAmount) : '--' }}</a-col>
+                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
+                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
+                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -210,11 +210,12 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealer.dealerName',width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌',
           align: 'center',
@@ -226,44 +227,44 @@ export default {
                 {
                   title: '滤清器',
                   dataIndex: 'jpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '变速箱滤清器',
                   dataIndex: 'jpBsxLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '喇叭',
                   dataIndex: 'jpLbAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'jpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '感应线',
                   dataIndex: 'jpGyxAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -274,23 +275,23 @@ export default {
                 {
                   title: '滤清器',
                   dataIndex: 'gpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'gpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'gpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -301,32 +302,32 @@ export default {
                 {
                   title: '点火线圈',
                   dataIndex: 'wsDhxqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '灯泡',
                   dataIndex: 'wsDpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德路斯',
               dataIndex: 'dlsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU',
@@ -335,32 +336,32 @@ export default {
                 {
                   title: '刹车片',
                   dataIndex: 'tbuScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车油',
                   dataIndex: 'tbuScyAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: 'TBU-P',
               dataIndex: 'tbupAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '布瑞斯',
               dataIndex: 'brsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ]
         },
@@ -370,58 +371,58 @@ export default {
             {
               title: 'NGK',
               dataIndex: 'ngkAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '飞利浦',
               dataIndex: 'flpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '车仆',
               dataIndex: 'cpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '瓦尔塔',
               dataIndex: 'wetAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '雷贝斯托',
               dataIndex: 'lbstAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德尔福',
               dataIndex: 'defAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '巴诺德',
               dataIndex: 'bndAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ]
         }
-        // { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
+        // { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } })
+        arr.splice(arr.length, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr
     }

+ 17 - 16
src/views/reportData/salesReturnDetailReport/list.vue

@@ -145,16 +145,16 @@
         bordered>
         <template slot="footer">
           <a-row :gutter="15">
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单退货金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? totalData.totalPrice : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? totalData.totalRealAmount : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单退货金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24">仓库实收数量:{{ (totalData && (totalData.receiveQty || totalData.receiveQty==0)) ? totalData.receiveQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">坏件数量:{{ (totalData && (totalData.totalBadQty || totalData.totalBadQty==0)) ? totalData.totalBadQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">良品数量:{{ (totalData && (totalData.goodQty || totalData.goodQty==0)) ? totalData.goodQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">返库数量:{{ (totalData && (totalData.totalBackStockQty || totalData.totalBackStockQty==0)) ? totalData.totalBackStockQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">正常退货数量:{{ (totalData && (totalData.totalNormalQty || totalData.totalNormalQty==0)) ? totalData.totalNormalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">正常退货金额:{{ (totalData && (totalData.totalNormalPrice || totalData.totalNormalPrice==0)) ? totalData.totalNormalPrice : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">正常再入库金额:{{ (totalData && (totalData.totalNormalCost || totalData.totalNormalCost==0)) ? totalData.totalNormalCost : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">正常退货入库差额:{{ (totalData && (totalData.totalNormalBalance || totalData.totalNormalBalance==0)) ? totalData.totalNormalBalance : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">正常退货金额:{{ (totalData && (totalData.totalNormalPrice || totalData.totalNormalPrice==0)) ? toThousands(totalData.totalNormalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">正常再入库金额:{{ (totalData && (totalData.totalNormalCost || totalData.totalNormalCost==0)) ? toThousands(totalData.totalNormalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">正常退货入库差额:{{ (totalData && (totalData.totalNormalBalance || totalData.totalNormalBalance==0)) ? toThousands(totalData.totalNormalBalance) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -247,6 +247,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
@@ -284,20 +285,20 @@ export default {
 
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         const ind = this.$hasPermissions('B_isShowCost') ? 29 : 28
-        arr.splice(20, 0, { title: '退货开单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(21, 0, { title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(22, 0, { title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(23, 0, { title: '退货实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(24, 0, { title: '市级价金额', dataIndex: 'totalWholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(25, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(26, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind, 0, { title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(20, 0, { title: '退货开单价', dataIndex: 'price', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(21, 0, { title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(22, 0, { title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(23, 0, { title: '退货实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(24, 0, { title: '市级价金额', dataIndex: 'totalWholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(25, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(26, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind, 0, { title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
         const ind = this.$hasPermissions('B_isShowPrice') ? 27 : 20
-        arr.splice(ind, 0, { title: '再入库单价', dataIndex: 'cost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 3, 0, { title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 4, 0, { title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '再入库单价', dataIndex: 'cost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 3, 0, { title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 4, 0, { title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 74 - 73
src/views/reportData/salesReturnReport/list.vue

@@ -103,30 +103,30 @@
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
-                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
-                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? totalData.jpGyxAmount : '--' }}</a-col>
-                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
-                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
-                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
-                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
-                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
-                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
-                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
-                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
-                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
-                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
-                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
-                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? totalData.wetAmount : '--' }}</a-col>
-                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
-                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
-                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">实售退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? toThousands(totalData.jpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? toThousands(totalData.jpBsxLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? toThousands(totalData.jpLbAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ?toThousands(totalData.jpScpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? toThousands(totalData.jpGyxAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? toThousands(totalData.gpScpAmount) : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? toThousands(totalData.wsDhxqAmount) : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? toThousands(totalData.wsDpAmount) : '--' }}</a-col>
+                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? toThousands(totalData.hjAmount) : '--' }}</a-col>
+                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? toThousands(totalData.dlsAmount) : '--' }}</a-col>
+                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? toThousands(totalData.tbuAmount) : '--' }}</a-col>
+                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? toThousands(totalData.tbupAmount) : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? toThousands(totalData.brsAmount) : '--' }}</a-col>
+                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? toThousands(totalData.ngkAmount) : '--' }}</a-col>
+                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? toThousands(totalData.flpAmount) : '--' }}</a-col>
+                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? toThousands(totalData.cpAmount) : '--' }}</a-col>
+                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? toThousands(totalData.wetAmount) : '--' }}</a-col>
+                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
+                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
+                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">实售退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -212,10 +212,11 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealer.dealerName',width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌',
           align: 'center',
@@ -227,44 +228,44 @@ export default {
                 {
                   title: '滤清器',
                   dataIndex: 'jpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '变速箱滤清器',
                   dataIndex: 'jpBsxLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '喇叭',
                   dataIndex: 'jpLbAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'jpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '感应线',
                   dataIndex: 'jpGyxAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -275,23 +276,23 @@ export default {
                 {
                   title: '滤清器',
                   dataIndex: 'gpLqqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'gpYgpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'gpScpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -302,53 +303,53 @@ export default {
                 {
                   title: '点火线圈',
                   dataIndex: 'wsDhxqAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '灯泡',
                   dataIndex: 'wsDpAmount',
-                  align: 'center',
+                  align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德路斯',
               dataIndex: 'dlsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU',
               dataIndex: 'tbuAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU-P',
               dataIndex: 'tbupAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '布瑞斯',
               dataIndex: 'brsAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ] },
         { title: '代理品牌',
@@ -357,57 +358,57 @@ export default {
             {
               title: 'NGK',
               dataIndex: 'ngkAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '飞利浦',
               dataIndex: 'flpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '车仆',
               dataIndex: 'cpAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '瓦尔塔',
               dataIndex: 'wetAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '雷贝斯托',
               dataIndex: 'lbstAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德尔福',
               dataIndex: 'defAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '巴诺德',
               dataIndex: 'bndAmount',
-              align: 'center',
+              align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ] }
-        // { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
+        // { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } })
+        arr.splice(arr.length, 0, { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr
     }

+ 14 - 13
src/views/reportData/salesReturnsReport/list.vue

@@ -112,11 +112,11 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单退货金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? totalData.totalRealAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">经销商金额:{{ (totalData && (totalData.totalWholesalePrice2 || totalData.totalWholesalePrice2==0)) ? totalData.totalWholesalePrice2 : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">服务中心金额:{{ (totalData && (totalData.totalWholesalePrice1 || totalData.totalWholesalePrice1==0)) ? totalData.totalWholesalePrice1 : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">特约加盟店金额:{{ (totalData && (totalData.totalWholesalePrice3 || totalData.totalWholesalePrice3==0)) ? totalData.totalWholesalePrice3 : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单退货金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">经销商金额:{{ (totalData && (totalData.totalWholesalePrice2 || totalData.totalWholesalePrice2==0)) ? toThousands(totalData.totalWholesalePrice2) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">服务中心金额:{{ (totalData && (totalData.totalWholesalePrice1 || totalData.totalWholesalePrice1==0)) ? toThousands(totalData.totalWholesalePrice1) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">特约加盟店金额:{{ (totalData && (totalData.totalWholesalePrice3 || totalData.totalWholesalePrice3==0)) ? toThousands(totalData.totalWholesalePrice3) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -196,10 +196,11 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName',width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -215,13 +216,13 @@ export default {
         { title: '操作员', dataIndex: 'operatorName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(7, 0, { title: '开单退货金额', dataIndex: 'totalAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(8, 0, { title: '经销商价', dataIndex: 'totalWholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(9, 0, { title: '服务中心价', dataIndex: 'totalWholesalePrice1', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(10, 0, { title: '特约加盟店价', dataIndex: 'totalWholesalePrice3', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(11, 0, { title: '实售退货金额', dataIndex: 'totalRealAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(12, 0, { title: '直接差价', dataIndex: 'totalDirectRebate', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(13, 0, { title: '间接差价', dataIndex: 'totalIndirectRebate', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '开单退货金额', dataIndex: 'totalAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '经销商价', dataIndex: 'totalWholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(9, 0, { title: '服务中心价', dataIndex: 'totalWholesalePrice1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(10, 0, { title: '特约加盟店价', dataIndex: 'totalWholesalePrice3', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(11, 0, { title: '实售退货金额', dataIndex: 'totalRealAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(12, 0, { title: '直接差价', dataIndex: 'totalDirectRebate', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(13, 0, { title: '间接差价', dataIndex: 'totalIndirectRebate', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 53 - 52
src/views/reportData/salesSlipReport/list.vue

@@ -108,31 +108,31 @@
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
-                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
-                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
-                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
-                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? totalData.jpGyxAmount : '--' }}</a-col>
-                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
-                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
-                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
-                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
-                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
-                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
-                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">TBU刹车片:{{ (totalData && (totalData.tbuScpAmount || totalData.tbuScpAmount==0)) ? totalData.tbuScpAmount : '--' }}</a-col>
-                <a-col span="4">TBU刹车油:{{ (totalData && (totalData.tbuScyAmount || totalData.tbuScyAmount==0)) ? totalData.tbuScyAmount : '--' }}</a-col>
-                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
-                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
-                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
-                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
-                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? totalData.wetAmount : '--' }}</a-col>
-                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
-                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
-                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? toThousands(totalData.jpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? toThousands(totalData.jpBsxLqqAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? toThousands(totalData.jpLbAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? toThousands(totalData.jpScpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? toThousands(totalData.jpGyxAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? toThousands(totalData.gpScpAmount) : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? toThousands(totalData.wsDhxqAmount) : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? toThousands(totalData.wsDpAmount) : '--' }}</a-col>
+                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? toThousands(totalData.hjAmount) : '--' }}</a-col>
+                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? toThousands(totalData.dlsAmount) : '--' }}</a-col>
+                <a-col span="4">TBU刹车片:{{ (totalData && (totalData.tbuScpAmount || totalData.tbuScpAmount==0)) ? toThousands(totalData.tbuScpAmount) : '--' }}</a-col>
+                <a-col span="4">TBU刹车油:{{ (totalData && (totalData.tbuScyAmount || totalData.tbuScyAmount==0)) ? toThousands(totalData.tbuScyAmount) : '--' }}</a-col>
+                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? toThousands(totalData.tbupAmount) : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? toThousands(totalData.brsAmount) : '--' }}</a-col>
+                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? toThousands(totalData.ngkAmount) : '--' }}</a-col>
+                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? toThousands(totalData.flpAmount) : '--' }}</a-col>
+                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? toThousands(totalData.cpAmount) : '--' }}</a-col>
+                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? toThousands(totalData.wetAmount) : '--' }}</a-col>
+                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
+                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
+                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -219,11 +219,12 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'dealer.dealerName',width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌',
           align: 'center',
@@ -237,42 +238,42 @@ export default {
                   dataIndex: 'jpLqqAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '变速箱滤清器',
                   dataIndex: 'jpBsxLqqAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '喇叭',
                   dataIndex: 'jpLbAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'jpScpAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '感应线',
                   dataIndex: 'jpGyxAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -285,21 +286,21 @@ export default {
                   dataIndex: 'gpLqqAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'gpYgpAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'gpScpAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -312,14 +313,14 @@ export default {
                   dataIndex: 'wsDhxqAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '灯泡',
                   dataIndex: 'wsDpAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -328,14 +329,14 @@ export default {
               dataIndex: 'hjAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德路斯',
               dataIndex: 'dlsAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU',
@@ -346,14 +347,14 @@ export default {
                   dataIndex: 'tbuScpAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车油',
                   dataIndex: 'tbuScyAmount',
                   align: 'center',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -362,14 +363,14 @@ export default {
               dataIndex: 'tbupAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '布瑞斯',
               dataIndex: 'brsAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ] },
         { title: '代理品牌',
@@ -380,55 +381,55 @@ export default {
               dataIndex: 'ngkAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '飞利浦',
               dataIndex: 'flpAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '车仆',
               dataIndex: 'cpAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '瓦尔塔',
               dataIndex: 'wetAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '雷贝斯托',
               dataIndex: 'lbstAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德尔福',
               dataIndex: 'defAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '巴诺德',
               dataIndex: 'bndAmount',
               align: 'center',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ] }
-        // { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
+        // { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(7, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } })
+        arr.splice(7, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr
     }

+ 6 - 5
src/views/reportData/transferReturnDetailReport/list.vue

@@ -141,8 +141,8 @@
             <a-col :md="4" :sm="24">退货总数量:{{ (totalData && (totalData.returnQty || totalData.returnQty==0)) ? totalData.returnQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">坏件总数量:{{ (totalData && (totalData.badQty || totalData.badQty==0)) ? totalData.badQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">返库总数量:{{ (totalData && (totalData.backStockQty || totalData.backStockQty==0)) ? totalData.backStockQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? totalData.totalPrice : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }}</a-col>
+            <a-col :md="4" :sm="24">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -249,6 +249,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨退货单号', dataIndex: 'allocateReturnNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
@@ -266,11 +267,11 @@ export default {
         { title: '退货数量', dataIndex: 'returnQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'backStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '退货单价', dataIndex: 'price', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '退货金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.push({ title: '退货入库成本', dataIndex: 'totalCost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ title: '退货入库成本', dataIndex: 'totalCost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
       }

+ 5 - 4
src/views/reportData/transferReturnReport/list.vue

@@ -100,8 +100,8 @@
             <a-col :md="4" :sm="24">退货总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">坏件总数量:{{ (totalData && (totalData.totalBadQty || totalData.totalBadQty==0)) ? totalData.totalBadQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">返库总数量:{{ (totalData && (totalData.totalBackStockQty || totalData.totalBackStockQty==0)) ? totalData.totalBackStockQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? totalData.totalPrice : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }}</a-col>
+            <a-col :md="4" :sm="24">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -178,6 +178,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '退货单号', dataIndex: 'allocateReturnNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'financeAuditTime', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
@@ -188,11 +189,11 @@ export default {
         { title: '退货总数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货总金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '退货总金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
         // { title: '退货总成本', dataIndex: 'totalCost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.push({ title: '退货总成本', dataIndex: 'totalCost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ title: '退货总成本', dataIndex: 'totalCost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 1 - 1
src/views/reportData/urchaseReturn/list.vue

@@ -83,7 +83,7 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">申请退货数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0))?totalData.totalCost : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>

+ 3 - 2
src/views/reportData/warehousingOrder/list.vue

@@ -93,7 +93,7 @@
               总数量:{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}
             </a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">
-              总金额:{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? totalData.productTotalCost : '--' }}
+              总金额:{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}
             </a-col>
           </a-row>
         </template>
@@ -161,6 +161,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '入库单号', dataIndex: 'stockPutNo', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库开单日期', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -171,7 +172,7 @@ export default {
         { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(4, 0, { title: '入库金额', dataIndex: 'productTotalCost', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '入库金额', dataIndex: 'productTotalCost', width: '11%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 3 - 2
src/views/reportData/warehousingOrderDetail/list.vue

@@ -172,6 +172,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '入库单号', dataIndex: 'stockPutNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库开单日期', dataIndex: 'openBillTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -187,8 +188,8 @@ export default {
         { title: '完成日期', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(7, 0, { title: '进价', dataIndex: 'putCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(8, 0, { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '进价', dataIndex: 'putCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }