From e7eca504e167de53fd97e5c2cc1fc039a8e758cc Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:29:37 +0800
Subject: [PATCH] 提交
---
src/views/system/modules/UserModal.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 05b0da8..a1f4328 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -278,6 +278,14 @@
/>
</a-form-model-item>
+ <a-form-model-item label="韬唤" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-radio-group v-model="model.userType">
+ <a-radio :value="1">鏅�氱敤鎴�</a-radio>
+ <a-radio :value="2">宸ユ涓荤</a-radio>
+ <a-radio :value="3">杞﹂棿涓荤</a-radio>
+ <a-radio :value="4">鍏徃涓荤</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
<!--<a-form-model-item label="宸ヤ綔娴佸紩鎿�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!--<j-dict-select-tag v-model="model.activitiSync" placeholder="璇烽�夋嫨鏄惁鍚屾宸ヤ綔娴佸紩鎿�" :type="'radio'" dictCode="activiti_sync"/>-->
<!--</a-form-model-item>-->
@@ -359,7 +367,6 @@
{ validator: this.validateWorkNo }],
telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '璇疯緭鍏ユ纭殑搴ф満鍙风爜' }],
teamId: [{ required: false, message: '璇风淮鎶ょ彮缁�' }]
-
},
departIdShow: false,
title: '鎿嶄綔',
@@ -403,9 +410,13 @@
},
'model.selectedProduction': {
handler(newVal, oldVal) {
- console.log('瑙﹀彂鐩戝惉', 'newVal=', newVal, 'oldVal=', oldVal)
- // if ((newVal !== oldVal && oldVal) || !newVal) this.model.equipmentIds = ''
- if (newVal && this.$refs.selectDeviceModal) this.$refs.selectDeviceModal.queryTreeData(newVal)
+ if (newVal && this.$refs.selectDeviceModal) {
+ // 濡傛灉杞﹂棿閫夋嫨鍓嶅悗涓嶄竴鑷村垯閲嶇疆閫夋嫨璁惧
+ if ((oldVal && newVal !== oldVal)) this.model.equipmentIds = ''
+ this.$refs.selectDeviceModal.queryTreeData(newVal)
+ }
+ // 濡傛灉娓呯┖杞﹂棿鍊煎垯閲嶇疆閫夋嫨璁惧
+ if (newVal === '') this.model.equipmentIds = ''
}
}
},
@@ -466,7 +477,6 @@
that.getUserRoles(record.id)
that.getUserDeparts(record.id)
}
- console.log('that.model', that.model)
},
isDisabledAuth(code) {
return disabledAuthFilter(code)
@@ -497,7 +507,6 @@
let c = { label: item.name, value: item.id + '' }
return c
})
- console.log('this.tenantsOptions: ', this.tenantsOptions)
}
})
},
@@ -509,16 +518,13 @@
let c = { label: item.roleName, value: item.id }
return c
})
- console.log('this.rolesOptions: ', this.rolesOptions)
}
})
},
getUserRoles(userid) {
queryUserRole({ userid: userid }).then((res) => {
if (res.success) {
- // this.model.selectedroles = res.result.join(',')
this.$set(this.model, 'selectedroles', res.result.join(','))
- console.log('that.model.selectedroles=', this.model.selectedroles)
}
})
},
@@ -538,11 +544,8 @@
})
}
- // that.model.selecteddeparts = selectDepartKeys.join(',')
this.$set(this.model, 'selecteddeparts', selectDepartKeys.join(','))
-
that.nextDepartOptions = departOptions
- console.log('that.nextDepartOptions=', that.nextDepartOptions)
}
})
@@ -560,10 +563,8 @@
})
}
- // that.model.selectedProduction = selectProductKeys.join(',')
this.$set(this.model, 'selectedProduction', selectProductKeys.join(','))
that.nextProductionOptions = ProductionOptions
- console.log('that.nextProductionOptions=', that.nextProductionOptions)
}
})
//杞﹂棿鐨剈rl
--
Gitblit v1.9.3