lilei 2 년 전
부모
커밋
6e39f2abda
3개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 1
      public/version.json
  2. 2 2
      src/views/customerManagement/customerInfo/detailModal.vue
  3. 3 3
      src/views/customerManagement/customerInfo/list.vue

+ 1 - 1
public/version.json

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

+ 2 - 2
src/views/customerManagement/customerInfo/detailModal.vue

@@ -79,8 +79,8 @@ export default {
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '合并时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '合并时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '被合并客户名称', dataIndex: 'customerName', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '主体客户名称', dataIndex: 'contactName', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '被合并客户名称', dataIndex: 'customerNameSource', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '主体客户名称', dataIndex: 'customerNameTarget', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

+ 3 - 3
src/views/customerManagement/customerInfo/list.vue

@@ -23,7 +23,7 @@
             <template v-if="advanced">
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="是否为下级">
                 <a-form-item label="是否为下级">
-                  <v-select code="FLAG" id="customerManagementList-mainFlag" v-model="queryParam.mainFlag" allowClear placeholder="请选择"></v-select>
+                  <v-select code="FLAG" id="customerManagementList-dealerFlag" v-model="queryParam.dealerFlag" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="12" :sm="24">
               <a-col :md="12" :sm="24">
@@ -157,7 +157,7 @@ export default {
         provinceSn: undefined, //  省
         provinceSn: undefined, //  省
         citySn: undefined, //  市
         citySn: undefined, //  市
         countySn: undefined, //  区
         countySn: undefined, //  区
-        mainFlag: undefined, //  是否卫星仓客户
+        dealerFlag: undefined, //  是否卫星仓客户
         customerTypeSn: undefined //  客户类型
         customerTypeSn: undefined //  客户类型
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
@@ -217,7 +217,7 @@ export default {
       this.queryParam.provinceSn = undefined
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.countySn = undefined
       this.queryParam.countySn = undefined
-      this.queryParam.mainFlag = undefined
+      this.queryParam.dealerFlag = undefined
       this.queryParam.customerTypeSn = undefined
       this.queryParam.customerTypeSn = undefined
       this.addrCityList = []
       this.addrCityList = []
       this.addrDistrictList = []
       this.addrDistrictList = []