diff --git a/monitorMobile/components/cell.vue b/monitorMobile/components/cell.vue
index 96b18e4..bb22926 100644
--- a/monitorMobile/components/cell.vue
+++ b/monitorMobile/components/cell.vue
@@ -1,27 +1,51 @@
-
+
+
+
+ {{item}}
+
+
+
-
\ No newline at end of file
diff --git a/monitorMobile/components/selectRadio.vue b/monitorMobile/components/selectRadio.vue
index 02c9727..e5e1bcf 100644
--- a/monitorMobile/components/selectRadio.vue
+++ b/monitorMobile/components/selectRadio.vue
@@ -19,7 +19,6 @@
props: {
value: {
default: "",
- type: String | Number
},
options: {
default: [],
@@ -27,7 +26,6 @@
},
title:{
default: "",
- type: String
},
cellVisible: {
default: true,
diff --git a/monitorMobile/components/selectSearch.vue b/monitorMobile/components/selectSearch.vue
index 2a95b12..10f06a8 100644
--- a/monitorMobile/components/selectSearch.vue
+++ b/monitorMobile/components/selectSearch.vue
@@ -1,20 +1,23 @@
-
+
+
- {{'请选择' + popupTitle}}
+ {{popupTitle}}
-
-
+
-
+
@@ -38,47 +41,60 @@
props: {
value: {
default: "",
- type: String | Number
},
options: {
default: [],
type: Array
},
- title: {
- default: "",
- type: String
+ // 是否显示cell回显
+ cellVisible: {
+ default: true,
+ },
+ // cell回显默认文字
+ placeholder:{
+ default:'请选择'
},
+ // 弹框标题
popupTitle: {
- default: "",
+ default: "请选择",
type: String
},
- searchPlaceHolder: {
- default: "",
+ // 是否显示搜索
+ filterable: {
+ default: true,
+ },
+ // 搜索框默认文字
+ searchPlaceholder: {
+ default: "请输入",
type: String
},
- cellVisible: {
- default: true,
+ // 单选时候cell回显的文字
+ title: {
+ default: "",
},
+ // 是否多选
multiple: {
default: false,
},
- filterable: {
- default: true,
- },
},
data() {
return {
show: false,
- title_: this.title,
+ title_: this.title||this.placeholder,
value_: this.value,
- radioValue: '',
- searchText: ''
+ gruopValue: '',
+ searchText: '',
+ cellValue:[],
};
},
mounted() {
- if (this.value) {
+ if (this.multiple) this.gruopValue = []
+ if (!this.multiple) {
let obj = this.options.find(e1 => e1.value == this.value)
if (obj) this.title_ = obj.label
+ } else {
+ let arr = this.options.filter(e1 => this.value.includes(e1.value))
+ this.cellValue = arr.map(e => e.label)
}
},
methods: {
@@ -86,20 +102,30 @@
this.show = false
},
open() {
- let obj = this.options.find(e1 => e1.value == this.value)
- if (obj) this.title_ = obj.label
- this.title_ = obj ? obj.label : (this.popupTitle || this.title)
+ if (this.multiple) this.gruopValue = []
+ if (!this.multiple) {
+ let obj = this.options.find(e1 => e1.value == this.value)
+ if (obj) this.title_ = obj.label
+ } else {
+ let arr = this.options.filter(e1 => this.value.includes(e1.value))
+ this.cellValue = arr.map(e => e.label)
+ }
this.value_ = this.value
this.searchText = ''
},
change(e) {
- this.radioValue = e
+ this.gruopValue = e
},
cofirm() {
- this.$emit("update:value", this.radioValue)
- this.$emit("change", this.radioValue)
- let obj = this.options.find(e1 => e1.value == this.radioValue)
- if (obj) this.title_ = obj.label
+ this.$emit("update:value", this.gruopValue)
+ this.$emit("change", this.gruopValue)
+ if (!this.multiple) {
+ let obj = this.options.find(e1 => e1.value == this.gruopValue)
+ if (obj) this.title_ = obj.label
+ } else {
+ let arr = this.options.filter(e1 => this.gruopValue.includes(e1.value))
+ this.cellValue = arr.map(e => e.label)
+ }
this.close()
},
}
@@ -126,13 +152,13 @@
padding: 24rpx 0;
}
}
-
+
.u-checkbox-group {
width: 92%;
max-height: 680rpx;
overflow-y: auto;
padding: 0 30rpx;
-
+
.u-cell {
background-color: #fff;
border-radius: 20rpx 20rpx 0 0;
@@ -147,7 +173,7 @@
.u-radio {
margin-top: 18rpx;
}
-
+
.u-checkbox {
margin-top: 18rpx;
}
diff --git a/monitorMobile/components/selectTree.vue b/monitorMobile/components/selectTree.vue
new file mode 100644
index 0000000..347565f
--- /dev/null
+++ b/monitorMobile/components/selectTree.vue
@@ -0,0 +1,252 @@
+
+
+
+
+
+ {{popupTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/monitorMobile/pages/attendanceCall/passengerFlow/add.vue b/monitorMobile/pages/attendanceCall/passengerFlow/add.vue
index c188d6b..cd0238c 100644
--- a/monitorMobile/pages/attendanceCall/passengerFlow/add.vue
+++ b/monitorMobile/pages/attendanceCall/passengerFlow/add.vue
@@ -1,31 +1,88 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{form.tick.length?form.tick.join('-'):'请选择'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/monitorMobile/pages/attendanceCall/returnBed/index.vue b/monitorMobile/pages/attendanceCall/returnBed/index.vue
index aec139d..4826d2e 100644
--- a/monitorMobile/pages/attendanceCall/returnBed/index.vue
+++ b/monitorMobile/pages/attendanceCall/returnBed/index.vue
@@ -4,7 +4,7 @@
+ placeholder="请选择寝室" popupTitle="请选择寝室" search-placeholder="请输入寝室号"/>