Procházet zdrojové kódy

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

lilei před 2 roky
rodič
revize
c82ad3f66e

+ 3 - 3
src/views/financialManagement/companyReceivablePayable/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="companyReceivablePayableList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入单位名称"/>
+              <a-form-item label="客户名称">
+                <a-input id="companyReceivablePayableList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -96,7 +96,7 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '单位名称', dataIndex: 'settleClientName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: '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) : '--') } },

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

@@ -11,7 +11,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
-              <a-form-item label="单位名称">
+              <a-form-item label="客户名称">
                 <a-input id="outboundOrderList-demanderName" v-model.trim="queryParam.demanderName" placeholder="请输入单位名称" allowClear />
               </a-form-item>
             </a-col>
@@ -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: '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: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -23,7 +23,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions size="small" :column="3">
-              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerName==detailData.buyerNameCurrent?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</a-descriptions-item>
               <a-descriptions-item label="客户地址" :span="2">
                 <div v-if="detailData&&(detailData.shippingAddressProvinceName || detailData.shippingAddressCityName || detailData.shippingAddressCountyName || detailData.shippingAddress)">
                   {{ detailData&&detailData.shippingAddressProvinceName || '' }}

+ 6 - 6
src/views/salesManagement/salesQuery/list.vue

@@ -267,7 +267,7 @@ export default {
         auditEndDate: '',
         outWarehouseBeginDate: '',
         outWarehouseEndDate: '',
-        buyerName: undefined, //  客户名称
+        buyerNameCurrent: undefined, //  客户名称
         buyerSn: undefined,
         salesBillNo: '', //  销售单号
         purchaseBillNo: '', //  采购单号
@@ -290,7 +290,7 @@ export default {
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
         { title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -356,9 +356,9 @@ export default {
       console.log(v, row)
       if (row && row.customerSn) {
         this.queryParam.buyerSn = row.customerSn
-        this.queryParam.buyerName = undefined
+        this.queryParam.buyerNameCurrent = undefined
       } else {
-        this.queryParam.buyerName = v
+        this.queryParam.buyerNameCurrent = v
         this.queryParam.buyerSn = undefined
       }
     },
@@ -434,7 +434,7 @@ export default {
       }
       this.$confirm({
         title: '提示',
-        content: <div><div style='font-size:16px;margin-bottom:10px;'>{content}</div><div>销售单号:{row.salesBillNo}</div><div>客户名称:{row.buyerName}</div></div>,
+        content: <div><div style='font-size:16px;margin-bottom:10px;'>{content}</div><div>销售单号:{row.salesBillNo}</div><div>客户名称:{row.buyerNameCurrent}</div></div>,
         centered: true,
         closable: true,
         onOk () {
@@ -491,7 +491,7 @@ export default {
         this.$refs.outWareRangeDate.resetDate('')
       }
 
-      this.queryParam.buyerName = undefined
+      this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSn = undefined
       this.queryParam.salesBillNo = ''
       this.queryParam.purchaseBillNo = ''

+ 1 - 1
src/views/salesManagement/salesReturn/detail.vue

@@ -14,7 +14,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions size="small" :column="3">
-              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerName==detailData.buyerNameCurrent?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</a-descriptions-item>
               <a-descriptions-item label="客户地址">
                 <div v-if="detailData&&(detailData.provinceName || detailData.cityName || detailData.countyName || detailData.customerAddr)">
                   {{ detailData&&detailData.provinceName || '' }}

+ 4 - 4
src/views/salesManagement/salesReturn/list.vue

@@ -17,7 +17,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <custList ref="custList" v-model="queryParam.buyerName"></custList>
+                <custList ref="custList" v-model="queryParam.buyerNameCurrent"></custList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -161,7 +161,7 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         auditBeginDate: '',
         auditEndDate: '',
-        buyerName: undefined,
+        buyerNameCurrent: undefined,
         salesReturnNo: undefined, //  销售退货单号
         state: undefined // 业务状态
       },
@@ -171,7 +171,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售退货单号', scopedSlots: { customRender: 'salesReturnNo' }, width: '15%', align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退款总金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总款数', dataIndex: 'totalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -290,7 +290,7 @@ export default {
       this.$refs.rangeExamineDate.resetDate()
       this.queryParam.auditBeginDate = ''
       this.queryParam.auditEndDate = ''
-      this.queryParam.buyerName = undefined
+      this.queryParam.buyerNameCurrent = undefined
       this.queryParam.salesReturnNo = ''
       this.queryParam.state = undefined
       this.$refs.custList.resetForm()

+ 1 - 1
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -13,7 +13,7 @@
         <a-collapse :activeKey="['1']" v-if="detailData&&detailData.bizType!='REPLENISH'">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
-              <a-descriptions-item label="单位名称">{{ (detailData&&detailData.buyerName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="客户名称">{{ (detailData&&detailData.buyerNameCurrent) || '--' }}{{ detailData&&detailData.buyerName?detailData.buyerName==detailData.buyerNameCurrent?'':'('+detailData.buyerName+')':'' }}</a-descriptions-item>
               <a-descriptions-item label="单位地址">
                 <div v-if="detailData&&(detailData.shippingAddressProvinceName || detailData.shippingAddressCityName || detailData.shippingAddressCountyName || detailData.shippingAddress)">
                   {{ (detailData&&detailData.shippingAddressProvinceName) || '' }}

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

@@ -11,8 +11,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="单位名称">
-                <custList ref="custList" v-model="queryParam.buyerName"></custList>
+              <a-form-item label="客户名称">
+                <custList ref="custList" v-model="queryParam.buyerNameCurrent"></custList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -121,7 +121,7 @@ export default {
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
-        buyerName: undefined, //  客户名称
+        buyerNameCurrent: undefined, //  客户名称
         bizBillNo: '', //  关联单号
         urgentBillNo: '', //  急件单号
         status: undefined, //  状态
@@ -133,7 +133,7 @@ export default {
         { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: '15%', align: 'center' },
         { 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: 'buyerNameCurrent', 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: '14%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -193,7 +193,7 @@ export default {
       this.$refs.rangeDate.resetDate(this.time)
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
-      this.queryParam.buyerName = undefined
+      this.queryParam.buyerNameCurrent = undefined
       this.queryParam.bizBillNo = ''
       this.queryParam.urgentBillNo = ''
       this.queryParam.status = undefined