From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/system/modules/UserModal.vue | 174 +++++++++++++++++++++++++++++----------------------------
1 files changed, 88 insertions(+), 86 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 05b0da8..dc6a2a4 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -160,6 +160,15 @@
placeholder="璇烽�夋嫨璁惧" :disabled="!model.selectedProduction"/>
</a-form-model-item>
+ <a-form-model-item label="棣栭〉鏉冮檺" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-radio-group v-model="model.userType" :defaultValue="1">
+ <a-radio :value="4">鍏徃绾�</a-radio>
+ <a-radio :value="3">杞﹂棿绾�</a-radio>
+ <a-radio :value="2">宸ユ绾�</a-radio>
+ <a-radio :value="1">鎿嶄綔宸�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+
<a-form-model-item
label="鐝粍鍒嗛厤"
:labelCol="labelCol"
@@ -201,83 +210,82 @@
</j-multi-select-tag>
</a-form-model-item>
- <a-form-model-item
- label="澶村儚"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-image-upload
- class="avatar-uploader"
- text="涓婁紶"
- v-model="model.avatar"
- ></j-image-upload>
- </a-form-model-item>
+ <!--<a-form-model-item-->
+ <!--label="澶村儚"-->
+ <!--:labelCol="labelCol"-->
+ <!--:wrapperCol="wrapperCol"-->
+ <!-->-->
+ <!--<j-image-upload-->
+ <!--class="avatar-uploader"-->
+ <!--text="涓婁紶"-->
+ <!--v-model="model.avatar"-->
+ <!--></j-image-upload>-->
+ <!--</a-form-model-item>-->
- <a-form-model-item
- label="鐢熸棩"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-date-picker
- style="width: 100%"
- placeholder="璇烽�夋嫨鐢熸棩"
- v-model="model.birthday"
- :format="dateFormat"
- :getCalendarContainer="node => node.parentNode"
- />
- </a-form-model-item>
+ <!--<a-form-model-item-->
+ <!--label="鐢熸棩"-->
+ <!--:labelCol="labelCol"-->
+ <!--:wrapperCol="wrapperCol"-->
+ <!-->-->
+ <!--<a-date-picker-->
+ <!--style="width: 100%"-->
+ <!--placeholder="璇烽�夋嫨鐢熸棩"-->
+ <!--v-model="model.birthday"-->
+ <!--:format="dateFormat"-->
+ <!--:getCalendarContainer="node => node.parentNode"-->
+ <!--/>-->
+ <!--</a-form-model-item>-->
- <a-form-model-item
- label="鎬у埆"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-select
- v-model="model.sex"
- placeholder="璇烽�夋嫨鎬у埆"
- :getPopupContainer="(target) => target.parentNode"
- >
- <a-select-option :value="1">鐢�</a-select-option>
- <a-select-option :value="2">濂�</a-select-option>
- </a-select>
- </a-form-model-item>
+ <!--<a-form-model-item-->
+ <!--label="鎬у埆"-->
+ <!--:labelCol="labelCol"-->
+ <!--:wrapperCol="wrapperCol"-->
+ <!-->-->
+ <!--<a-select-->
+ <!--v-model="model.sex"-->
+ <!--placeholder="璇烽�夋嫨鎬у埆"-->
+ <!--:getPopupContainer="(target) => target.parentNode"-->
+ <!-->-->
+ <!--<a-select-option :value="1">鐢�</a-select-option>-->
+ <!--<a-select-option :value="2">濂�</a-select-option>-->
+ <!--</a-select>-->
+ <!--</a-form-model-item>-->
- <a-form-model-item
- label="閭"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="email"
- >
- <a-input
- placeholder="璇疯緭鍏ラ偖绠�"
- v-model="model.email"
- />
- </a-form-model-item>
+ <!--<a-form-model-item-->
+ <!--label="閭"-->
+ <!--:labelCol="labelCol"-->
+ <!--:wrapperCol="wrapperCol"-->
+ <!--prop="email"-->
+ <!-->-->
+ <!--<a-input-->
+ <!--placeholder="璇疯緭鍏ラ偖绠�"-->
+ <!--v-model="model.email"-->
+ <!--/>-->
+ <!--</a-form-model-item>-->
- <a-form-model-item
- label="鎵嬫満鍙风爜"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="phone"
- >
- <a-input
- placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
- v-model="model.phone"
- />
- </a-form-model-item>
+ <!--<a-form-model-item-->
+ <!--label="鎵嬫満鍙风爜"-->
+ <!--:labelCol="labelCol"-->
+ <!--:wrapperCol="wrapperCol"-->
+ <!--prop="phone"-->
+ <!-->-->
+ <!--<a-input-->
+ <!--placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"-->
+ <!--v-model="model.phone"-->
+ <!--/>-->
+ <!--</a-form-model-item>-->
- <a-form-model-item
- label="搴ф満"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="telephone"
- >
- <a-input
- placeholder="璇疯緭鍏ュ骇鏈�"
- v-model="model.telephone"
- />
- </a-form-model-item>
-
+ <!--<a-form-model-item-->
+ <!--label="搴ф満"-->
+ <!--:labelCol="labelCol"-->
+ <!--:wrapperCol="wrapperCol"-->
+ <!--prop="telephone"-->
+ <!-->-->
+ <!--<a-input-->
+ <!--placeholder="璇疯緭鍏ュ骇鏈�"-->
+ <!--v-model="model.telephone"-->
+ <!--/>-->
+ <!--</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 = ''
}
}
},
@@ -441,6 +452,7 @@
this.refresh()
this.edit({
activitiSync: '1',
+ userType: 1,
userIdentity: 1,
selectedroles: '',
selecteddeparts: '',
@@ -466,7 +478,6 @@
that.getUserRoles(record.id)
that.getUserDeparts(record.id)
}
- console.log('that.model', that.model)
},
isDisabledAuth(code) {
return disabledAuthFilter(code)
@@ -497,7 +508,6 @@
let c = { label: item.name, value: item.id + '' }
return c
})
- console.log('this.tenantsOptions: ', this.tenantsOptions)
}
})
},
@@ -509,16 +519,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 +545,8 @@
})
}
- // that.model.selecteddeparts = selectDepartKeys.join(',')
this.$set(this.model, 'selecteddeparts', selectDepartKeys.join(','))
-
that.nextDepartOptions = departOptions
- console.log('that.nextDepartOptions=', that.nextDepartOptions)
}
})
@@ -560,10 +564,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