Bläddra i källkod

Merge branch 'develop_yh13' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh13

chenrui 2 år sedan
förälder
incheckning
67feb84a92

+ 2 - 2
src/views/allocationManagement/transferReturn/detail.vue

@@ -123,11 +123,11 @@ export default {
         { 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: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(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: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(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') {

+ 2 - 2
src/views/financialManagement/allocateReturnConfirmation/list.vue

@@ -148,13 +148,13 @@ export default {
         { title: '退货总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '确认时间', dataIndex: 'financeAuditTime', width: '11%', 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' }
       ]
       // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-      //   arr.splice(8, 0, { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      //   arr.splice(8, 0, { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       // }
       return arr
     }

+ 12 - 12
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -128,12 +128,12 @@
         </a-form>
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
-            订单总金额:{{ countData&&countData.orderAmount||0 }}
-            收款总金额:{{ countData&&countData.receiptAmount||0 }}
-            使用授信总金额:{{ countData&&countData.useCreditAmount||0 }}
-            授信还款总金额:{{ countData&&countData.payCreditAmount||0 }}
-            余款抵扣总金额:{{ countData&&countData.balanceAmount||0 }}
-            跨月打款总金额:{{ countData&&countData.nextMonthAmount||0 }}
+            订单总金额:{{ toThousands(countData&&countData.orderAmount||0) }};
+            收款总金额:{{ toThousands(countData&&countData.receiptAmount||0) }};
+            使用授信总金额:{{ toThousands(countData&&countData.useCreditAmount||0) }};
+            授信还款总金额:{{ toThousands(countData&&countData.payCreditAmount||0) }};
+            余款抵扣总金额:{{ toThousands(countData&&countData.balanceAmount||0) }};
+            跨月打款总金额:{{ toThousands(countData&&countData.nextMonthAmount||0) }};
           </div>
         </a-alert>
       </div>
@@ -293,12 +293,12 @@ export default {
         { title: '付款方', dataIndex: 'payerName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '财务编码', dataIndex: 'kdMidCustomerFnumber', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '付款账户(营业执照)', dataIndex: 'payerAccountInfo', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '订单金额', dataIndex: 'orderAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '收款金额', dataIndex: 'receiptAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '使用授信', dataIndex: 'useCreditAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '授信还款', dataIndex: 'payCreditAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
+        { title: '订单金额', dataIndex: 'orderAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '收款金额', dataIndex: 'receiptAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '使用授信', dataIndex: 'useCreditAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '授信还款', dataIndex: 'payCreditAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },

+ 15 - 15
src/views/financialManagement/financialCollection/detail.vue

@@ -36,11 +36,11 @@
         <a-alert type="info" style="margin-bottom:10px" v-if="detailData">
           <div slot="message">
             共 {{ total }} 条,
-            订单金额合计¥{{ detailData.orderTotalAmount }},
-            收款金额合计¥{{ detailData.receiptTotalAmount }},
-            使用授信合计¥{{ detailData.useTotalAmount }},
-            授信还款合计¥{{ detailData.payTotalAmount }},
-            余款抵扣合计¥{{ detailData.balanceTotalAmount }}
+            订单金额合计 {{ toThousands(detailData.orderTotalAmount ||0)}},
+            收款金额合计 {{ toThousands(detailData.receiptTotalAmount ||0)}},
+            使用授信合计 {{ toThousands(detailData.useTotalAmount||0) }},
+            授信还款合计 {{ toThousands(detailData.payTotalAmount||0) }},
+            余款抵扣合计 {{ toThousands(detailData.balanceTotalAmount||0) }}
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -125,24 +125,24 @@ export default {
         { title: '付款方', dataIndex: 'payerName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '财务编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '付款账户(营业执照)', scopedSlots: { customRender: 'payerAccountInfo' }, align: 'center', width: '8%' },
-        { title: '订单金额', dataIndex: 'orderAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '收款金额', dataIndex: 'receiptAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '使用授信', dataIndex: 'useTotalAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '授信还款', dataIndex: 'payTotalAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
+        { title: '订单金额', dataIndex: 'orderAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '收款金额', dataIndex: 'receiptAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '使用授信', dataIndex: 'useTotalAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '授信还款', dataIndex: 'payTotalAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
         { title: '说明', dataIndex: 'explainInfo', align: 'center', width: '10%', customRender: function (text) { return text || '--' } }
       ],
       useCol: [
-        { title: '使用授信项目', dataIndex: 'itemName', width: '50%', align: 'center' },
-        { title: '使用授信金额', dataIndex: 'itemAmount', width: '50%', align: 'center' }
+        { title: '使用授信项目', dataIndex: 'itemName', width: '50%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '使用授信金额', dataIndex: 'itemAmount', width: '50%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') }
       ],
       payCol: [
-        { title: '授信还款项目', dataIndex: 'itemName', width: '50%', align: 'center' },
-        { title: '授信还款金额', dataIndex: 'itemAmount', width: '50%', align: 'center' }
+        { title: '授信还款项目', dataIndex: 'itemName', width: '50%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '授信还款金额', dataIndex: 'itemAmount', width: '50%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') }
       ]
     }
   },

+ 3 - 1
src/views/financialManagement/financialCollection/dispatchModal.vue

@@ -36,11 +36,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { querySettleReceiptFinanceBookList } from '@/api/financeBook.js'
 export default {
   name: 'DispatchModal',
   components: { STable },
+  mixins: [commonMixin],
   props: {
     openModal: {
       type: Boolean,
@@ -65,7 +67,7 @@ export default {
         { title: '发货编号', dataIndex: 'sendNo', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'totalCategory', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
         { title: '产品数量', dataIndex: 'totalQty', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '总售价', dataIndex: 'totalAmount', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
+        { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '8%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '业务状态', dataIndex: 'billStatusDictValue', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } }
       ],

+ 14 - 14
src/views/financialManagement/financialCollection/edit.vue

@@ -42,11 +42,11 @@
         <a-alert type="info" style="margin-bottom:10px" v-if="detailData">
           <div slot="message">
             共 {{ total }} 条,
-            订单金额合计¥{{ detailData.orderTotalAmount }},
-            收款金额合计¥{{ detailData.receiptTotalAmount }},
-            使用授信合计¥{{ detailData.useTotalAmount }},
-            授信还款合计¥{{ detailData.payTotalAmount }},
-            余款抵扣合计¥{{ detailData.balanceTotalAmount }}
+            订单金额合计 {{ toThousands(detailData.orderTotalAmount ||0)}},
+            收款金额合计 {{ toThousands(detailData.receiptTotalAmount ||0)}},
+            使用授信合计 {{ toThousands(detailData.useTotalAmount||0) }},
+            授信还款合计 {{ toThousands(detailData.payTotalAmount||0) }},
+            余款抵扣合计 {{ toThousands(detailData.balanceTotalAmount||0) }}
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -236,12 +236,12 @@ export default {
         { title: '付款方', dataIndex: 'payerName', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '财务编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '付款账户(营业执照)', scopedSlots: { customRender: 'payerAccountInfo' }, align: 'center', width: '7%' },
-        { title: '订单金额', dataIndex: 'orderAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '收款金额', dataIndex: 'receiptAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '使用授信', dataIndex: 'useTotalAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '授信还款', dataIndex: 'payTotalAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
+        { title: '订单金额', dataIndex: 'orderAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '收款金额', dataIndex: 'receiptAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '使用授信', dataIndex: 'useTotalAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '授信还款', dataIndex: 'payTotalAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
@@ -250,11 +250,11 @@ export default {
       ],
       useCol: [
         { title: '使用授信项目', dataIndex: 'itemName', width: '50%', align: 'center' },
-        { title: '使用授信金额', dataIndex: 'itemAmount', width: '50%', align: 'center' }
+        { title: '使用授信金额', dataIndex: 'itemAmount', width: '50%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') }
       ],
       payCol: [
         { title: '授信还款项目', dataIndex: 'itemName', width: '50%', align: 'center' },
-        { title: '授信还款金额', dataIndex: 'itemAmount', width: '50%', align: 'center' }
+        { title: '授信还款金额', dataIndex: 'itemAmount', width: '50%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') }
       ],
       // 关联单据
       detailGlData: {
@@ -318,7 +318,7 @@ export default {
         { title: '发货编号', dataIndex: 'sendNo', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'totalCategory', align: 'center', width: '6%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
         { title: '产品数量', dataIndex: 'totalQty', align: 'center', width: '6%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '总售价', dataIndex: 'totalAmount', align: 'center', width: '6%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
+        { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '业务状态', dataIndex: 'billStatusDictValue', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', align: 'center', width: '6%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }

+ 10 - 10
src/views/financialManagement/financialCollection/list.vue

@@ -79,11 +79,11 @@
         </div>
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
-            订单总金额:{{ countData&&countData.orderTotalAmount||0 }}
-            收款总金额:{{ countData&&countData.receiptTotalAmount||0 }}
-            使用授信总金额:{{ countData&&countData.useTotalAmount||0 }}
-            授信还款总金额:{{ countData&&countData.payTotalAmount||0 }}
-            余款抵扣总金额:{{ countData&&countData.balanceTotalAmount||0 }}
+            订单总金额:{{ toThousands(countData&&countData.orderTotalAmount||0) }};
+            收款总金额:{{ toThousands(countData&&countData.receiptTotalAmount||0) }};
+            使用授信总金额:{{ toThousands(countData&&countData.useTotalAmount||0) }};
+            授信还款总金额:{{ toThousands(countData&&countData.payTotalAmount||0) }};
+            余款抵扣总金额:{{ toThousands(countData&&countData.balanceTotalAmount||0) }};
           </div>
         </a-alert>
       </div>
@@ -233,11 +233,11 @@ export default {
         { title: '申请人', dataIndex: 'applyPersonName', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
         { title: '收款事由', dataIndex: 'bookReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '付款方', dataIndex: 'payerName', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订单总金额', dataIndex: 'orderTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '授信还款总金额', dataIndex: 'payTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余款抵扣总金额', dataIndex: 'balanceTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '订单总金额', dataIndex: 'orderTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '授信还款总金额', dataIndex: 'payTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '余款抵扣总金额', dataIndex: 'balanceTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'statusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }

+ 3 - 1
src/views/financialManagement/financialCollection/selectGlAllocatModal.vue

@@ -88,6 +88,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { allocateBillList } from '@/api/allocateBill'
 import commonModal from '@/views/common/commonModal.vue'
@@ -95,6 +96,7 @@ import allocationDetailModal from '@/views/allocationManagement/transferOut/deta
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 export default {
   name: 'SelectGlAllocatModal',
+  mixins: [commonMixin],
   components: { STable, VSelect, dealerSearchList, commonModal, allocationDetailModal },
   props: {
     openModal: { //  弹框显示状态
@@ -172,7 +174,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(8, 0, { title: '总售价', dataIndex: 'totalPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(8, 0, { title: '总售价', dataIndex: 'totalPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }

+ 3 - 1
src/views/financialManagement/financialCollection/selectGlSalesModal.vue

@@ -101,6 +101,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { dispatchlList } from '@/api/dispatch'
 import commonModal from '@/views/common/commonModal.vue'
@@ -109,6 +110,7 @@ import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.v
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 export default {
   name: 'SelectGlSalesModal',
+  mixins: [commonMixin],
   components: { STable, VSelect, dealerSubareaScopeList, commonModal, salesDetail, dispatchDetail },
   props: {
     openModal: { //  弹框显示状态
@@ -190,7 +192,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(10, 0, { title: '总售价', dataIndex: 'totalAmount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(10, 0, { title: '总售价', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }

+ 6 - 6
src/views/financialManagement/inventoryConfirmation/detail.vue

@@ -34,15 +34,15 @@
           <div slot="message" style="display: flex;">
             盘盈数量:<strong :style="{ color: productTotal && productTotal.profitQty>0?'red':productTotal && productTotal.profitQty<0?'green':'' }">{{ productTotal && (productTotal.profitQty || productTotal.profitQty==0) ? productTotal.profitQty : '--' }}</strong>,
             <div v-if="$hasPermissions('B_isShowCost')">
-              盘盈金额:<strong :style="{ color: productTotal && productTotal.profitCost>0?'red':productTotal && productTotal.profitCost<0?'green':'' }">{{ productTotal && (productTotal.profitCost || productTotal.profitCost==0) ? productTotal.profitCost : '--' }}</strong>,
+              盘盈金额:<strong :style="{ color: productTotal && productTotal.profitCost>0?'red':productTotal && productTotal.profitCost<0?'green':'' }">{{ productTotal && (productTotal.profitCost || productTotal.profitCost==0) ? toThousands(productTotal.profitCost) : '--' }}</strong>,
             </div>
             盘亏数量:<strong :style="{ color: productTotal && productTotal.lossQty>0?'red':productTotal && productTotal.lossQty<0?'green':'' }">{{ productTotal && (productTotal.lossQty || productTotal.lossQty==0) ? productTotal.lossQty : '--' }}</strong>,
             <div v-if="$hasPermissions('B_isShowCost')">
-              盘亏金额:<strong :style="{ color: productTotal && productTotal.lossCost>0?'red':productTotal && productTotal.lossCost<0?'green':'' }">{{ productTotal && (productTotal.lossCost || productTotal.lossCost==0) ? productTotal.lossCost : '--' }}</strong>,
+              盘亏金额:<strong :style="{ color: productTotal && productTotal.lossCost>0?'red':productTotal && productTotal.lossCost<0?'green':'' }">{{ productTotal && (productTotal.lossCost || productTotal.lossCost==0) ? toThousands(productTotal.lossCost) : '--' }}</strong>,
             </div>
             盈亏总数量:<strong :style="{ color: productTotal && productTotal.profitLossQty>0?'red':productTotal && productTotal.profitLossQty<0?'green':'' }">{{ productTotal && (productTotal.profitLossQty	|| productTotal.profitLossQty ==0) ? productTotal.profitLossQty : '--' }}</strong>,
             <div v-if="$hasPermissions('B_isShowCost')">
-              盈亏总金额:<strong :style="{ color: productTotal && productTotal.profitLossCost>0?'red':productTotal && productTotal.profitLossCost<0?'green':'' }">{{ productTotal && (productTotal.profitLossCost || productTotal.profitLossCost==0) ? productTotal.profitLossCost : '--' }}</strong>
+              盈亏总金额:<strong :style="{ color: productTotal && productTotal.profitLossCost>0?'red':productTotal && productTotal.profitLossCost<0?'green':'' }">{{ productTotal && (productTotal.profitLossCost || productTotal.profitLossCost==0) ? toThousands(productTotal.profitLossCost) : '--' }}</strong>
             </div>
           </div>
         </a-alert>
@@ -92,7 +92,7 @@
           <!-- 盈亏金额 -->
           <template slot="profitLossCost" slot-scope="text, record">
             <span :style="{ color: record.profitLossCost>0?'red':record.profitLossCost<0?'green':'', fontWeight: record.profitLossCost!=0?'bold':'' }">
-              {{ (record.profitLossCost || record.profitLossCost==0) ? record.profitLossCost : '--' }}
+              {{ (record.profitLossCost || record.profitLossCost==0) ? toThousands(record.profitLossCost) : '--' }}
             </span>
           </template>
         </s-table>
@@ -162,8 +162,8 @@ export default {
       // { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
-        arr.splice(11, 0, { title: '单价', dataIndex: 'checkCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(13, 0, { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'center' })
+        arr.splice(11, 0, { title: '单价', dataIndex: 'checkCost', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(13, 0, { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'right' })
       }
       return arr
     }

+ 5 - 3
src/views/financialManagement/returnConfirmation/detailModal.vue

@@ -26,7 +26,7 @@
               <a-descriptions-item label="坏件数量">{{ detailData&&(detailData.totalBadQty || detailData.totalBadQty==0) ? detailData.totalBadQty : '--' }}</a-descriptions-item>
               <a-descriptions-item label="良品数量">{{ detailData&&(detailData.totalGoodQty || detailData.totalGoodQty==0) ? detailData.totalGoodQty : '--' }}</a-descriptions-item>
               <a-descriptions-item label="返库数量">{{ detailData&&(detailData.totalBackStockQty || detailData.totalBackStockQty==0) ? detailData.totalBackStockQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="实际退货金额" v-if="$hasPermissions('B_isShowPrice')">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? detailData.totalAmount : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="实际退货金额" v-if="$hasPermissions('B_isShowPrice')">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -50,10 +50,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { salesReturnFinancialDetailList, salesReturnDetail } from '@/api/salesReturn'
 export default {
   name: 'ConfirmationDetailModal',
+  mixins: [commonMixin],
   components: { STable },
   props: {
     openModal: { //  弹框显示状态
@@ -103,8 +105,8 @@ export default {
         { title: '实际退货单价说明', dataIndex: 'priceRemark', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(10, 0, { title: '实际退货单价', dataIndex: 'price', align: 'center', width: '6%', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(11, 0, { title: '实际退货金额', dataIndex: 'totalAmount', align: 'center', width: '6%', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(10, 0, { title: '实际退货单价', dataIndex: 'price', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(11, 0, { title: '实际退货金额', dataIndex: 'totalAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }

+ 1 - 1
src/views/financialManagement/returnConfirmation/list.vue

@@ -154,7 +154,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(7, 0, { title: '退货金额', dataIndex: 'totalAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '退货金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }

+ 3 - 1
src/views/financialManagement/warehousingConfirmation/detailModal.vue

@@ -30,10 +30,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { stockPutDetailList } from '@/api/stockPut'
 export default {
   name: 'ConfirmationDetailModal',
+  mixins: [commonMixin],
   components: { STable },
   props: {
     openModal: { //  弹框显示状态
@@ -83,7 +85,7 @@ export default {
         // { title: '入库成本(¥)', dataIndex: 'putCost',width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_isShowCost')) {
-        arr.splice(4, 0, { title: '入库成本(¥)', dataIndex: 'putCost', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '入库成本', dataIndex: 'putCost', width: '14%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }

+ 1 - 1
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -152,7 +152,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
-        arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }