Ver Fonte

bug 修复

lilei há 4 anos atrás
pai
commit
9c07403347

+ 25 - 25
src/config/router.config.js

@@ -466,32 +466,32 @@ export const asyncRouterMap = [
                 }
               }
             ]
+          },
+          {
+            path: '/dealerManagement/rebateSettings',
+            redirect: '/dealerManagement/rebateSettings/list',
+            name: 'rebateSettings',
+            component: RouteView,
+            meta: {
+              title: '差价归属设置',
+              icon: 'sketch'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'rebateSettingsList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/dealerManagement/rebateSettings/list.vue'),
+                meta: {
+                  title: '差价归属设置列表',
+                  icon: 'sketch',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              }
+            ]
           }
-          // {
-          //   path: '/dealerManagement/rebateSettings',
-          //   redirect: '/dealerManagement/rebateSettings/list',
-          //   name: 'rebateSettings',
-          //   component: RouteView,
-          //   meta: {
-          //     title: '差价归属设置',
-          //     icon: 'sketch'
-          //     // permission: 'M_goodsManage_list'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'rebateSettingsList',
-          //       component: () => import(/* webpackChunkName: "shop" */ '@/views/dealerManagement/rebateSettings/list.vue'),
-          //       meta: {
-          //         title: '差价归属设置列表',
-          //         icon: 'sketch',
-          //         hidden: true
-          //         // permission: 'M_goodsManage_list'
-          //       }
-          //     }
-          //   ]
-          // }
         ]
       },
       //  供应商管理

+ 2 - 2
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -46,9 +46,9 @@
           @click.stop="handleAssociate(record)">关联下级</a-button>
         <a-button
           type="link"
-          class="button-warning"
+          class="button-error"
           size="small"
-          icon="plus"
+          icon="close"
           :id="'relationshipBindingList-delSubItem'+record.id"
           v-else
           @click.stop="handleDisassociate(record)">取消关联</a-button>

+ 37 - 76
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     centered
-    class="rebateSettingsEdit-modal"
+    class="relationshipBinding-modal"
     :footer="null"
     :maskClosable="false"
     title="编辑"
@@ -11,61 +11,39 @@
     <!-- 表单 -->
     <div>
       <a-form-model
-        id="rebateSettingsEdit-form"
+        id="relationshipBinding-form"
         ref="ruleForm"
         :model="form"
         :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol"
       >
-        <a-form-model-item label="经销商名">
-          收款方还是空见房东
+        <a-form-model-item label="经销商名称" v-if="nowData">
+          {{ nowData.subDealer.dealerName }}
         </a-form-model-item>
-        <a-form-model-item label="返利归属" prop="productTypeName">
-          <a-select
-            placeholder="请选择"
-            id="rebateSettingsEdit-productBrandSn"
-            allowClear
-            v-model="form.productTypeName"
-            :showSearch="true"
-            @search="handlerSearch">
-            <div slot="dropdownRender" slot-scope="menu">
-              <ul style="padding: 0;margin: 0;list-style: none;">
-                <li style="padding: 10px 15px;display: flex;justify-content: space-between;align-items: center;" @click="handleDisassociate()">
-                  <p style="margin: 0;">西安车领主网络科技有限公司</p>
-                  <a-button
-                    type="link"
-                    class="button-error"
-                    size="small"
-                    id="rebateSettingsEdit-edit">立刻关联</a-button>
-                </li>
-              </ul>
-            </div>
-            <!-- <a-select-option v-for="item in productBrandList" :key="item.productBrandSn" :value="item.productBrandSn">{{ item.productBrandName }}</a-select-option> -->
-          </a-select>
+        <a-form-model-item label="差价归属">
+          <queryChild ref="queryChid" :dealerLevelList="dealerLevelList" @change="handleDisassociate"></queryChild>
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
-        <a-button type="primary" id="rebateSettingsEdit-save" @click="handleSave">保存</a-button>
-        <a-button id="rebateSettingsEdit-back" @click="isShow = false" style="margin-left: 15px;">关闭</a-button>
+        <a-button type="primary" id="product-category-edit-modal-save" @click="handleSave">确定</a-button>
+        <a-button id="product-category-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">关闭</a-button>
       </div>
     </div>
   </a-modal>
 </template>
 
 <script>
-// import { dealerProductTypeSave } from '@/api/dealerProductType'
+import { updateRebate } from '@/api/dealerRelation'
+import queryChild from './queryChild.vue'
 export default {
-  name: 'RebateSettingsEditModal',
+  name: 'AssociateModal',
+  components: { queryChild },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
       default: false
     },
-    itemId: {
-      type: [Number, String],
-      default: ''
-    },
     nowData: {
       type: Object,
       default: null
@@ -74,53 +52,41 @@ export default {
   data () {
     return {
       isShow: this.openModal, //  是否打开弹框
+      form: {},
+      rules: {},
       formItemLayout: {
         labelCol: { span: 6 },
         wrapperCol: { span: 16 }
       },
-      form: {
-        productTypeName: '' // 产品分类名称
-      },
-      rules: {
-        productTypeName: [
-          { required: true, message: '请输入产品分类名称', trigger: 'blur' }
-        ]
-      },
-      parentType: '', //  父级分类
-      productBrandList: [
-        { productBrandSn: 2, productBrandName: '爱的世界客户带伞' }
-      ]
-    }
-  },
-  components: {
-    VNodes: {
-      functional: true,
-      render: (h, ctx) => ctx.props.vnodes
+      dealerLevelList: ['CITY', 'PROVINCE'],
+      rebateDealerSn: ''
     }
   },
   methods: {
-    handleDisassociate () {
-      console.log('选中')
-    },
-    // search
-    handlerSearch (val) {
-      console.log(val)
+    handleDisassociate (val) {
+      console.log('选中', val)
+      this.rebateDealerSn = val.key
     },
     //  保存
     handleSave () {
       const _this = this
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const formData = JSON.parse(JSON.stringify(_this.form))
-          formData.id = _this.itemId ? _this.itemId : undefined
-          formData.psn = _this.nowData && _this.nowData.psn ? _this.nowData.psn : undefined
-          // dealerProductTypeSave(formData).then(res => {
-          //   if (res.status == 200) {
-          //     _this.$message.success(res.message)
-          //     _this.$emit('ok')
-          //     _this.isShow = false
-          //   }
-          // })
+          if (_this.rebateDealerSn == '') {
+            this.$message.info('请选择下级')
+            return
+          }
+          const formData = {
+            rebateDealerSn: _this.rebateDealerSn,
+            dealerSn: _this.nowData && _this.nowData.subDealer.dealerSn ? _this.nowData.subDealer.dealerSn : undefined
+          }
+          updateRebate(formData).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$emit('ok', formData.dealerSn)
+              _this.isShow = false
+            }
+          })
         } else {
           return false
         }
@@ -142,13 +108,8 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
-      }
-    },
-    itemId (newValue, oldValue) {
-      if (this.isShow && newValue) {
-
-      } else {
-
+        this.$refs.queryChid.resetForm()
+        this.rebateDealerSn = []
       }
     }
   }
@@ -156,7 +117,7 @@ export default {
 </script>
 
 <style lang="less">
-  .rebateSettingsEdit-modal{
+  .relationshipBinding-modal{
     .ant-modal-body {
       padding: 40px 40px 24px;
     }

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

@@ -6,7 +6,7 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-item label="经销商名称">
-              <a-input id="rebateSettingsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入经销商名称"/>
+              <a-input id="rebateSettingsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -30,15 +30,36 @@
       <template slot="action" slot-scope="text, record">
         <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="rebateSettingsList-edit-btn">编辑</a-button>
       </template>
+      <!-- 经销商名称 -->
+      <template slot="jxs" slot-scope="text, record">
+        <span v-if="record.subDealer">{{ record.subDealer.dealerName }}</span>
+        <span v-else>--</span>
+      </template>
+      <!-- 经销商级别 -->
+      <template slot="dealerLevel" slot-scope="text, record">
+        <span v-if="record.subDealer">{{ record.subDealer.provinceName }} > {{ record.subDealer.dealerLevelDictValue }}</span>
+        <span v-else>--</span>
+      </template>
+      <!-- 差价归属 -->
+      <template slot="cjgs" slot-scope="text, record">
+        <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
+        <span v-else>--</span>
+      </template>
+      <!-- 归属经销商级别 -->
+      <template slot="gsjxsjb" slot-scope="text, record">
+        <span v-if="record.supDealer">{{ record.supDealer.provinceName }} > {{ record.supDealer.dealerLevelDictValue }}</span>
+        <span v-else>--</span>
+      </template>
     </s-table>
     <!-- 关联下级 -->
-    <associate-modal :openModal="openModal" :nowData="nowData" :itemId="itemId" @ok="$refs.table.refresh(true)" @close="closeModal" />
+    <associate-modal :openModal="openModal" :nowData="nowData" @ok="$refs.table.refresh(true)" @close="closeModal" />
   </a-card>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
 import associateModal from './associateModal.vue'
+import { queryRebatePage } from '@/api/dealerRelation'
 export default {
   components: { STable, VSelect, associateModal },
   data () {
@@ -48,13 +69,15 @@ export default {
         labelCol: { span: 6 },
         wrapperCol: { span: 16 }
       },
-      queryParam: {},
+      queryParam: {
+        dealerName: ''
+      },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '经销商名称', dataIndex: 'productTypeName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '经销商级别', dataIndex: 'productTyspeName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '差价归属', dataIndex: 'productTypdeName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '归属经销商级别', dataIndex: 'productTfypeName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '经销商名称', scopedSlots: { customRender: 'jxs' }, align: 'center', ellipsis: true },
+        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'center' },
+        { title: '差价归属', scopedSlots: { customRender: 'cjgs' }, align: 'center' },
+        { title: '归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -63,54 +86,34 @@ export default {
         if (this.tableHeight == 0) {
           this.tableHeight = window.innerHeight - 380
         }
-        // return dealerProductList(Object.assign(parameter, this.queryParam)).then(res => {
-        //   const data = res.data
-        //   const no = (data.pageNo - 1) * data.pageSize
-        //   for (var i = 0; i < data.list.length; i++) {
-        //     data.list[i].no = no + i + 1
-        //   }
-        //   this.disabled = false
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productPic: ['https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg', 'https://qn.antdv.com/vue.png'], productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
-            ]
-          }
+        return queryRebatePage(Object.assign(parameter, this.queryParam)).then(res => {
+          const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
           }
-          _this.disabled = false
-          resolve(data)
+          this.disabled = false
+          return data
         })
       },
       defaultExpandedRowKeys: [], //  树形数据默认展开项
       openModal: false, //  新增编辑  弹框
-      itemId: '', //  当前id
       nowData: null //  当前记录数据
     }
   },
   methods: {
     //  重置
     resetSearchForm () {
-      this.queryParam.productCode = ''
-      this.queryParam.enabledFlag = undefined
+      this.queryParam.dealerName = ''
       this.$refs.table.refresh(true)
     },
     // 编辑
     handleEdit (row) {
-      this.itemId = row.id
       this.nowData = row
       this.openModal = true
     },
     //  关闭弹框
     closeModal () {
-      this.itemId = ''
       this.nowData = null
       this.openModal = false
     }

+ 69 - 0
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -0,0 +1,69 @@
+<template>
+  <a-select
+    show-search
+    label-in-value
+    :value="dealerName"
+    placeholder="请选择下级"
+    style="width: 100%"
+    :filter-option="false"
+    :not-found-content="fetching ? undefined : null"
+    @search="fetchUser"
+    @change="handleChange"
+  >
+    <a-spin v-if="fetching" slot="notFoundContent" size="small" />
+    <a-select-option v-for="item in data" :key="item.dealerSn" :value="item.dealerSn">
+      {{ item.dealerName }}
+    </a-select-option>
+  </a-select>
+</template>
+<script>
+import debounce from 'lodash/debounce'
+import { dealerRelationList } from '@/api/dealerRelation'
+export default {
+  props: {
+    dealerLevelList: {
+      type: Array,
+      default: function () {
+        return []
+      }
+    }
+  },
+  data () {
+    this.lastFetchId = 0
+    this.fetchUser = debounce(this.fetchUser, 800)
+    return {
+      data: [],
+      dealerName: [],
+      fetching: false
+    }
+  },
+  methods: {
+    fetchUser (dealerName) {
+      console.log('fetching user', dealerName)
+      if (dealerName == '') return
+      this.lastFetchId += 1
+      const fetchId = this.lastFetchId
+      this.data = []
+      this.fetching = true
+      dealerRelationList({ 'dealerName': dealerName, 'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 1000 }).then(res => {
+        if (fetchId !== this.lastFetchId) {
+          return
+        }
+        this.data = res.data.list || []
+        this.fetching = false
+      })
+    },
+    handleChange (value) {
+      Object.assign(this, {
+        dealerName: value,
+        data: [],
+        fetching: false
+      })
+      this.$emit('change', value)
+    },
+    resetForm () {
+      this.dealerName = []
+    }
+  }
+}
+</script>