Bladeren bron

价格优化

lilei 2 jaren geleden
bovenliggende
commit
e4844a9d39

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675147719050
+  "version": 1675150088201
 }

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

@@ -14,7 +14,7 @@
         <a-descriptions-item label="收款单号">{{ detailsData&&detailsData.settleNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="关联单号">{{ detailsData&&detailsData.bizNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="商户名称">{{ detailsData&&detailsData.settleClientName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="收款金额">{{ detailsData&&(detailsData.settledAmount || detailsData.settledAmount==0) ? '¥'+ detailsData.settledAmount : '--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款金额">{{ detailsData&&(detailsData.settledAmount || detailsData.settledAmount==0) ? toThousands(detailsData.settledAmount) : '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款类型">{{ detailsData&&detailsData.bizTypeDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款方式">{{ detailsData&&detailsData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款时间">{{ detailsData&&detailsData.settleTime || '--' }}</a-descriptions-item>
@@ -26,9 +26,11 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { findReceiptDetail } from '@/api/settleReceipt'
 export default {
   name: 'FinancialPaymentDetailModal',
+  mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,

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

@@ -70,18 +70,18 @@
           <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong>
           条记录,应收金额合计
-          <strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? '¥'+totalData.totalAmount : '--' }}</strong>
+          <strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>
           ,其中已收金额
-          <strong>{{ totalData&&(totalData.settledAmount || totalData.settledAmount==0) ? '¥'+totalData.settledAmount : '--' }}</strong>
+          <strong>{{ totalData&&(totalData.settledAmount || totalData.settledAmount==0) ? toThousands(totalData.settledAmount) : '--' }}</strong>
           ,待收金额
-          <strong>{{ totalData&&(totalData.unsettleAmount || totalData.unsettleAmount==0) ? '¥'+totalData.unsettleAmount : '--' }}</strong>
+          <strong>{{ totalData&&(totalData.unsettleAmount || totalData.unsettleAmount==0) ? toThousands(totalData.unsettleAmount) : '--' }}</strong>
         </div>
       </a-alert>
       <div v-if="$hasPermissions('B_financialCollectionPl')" style="margin-bottom: 10px">
         <a-button type="primary" id="financialCollectionList-export" :loading="loading" @click="enableFundAccount ? handleSettleAcountPay(null,1) : handleCollection()">批量收款</a-button>
         <span style="margin-left: 8px" v-if="$hasPermissions('B_financialCollectionPl')">
           <template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-          <template v-if="selectTotalAmount">,合计{{ selectTotalAmount }}</template>
+          <template v-if="selectTotalAmount">,合计{{ toThousands(selectTotalAmount) }}</template>
         </span>
       </div>
       <!-- 列表 -->
@@ -179,6 +179,7 @@ export default {
   components: { STable, VSelect, detailModal, rangeDate, settleModal, pushOrderDetailModal, pushOrderOutSyncDetailModal, salesDetailModal, chainTransferOutDetailModal, bulkReturnGoodsDetailModal, storeTransferOutDetailModal },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       advanced: true, //  高级搜索 展开/关闭
@@ -218,9 +219,9 @@ export default {
         { title: '收款单号', dataIndex: 'settleNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '16%', align: 'center' },
         { title: '商户名称', dataIndex: 'settleClientName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '已收金额', dataIndex: 'settledAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '待收金额', dataIndex: 'unsettleAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '应收金额', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已收金额', dataIndex: 'settledAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'unsettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '收款类型', dataIndex: 'bizName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -373,7 +374,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div style="text-align:center"><p style="margin-top:20px;">收款单号:{row.settleNo} { row.bizName } 合计{ row.unsettleAmount }</p><p>{row.settleClientName}</p><p>确认收款吗?</p></div>,
+        content: <div style="text-align:center"><p style="margin-top:20px;">收款单号:{row.settleNo} { row.bizName } 合计{ this.toThousands(row.unsettleAmount) }</p><p>{row.settleClientName}</p><p>确认收款吗?</p></div>,
         centered: true,
         closable: true,
         class:'confirm-center',
@@ -397,7 +398,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div style="text-align:center"><p style="margin-top:20px;">共计{this.rowSelectionInfo.selectedRowKeys.length}单,合计金额{ this.selectTotalAmount } </p><p>确认批量收款吗?</p></div>,
+        content: <div style="text-align:center"><p style="margin-top:20px;">共计{this.rowSelectionInfo.selectedRowKeys.length}单,合计金额{ this.toThousands(this.selectTotalAmount) } </p><p>确认批量收款吗?</p></div>,
         centered: true,
         closable: true,
         class:'confirm-center',

+ 6 - 5
src/views/salesManagement/productPricing/list.vue

@@ -133,6 +133,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
@@ -144,15 +145,15 @@ export default {
         // { title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '终端会员价', dataIndex: 'terminalPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '车主价', dataIndex: 'carOwnersPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '车主价', dataIndex: 'carOwnersPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isCostPrice) {
-        arr.splice(6, 0, { title: '成本价', dataIndex: 'offerCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(6, 0, { title: '成本价', dataIndex: 'offerCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.isCityPrice) {
         const ind = this.isCostPrice ? 7 : 6
-        arr.splice(ind, 0, { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.isSpecialPrice) {
         let ind = 0
@@ -163,10 +164,10 @@ export default {
         } else if (!this.isCostPrice && !this.isCityPrice) {
           ind = 6
         }
-        arr.splice(ind, 0, { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.isTerminalPrice) {
-        arr.splice(arr.length - 1, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(arr.length - 1, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 7 - 4
src/views/salesManagement/productPricing/productSalesRecordModal.vue

@@ -10,9 +10,9 @@
       @cancle="isShow=false"
       :width="960">
       <div>
-        <div v-if="baseData" style="line-height: 28px;margin-bottom: 10px;">
-          <div>产品编码:{{ baseData.code }}</div>
-          <div>产品名称:{{ baseData.name }}</div>
+        <div v-if="baseData" style="line-height: 28px;margin-bottom: 10px;display:flex;">
+          <div style="flex:1">产品编码:{{ baseData.code }}</div>
+          <div style="flex:1">产品名称:{{ baseData.name }}</div>
         </div>
         <div style="display: flex;padding-bottom: 15px;align-items: center;">
           <span>选择客户:</span>
@@ -48,6 +48,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { salesRecordlList } from '@/api/salesDetail.js'
 import { STable } from '@/components'
 import tablePagination from '@/views/common/tablePagination.vue'
@@ -55,6 +56,7 @@ import custList from '@/views/common/custList.vue'
 export default {
   name: 'SalesRecordModal',
   components: { STable, tablePagination, custList },
+  mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -71,6 +73,7 @@ export default {
     }
   },
   data () {
+    const _this = this
     return {
       isShow: this.openModal, //  是否打开弹框
       queryParam: {
@@ -81,7 +84,7 @@ export default {
       // 表头
       columns: [
         { title: '销售时间', dataIndex: 'salesBillEntity.createDate', width: 250, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售价(¥)', dataIndex: 'price', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '销售价', dataIndex: 'price', width: 150, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '销售数量', dataIndex: 'qty', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '客户名称', dataIndex: 'salesBillEntity.buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],