From c7bd6db3190ff5c4b55d004db0b9fa944604925f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 18 十月 2024 11:09:15 +0800
Subject: [PATCH] Merge branch 'lsf-topTask'
---
src/components/search-option/FYOptionLocation.vue | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/components/search-option/FYOptionLocation.vue b/src/components/search-option/FYOptionLocation.vue
index f4dc270..821cb2a 100644
--- a/src/components/search-option/FYOptionLocation.vue
+++ b/src/components/search-option/FYOptionLocation.vue
@@ -6,7 +6,7 @@
:options="locations"
:placeholder="placeholder"
:props="optionProps"
- style="width: 280px"
+ style="width: 320px"
/>
</el-form-item>
</template>
@@ -21,7 +21,7 @@
type: Boolean,
default: true
},
- // 鏌ヨ鐨勮鏀跨骇鍒紝鍙栧��1锛�2锛�3锛�4
+ // 鏌ヨ鐨勮鏀跨骇鍒紝鍙栧��1锛�2锛�3锛�4, 5, 6
level: {
type: Number,
default: 4
@@ -38,9 +38,12 @@
type: Boolean,
default: true
},
- prop: String
+ prop: {
+ type: String,
+ default: '_locations'
+ }
},
- emits: ['update:value'],
+ emits: ['update:value', 'change'],
data() {
return {
locations: enumLocation(this.allOption, this.level),
@@ -51,7 +54,7 @@
},
computed: {
placeholder() {
- const list = '鐪�/甯�/鍖�/闀�'.split('/');
+ const list = '鐪�/甯�/鍖�/闀�/闆�/鐗�'.split('/');
const p = [];
for (let i = 0; i < this.level; i++) {
p.push(list[i]);
@@ -65,6 +68,7 @@
methods: {
handleChange(value) {
this.$emit('update:value', this.optionFormat(value));
+ this.$emit('change', this.optionFormat(value));
},
/**
* 鍦板尯閫夐」缁撴灉鏍煎紡鍖�
@@ -78,7 +82,11 @@
dCode: null,
dName: null,
tCode: null,
- tName: null
+ tName: null,
+ aCode: null,
+ aName: null,
+ mCode: null,
+ mName: null,
};
if (val.length > 0) {
res.pCode = val[0][0];
@@ -96,6 +104,14 @@
res.tCode = val[3][0];
res.tName = val[3][1];
}
+ if (val.length > 4) {
+ res.aCode = val[4][0];
+ res.aName = val[4][1];
+ }
+ if (val.length > 5) {
+ res.mCode = val[5][0];
+ res.mName = val[5][1];
+ }
return res;
},
optionFormatReverse(val) {
@@ -113,6 +129,12 @@
if (val.tName) {
res.push([val.tCode, val.tName]);
}
+ if (val.aName) {
+ res.push([val.aCode, val.aName]);
+ }
+ if (val.mName) {
+ res.push([val.mCode, val.mName]);
+ }
}
return res;
}
--
Gitblit v1.9.3