From 0e625655fa2ce93e8fe50ca11fbccbfbac18e010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= <chen.yuda@ebiz-digits.com>
Date: Wed, 13 Aug 2025 15:50:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=96=B0=E5=A2=9E=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8F=91=E9=80=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD-=20=E5=9C=A8=20user.js=20=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20send=5Fsms=20=E6=96=B9=E6=B3=95-=20=E5=9C=A8=20system.js=20?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20verifyUpdatePassword=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95-=20=E6=96=B0=E5=A2=9E=20send-phone-code.vue=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=92=8C=E9=AA=8C=E8=AF=81=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81-=20=E4=BF=AE=E6=94=B9=20login.vue=EF=BC=8C=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=96=B0=E7=9A=84=20send-phone-code=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=BF=E6=8D=A2=E5=8E=9F=E6=9C=89=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91-=20=E6=9B=B4=E6=96=B0=20Re?=
 =?UTF-8?q?setPasswordDialog.vue=EF=BC=8C=E9=9B=86=E6=88=90=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E9=AA=8C=E8=AF=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/app/user.js                           |   6 +
 src/api/generatedApi/system.js                |   8 +
 src/generatedComponents/send-phone-code.vue   | 197 ++++++++++++++++++
 src/views/app/login/index.vue                 | 106 ++--------
 .../employRule/index.vue                      |  47 ++---
 .../user/components/ResetPasswordDialog.vue   | 157 ++++++++------
 6 files changed, 345 insertions(+), 176 deletions(-)
 create mode 100644 src/generatedComponents/send-phone-code.vue

diff --git a/src/api/app/user.js b/src/api/app/user.js
index 4dbef8e..fa0342b 100644
--- a/src/api/app/user.js
+++ b/src/api/app/user.js
@@ -49,6 +49,12 @@ export function sendPhoneCodeLogin(data) {
     data
   })
 }
+export function send_sms() {
+  return request({
+    url: getUrl('/sysUserEx/send_sms'),
+    method: 'get'
+  })
+}
 export function verify_login(data) {
   return request({
     url: getUrl('/sysUserEx/verify_login'),
diff --git a/src/api/generatedApi/system.js b/src/api/generatedApi/system.js
index dd6a223..10e3167 100644
--- a/src/api/generatedApi/system.js
+++ b/src/api/generatedApi/system.js
@@ -62,6 +62,14 @@ export function updatePassword(data) {
   return request({
     url: getUrl(`/sysUserEx/updatePassword`),
     method: 'post',
+    data,
+    back: true
+  })
+}
+export function verifyUpdatePassword(data) {
+  return request({
+    url: getUrl(`/sysUserEx/verifyUpdatePassword`),
+    method: 'post',
     data
   })
 }
diff --git a/src/generatedComponents/send-phone-code.vue b/src/generatedComponents/send-phone-code.vue
new file mode 100644
index 0000000..644a03b
--- /dev/null
+++ b/src/generatedComponents/send-phone-code.vue
@@ -0,0 +1,197 @@
+<template>
+  <r-dialog
+    :visible.sync="visible"
+    title="发送短信验证码"
+    width="550px"
+    append-to-body
+    class="send-chat-phone-dialog"
+  >
+    <el-form
+      label-width="100px"
+      :model="phoneForm"
+      :rules="phoneRules"
+      class="phone-form"
+      ref="phoneForm"
+    >
+      <!--        <el-form-item label="手机号" prop="phone">-->
+      <!--          <div class="flex">-->
+      <!--            <el-input-->
+      <!--              v-model="phoneForm.phone"-->
+      <!--              placeholder="请输入手机号"-->
+      <!--              style="color:#000"-->
+      <!--            ></el-input>-->
+      <!--            <el-button-->
+      <!--              class="ml10 render-button pv5 ph10"-->
+      <!--              type="primary"-->
+      <!--              size="medium"-->
+      <!--              @click="sendPhoneCode"-->
+      <!--              :disabled="!sendCode"-->
+      <!--              >{{ !sendCode ? minute + '秒后重新发送' : '发送验证码' }}-->
+      <!--            </el-button>-->
+      <!--          </div>-->
+      <!--        </el-form-item>-->
+      <el-form-item label="短信验证码" prop="code" class="mr30">
+        <div class="flex">
+          <el-input
+            v-model="phoneForm.code"
+            placeholder="请输入短信验证码"
+            style="color:#000"
+            size="medium"
+          >
+            <template slot="append">
+              <el-button
+                class="ml10"
+                type="primary"
+                size="medium"
+                @click="sendPhoneCode"
+                :disabled="!sendCode"
+                >{{ !sendCode ? minute + '秒后重新发送' : '发送短信验证码' }}
+              </el-button>
+            </template>
+          </el-input>
+        </div>
+        <!--          <el-input-->
+        <!--            v-model="phoneForm.code"-->
+        <!--            placeholder="请输入验证码"-->
+        <!--          ></el-input>-->
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="cancel" size="medium">取消</el-button>
+      <el-button type="primary" @click="handleSubmit" size="medium"
+        >确定</el-button
+      >
+    </div>
+  </r-dialog>
+</template>
+<script>
+import { sendPhoneCodeLogin, send_sms } from '@/api/app/user'
+import { setToken } from '@/assets/js/utils/auth'
+
+export default {
+  name: 'send-phone-code',
+  data() {
+    const validatePhone = (rule, value, callback) => {
+      //  手机号正则
+      const validPhone = phone => {
+        return /^1[3456789]\d{9}$/.test(phone)
+      }
+      if (!validPhone(value)) {
+        callback(new Error('请输入正确的手机号'))
+      } else {
+        callback()
+      }
+    }
+
+    return {
+      sendCode: true,
+      phoneRules: {
+        phone: [
+          { required: true, message: '请输入手机号', trigger: 'change' },
+          { validator: validatePhone, trigger: 'change' }
+        ],
+        code: [{ required: true, message: '请输入验证码', trigger: 'change' }]
+      },
+      phoneForm: {
+        phone: '',
+        code: ''
+      },
+      minute: 120 // 默认120秒 发送间隔
+    }
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    userName: {
+      type: String,
+      default: ''
+    },
+    resetPassword: {
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    visible(newVal) {
+      if (!newVal) {
+        // 重置表单
+        this.phoneForm = {
+          phone: '',
+          code: ''
+        }
+        // this.sendCode = true
+        // clearInterval(this.timer)
+      }
+    }
+  },
+  components: {},
+  filters: {},
+  methods: {
+    sendCodeText() {
+      //   倒计时 60S
+      this.minute = 120
+
+      this.timer = setInterval(() => {
+        this.minute--
+        if (this.minute <= 0) {
+          this.sendCode = true
+          clearInterval(this.timer)
+        }
+      }, 1000)
+
+      return this.minute
+    },
+
+    sendPhoneCode() {
+      let api = this.resetPassword ? send_sms : sendPhoneCodeLogin
+
+      api({
+        userName: !this.resetPassword ? this.userName : undefined
+      }).then(res => {
+        if (Number(res.code) === 0) {
+          this.sendCode = false
+          this.sendCodeText()
+        }
+      })
+    },
+
+    handleSubmit() {
+      this.$refs.phoneForm.validate(valid => {
+        if (valid) {
+          this.$emit('handleSubmit', this.phoneForm.code)
+        }
+      })
+    },
+
+    cancel() {
+      this.$emit('update:visible', false)
+    }
+  },
+  created() {
+    console.log(this.sendCode, 231)
+  },
+  mounted() {},
+  computed: {}
+}
+</script>
+<style lang="scss">
+@import '../assets/sass/renderSass/theme.scss';
+.send-chat-phone-dialog {
+  .phone-form {
+    & .el-input-group__append {
+      background: $--color-primary;
+      color: #fff;
+      border-color: $--color-primary;
+      & .el-button {
+        &.is-disabled {
+          & ~ .el-input-group__append {
+            background: $--color-primary-disabled;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/app/login/index.vue b/src/views/app/login/index.vue
index 18a469f..fc95475 100644
--- a/src/views/app/login/index.vue
+++ b/src/views/app/login/index.vue
@@ -112,68 +112,11 @@
       <!--      <p>京公网安备 ICP许可证号：津ICP备14004859号-4</p>-->
     </div>
 
-    <r-dialog
+    <send-phone-code
       :visible.sync="dialogVisible"
-      title="发送短信验证码"
-      width="550px"
-    >
-      <el-form
-        label-width="100px"
-        :model="phoneForm"
-        :rules="phoneRules"
-        class="phone-form"
-        ref="phoneForm"
-      >
-        <!--        <el-form-item label="手机号" prop="phone">-->
-        <!--          <div class="flex">-->
-        <!--            <el-input-->
-        <!--              v-model="phoneForm.phone"-->
-        <!--              placeholder="请输入手机号"-->
-        <!--              style="color:#000"-->
-        <!--            ></el-input>-->
-        <!--            <el-button-->
-        <!--              class="ml10 render-button pv5 ph10"-->
-        <!--              type="primary"-->
-        <!--              size="medium"-->
-        <!--              @click="sendPhoneCode"-->
-        <!--              :disabled="!sendCode"-->
-        <!--              >{{ !sendCode ? minute + '秒后重新发送' : '发送验证码' }}-->
-        <!--            </el-button>-->
-        <!--          </div>-->
-        <!--        </el-form-item>-->
-        <el-form-item label="短信验证码" prop="code" class="mr30">
-          <div class="flex">
-            <el-input
-              v-model="phoneForm.code"
-              placeholder="请输入短信验证码"
-              style="color:#000"
-              size="medium"
-            >
-              <template slot="append">
-                <el-button
-                  class="ml10"
-                  type="primary"
-                  size="medium"
-                  @click="sendPhoneCode"
-                  :disabled="!sendCode"
-                  >{{ !sendCode ? minute + '秒后重新发送' : '发送短信验证码' }}
-                </el-button>
-              </template>
-            </el-input>
-          </div>
-          <!--          <el-input-->
-          <!--            v-model="phoneForm.code"-->
-          <!--            placeholder="请输入验证码"-->
-          <!--          ></el-input>-->
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false" size="medium">取消</el-button>
-        <el-button type="primary" @click="handleSubmit" size="medium"
-          >确定</el-button
-        >
-      </div>
-    </r-dialog>
+      :user-name="loginForm.userName"
+      @handleSubmit="handleSubmit"
+    ></send-phone-code>
   </div>
 </template>
 
@@ -306,21 +249,17 @@ export default {
         }
       })
     },
-    handleSubmit() {
-      this.$refs.phoneForm.validate(valid => {
-        if (valid) {
-          verify_login({
-            smsCode: this.phoneForm.code,
-            userName: this.loginForm.userName
-          }).then(vali => {
-            if (Number(vali.code) === 0) {
-              this.$store.commit('user/SET_TOKEN', vali.content.content.sid)
-              setToken(vali.content.content.sid)
-              localStorage.setItem('deviceId', vali.content.content.deviceId)
-              this.$router.push({ path: '/home' })
-              this.loading = false
-            }
-          })
+    handleSubmit(code) {
+      verify_login({
+        smsCode: code,
+        userName: this.loginForm.userName
+      }).then(vali => {
+        if (Number(vali.code) === 0) {
+          this.$store.commit('user/SET_TOKEN', vali.content.content.sid)
+          setToken(vali.content.content.sid)
+          localStorage.setItem('deviceId', vali.content.content.deviceId)
+          this.$router.push({ path: '/home' })
+          this.loading = false
         }
       })
     },
@@ -428,20 +367,7 @@ $cursor: #fff;
     font-style: normal;
   }
 }
-.phone-form {
-  & .el-input-group__append {
-    background: $--color-primary;
-    color: #fff;
-    border-color: $--color-primary;
-    & .el-button {
-      &.is-disabled {
-        & ~ .el-input-group__append {
-          background: $--color-primary-disabled;
-        }
-      }
-    }
-  }
-}
+
 .login-input {
   position: relative;
   border: 1px solid #eaecf5;
diff --git a/src/views/applicationManagement/employRule/index.vue b/src/views/applicationManagement/employRule/index.vue
index c9a5eb9..c358759 100644
--- a/src/views/applicationManagement/employRule/index.vue
+++ b/src/views/applicationManagement/employRule/index.vue
@@ -238,14 +238,30 @@ export default {
       }
     },
     // 获取规则列表数据
-    getList(queryParams) {
+    getList() {
+      const queryParams = Object.assign({}, this.queryParams)
       this.loading = true
-      const params = Object.assign(
-        {},
-        queryParams ? queryParams : this.queryParams
-      )
+      // 如果ruleType是中文，转换为编码值
+      if (queryParams && queryParams.ruleType) {
+        const ruleTypeItem = this.ruleTypeList.find(
+          item => item.typeCode === queryParams.ruleType
+        )
 
-      getRulePage(params)
+        if (queryParams && ruleTypeItem) {
+          queryParams.ruleType = ruleTypeItem.typeName
+        }
+      }
+
+      // 如果ruleField是中文，转换为编码值
+      if (queryParams && queryParams.ruleField) {
+        const fieldTypeItem = this.fieldTypeList.find(
+          item => item.fieldName === queryParams.ruleField
+        )
+        if (queryParams && fieldTypeItem) {
+          queryParams.ruleField = fieldTypeItem.fieldComment
+        }
+      }
+      getRulePage(queryParams)
         .then(response => {
           // 根据实际API返回结构调整，兼容Vue2语法
           var content = response.content.content || {}
@@ -331,25 +347,6 @@ export default {
       this.queryParams.page = 1
       // 创建查询参数的副本
       const queryParams = Object.assign({}, this.queryParams)
-      // 如果ruleType是中文，转换为编码值
-      if (queryParams.ruleType) {
-        const ruleTypeItem = this.ruleTypeList.find(
-          item => item.typeCode === queryParams.ruleType
-        )
-        if (ruleTypeItem) {
-          queryParams.ruleType = ruleTypeItem.typeName
-        }
-      }
-
-      // 如果ruleField是中文，转换为编码值
-      if (queryParams.ruleField) {
-        const fieldTypeItem = this.fieldTypeList.find(
-          item => item.fieldName === queryParams.ruleField
-        )
-        if (fieldTypeItem) {
-          queryParams.ruleField = fieldTypeItem.fieldComment
-        }
-      }
 
       // 使用转换后的参数进行查询
       // this.queryParams = queryParams
diff --git a/src/views/system/user/components/ResetPasswordDialog.vue b/src/views/system/user/components/ResetPasswordDialog.vue
index 76204e8..5446cc3 100644
--- a/src/views/system/user/components/ResetPasswordDialog.vue
+++ b/src/views/system/user/components/ResetPasswordDialog.vue
@@ -1,68 +1,78 @@
 <template>
-  <el-dialog
-    title="修改密码"
-    :visible.sync="visible"
-    width="500px"
-    append-to-body
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="form"
-      :rules="rules"
-      label-width="120px"
-      status-icon
-      label-position="top"
+  <div>
+    {{ minute }}
+    <r-dialog
+      title="修改密码"
+      :visible.sync="visible"
+      width="500px"
+      append-to-body
+      @close="handleClose"
     >
-      <el-form-item label="旧密码" prop="userPassword">
-        <el-input
-          v-model="form.userPassword"
-          placeholder="请输入旧密码"
-          type="password"
-          show-password
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="新密码" prop="newPassword">
-        <el-input
-          v-model="form.newPassword"
-          placeholder="请输入新密码"
-          type="password"
-          show-password
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="确认新密码" prop="confirmPassword">
-        <el-input
-          v-model="form.confirmPassword"
-          placeholder="请再次输入新密码"
-          type="password"
-          show-password
-          clearable
-          size="small"
-        />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button
-        type="primary"
-        size="small"
-        :loading="loading"
-        @click="submitForm"
-        >确 定</el-button
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="120px"
+        status-icon
+        label-position="top"
       >
-      <el-button size="small" @click="handleClose">取 消</el-button>
-    </div>
-  </el-dialog>
+        <el-form-item label="旧密码" prop="userPassword">
+          <el-input
+            v-model="form.userPassword"
+            placeholder="请输入旧密码"
+            type="password"
+            show-password
+            clearable
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="新密码" prop="newPassword">
+          <el-input
+            v-model="form.newPassword"
+            placeholder="请输入新密码"
+            type="password"
+            show-password
+            clearable
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="确认新密码" prop="confirmPassword">
+          <el-input
+            v-model="form.confirmPassword"
+            placeholder="请再次输入新密码"
+            type="password"
+            show-password
+            clearable
+            size="small"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          size="medium"
+          :loading="loading"
+          @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button size="medium" @click="handleClose">取 消</el-button>
+      </div>
+    </r-dialog>
+    <send-phone-code
+      :visible.sync="phoneVisabled"
+      :resetPassword="true"
+      @handleSubmit="handleSubmit"
+    ></send-phone-code>
+  </div>
 </template>
 
 <script>
-import { updatePassword } from '@/api/generatedApi/system'
+import { updatePassword, verifyUpdatePassword } from '@/api/generatedApi/system'
+import SendPhoneCode from '@/generatedComponents/send-phone-code.vue'
 
 export default {
   name: 'ResetPasswordDialog',
+  components: { SendPhoneCode },
   props: {
     visible: {
       type: Boolean,
@@ -83,6 +93,8 @@ export default {
       }
     }
     return {
+      phoneVisabled: false,
+      minute: 120,
       form: {
         userPassword: '',
         newPassword: '',
@@ -105,6 +117,19 @@ export default {
     }
   },
   methods: {
+    handleSubmit(code) {
+      verifyUpdatePassword({
+        userPassword: this.form.userPassword,
+        newPassword: this.form.newPassword,
+        smsCode: code
+      }).then(async res => {
+        if (res) {
+          this.$message.success('密码修改成功')
+          await this.$store.dispatch('user/logout')
+          this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+        }
+      })
+    },
     handleClose() {
       this.$refs.form.resetFields()
       this.$emit('update:visible', false)
@@ -119,13 +144,23 @@ export default {
           }
 
           updatePassword(data)
-            .then(async () => {
-              this.$message.success('密码修改成功')
-              await this.$store.dispatch('user/logout')
-              this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+            .then(async res => {
+              let number = Number(res.content.result)
+              switch (number) {
+                case 0:
+                  this.$message.success('密码修改成功')
+                  await this.$store.dispatch('user/logout')
+                  this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+                  break
+                case 51001:
+                  this.phoneVisabled = true
+                  break
+                default:
+                  this.$message.error(res.content.resultMessage)
+              }
             })
             .catch(() => {
-              this.$message.error('密码修改出错')
+              this.$message.error('系统异常，请联系管理员')
             })
             .finally(() => {
               this.loading = false