lilei 2 年之前
父節點
當前提交
266a471126

+ 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.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.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: '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: '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: '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: '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') {
       if (this.basicInfoData && this.basicInfoData.grabFlag == '1') {

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

@@ -318,7 +318,7 @@ export default {
         { title: '发货编号', dataIndex: 'sendNo', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { 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: '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: '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: '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: '财务状态', dataIndex: 'financialStatusDictValue', align: 'center', width: '6%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }

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

@@ -163,7 +163,7 @@ export default {
       ]
       ]
       if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
       if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
         arr.splice(11, 0, { title: '单价', dataIndex: 'checkCost', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         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: 'center' })
+        arr.splice(13, 0, { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'right' })
       }
       }
       return arr
       return arr
     }
     }

+ 2 - 0
src/views/financialManagement/returnConfirmation/detailModal.vue

@@ -50,10 +50,12 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { STable } from '@/components'
 import { salesReturnFinancialDetailList, salesReturnDetail } from '@/api/salesReturn'
 import { salesReturnFinancialDetailList, salesReturnDetail } from '@/api/salesReturn'
 export default {
 export default {
   name: 'ConfirmationDetailModal',
   name: 'ConfirmationDetailModal',
+  mixins: [commonMixin],
   components: { STable },
   components: { STable },
   props: {
   props: {
     openModal: { //  弹框显示状态
     openModal: { //  弹框显示状态

+ 2 - 0
src/views/financialManagement/warehousingConfirmation/detailModal.vue

@@ -30,10 +30,12 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { STable } from '@/components'
 import { stockPutDetailList } from '@/api/stockPut'
 import { stockPutDetailList } from '@/api/stockPut'
 export default {
 export default {
   name: 'ConfirmationDetailModal',
   name: 'ConfirmationDetailModal',
+  mixins: [commonMixin],
   components: { STable },
   components: { STable },
   props: {
   props: {
     openModal: { //  弹框显示状态
     openModal: { //  弹框显示状态