|
@@ -50,10 +50,10 @@
|
|
<el-form-item label="登录账号:" prop="account">
|
|
<el-form-item label="登录账号:" prop="account">
|
|
<el-input v-model="formModel.account" placeholder="仅支持英文或拼音" autocomplete="new-password"/>
|
|
<el-input v-model="formModel.account" placeholder="仅支持英文或拼音" autocomplete="new-password"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="登录密码:" prop="password">
|
|
|
|
|
|
+ <el-form-item label="登录密码:" :prop="formModel.id?'':'password'">
|
|
<el-input v-model="formModel.password" placeholder="请输入密码" autocomplete="new-password" show-password type="password"/>
|
|
<el-input v-model="formModel.password" placeholder="请输入密码" autocomplete="new-password" show-password type="password"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="确认密码:" prop="password1">
|
|
|
|
|
|
+ <el-form-item label="确认密码:" :prop="formModel.id?'':'password1'">
|
|
<el-input v-model="formModel.password1" placeholder="请输入确认密码" autocomplete="new-password" show-password type="password"/>
|
|
<el-input v-model="formModel.password1" placeholder="请输入确认密码" autocomplete="new-password" show-password type="password"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
@@ -130,7 +130,7 @@
|
|
|
|
|
|
<script setup>
|
|
<script setup>
|
|
import {ref, onMounted} from "vue";
|
|
import {ref, onMounted} from "vue";
|
|
-import {arrIndex, arrToId, isPhone} from "js-fast-way"
|
|
|
|
|
|
+import {arrIndex, arrToId, formValidate, isPhone} from "js-fast-way"
|
|
import mainApi from '~api/system/user';
|
|
import mainApi from '~api/system/user';
|
|
import organizationApi from '~api/system/organization';
|
|
import organizationApi from '~api/system/organization';
|
|
import {getArrValue} from "js-fast-way"
|
|
import {getArrValue} from "js-fast-way"
|
|
@@ -230,7 +230,9 @@ const formModel = ref({
|
|
deptList: [{}],
|
|
deptList: [{}],
|
|
})
|
|
})
|
|
const formRules = {
|
|
const formRules = {
|
|
- projectId: [{required: true, message: '请选择所属项目', trigger: 'change'}],
|
|
|
|
|
|
+ deptId: [{required: true, message: '请选择选择部门', trigger: 'change'}],
|
|
|
|
+ postId: [{required: true, message: '请选择选择岗位', trigger: 'change'}],
|
|
|
|
+ isLader: [{required: true, message: '请选择是否为部门负责人', trigger: 'change'}],
|
|
phone: {
|
|
phone: {
|
|
required: true,
|
|
required: true,
|
|
validator: (rule, value, callback) => {
|
|
validator: (rule, value, callback) => {
|
|
@@ -333,7 +335,7 @@ const initPostData = async (id, index) => {
|
|
|
|
|
|
|
|
|
|
//新增组织
|
|
//新增组织
|
|
-const addOrganizationClick = (row) => {
|
|
|
|
|
|
+const addOrganizationClick = () => {
|
|
formModel.value.deptList.push({})
|
|
formModel.value.deptList.push({})
|
|
postData.value.push({})
|
|
postData.value.push({})
|
|
}
|
|
}
|
|
@@ -346,10 +348,25 @@ const delOrganizationClick = (index) => {
|
|
|
|
|
|
|
|
|
|
//保存
|
|
//保存
|
|
-const formModalSave = () => {
|
|
|
|
|
|
+const formModalSave = async () => {
|
|
console.log(formModel.value)
|
|
console.log(formModel.value)
|
|
|
|
+ const isForm = await formValidate(formRef.value)
|
|
|
|
+ const isForm1 = await formValidate(formRef1.value)
|
|
|
|
+ if (!isForm || !isForm1) {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ const form = formModel.value
|
|
|
|
+ for (let i = 0; i < form.deptList.length; i++) {
|
|
|
|
+ const refs = await getFormRef(i)
|
|
|
|
+ const isRefs = await formValidate(refs)
|
|
|
|
+ if (!isRefs) {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ console.log('submit')
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
//关闭用户信息弹窗
|
|
//关闭用户信息弹窗
|
|
const formModalClose = () => {
|
|
const formModalClose = () => {
|
|
formModal.value = false
|
|
formModal.value = false
|