|
|
@@ -460,18 +460,15 @@ export default {
|
|
|
this.showPopup = false
|
|
|
},
|
|
|
onConfirm(selectedData) {
|
|
|
- if (this.$utils.isEmpty(selectedData)) {
|
|
|
- this.$notify({
|
|
|
+ if (this.$utils.isEmpty(selectedData) || !this.multiple && this.$utils.isEmpty(selectedData[0])) {
|
|
|
+ if (this.$utils.isEmpty(this.selectedValue)) {
|
|
|
+ this.$notify({
|
|
|
type: 'warning',
|
|
|
message: '请选择!'
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
- if (!this.multiple && this.$utils.isEmpty(selectedData[0])) {
|
|
|
- this.$notify({
|
|
|
- type: 'warning',
|
|
|
- message: '请选择!'
|
|
|
- })
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.showPopup = false
|
|
|
+ }
|
|
|
return
|
|
|
}
|
|
|
this.showPopup = false
|
|
|
@@ -480,7 +477,7 @@ export default {
|
|
|
},
|
|
|
callbackData(selectedData) {
|
|
|
this.emitInput(selectedData, this.type)
|
|
|
- this.showPopup = false
|
|
|
+ //this.showPopup = false
|
|
|
},
|
|
|
emitInput(value, type) {
|
|
|
if (this.store === 'bind') {
|