Ver código fonte

Merge branch 'develop_12' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh12

chenrui 2 anos atrás
pai
commit
fbc19063ff
27 arquivos alterados com 124 adições e 100 exclusões
  1. 1 1
      public/version.json
  2. 8 7
      src/views/financialManagement/companyCollectionPayment/detail.vue
  3. 4 3
      src/views/financialManagement/companyCollectionPayment/list.vue
  4. 3 2
      src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue
  5. 6 5
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  6. 5 4
      src/views/financialManagement/companyReceivablePayable/detail.vue
  7. 5 4
      src/views/financialManagement/companyReceivablePayable/list.vue
  8. 3 1
      src/views/financialManagement/expenseManagement/detailModal.vue
  9. 3 2
      src/views/financialManagement/expenseManagement/list.vue
  10. 3 1
      src/views/financialManagement/financialPayment/detailModal.vue
  11. 3 1
      src/views/financialManagement/financialPayment/expenseDetail.vue
  12. 12 9
      src/views/financialManagement/financialPayment/list.vue
  13. 1 1
      src/views/financialManagement/fundAccountManagement/detail.vue
  14. 3 2
      src/views/financialManagement/fundAccountManagement/list.vue
  15. 2 1
      src/views/financialManagement/inventoryCheckAudit/list.vue
  16. 3 2
      src/views/financialManagement/ledgerRecord/list.vue
  17. 1 1
      src/views/financialManagement/settleModal/settleModal.vue
  18. 5 4
      src/views/financialManagement/warehousingAudit/detail.vue
  19. 2 1
      src/views/financialManagement/warehousingAudit/list.vue
  20. 1 1
      src/views/financialManagement/withdrawalManagement/cashOutModal.vue
  21. 1 1
      src/views/financialManagement/withdrawalManagement/list.vue
  22. 2 1
      src/views/outboundOrderManagement/outboundOrder/list.vue
  23. 3 2
      src/views/reportData/purchaseReturnReport/purchaseReturnDetail.vue
  24. 2 1
      src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue
  25. 13 13
      src/views/reportData/urgentItemsOffsetReport/detailList.vue
  26. 15 15
      src/views/reportData/urgentItemsOffsetReport/list.vue
  27. 14 14
      src/views/salesManagement/urgentItemsOffset/list.vue

+ 1 - 1
public/version.json

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

+ 8 - 7
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -16,9 +16,9 @@
               <a-descriptions-item label="单位名称">{{ (basicInfoData&&basicInfoData.settleClientName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="单位类型">{{ (basicInfoData&&basicInfoData.settleClientTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="结算类型">{{ (basicInfoData&&basicInfoData.settleTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="应结算金额">{{ (basicInfoData&&(basicInfoData.settleAmount || basicInfoData.settleAmount==0)) ? basicInfoData.settleAmount : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="折让金额">{{ (discountAmount || discountAmount==0) ? discountAmount : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="实结算金额">{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? basicInfoData.realSettleAmount : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="应结算金额">{{ (basicInfoData&&(basicInfoData.settleAmount || basicInfoData.settleAmount==0)) ? toThousands(basicInfoData.settleAmount) : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="折让金额">{{ (discountAmount || discountAmount==0) ? toThousands(discountAmount) : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="实结算金额">{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? toThousands(basicInfoData.realSettleAmount) : '--' }}</a-descriptions-item>
               <a-descriptions-item label="结算时间">{{ (basicInfoData&&basicInfoData.createDate) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="操作人">{{ (basicInfoData&&basicInfoData.operateName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="结算方式">{{ (basicInfoData&&basicInfoData.settleStyleSnDictValue) || '--' }}</a-descriptions-item>
@@ -35,8 +35,8 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 共 <strong>{{ total }}</strong> 条明细,
-                金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? '¥'+basicInfoData.totalSettleAmount : '--' }}</strong> ,
-                结算金额合计 <strong>{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? '¥'+basicInfoData.realSettleAmount : '--' }}</strong>
+                金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? toThousands(basicInfoData.totalSettleAmount) : '--' }}</strong> ,
+                结算金额合计 <strong>{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? toThousands(basicInfoData.realSettleAmount) : '--' }}</strong>
               </div>
             </a-alert>
             <!-- 列表 -->
@@ -66,6 +66,7 @@ export default {
   components: { STable, VSelect },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       // 表头
@@ -73,8 +74,8 @@ export default {
         { title: '序号', dataIndex: 'no', align: 'center', width: '10%' },
         { title: '单据号', dataIndex: 'bizNo', align: 'center', width: '25%', customRender: function (text) { return text || '--' } },
         { title: '类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '25%', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', align: 'center', width: '20%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '结算金额', dataIndex: 'settleAmount', align: 'center', width: '20%', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '金额', dataIndex: 'totalAmount', align: 'right', width: '20%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '结算金额', dataIndex: 'settleAmount', align: 'right', width: '20%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 4 - 3
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -73,9 +73,9 @@
         <div slot="message">
           共 <strong>{{ total }}</strong> 条记录,
           其中收款单 <strong>{{ (productTotal&&(productTotal.receiptCount || productTotal.receiptCount==0)) ? productTotal.receiptCount : '--' }}</strong> 条,
-          收款金额合计 <strong>{{ (productTotal&&(productTotal.receiptAmount || productTotal.receiptAmount==0)) ? '¥'+productTotal.receiptAmount : '--' }}</strong> ,
+          收款金额合计 <strong>{{ (productTotal&&(productTotal.receiptAmount || productTotal.receiptAmount==0)) ? toThousands(productTotal.receiptAmount) : '--' }}</strong> ,
           付款单 <strong>{{ (productTotal&&(productTotal.payCount || productTotal.payCount==0)) ? productTotal.payCount : '--' }}</strong> 条,
-          付款金额合计 <strong>{{ (productTotal&&(productTotal.payAmount || productTotal.payAmount==0)) ? '¥'+productTotal.payAmount : '--' }}</strong>
+          付款金额合计 <strong>{{ (productTotal&&(productTotal.payAmount || productTotal.payAmount==0)) ? toThousands(productTotal.payAmount) : '--' }}</strong>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -109,6 +109,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       advanced: true, //  高级搜索 展开/关闭
@@ -131,7 +132,7 @@ export default {
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算类型', dataIndex: 'settleTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算单号', scopedSlots: { customRender: 'unitSettleNo' }, width: '17%', align: 'center' },
-        { title: '结算金额', dataIndex: 'realSettleAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '结算金额', dataIndex: 'realSettleAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '结算时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作人', dataIndex: 'operateName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '结算方式', dataIndex: 'settleStyleSnDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }

+ 3 - 2
src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue

@@ -94,6 +94,7 @@ export default {
     }
   },
   data () {
+    const _this = this
     return {
       spinning: false,
       isShow: this.openModal, //  是否打开弹框
@@ -111,8 +112,8 @@ export default {
         { title: '单据号', dataIndex: 'bizNo', width: '28%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '金额', dataIndex: 'totalAmount', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '余额', dataIndex: 'unsettleAmount', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 6 - 5
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -23,9 +23,9 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 共 <strong>{{ chooseLoadData.length }}</strong>条明细 ,
-                金额合计<strong>{{ totalAmount }}</strong> ,
-                余额合计<strong>{{ totalBalance }}</strong> ,
-                本次结算金额合计<strong>{{ currentTotalBalance }}</strong>
+                金额合计<strong>{{ toThousands(totalAmount) }}</strong> ,
+                余额合计<strong>{{ toThousands(totalBalance) }}</strong> ,
+                本次结算金额合计<strong>{{ toThousands(currentTotalBalance) }}</strong>
               </div>
             </a-alert>
             <!-- 列表 -->
@@ -191,6 +191,7 @@ export default {
   data () {
     this.amountSettledChange = debounce(this.amountSettledChange, 800)
     this.amountSettledTotalChange = debounce(this.amountSettledTotalChange, 800)
+    const _this = this
     return {
       spinning: false,
       loading: false, //  表格加载中
@@ -204,8 +205,8 @@ export default {
         { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '金额', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '余额', dataIndex: 'unsettleAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '本次结算金额', scopedSlots: { customRender: 'settleAmount' }, width: '15%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],

+ 5 - 4
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -43,8 +43,8 @@
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
             共 <strong>{{ total }}</strong> 条明细,
-            金额合计 <strong>{{ (productTotal&&(productTotal.totalAmount || productTotal.totalAmount==0)) ? '¥'+productTotal.totalAmount : '--' }}</strong> ,
-            余额合计 <strong>{{ (productTotal&&(productTotal.unsettleAmount || productTotal.unsettleAmount==0)) ? '¥'+productTotal.unsettleAmount : '--' }}</strong>
+            金额合计 <strong>{{ (productTotal&&(productTotal.totalAmount || productTotal.totalAmount==0)) ? toThousands(productTotal.totalAmount) : '--' }}</strong> ,
+            余额合计 <strong>{{ (productTotal&&(productTotal.unsettleAmount || productTotal.unsettleAmount==0)) ? toThousands(productTotal.unsettleAmount) : '--' }}</strong>
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -82,6 +82,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
@@ -98,8 +99,8 @@ export default {
         { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '类型', dataIndex: 'bizTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', width: '17%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: '17%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '金额', dataIndex: 'totalAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '余额', dataIndex: 'unsettleAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 5 - 4
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -34,8 +34,8 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ total }}</strong> 条记录,
-          应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? '¥'+productTotal.receipt : '--' }}</strong> ,
-          应付金额合计 <strong>¥{{ (productTotal&&productTotal.pay) ? Math.abs(productTotal.pay) : 0 }}</strong>
+          应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+          应付金额合计 <strong>{{ (productTotal&&productTotal.pay) ? toThousands(productTotal.pay) : 0 }}</strong>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -82,6 +82,7 @@ export default {
   components: { STable, VSelect },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
@@ -96,8 +97,8 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '单位名称', dataIndex: 'settleClientName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '20%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

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

@@ -22,7 +22,7 @@
           </div>
           <span v-else>--</span>
         </a-descriptions-item>
-        <a-descriptions-item label="费用金额">¥{{ detailsData&&detailsData.settleAmount || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="费用金额">{{ detailsData&&detailsData.settleAmount ? toThousands(detailsData.settleAmount) : '--' }}</a-descriptions-item>
         <a-descriptions-item label="单据状态">{{ detailsData&&detailsData.stateDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="备注">{{ detailsData&&detailsData.remark || '--' }}</a-descriptions-item>
       </a-descriptions>
@@ -32,9 +32,11 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { findExpenseDetail } from '@/api/settleExpense'
 export default {
   name: 'ExpenseManagementDetailModal',
+  mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,

+ 3 - 2
src/views/financialManagement/expenseManagement/list.vue

@@ -63,7 +63,7 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <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>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -135,6 +135,7 @@ export default {
   components: { STable, VSelect, expenseManagementDetailModal, rangeDate, stateIcon },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       tableHeight: 0,
@@ -164,7 +165,7 @@ export default {
         { title: '费用单号', dataIndex: 'accountExpensesNo', width: '20%', align: 'center', scopedSlots: { customRender: 'accountExpensesNo' } },
         { title: '创建时间', dataIndex: 'createDate', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用类型', scopedSlots: { customRender: 'expensesType' }, width: '20%', align: 'center' },
-        { title: '金额', dataIndex: 'settleAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '金额', dataIndex: 'settleAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         // { title: '单据状态', dataIndex: 'stateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核', scopedSlots: { customRender: 'audit' }, width: '3%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }

+ 3 - 1
src/views/financialManagement/financialPayment/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.settleStyleName || '--' }}</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 { findPayDetail } from '@/api/settlePay.js'
 export default {
   name: 'FinancialPaymentDetailModal',
+  mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,

+ 3 - 1
src/views/financialManagement/financialPayment/expenseDetail.vue

@@ -13,7 +13,7 @@
         </div>
         <span v-else>--</span>
       </a-descriptions-item>
-      <a-descriptions-item label="费用金额">¥{{ detailsData&&detailsData.settleAmount || '--' }}</a-descriptions-item>
+      <a-descriptions-item label="费用金额">{{ detailsData&&detailsData.settleAmount ? toThousands(detailsData.settleAmount) : '--' }}</a-descriptions-item>
       <a-descriptions-item label="单据状态">{{ detailsData&&detailsData.stateDictValue || '--' }}</a-descriptions-item>
       <a-descriptions-item label="备注">{{ detailsData&&detailsData.remark || '--' }}</a-descriptions-item>
     </a-descriptions>
@@ -21,9 +21,11 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { findExpenseDetailBySn } from '@/api/settleExpense'
 export default {
   name: 'ExpenseManagementDetail',
+  mixins: [commonMixin],
   props: {
     outBizSn: {
       type: [Number, String],

+ 12 - 9
src/views/financialManagement/financialPayment/list.vue

@@ -69,18 +69,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_financialPaymentPl')" style="margin-bottom: 10px">
         <a-button type="primary" id="finacialPay-export" :loading="loading" @click="enableFundAccount ? handleSettleAcountPay(null,1) : handlePayment()">批量付款</a-button>
         <span style="margin-left: 8px" v-if="$hasPermissions('B_financialPaymentPl')">
           <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>
       <!-- 列表 -->
@@ -176,6 +176,7 @@ export default {
   components: { STable, VSelect, detailModal, rangeDate, settleModal, salesReturnDetail, chainTransInDetail, bulkWareDetail, expenseDetail, purchasDetail, stockOrderDetail },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       advanced: true, //  高级搜索 展开/关闭
@@ -214,9 +215,9 @@ export default {
         { title: '付款单号', dataIndex: 'settleNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '14%', align: 'center' },
         { title: '商户名称', dataIndex: 'settleClientName', width: '10%', 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: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '付款方式', dataIndex: 'settleStyleName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -376,9 +377,10 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '确认付款吗?',
+        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',
         onOk () {
           _this.settleAcountPay(null, { type: 0, row: row })
         }
@@ -399,9 +401,10 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div><p style="margin-top:20px;">合计金额¥{ this.selectTotalAmount } </p><p>确认批量付款吗?</p></div>,
+        content: <div><p style="margin-top:20px;">共计{this.rowSelectionInfo.selectedRowKeys.length}单,合计金额¥{ _this.toThousands(this.selectTotalAmount) } </p><p>确认批量付款吗?</p></div>,
         centered: true,
         closable: true,
+        class:'confirm-center',
         onOk () {
           _this.settleAcountPay(null, { type: 1, row: null })
         }

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

@@ -69,7 +69,7 @@
           bordered>
           <!-- 结算金额 -->
           <template slot="settleAmount" slot-scope="text, record">
-            <span :style="{color:text<0?'red':''}">{{ ((text || text == 0) ? (text) : '--') }}</span>
+            <span :style="{color:text<0?'red':''}">{{ ((text || text == 0) ? toThousands(text) : '--') }}</span>
           </template>
         </s-table>
       </a-card>

+ 3 - 2
src/views/financialManagement/fundAccountManagement/list.vue

@@ -98,6 +98,7 @@ export default {
   components: { STable, VSelect, addModal, rangeDate },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       tableHeight: 0,
@@ -112,8 +113,8 @@ export default {
         { title: '账户类型', dataIndex: 'settleStyleName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '账户名称', dataIndex: 'accountName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '账户号码', dataIndex: 'accountNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收入金额', dataIndex: 'totalIncomeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text) : '--') } },
-        { title: '支出金额', dataIndex: 'totalExpendAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text) : '--') } },
+        { title: '收入金额', dataIndex: 'totalIncomeAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '支出金额', dataIndex: 'totalExpendAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '状态', dataIndex: 'stateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],

+ 2 - 1
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -126,6 +126,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '盘点单号', scopedSlots: { customRender: 'checkWarehouseNo' }, width: '15%', align: 'center' },
@@ -141,7 +142,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(4, 0, { title: '总成本', dataIndex: 'totalStockCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '总成本', dataIndex: 'totalStockCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 3 - 2
src/views/financialManagement/ledgerRecord/list.vue

@@ -43,7 +43,7 @@
     <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">
         总计:<strong>{{ total }}</strong>条 ,
-        分账金额:<strong>{{ (totalAmount || totalAmount == 0) ? totalAmount+'元' : '--' }}</strong>
+        分账金额:<strong>{{ (totalAmount || totalAmount == 0) ? toThousands(totalAmount) : '--' }}</strong>
       </div>
     </a-alert>
     <!-- 列表 -->
@@ -74,6 +74,7 @@ export default {
   components: { STable, VSelect, rangeDate, custSatelliteList },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
@@ -103,7 +104,7 @@ export default {
         { title: '产品名称', dataIndex: 'dealerProduct.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'dealerProduct.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'productQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '分账金额(¥)', dataIndex: 'separateAmount', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '分账金额', dataIndex: 'separateAmount', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '分账状态', dataIndex: 'stateDictValue', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'remark', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],

+ 1 - 1
src/views/financialManagement/settleModal/settleModal.vue

@@ -23,7 +23,7 @@
         </a-form-model-item>
         <a-form-model-item style="margin-bottom: 10px;" :label="title+'金额'" v-if="baseData">
           <span class="ant-form-text">
-            {{ baseData.totalAmount }}
+            {{ toThousands(baseData.totalAmount) }}
           </span>
         </a-form-model-item>
         <a-form-model-item label="结算方式" prop="settleStyleSn">

+ 5 - 4
src/views/financialManagement/warehousingAudit/detail.vue

@@ -24,10 +24,10 @@
             <a-descriptions :column="4" size="small">
               <a-descriptions-item label="采购总款数">{{ basicInfoData&&(basicInfoData.totalCategory || basicInfoData.totalCategory==0) ? basicInfoData.totalCategory : '--' }}</a-descriptions-item>
               <a-descriptions-item label="采购总数量">{{ basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0) ? basicInfoData.totalQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="采购总成本" v-if="$hasPermissions('M_ShowAllCost')">{{ basicInfoData&&(basicInfoData.totalAmount || basicInfoData.totalAmount==0) ? '¥'+basicInfoData.totalAmount : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="采购总成本" v-if="$hasPermissions('M_ShowAllCost')">{{ basicInfoData&&(basicInfoData.totalAmount || basicInfoData.totalAmount==0) ? toThousands(basicInfoData.totalAmount) : '--' }}</a-descriptions-item>
               <a-descriptions-item label="入库总款数">{{ basicInfoData&&(basicInfoData.totalPutCategory || basicInfoData.totalPutCategory==0) ? basicInfoData.totalPutCategory : '--' }}</a-descriptions-item>
               <a-descriptions-item label="入库总数量">{{ basicInfoData&&(basicInfoData.totalPutQty || basicInfoData.totalPutQty==0) ? basicInfoData.totalPutQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="入库总成本" v-if="$hasPermissions('M_ShowAllCost')">{{ basicInfoData&&(basicInfoData.totalPutAmount || basicInfoData.totalPutAmount==0) ? '¥'+basicInfoData.totalPutAmount : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="入库总成本" v-if="$hasPermissions('M_ShowAllCost')">{{ basicInfoData&&(basicInfoData.totalPutAmount || basicInfoData.totalPutAmount==0) ? toThousands(basicInfoData.totalPutAmount) : '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -93,6 +93,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -107,8 +108,8 @@ export default {
         { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(6, 0, { title: '成本价', dataIndex: 'discountedPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(8, 0, { title: '入库小计', dataIndex: 'discountedAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(6, 0, { title: '成本价', dataIndex: 'discountedPrice', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '入库小计', dataIndex: 'discountedAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 2 - 1
src/views/financialManagement/warehousingAudit/list.vue

@@ -160,6 +160,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '采购单号', dataIndex: 'purchaseBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -174,7 +175,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(5, 0, { title: '入库总成本', dataIndex: 'totalPutAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(5, 0, { title: '入库总成本', dataIndex: 'totalPutAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 1 - 1
src/views/financialManagement/withdrawalManagement/cashOutModal.vue

@@ -30,7 +30,7 @@
               style="width: 100%;" />
           </a-form-model-item>
           <a-form-model-item label="实际扣除金额" prop="brandName">
-            <strong>{{ deductionAmount }}</strong>元(申请提现金额+提现手续费)
+            <strong>{{ toThousands(deductionAmount) }}</strong>元(申请提现金额+提现手续费)
           </a-form-model-item>
           <a-form-model-item label="提现账户" prop="brandName">
             <div>{{ nowData&&nowData.bankName || '--' }}({{ nowData&&nowData.accountName || '--' }})</div>

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

@@ -22,7 +22,7 @@
       <!-- 操作按钮 -->
       <div class="table-operator">
         <a-button v-if="$hasPermissions('B_withdrawalManagement_cashOut')" id="withdrawalManagementList-tx" type="primary" class="button-warning" @click="handleCashOut">申请提现</a-button>
-        <div style="display: inline-block;margin-left: 80px;">可提现余额: <strong>{{ accountInfo&&(accountInfo.balance || accountInfo.balance==0) ? '¥'+accountInfo.balance : '--' }}</strong> 元</div>
+        <div style="display: inline-block;margin-left: 80px;">可提现余额: <strong>{{ accountInfo&&(accountInfo.balance || accountInfo.balance==0) ? toThousands(accountInfo.balance) : '--' }}</strong> 元</div>
       </div>
       <!-- 列表 -->
       <s-table

+ 2 - 1
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -138,6 +138,7 @@ export default {
   components: { STable, VSelect, rangeDate, pushOrderDetailModal, salesDetailModal, urgentDetailModal, storeTransferOutDetailModal, chainTransferOutDetailModal, warehouseAllocationDetailModal, replenishmentDetailModal, stateIcon },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
@@ -161,7 +162,7 @@ export default {
         { title: '单位名称', dataIndex: 'demanderName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'productTotalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总售价', dataIndex: 'productTotalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '出库时间', dataIndex: 'outTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库', scopedSlots: { customRender: 'state' }, width: '3%', align: 'center' },

+ 3 - 2
src/views/reportData/purchaseReturnReport/purchaseReturnDetail.vue

@@ -50,7 +50,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
-                <ProductBrand id="purchaseReceiptDetailList-productBrandSn" v-model="queryParam.returnTargetSn"></ProductBrand>
+                <ProductBrand id="purchaseReceiptDetailList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -197,7 +197,7 @@ export default {
         { title: '出库时间', dataIndex: 'outStockTime', width: '16%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) { //  售价权限
-        arr.splice(6, 0, { title: '成本', dataIndex: 'cost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '成本', dataIndex: 'cost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -299,6 +299,7 @@ export default {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.resetSearchForm()
+      this.getSupperList()
     }
   },
   beforeRouteEnter (to, from, next) {

+ 2 - 1
src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue

@@ -162,7 +162,7 @@ export default {
         { title: '出库时间', dataIndex: 'outStockTime', width: '16%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) { //  售价权限
-        arr.splice(4, 0, { title: '成本', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '成本', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -254,6 +254,7 @@ export default {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.resetSearchForm()
+      this.getSupperList()
     }
   },
   beforeRouteEnter (to, from, next) {

+ 13 - 13
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -34,17 +34,17 @@
                 <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="急件类型">
+            <!-- <a-col :md="6" :sm="24">
+              <a-form-item label="单据来源">
                 <v-select
-                  v-model="queryParam.bizType"
-                  ref="status"
-                  id="urgentItemsOffsetReport-biztype"
-                  code="URGENT_BIZ_TYPE"
-                  placeholder="急件类型"
+                  v-model="queryParam.sourceType"
+                  ref="sourceType"
+                  id="urgentItemsOffsetReport-sourceType"
+                  code="SALES_SOURCE"
+                  placeholder="请选择单据来源"
                   allowClear></v-select>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="urgentItemsOffsetReport-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
@@ -134,7 +134,7 @@ export default {
         buyerName: '',
         bizBillNo: '',
         urgentBillNo: '',
-        bizType: undefined,
+        sourceType: undefined,
         productType: undefined,
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
@@ -180,11 +180,11 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', dataIndex: 'urgentBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'bizBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '13%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '冲减时间', dataIndex: 'offSetTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
@@ -232,7 +232,7 @@ export default {
       this.queryParam.bizBillNo = ''
       this.queryParam.buyerName = ''
       this.queryParam.urgentBillNo = ''
-      this.queryParam.bizType = undefined
+      this.queryParam.sourceType = undefined
       this.queryParam.productBrandSn = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''

+ 15 - 15
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -33,17 +33,17 @@
               <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="急件类型">
+          <!-- <a-col :md="6" :sm="24">
+            <a-form-item label="单据来源">
               <v-select
-                v-model="queryParam.bizType"
-                ref="status"
-                id="urgentItemsOffsetReport-biztype"
-                code="URGENT_BIZ_TYPE"
-                placeholder="急件类型"
+                v-model="queryParam.sourceType"
+                ref="sourceType"
+                id="urgentItemsOffsetReport-sourceType"
+                code="SALES_SOURCE"
+                placeholder="请选择单据来源"
                 allowClear></v-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="urgentItemsOffsetReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="urgentItemsOffsetReport-reset">重置</a-button>
@@ -107,7 +107,7 @@ export default {
         buyerName: '',
         bizBillNo: '',
         urgentBillNo: '',
-        bizType: undefined
+        sourceType: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择冲减时间', trigger: 'change' }]
@@ -145,16 +145,16 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', dataIndex: 'urgentBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件类型', dataIndex: 'bizTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'bizBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '款数', dataIndex: 'totalCategory', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '数量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '款数', dataIndex: 'totalCategory', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -196,7 +196,7 @@ export default {
         buyerName: '',
         bizBillNo: '',
         urgentBillNo: '',
-        bizType: undefined
+        sourceType: undefined
       }
       this.$refs.rangeDate.resetDate()
       this.$refs.ruleForm.resetFields()

+ 14 - 14
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -26,17 +26,17 @@
                   <a-input id="urgentItemsOffsetList-urgentBillNo" v-model.trim="queryParam.urgentBillNo" allowClear placeholder="请输入急件单号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="急件类型">
+              <!-- <a-col :md="6" :sm="24">
+                <a-form-item label="单据来源">
                   <v-select
-                    v-model="queryParam.bizType"
-                    ref="status"
-                    id="chainTransferInList-biztype"
-                    code="URGENT_BIZ_TYPE"
-                    placeholder="请选择急件类型"
+                    v-model="queryParam.sourceType"
+                    ref="sourceType"
+                    id="urgentItemsOffsetList-sourceType"
+                    code="SALES_SOURCE"
+                    placeholder="请选择单据来源"
                     allowClear></v-select>
                 </a-form-item>
-              </a-col>
+              </a-col> -->
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
                   <v-select
@@ -125,19 +125,19 @@ export default {
         bizBillNo: '', //  关联单号
         urgentBillNo: '', //  急件单号
         status: undefined, //  状态
-        bizType: undefined // 急件类型
+        sourceType: undefined // 单据来源
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: '15%', align: 'center' },
-        { title: '急件类型', dataIndex: 'bizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单号', dataIndex: 'bizBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'bizBillNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '销售单来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', dataIndex: 'buyerName', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '冲减时间', dataIndex: 'offSetTime', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', scopedSlots: { customRender: 'status' }, width: '3%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
@@ -197,7 +197,7 @@ export default {
       this.queryParam.bizBillNo = ''
       this.queryParam.urgentBillNo = ''
       this.queryParam.status = undefined
-      this.queryParam.bizType = undefined
+      this.queryParam.sourceType = undefined
       this.$refs.custList.resetForm()
       this.$refs.table.refresh(true)
     },