|
@@ -59,7 +59,7 @@
|
|
|
></el-date-picker>
|
|
|
</el-form-item> -->
|
|
|
|
|
|
- <el-form-item label="角色名称:" prop="roleName">
|
|
|
+ <el-form-item label="角色名称:" prop="roleId">
|
|
|
<!-- <el-input v-model="form.roleName"></el-input> -->
|
|
|
<el-select
|
|
|
v-model="form.roleId"
|
|
@@ -76,23 +76,26 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <!-- <el-form-item label="所属站点:" prop="roleName">
|
|
|
+ <el-form-item label="所属站点:" prop="siteId">
|
|
|
<el-select
|
|
|
- v-model="value2"
|
|
|
+ v-model="form.siteId"
|
|
|
placeholder="请选择"
|
|
|
clearable
|
|
|
multiple
|
|
|
filterable
|
|
|
+ collapse-tags
|
|
|
@change="linkChange()"
|
|
|
+
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="site in store.state.siteList"
|
|
|
:key="site"
|
|
|
:label="site.siteName"
|
|
|
:value="site.id"
|
|
|
+
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
- </el-form-item> -->
|
|
|
+ </el-form-item>
|
|
|
|
|
|
|
|
|
<br />
|
|
@@ -114,7 +117,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { defineComponent, ref, onMounted, watchEffect } from 'vue'
|
|
|
+import { defineComponent, ref, onMounted, watchEffect,watch } from 'vue'
|
|
|
import * as api from '@/api/systemManage/userManage.js'
|
|
|
import { ElMessage } from 'element-plus'
|
|
|
import { parseTime, validatorPhone } from '@/utils'
|
|
@@ -131,7 +134,6 @@ export default defineComponent({
|
|
|
setup(props, context) {
|
|
|
context
|
|
|
const store = useStore()
|
|
|
- // const value2 = ref([])
|
|
|
const dialogVisible = ref(false)
|
|
|
const formInfo = ref(null)
|
|
|
const isDisable = ref(false)
|
|
@@ -141,33 +143,14 @@ export default defineComponent({
|
|
|
|
|
|
// open(): Dialog弹窗打开之前做的事
|
|
|
const open = () => {
|
|
|
- // value2.value=[]
|
|
|
+
|
|
|
form.value = props.itemInfo.value
|
|
|
-
|
|
|
+ console.log('form.value')
|
|
|
+ console.log(form.value)
|
|
|
+ console.log(form.value.siteId)
|
|
|
}
|
|
|
|
|
|
- const options = [
|
|
|
- {
|
|
|
- value: '选项1',
|
|
|
- label: '站点一',
|
|
|
- },
|
|
|
- {
|
|
|
- value: '选项2',
|
|
|
- label: '站点二',
|
|
|
- },
|
|
|
- {
|
|
|
- value: '选项3',
|
|
|
- label: '站点三',
|
|
|
- },
|
|
|
- {
|
|
|
- value: '选项4',
|
|
|
- label: '站点四',
|
|
|
- },
|
|
|
- {
|
|
|
- value: '选项5',
|
|
|
- label: '站点五',
|
|
|
- },
|
|
|
- ]
|
|
|
+
|
|
|
|
|
|
// 关闭弹框
|
|
|
const closeDialog = () => {
|
|
@@ -253,11 +236,20 @@ export default defineComponent({
|
|
|
function resetForm() {
|
|
|
formInfo.value.resetFields()
|
|
|
}
|
|
|
- // function linkChange(){
|
|
|
- // console.log('value2.value')
|
|
|
- // alert(value2.value)
|
|
|
+ function linkChange(){
|
|
|
+
|
|
|
|
|
|
- // }
|
|
|
+ }
|
|
|
+
|
|
|
+ //监听变化
|
|
|
+ watch(
|
|
|
+ () => props.siteIdArr,
|
|
|
+ (newVal) => {
|
|
|
+ alert(1)
|
|
|
+ newVal
|
|
|
+
|
|
|
+ }
|
|
|
+ )
|
|
|
|
|
|
onMounted(() => {
|
|
|
optionselect()
|
|
@@ -265,10 +257,9 @@ export default defineComponent({
|
|
|
|
|
|
return {
|
|
|
store,
|
|
|
- // linkChange,
|
|
|
+ linkChange,
|
|
|
closeDialog,
|
|
|
dialogVisible,
|
|
|
- options,
|
|
|
roleValid,
|
|
|
formInfo,
|
|
|
form,
|
|
@@ -277,8 +268,8 @@ export default defineComponent({
|
|
|
submitForm,
|
|
|
resetForm,
|
|
|
isDisable,
|
|
|
- // value2,
|
|
|
rules: {
|
|
|
+
|
|
|
nickName: [
|
|
|
{ required: true, message: '请输入用户名', trigger: 'blur' },
|
|
|
{
|
|
@@ -311,6 +302,7 @@ export default defineComponent({
|
|
|
roleId: [
|
|
|
{ required: true, message: '请选择角色名称', trigger: 'change' },
|
|
|
],
|
|
|
+ siteId: [{ required: true, message: '请选择站点', trigger: 'change' }],
|
|
|
password: [
|
|
|
{ required: true, message: '请输入密码', trigger: 'blur' },
|
|
|
{
|