Ver código fonte

归属设置

chenrui 1 ano atrás
pai
commit
7abe480490

+ 1 - 1
src/views/dealerManagement/provincialWarehouseManagement/list.vue

@@ -135,7 +135,7 @@ export default {
   methods: {
     // 关联经销商
     handleDealer (row) {
-      this.$router.push({ name: 'relatedDealersList', query: { sn: row.serviceCenterSn, name: row.serviceCenterName } })
+      this.$router.push({ name: 'relatedDealersList', params: { sn: row.serviceCenterSn, name: row.serviceCenterName } })
     },
     //  重置
     resetSearchForm () {

+ 5 - 5
src/views/dealerManagement/provincialWarehouseManagement/relatedDealersList.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span class="subTitle-word text-overflow" style="max-width:300px;margin-left:15px;">省仓名称:{{ $route.query.name ||'--' }}</span>
+          <span class="subTitle-word text-overflow" style="max-width:300px;margin-left:15px;">省仓名称:{{ $route.params.name ||'--' }}</span>
         </template>
       </a-page-header>
     </div>
@@ -95,7 +95,7 @@
       width="72%"
     >
       <div class="dealerModalCon">
-        <chooseDealer ref="dealerChoose" :itemSn="$route.query.sn" @plAdd="handleAddDealer"></chooseDealer>
+        <chooseDealer ref="dealerChoose" :itemSn="$route.params.sn" @plAdd="handleAddDealer"></chooseDealer>
       </div>
     </a-drawer>
   </div>
@@ -181,7 +181,7 @@ export default {
     handleAddDealer (list) {
       this.spinning = true
       const params = {
-        serviceCenterSn: this.$route.query.sn,
+        serviceCenterSn: this.$route.params.sn,
         dealerList: list
       }
       serviceCenterBinding(params).then(res => {
@@ -211,7 +211,7 @@ export default {
         centered: true,
         onOk () {
           const ajaxData = {
-            serviceCenterSn: this.$route.query.sn,
+            serviceCenterSn: _this.$route.params.sn,
             dealerSn: row.dealerSn
           }
           _this.submitDel(ajaxData)
@@ -239,7 +239,7 @@ export default {
         citySn: undefined,
         districtSn: undefined,
         dealerName: undefined,
-        serviceCenterSn: this.$route.query.sn,
+        serviceCenterSn: this.$route.params.sn,
         relationType: 'PURCHASE'
       }
       this.$refs.areaList.clearData()

+ 29 - 8
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -22,8 +22,11 @@
           <a-form-model-item label="经销商名称" v-if="nowData">
             {{ nowData.subDealer.dealerName }}
           </a-form-model-item>
-          <a-form-model-item label="差价归属">
-            <queryChild ref="queryChid" :dealerLevelList="dealerLevelList" @change="handleDisassociate"></queryChild>
+          <a-form-model-item label="上级经销商">
+            <queryChild ref="higherLevel" placeholderInfo="请输入上级经销商名称搜索" :dealerLevelList="higherDealerLevelList" @change="handleHigherLevel"></queryChild>
+          </a-form-model-item>
+          <a-form-model-item label="指定差价归属">
+            <queryChild ref="queryChid" placeholderInfo="请输入指定差价归属经销商名称搜索" :dealerLevelList="dealerLevelList" @change="handleDisassociate"></queryChild>
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
@@ -63,8 +66,10 @@ export default {
         labelCol: { span: 6 },
         wrapperCol: { span: 16 }
       },
+      higherDealerLevelList: ['CITY', 'PROVINCE'],
       dealerLevelList: ['CITY', 'PROVINCE'],
-      rebateDealerSn: ''
+      rebateDealerSn: '',
+      higherDealerSn: ''
     }
   },
   methods: {
@@ -72,12 +77,16 @@ export default {
       console.log('选中', val)
       this.rebateDealerSn = val ? val.key : ''
     },
+    handleHigherLevel (e) {
+      this.higherDealerSn = e ? e.key : ''
+    },
     //  保存
     handleSave () {
       const _this = this
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const formData = {
+            parentDealerSn: _this.higherDealerSn,
             rebateDealerSn: _this.rebateDealerSn,
             dealerSn: _this.nowData && _this.nowData.subDealer.dealerSn ? _this.nowData.subDealer.dealerSn : undefined
           }
@@ -113,13 +122,25 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
+        this.$refs.higherLevel.resetForm()
         this.$refs.queryChid.resetForm()
         this.rebateDealerSn = ''
-      }else{
-        this.$nextTick(()=>{
-          this.rebateDealerSn = this.nowData && this.nowData.rebateDealer && this.nowData.rebateDealer.dealerSn ? this.nowData.rebateDealer.dealerSn : ''
-          const dealerName = this.nowData && this.nowData.rebateDealer && this.nowData.rebateDealer.dealerName ? this.nowData.rebateDealer.dealerName : ''
-          this.$refs.queryChid.setVal(this.rebateDealerSn, dealerName)
+        this.higherDealerSn = ''
+      } else {
+        this.$nextTick(() => {
+          // 上级经销商
+          if (this.nowData && this.nowData.supDealer) {
+            this.higherDealerSn = this.nowData.supDealer.dealerSn ? this.nowData.supDealer.dealerSn : ''
+            const higherDealerName = this.nowData.supDealer.dealerName ? this.nowData.supDealer.dealerName : ''
+            this.$refs.higherLevel.setVal(this.higherDealerSn, higherDealerName)
+            this.higherDealerLevelList = this.nowData.supDealer.dealerLevel === 'CITY' ? ['PROVINCE'] : ['CITY', 'PROVINCE']
+          }
+          if (this.nowData && this.nowData.rebateDealer) {
+            this.rebateDealerSn = this.nowData.rebateDealer.dealerSn ? this.nowData.rebateDealer.dealerSn : ''
+            const dealerName = this.nowData.rebateDealer.dealerName ? this.nowData.rebateDealer.dealerName : ''
+            this.$refs.queryChid.setVal(this.rebateDealerSn, dealerName)
+            this.dealerLevelList = this.nowData.rebateDealer.dealerLevel === 'CITY' ? ['PROVINCE'] : ['CITY', 'PROVINCE']
+          }
         })
       }
     }

+ 3 - 2
src/views/dealerManagement/rebateSettings/list.vue

@@ -40,7 +40,7 @@
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
-          :pageSize="30"
+          :pageSize="20"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -49,7 +49,7 @@
             <a-button
               size="small"
               type="link"
-              v-if="$hasPermissions('B_rebateSettings_edit')"
+              v-if="$hasPermissions('B_rebateSettings_edit') && record.subDealer&&record.subDealer.dealerLevel&&record.subDealer.dealerLevel!='PROVINCE'"
               class="button-info"
               @click="handleEdit(record)"
               id="rebateSettingsList-edit-btn">编辑</a-button>
@@ -117,6 +117,7 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'left', ellipsis: true },
         { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'left', width: '15%' },
         { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'left', width: '15%' },

+ 12 - 8
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -3,7 +3,7 @@
     show-search
     label-in-value
     :value="dealerName"
-    placeholder="请输入上级名称搜索"
+    :placeholder="placeholderInfo"
     style="width: 100%"
     :filter-option="false"
     :not-found-content="fetching ? undefined : null"
@@ -27,6 +27,10 @@ export default {
       default: function () {
         return []
       }
+    },
+    placeholderInfo: {
+      type: String,
+      default: '请输入上级名称搜索'
     }
   },
   data () {
@@ -47,10 +51,10 @@ export default {
       const fetchId = this.lastFetchId
       this.data = []
       this.fetching = true
-      const params = {'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }
-      if(this.itemSn && !dealerName){
+      const params = { 'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }
+      if (this.itemSn && !dealerName) {
         params.dealerSn = this.itemSn
-      }else{
+      } else {
         params.dealerName = dealerName
       }
       dealerRelationList(params).then(res => {
@@ -68,16 +72,16 @@ export default {
         data: [],
         fetching: false
       })
-      if(!value){
+      if (!value) {
         this.itemSn = null
       }
       this.$emit('change', value)
     },
-    setVal(value, label){
-      if(value){
+    setVal (value, label) {
+      if (value) {
         this.itemSn = value
         this.fetchUser()
-        this.handleChange({key: this.itemSn, label: label})
+        this.handleChange({ key: this.itemSn, label: label })
       }
     },
     resetForm () {

+ 2 - 1
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -425,7 +425,8 @@ export default {
        overflow-y:scroll;
     }
    .tabBox::-webkit-scrollbar {
-       width: 0px;
+       // width: 0px;
+       display: none;
     }
     .ant-form-item-control .ant-input[disabled]{
       color:#333333;