lilei 2 роки тому
батько
коміт
df66eeb73d

+ 11 - 0
src/views/common/subarea.js

@@ -42,10 +42,17 @@ const AreaList = {
         type: String,
         default: 'default'
     },
+    // 只能选择分区,如果区域下无分区不能选择
+    onlySubarea:{
+      type: Boolean,
+      default: false
+    },
+    // true可选择一级、二级,false只能选择叶子节点
     changeOnSelect:{
         type: Boolean,
         default: true
     },
+    // 只显示那一级数据,空全部显示
     showLeve:{
       type: String,
       default: ''
@@ -87,6 +94,10 @@ const AreaList = {
                         cd.name = cd.subareaAreaName
                         cd.areaSn = cd.subareaAreaSn
                       })
+                    }else{
+                      if(this.onlySubarea){
+                        item.disabled = true
+                      }
                     }
                   })
                   this.list = res.data

+ 10 - 6
src/views/dealerManagement/marketingDivisionSetNew/viewDealers.vue

@@ -128,6 +128,7 @@ export default {
     visible (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+        this.resetData()
       }else{
         this.pageInit()
       }
@@ -235,11 +236,8 @@ export default {
         this.$refs.table.refresh(true)
       }
     },
-    resetSearchForm () {
-      if(this.flag){
-        this.hasData()
-      }else{
-        this.queryParam = {
+    resetData(){
+      this.queryParam = {
           dealer:{
             nameLike: '',
             dealerType: null,
@@ -250,7 +248,13 @@ export default {
             districtSn: undefined
           }
         }
-        this.$refs.areaList.clearData()
+      this.$refs.areaList.clearData()
+    },
+    resetSearchForm () {
+      if(this.flag){
+        this.hasData()
+      }else{
+        this.resetData()
         this.$refs.table.refresh(true)
       }
     },

+ 1 - 0
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -53,6 +53,7 @@
                     id="epenseDetailModal-subarea"
                     ref="subareaBox"
                     defValKey="name"
+                    :onlySubarea="true"
                     :changeOnSelect="false"
                     @change="subareaChange"
                     v-model="subareaList"