Ver Fonte

主体客户-->合并后客户

chenrui há 2 anos atrás
pai
commit
18f0874e21

+ 1 - 2
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -185,6 +185,7 @@ export default {
       storeCallOutDetailCount({ storeCallOutSn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.productTotal = res.data
+          this.$refs.table.refresh(true)
         } else {
           this.productTotal = null
         }
@@ -198,7 +199,6 @@ export default {
   mounted () {
     if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新 或 为弹框时调用
       this.printCostChecked = true
-      this.$refs.table.refresh(true)
       this.getDetail()
       this.getDetailCount()
     }
@@ -207,7 +207,6 @@ export default {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
       this.printCostChecked = true
-      this.$refs.table.refresh(true)
       this.getDetail()
       this.getDetailCount()
     }

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

@@ -80,7 +80,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '合并时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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 },
+        { title: '合并后客户名称', dataIndex: 'customerNameTarget', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 0
src/views/customerManagement/customerInfo/edit.vue

@@ -205,6 +205,7 @@ export default {
         if (res.status == 200) {
           if (res.data.provinceSn) { this.getArea('city', res.data.provinceSn) }
           if (res.data.citySn) { this.getArea('district', res.data.citySn) }
+          res.data.satelliteFlag = res.data.dealerFlag
           this.form = Object.assign(this.form, res.data)
         } else {
           this.$refs.ruleForm.resetFields()

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

@@ -18,7 +18,7 @@
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol"
       >
-        <a-form-model-item label="主体客户:">
+        <a-form-model-item label="合并后客户:">
           <div>{{ mainCustomerName }}</div>
         </a-form-model-item>
         <a-form-model-item label="被合并的客户名称:" prop="customerSnSource">
@@ -61,10 +61,10 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        customerSnTarget: '', // 主体客户sn
+        customerSnTarget: '', // 合并后客户sn
         customerSnSource: '' // 被合并客户sn
       },
-      mainCustomerName: '', // 主体客户名称
+      mainCustomerName: '', // 合并后客户名称
       rules: {
         customerSnSource: [
           { required: true, message: '输入客户名称搜索', trigger: 'blur' }