@zscreate/zhxy-app-component 1.0.230 → 1.0.232

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -247,7 +247,7 @@
247
247
 
248
248
  console.log('city', this.city)
249
249
 
250
- this.$emit('change', this.city);
250
+ this.$emit('change', this.city.filter( item => item !== ''));
251
251
  this.$refs.popup.close()
252
252
  },
253
253
  handleCancle() {
@@ -78,6 +78,7 @@ export default {
78
78
  // #ifdef MP-WEIXIN
79
79
  paddingTop: '95rpx 20rpx 20rpx 20rpx',
80
80
  // #endif
81
+ departRelation: 0
81
82
  }
82
83
  },
83
84
  computed: {
@@ -105,6 +106,7 @@ export default {
105
106
  console.log("userInfo: ", userInfo)
106
107
  this.depId = userInfo.departId || userInfo.depart_id
107
108
  }
109
+ this.departRelation = widget.options.departRelation ? 1 : 0
108
110
  this.role = widget.options.role
109
111
  this.multiple = widget.options.multiple
110
112
  this.currValue = cloneObj(value || [])
@@ -112,11 +114,12 @@ export default {
112
114
  this.$u.get('/sys/role/list', {
113
115
  pageNo: 1,
114
116
  pageSize: 100000,
117
+ departRelation: widget.options.departRelation ? 1 : 0
115
118
  }).then(res => {
116
119
  this.rolesList = res.result.records.filter((item) => {
117
120
  return this.role.includes(item.id);
118
121
  })
119
- this.roleChange('')
122
+ this.roleChange(this.rolesList.map(item => item.id).join(','))
120
123
  }).finally(() => {
121
124
  this.isLoading = false
122
125
  })
@@ -205,6 +208,7 @@ export default {
205
208
  pageNo: 1,
206
209
  pageSize: 100000,
207
210
  depId: this.depId,
211
+ departRelation: this.departRelation,
208
212
  roleId
209
213
  }).then(res => {
210
214
  this.roleUserList = res.result.records.filter(item => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zscreate/zhxy-app-component",
3
- "version": "1.0.230",
3
+ "version": "1.0.232",
4
4
  "private": false,
5
5
  "description": "zhxy-app-component",
6
6
  "main": "index.js",