소스 검색

修改bug

chenrui 2 년 전
부모
커밋
4cdcdbe2e5

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

@@ -60,7 +60,7 @@
       @rowSelection="rowSelectionFun"
       :columns="columns"
       :data="loadData"
-      :style="{ height: tableHeight+84.5+'px' }"
+      :style="{ height:pageType=='viewDealers'? tableHeight+84.5+'px':tableHeight-15+'px' }"
       :scroll="{ y: pageType=='viewDealers'?tableHeight:tableHeight+80 }"
       :defaultLoadData="false"
       bordered>
@@ -88,7 +88,6 @@ import { STable, VSelect } from '@/components'
 import AreaList from '@/views/common/areaList.js'
 import { queryDealerPageList } from '@/api/dealer'
 import subarea from '@/views/common/subarea.js'
-import Array from 'core-js/library/fn/array'
 export default {
   name: 'ChooseDealer',
   mixins: [commonMixin],
@@ -255,7 +254,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 285
     }
   },
   mounted () {

+ 8 - 2
src/views/dealerManagement/businessOwnerSettings/categorySet.vue

@@ -90,6 +90,12 @@ export default {
   name: 'CategorySet',
   mixins: [commonMixin],
   components: { ChooseBrandModal, ChooseTypeModal },
+  props: {
+    bizUserSn: {
+      type: String,
+      default: ''
+    }
+  },
   data () {
     return {
       spinning: false,
@@ -227,7 +233,7 @@ export default {
       }
     },
     save (list, type) {
-      const ajaxdata = { userSn: this.$route.query.sn, bizUserScopeSn: this.chooseObj.bizUserScopeSn }
+      const ajaxdata = { userSn: this.$route.query.sn, bizUserScopeSn: this.chooseObj.bizUserScopeSn, bizUserSn: this.bizUserSn }
       if (type == 'BRAND') {
         ajaxdata.productBrandList = list
         saveProductBrandList(ajaxdata).then(res => {
@@ -278,8 +284,8 @@ export default {
         pageSize: 20,
         userSn: this.$route.query.sn,
         hasDetail: 1,
+        bizUserSn: this.bizUserSn,
         ...params
-
       }).then(res => {
         if (res.status == 200) {
           this.dataSource = res.data.list

+ 5 - 3
src/views/dealerManagement/businessOwnerSettings/chooseAreaModal.vue

@@ -42,7 +42,7 @@ export default {
     chooseData: {
       type: Object,
       default: () => {
-        return []
+        return {}
       }
     }
   },
@@ -52,7 +52,7 @@ export default {
     },
     visible (newValue, oldValue) {
       if (!newValue) {
-        this.checkedKeys = []
+        this.checkedKeys = { checked: [], halfChecked: [] }
         this.$emit('close')
       }
     }
@@ -60,7 +60,9 @@ export default {
   data () {
     return {
       autoExpandParent: false,
-      checkedKeys: [],
+      checkedKeys: {
+        checked: [], halfChecked: []
+      },
       subregionData: null,
       tableHeight: 0,
       visible: false,

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

@@ -45,7 +45,8 @@
                     class="sTable fixPagination"
                     ref="table"
                     size="small"
-                    :rowKey="(record) => record.id"
+                    :rowKey="(record) => record.no"
+                    rowKeyName="no"
                     :columns="columns"
                     :data="loadData"
                     :defaultLoadData="false"
@@ -68,7 +69,7 @@
               </div>
             </a-tab-pane>
             <a-tab-pane key="2" tab="设置管辖品类" force-render v-if="infoObj.allProductFlag&&infoObj.allProductFlag!=1">
-              <categorySet ref="setCategory"></categorySet>
+              <categorySet ref="setCategory" :bizUserSn="infoObj.bizUserSn"></categorySet>
             </a-tab-pane>
           </a-tabs>
         </div>
@@ -240,7 +241,7 @@ export default {
       if (dataList.data.list && dataList.data.list.length > 0) {
         dataList.data.list.forEach(item => {
           if (item.bizType == 'subarea_area') {
-            item.bixSn = item.bizSn + '_'
+            item.bizSn = item.bizSn + '_'
           }
           checkedArr.push(item.bizSn)
         })