Merge remote-tracking branch 'origin/master'

src/api/modules/system/user.js

@@ -5,4 +5,10 @@ export const getSelectUserlist= (form, msg = true) => httpApi({
     url: '/api/blade-control/sysinfo/selectUserlist',
     method: 'get',
     params: form
+}, msg);
+//新增或修改用户
+export const submitSaveUser = (form, msg = true) => httpApi({
+    url: '/api/blade-control/sysinfo/saveUser',
+    method: 'post',
+    data: form
 }, msg);

src/views/system/user.vue

@@ -1,5 +1,6 @@
 <template>
     <HcCard>
+        
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.postType" placeholder="选择岗位类型" clearable size="large">
@@ -45,11 +46,11 @@
                     <el-form-item label="登录账号:" prop="account">
                         <el-input v-model="formUserModel.account" placeholder="" autocomplete="new-password"/>
                     </el-form-item>
-                    <el-form-item label="密码:" prop="newPassword">
-                        <el-input v-model="formUserModel.newPassword" placeholder="请输入密码" autocomplete="new-password" show-password type="password"/>
+                    <el-form-item label="密码:" prop="password">
+                        <el-input v-model="formUserModel.password" placeholder="请输入密码" autocomplete="new-password" show-password type="password"/>
                     </el-form-item>
-                    <el-form-item label="确认密码:" prop="newPassword1">
-                        <el-input v-model="formUserModel.newPassword1" placeholder="请输入确认密码" autocomplete="new-password" show-password type="password"/>
+                    <el-form-item label="确认密码:" prop="plaintextPassword">
+                        <el-input v-model="formUserModel.plaintextPassword" placeholder="请输入确认密码" autocomplete="new-password" show-password type="password"/>
                     </el-form-item>
                 </el-form>
             </HcCardItem>
@@ -68,21 +69,25 @@
                         <el-input v-model="formUserModel.idNumber" placeholder=""/>
                     </el-form-item>
                     <el-form-item label="机构信息:" prop="real_name">
-                        <el-select v-model="value" placeholder="选择部门" size="large">
+                        <el-select v-model="formUserModel.position" placeholder="选择部门" size="large">
                             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"/>
                         </el-select>
-                        <el-select v-model="value" class="ml-2" placeholder="选择岗位" size="large">
+                        <el-select  v-model="formUserModel.postId" class="ml-2" placeholder="选择岗位" size="large">
                             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"/>
                         </el-select>
-                        <el-select v-model="value" class="ml-2" placeholder="是否为部门负责人" size="large">
-                            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"/>
+                        <el-select v-model="formUserModel.roleId" class="ml-2" placeholder="是否为部门负责人" size="large">
+                            <!-- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"/> -->
+                            <el-option label="是" :value="1">
+                            </el-option>
+                            <el-option label="否" :value="0">
+                            </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="日单价:">
                         <el-input v-model="formUserModel.roleName" placeholder=""/>
                     </el-form-item>
                     <el-form-item label="启用状态:">
-                        <el-select v-model="formUserModel.state" class="block" placeholder="" size="large">
+                        <el-select v-model="formUserModel.status" class="block" placeholder="" size="large">
                             <el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value"/>
                         </el-select>
                     </el-form-item>