diff --git a/src/utils/custom.js b/src/utils/custom.js index db6f8e8f..0d573e9d 100644 --- a/src/utils/custom.js +++ b/src/utils/custom.js @@ -639,5 +639,3 @@ export function genJsSeqNo() { return seqNo } - - diff --git a/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue index 06898344..e6f32928 100644 --- a/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue @@ -193,10 +193,6 @@ }; }, watch: { - value(newVal) { - }, - svalue(newVal, oldVal) { - }, countryCode(newVal, oldVal) { this.queryParams.countryCode = this.countryCode; this.initData(); @@ -207,6 +203,9 @@ }, isAddSite(val){ this.initData(); + }, + selectSiteCode(val){ + }, // 根据名称筛选部门树 filterName(val) { @@ -241,15 +240,10 @@ initData() { this.loading = true; - // console.log(this.queryParams) - // console.log(this.selectSiteCodeStr) - if(this.selectSiteCodeStr!=null){ this.checkList = this.selectSiteCodeStr.split(','); } - console.log(this.isAddSite); - listSimpleEmisSite(this.queryParams).then(response => { this.loading = false; // 追加节点 过滤已经选中节点 diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue index c90fbddd..517a4dd5 100644 --- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue @@ -70,7 +70,7 @@ defaultValue:null }, blIncludeChildSite:{ - type: [String], + type: [String,Number], required: false, defaultValue:null }, diff --git a/src/views/emis/emisRegion/emisRegionForm.vue b/src/views/emis/emisRegion/emisRegionForm.vue index 304b2407..0f2da090 100644 --- a/src/views/emis/emisRegion/emisRegionForm.vue +++ b/src/views/emis/emisRegion/emisRegionForm.vue @@ -1,7 +1,8 @@