lilei 2 lat temu
rodzic
commit
523593b56e

+ 3 - 2
src/api/dealerRelation.js

@@ -51,8 +51,9 @@ export const unbindRelation = (params) => {
 // 更新经销商返利信息
 export const updateRebate = (params) => {
   return axios({
-    url: `/dealerRelation/updateRebate/${params.dealerSn}/${params.rebateDealerSn}`,
-    method: 'get'
+    url: `/dealerRelation/updateRebate/${params.dealerSn}`,
+    data: params,
+    method: 'post'
   })
 }
 

+ 4 - 4
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -77,10 +77,6 @@ export default {
       const _this = this
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          if (_this.rebateDealerSn == '') {
-            this.$message.info('请选择下级')
-            return
-          }
           const formData = {
             rebateDealerSn: _this.rebateDealerSn,
             dealerSn: _this.nowData && _this.nowData.subDealer.dealerSn ? _this.nowData.subDealer.dealerSn : undefined
@@ -119,6 +115,10 @@ export default {
         this.$refs.ruleForm.resetFields()
         this.$refs.queryChid.resetForm()
         this.rebateDealerSn = []
+      }else{
+        this.$nextTick(()=>{
+          this.$refs.queryChid.setVal(this.nowData && this.nowData.rebateDealer && this.nowData.rebateDealer.dealerSn ? this.nowData.rebateDealer.dealerSn : undefined)
+        })
       }
     }
   }

+ 32 - 6
src/views/dealerManagement/rebateSettings/list.vue

@@ -10,6 +10,16 @@
                 <a-input id="rebateSettingsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="归属经销商名称">
+                <a-input id="rebateSettingsList-dealerName1" v-model.trim="queryParam.rebateDealerName" allowClear placeholder="请输入归属经销商名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="上级经销商名称">
+                <a-input id="rebateSettingsList-dealerName2" v-model.trim="queryParam.supDealerName" allowClear placeholder="请输入上级经销商名称"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="rebateSettingsList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="rebateSettingsList-reset">重置</a-button>
@@ -53,11 +63,21 @@
         </template>
         <!-- 差价归属 -->
         <template slot="cjgs" slot-scope="text, record">
-          <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
+          <span v-if="record.rebateDealer">{{ record.rebateDealer.dealerName }}</span>
           <span v-else>--</span>
         </template>
         <!-- 归属经销商级别 -->
         <template slot="gsjxsjb" slot-scope="text, record">
+          <span v-if="record.rebateDealer">{{ record.rebateDealer.provinceName }} > {{ record.rebateDealer.dealerLevelDictValue }}</span>
+          <span v-else>--</span>
+        </template>
+         <!-- 上级差价归属 -->
+         <template slot="sjcjgs" slot-scope="text, record">
+          <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
+          <span v-else>--</span>
+        </template>
+        <!-- 上级归属经销商级别 -->
+        <template slot="sjgsjxsjb" slot-scope="text, record">
           <span v-if="record.supDealer">{{ record.supDealer.provinceName }} > {{ record.supDealer.dealerLevelDictValue }}</span>
           <span v-else>--</span>
         </template>
@@ -86,14 +106,18 @@ export default {
         wrapperCol: { span: 16 }
       },
       queryParam: {
-        dealerName: ''
+        dealerName: '',
+        supDealerName:'',
+        rebateDealerName:''
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '经销商名称', width: '22.5%', scopedSlots: { customRender: 'jxs' }, align: 'center', ellipsis: true },
-        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'center', width: '22.5%' },
-        { title: '差价归属', scopedSlots: { customRender: 'cjgs' }, align: 'center', width: '22.5%' },
-        { title: '归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'center', width: '22.5%' },
+        { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'center', ellipsis: true },
+        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'center', width: '15%' },
+        { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'center', width: '15%' },
+        { title: '指定归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'center', width: '15%' },
+        { title: '上级经销商', scopedSlots: { customRender: 'sjcjgs' }, align: 'center', width: '15%' },
+        { title: '上级经销商级别', scopedSlots: { customRender: 'sjgsjxsjb' }, align: 'center', width: '15%' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -123,6 +147,8 @@ export default {
     //  重置
     resetSearchForm () {
       this.queryParam.dealerName = ''
+      this.queryParam.supDealerName = ''
+      this.queryParam.rebateDealerName = ''
       this.$refs.table.refresh(true)
     },
     // 编辑

+ 20 - 2
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -9,6 +9,7 @@
     :not-found-content="fetching ? undefined : null"
     @search="fetchUser"
     @change="handleChange"
+    allowClear
   >
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
     <a-select-option v-for="item in data" :key="item.dealerSn" :value="item.dealerSn">
@@ -34,7 +35,8 @@ export default {
     return {
       data: [],
       dealerName: [],
-      fetching: false
+      fetching: false,
+      itemSn: null
     }
   },
   methods: {
@@ -45,7 +47,13 @@ export default {
       const fetchId = this.lastFetchId
       this.data = []
       this.fetching = true
-      dealerRelationList({ 'dealerName': dealerName, 'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }).then(res => {
+      const params = {'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }
+      if(this.itemSn){
+        params.dealerSn = this.itemSn
+      }else{
+        params.dealerName = dealerName
+      }
+      dealerRelationList(params).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }
@@ -61,7 +69,17 @@ export default {
       })
       this.$emit('change', value)
     },
+    setVal(value){
+      this.itemSn = value
+      this.fetchUser()
+      Object.assign(this, {
+        dealerName: {key: this.itemSn},
+        data: [],
+        fetching: false
+      })
+    },
     resetForm () {
+      this.itemSn = null
       this.dealerName = []
     }
   }

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.113:8660/ocs-admin',
+        target: 'http://192.168.2.103/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {