Bladeren bron

合并价格修改

chenrui 2 jaren geleden
bovenliggende
commit
3348ccca38

+ 5 - 5
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="单位名称">
-                <a-input id="companyCollectionPaymentList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入单位名称"/>
+              <a-form-item label="客户名称">
+                <a-input id="companyCollectionPaymentList-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -119,7 +119,7 @@ export default {
       queryParam: {
         beginDate: '',
         endDate: '',
-        settleClientName: '',
+        settleClientNameCurrent: '',
         settleClientType: undefined,
         settleType: undefined,
         unitSettleNo: '',
@@ -128,7 +128,7 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '单位名称', dataIndex: 'settleClientName', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'settleClientNameCurrent', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { 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' },
@@ -190,7 +190,7 @@ export default {
       }
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
-      this.queryParam.settleClientName = ''
+      this.queryParam.settleClientNameCurrent = ''
       this.queryParam.settleClientType = undefined
       this.queryParam.settleType = undefined
       this.queryParam.unitSettleNo = ''

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

@@ -13,7 +13,7 @@
       <a-descriptions :column="1" size="default">
         <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.settleClientNameCurrent || '--' }}{{ detailsData&&detailsData.settleClientName?detailsData.settleClientName==detailsData.settleClientNameCurrent?'':'('+detailsData.settleClientName+')':'' }}</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>

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

@@ -19,7 +19,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="商户名称">
-                <a-input id="financialCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入商户名称" />
+                <a-input id="financialCollectionList-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入商户名称" />
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -199,7 +199,7 @@ export default {
         bizType: 'ALL',
         settleNo: '',
         bizNo: '',
-        settleClientName: '',
+        settleClientNameCurrent: '',
         billState: '',
         auditBeginDate: '',
         auditEndDate: '',
@@ -218,7 +218,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { 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: 'settleClientNameCurrent', width: '15%', align: 'center', customRender: function (text) { return 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) : '--') } },
@@ -334,7 +334,7 @@ export default {
       this.openSettleModal = true
       const data = {
         totalAmount: type ? this.selectTotalAmount : row && row.unsettleAmount || 0,
-        settleClientName: type ? '' : row && row.settleClientName || '',
+        settleClientNameCurrent: type ? '' : row && row.settleClientNameCurrent || '',
         title: '收款',
         type,
         row
@@ -374,7 +374,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientName}</p><p>收款单号:{row.settleNo},合计{ this.toThousands(row.unsettleAmount) }</p><p>确认收款吗?</p></div>,
+        content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientNameCurrent}</p><p>收款单号:{row.settleNo},合计{ this.toThousands(row.unsettleAmount) }</p><p>确认收款吗?</p></div>,
         centered: true,
         closable: true,
         class: 'confirm-center',
@@ -429,7 +429,7 @@ export default {
         bizType: this.curBizType,
         settleNo: '',
         bizNo: '',
-        settleClientName: '',
+        settleClientNameCurrent: '',
         billState: '',
         beginDate: '',
         endDate: '',

+ 4 - 4
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="客户名称">
-                <a-input id="outboundOrderList-demanderName" v-model.trim="queryParam.demanderName" placeholder="请输入单位名称" allowClear />
+                <a-input id="outboundOrderList-demanderName" v-model.trim="queryParam.demanderNameCurrent" placeholder="请输入单位名称" allowClear />
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="6" :md="6" :sm="8">
@@ -150,7 +150,7 @@ export default {
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
-        demanderName: undefined, //  单位名称
+        demanderNameCurrent: undefined, //  单位名称
         outBizType: undefined, //  出库类型
         state: undefined //  状态
       },
@@ -159,7 +159,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '关联单号', dataIndex: 'outBizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'demanderName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'demanderNameCurrent', 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: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -247,7 +247,7 @@ export default {
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
       this.queryParam.beginDate = flag ? '' : getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = flag ? '' : getDate.getCurrMonthDays().endtime
-      this.queryParam.demanderName = undefined
+      this.queryParam.demanderNameCurrent = undefined
       this.queryParam.outBizType = undefined
       this.queryParam.state = undefined
     },

+ 5 - 5
src/views/salesManagement/giftRecord/list.vue

@@ -84,7 +84,7 @@ export default {
         productOrigCode: '', //  原厂编码
         salesBillNo: '', //  关联销售单号
         customerSn: undefined, //  赠送客户
-        customerName: undefined
+        customerNameCurrent: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
@@ -118,7 +118,7 @@ export default {
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '赠送数量', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '关联销售单号', dataIndex: 'salesBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '赠送客户', dataIndex: 'customerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '赠送客户', dataIndex: 'customerNameCurrent', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
         // arr.splice(8, 0, { title: '成本价', dataIndex: 'cost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
@@ -137,9 +137,9 @@ export default {
     custChange (obj, row) {
       if (row) {
         this.queryParam.customerSn = row && row.customerSn || undefined
-        this.queryParam.customerName = undefined
+        this.queryParam.customerNameCurrent = undefined
       } else {
-        this.queryParam.customerName = obj || undefined
+        this.queryParam.customerNameCurrent = obj || undefined
         this.queryParam.customerSn = undefined
       }
     },
@@ -152,7 +152,7 @@ export default {
       this.queryParam.productOrigCode = ''
       this.queryParam.salesBillNo = ''
       this.queryParam.customerSn = undefined
-      this.queryParam.customerName = undefined
+      this.queryParam.customerNameCurrent = undefined
       if (this.advanced) {
         this.$refs.custList.resetForm()
       }

+ 6 - 6
src/views/salesManagement/productPricing/productSalesRecordModal.vue

@@ -80,14 +80,14 @@ export default {
       queryParam: {
         productSn: null,
         buyerSn: undefined,
-        buyerName: undefined
+        buyerNameCurrent: undefined
       },
       // 表头
       columns: [
         { title: '销售时间', dataIndex: 'salesBillEntity.createDate', width: 250, align: 'center', customRender: function (text) { return 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 }
+        { title: '客户名称', dataIndex: 'salesBillEntity.buyerNameCurrent', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       list: [],
       loading: false,
@@ -102,7 +102,7 @@ export default {
   methods: {
     reset () {
       this.queryParam.buyerSn = undefined
-      this.queryParam.buyerName = undefined
+      this.queryParam.buyerNameCurrent = undefined
       this.$refs.custList.setData(undefined)
       this.getDetail(this.baseData)
     },
@@ -110,9 +110,9 @@ export default {
     custChange (obj, row) {
       if (row) {
         this.queryParam.buyerSn = row && row.customerSn || undefined
-        this.queryParam.buyerName = undefined
+        this.queryParam.buyerNameCurrent = undefined
       } else {
-        this.queryParam.buyerName = obj || undefined
+        this.queryParam.buyerNameCurrent = obj || undefined
         this.queryParam.buyerSn = undefined
       }
     },
@@ -173,7 +173,7 @@ export default {
         this.curTab = '1'
         this.list = []
         this.queryParam.buyerSn = undefined
-        this.queryParam.buyerName = undefined
+        this.queryParam.buyerNameCurrent = undefined
         this.$refs.custList.setData(undefined)
       }
     }