chenrui %!s(int64=2) %!d(string=hai) anos
pai
achega
b820cf2928

+ 3 - 9
src/views/common/chooseDealer.vue

@@ -104,12 +104,6 @@ export default {
         return null
       }
     }
-    // chooseInfo: {
-    //   type: Array,
-    //   defatut: () => {
-    //     return []
-    //   }
-    // }
   },
   data () {
     return {
@@ -122,10 +116,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
-        },
+        }
       },
       chooseInfo: [],
       tableHeight: 0,
@@ -210,7 +204,7 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         }

+ 9 - 3
src/views/dealerManagement/businessOwnerSettings/list.vue

@@ -49,7 +49,7 @@
           bordered>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="link" class="button-warning" @click="handleSetCategory(record)">设置管辖范围</a-button>
+            <a-button size="small" type="link" class="button-warning" v-if="record.allDealerFlag!=1&&record.allProductFlag!=1" @click="handleSetCategory(record)">设置管辖范围</a-button>
             <a-button size="small" type="link" class="button-info" @click="handleEdit(record)">编辑</a-button>
             <a-button size="small" type="link" class="button-error" @click="handleDelete(record)">删除</a-button>
           </template>
@@ -113,8 +113,14 @@ export default {
       this.queryParam.userSn = val.key
     },
     handleSetCategory (row) {
-      const name = encodeURI(row.userName)
-      this.$router.push({ name: 'categorySet', query: { sn: row.userSn, name: name } })
+      const obj = {
+        name: row.userName,
+        d_flag: row.allDealerFlag,
+        p_flag: row.allProductFlag
+      }
+      const newString = JSON.stringify(obj)
+      const newObj = encodeURI(newString)
+      this.$router.push({ name: 'categorySet', query: { sn: row.userSn, con: newObj } })
     },
     // 新增
     handleAdd () {

+ 7 - 4
src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue

@@ -5,7 +5,7 @@
         <a-page-header :ghost="false" :backIcon="false" class="header-bar">
           <!-- 自定义的二级文字标题 -->
           <template slot="subTitle">
-            <span class="subTitle-word text-overflow" style="max-width:300px;">用户姓名:{{ decodeURI($route.query.name) }}</span>
+            <span class="subTitle-word text-overflow" style="max-width:300px;">用户姓名:{{ infoObj.name?infoObj.name:'--' }}</span>
             <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
           </template>
         </a-page-header>
@@ -13,7 +13,7 @@
       <a-card size="small" :bordered="false" class="categorySet-cont">
         <div :style="{ height: tableHeight+84.5+'px' }">
           <a-tabs default-active-key="1" @change="handleTabs">
-            <a-tab-pane key="1" tab="设置管辖区域">
+            <a-tab-pane key="1" tab="设置管辖区域" v-if="infoObj.p_flag&&infoObj.p_flag!=1">
               <div class="areaSet-wrap">
                 <div class="table-page-search-wrapper newTableSearchName" >
                   <div class="areaSet-btnGroup" style="margin-bottom:20px;">
@@ -68,7 +68,7 @@
                 </a-spin>
               </div>
             </a-tab-pane>
-            <a-tab-pane key="2" tab="设置管辖品类" force-render>
+            <a-tab-pane key="2" tab="设置管辖品类" force-render v-if="infoObj.p_flag&&infoObj.p_flag!=1">
               <categorySet ref="setCategory"></categorySet>
             </a-tab-pane>
           </a-tabs>
@@ -125,6 +125,7 @@ export default {
         },
         dealerName: ''
       },
+      infoObj: {},
       newChooseData: {// 区域分区回显
         checked: [],
         halfChecked: []
@@ -284,7 +285,9 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
-      this.resetSearchForm()
+      const obj = decodeURI(_this.$route.query.con)
+      _this.infoObj = JSON.parse(obj)
+      _this.resetSearchForm()
     },
     setTableH () {
       const headHeight = this.$refs.headerBar.offsetHeight