feat: save

src/request/organization.ts

@@ -16,7 +16,7 @@ export type OrganizationType = {
     parentId: number
     orgName: string
     password: string
-    type: organizationTypeEnum | null
+    type?: organizationTypeEnum | null
     userName: string
     confirmPwd?: string,
     msgAuthCode?: string

src/request/users.ts

@@ -24,6 +24,7 @@ export type UserType = {
     password?: string
     phoneNum?: string
     type?: number
+    oldPassword?: string
 }
 
 

src/router.ts

@@ -109,13 +109,13 @@ const routes: RouteRecordRaw[] = [
       {
         path: "users",
         name: "users",
-        meta: { title: "用户管理", svgIcon: 'yhgl' },
+        meta: { title: "平台用户", svgIcon: 'yhgl' },
         component: () => import("@/view/users.vue"),
       },
       {
         path: "platform-users",
         name: "platform-users",
-        meta: { title: "平台用户", svgIcon: 'yhgl' },
+        meta: { title: "单位用户", svgIcon: 'yhgl' },
         component: () => import("@/view/platform-users/users.vue"),
       },
     ],

src/view/organization-add.vue

@@ -17,8 +17,8 @@
         placeholder="请输入"
       />
     </el-form-item>
-    <el-form-item label="类型" prop="type" required>
-      <!-- <el-input v-model="data.type" style="width: 300px" :maxlength="500" placeholder="请输入" /> -->
+    <!-- <el-form-item label="类型" prop="type" required>
+
       <el-select style="width: 300px" v-model="data.type">
         <el-option
           :value="Number(key)"
@@ -26,9 +26,9 @@
           v-for="(type, key) in OrganizationTypeDesc"
         />
       </el-select>
-    </el-form-item>
+    </el-form-item> -->
 
-    <el-form-item label="上级单位" prop="parentId">
+    <!-- <el-form-item label="上级单位" prop="parentId">
       <el-tree-select
         :check-strictly="true"
         :props="{
@@ -42,7 +42,7 @@
         clearable
       >
       </el-tree-select>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item label="联系人" prop="contact" required>
       <el-input
         v-model.trim="data.contact"
@@ -142,7 +142,7 @@ const data = ref<OrganizationType & {}>({
   orgName: "",
   parentId: null,
   password: "",
-  type: null,
+  // type: null,
   userName: "",
 });
 

src/view/organization.vue

@@ -11,7 +11,7 @@
               placeholder="请输入"
             />
           </el-form-item>
-          <el-form-item label="类型">
+          <!-- <el-form-item label="类型">
             <el-select style="width: 250px" v-model="pageProps.type" clearable>
               <el-option
                 :value="Number(key)"
@@ -19,7 +19,7 @@
                 v-for="(type, key) in OrganizationTypeDesc"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item>
             <el-button type="primary" @click="refresh">查询</el-button>
@@ -41,13 +41,13 @@
     <div class="relics-content">
       <el-table default-expand-all row-key="orgId" :data="relicsArray" border>
         <el-table-column label="单位名称" prop="orgName"></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           label="类型"
           prop="type"
           v-slot:default="{ row }: { row: OrganizationType }"
         >
           {{ row.type ? OrganizationTypeDesc[row.type] : "" }}
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="单位账号" prop="userName"></el-table-column>
         <el-table-column label="单位联系人" prop="contact"></el-table-column>
 

src/view/users-password-edit.vue

@@ -4,10 +4,27 @@
     <el-form-item label="手机号" prop="userName" required>
       <el-input disabled v-model="data.userName" style="width: 300px" :maxlength="500" placeholder="请输入" />
     </el-form-item>
-    <el-form-item label="验证码" prop="msgAuthCode" required>
+    <!-- <el-form-item label="验证码" prop="msgAuthCode" required>
       <el-input v-model="data.msgAuthCode" style="width: 190px" :maxlength="500" placeholder="请输入" />
       <el-button :loading="checkCodeBtn.loading" :disabled="checkCodeBtn.disabled" type="danger"
         style="margin-left: 10px" @click="getCheckCode"> {{ checkCodeBtn.text }}</el-button>
+    </el-form-item> -->
+    <el-form-item label="旧密码" prop="oldPassword" required>
+      <el-input autocomplete="off" readonly onfocus="this.removeAttribute('readonly');" v-model="data.oldPassword"
+        :type="addOldPassFlag ? 'text' : 'password'" style="width: 300px" :maxlength="500"
+        placeholder="请输入8-16位数字、字母大小写组合">
+        <template #suffix>
+          <span @click="addOldPassFlag = !addOldPassFlag" style="cursor: pointer;">
+            <el-icon v-if="addOldPassFlag">
+              <View />
+            </el-icon>
+            <el-icon v-else>
+              <Hide />
+            </el-icon>
+          </span>
+        </template>
+      </el-input>
+
     </el-form-item>
     <el-form-item label="密码" prop="password" required>
       <el-input autocomplete="off" readonly onfocus="this.removeAttribute('readonly');" v-model="data.password"
@@ -28,11 +45,11 @@
     </el-form-item>
     <el-form-item label="密码确认" prop="confirmPwd" required>
       <el-input autocomplete="off" readonly onfocus="this.removeAttribute('readonly');" v-model="data.confirmPwd"
-        :type="addPassFlag ? 'text' : 'password'" style="width: 300px" :maxlength="40"
+        :type="addConfirmPassFlag ? 'text' : 'password'" style="width: 300px" :maxlength="40"
         placeholder="请输入8-16位数字、字母大小写组合">
         <template #suffix>
-          <span @click="addPassFlag = !addPassFlag" style="cursor: pointer;">
-            <el-icon v-if="addPassFlag">
+          <span @click="addConfirmPassFlag = !addConfirmPassFlag" style="cursor: pointer;">
+            <el-icon v-if="addConfirmPassFlag">
               <View />
             </el-icon>
             <el-icon v-else>
@@ -60,6 +77,8 @@ import {
 import { ref, reactive, unref, onMounted, watchEffect } from "vue";
 import { onUnmounted } from "vue";
 const addPassFlag = ref(false)//图标显示标识
+const addOldPassFlag = ref(false)//图标显示标识
+const addConfirmPassFlag = ref(false)//图标显示标识
 import { globalPasswordRex } from "@/util/regex";
 const baseFormRef = ref<FormInstance>();
 
@@ -71,7 +90,8 @@ const data = ref<UserType>({
   nickName: "",
   orgId: undefined,
   password: "",
-  msgAuthCode: "",
+  oldPassword :"",
+  // msgAuthCode: "",
   confirmPwd: "",
   status: 0,
   userName: "",
@@ -106,6 +126,10 @@ const rules = reactive<FormRules>({
     { required: true, message: "请输入验证码", trigger: "change" },
   ],
 
+  oldPassword: [
+    { required: true, pattern: globalPasswordRex, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
+    { required: true, min: 8, message: '密码太短！', trigger: "blur" },
+  ],
   password: [
     { required: true, pattern: globalPasswordRex, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
     { required: true, min: 8, message: '密码太短！', trigger: "blur" },