Browse Source

Merge branch 'zhangrenyuan/feature-20250917134308-现金管理' into milestone-20250913-现金管理

zhangyong/milestone-20250913-现金管理
zhangrenyuan 1 month ago
parent
commit
2c3f9a6f01
  1. 5
      src/components/changePassword.vue
  2. 2
      src/components/dialogs/ConfirmDialog.vue
  3. 21
      src/views/audit/bean/beanAudit.vue
  4. 1
      src/views/audit/gold/rechargeAudit.vue
  5. 1
      src/views/audit/gold/refundAudit.vue

5
src/components/changePassword.vue

@ -222,13 +222,14 @@ onMounted(() => {
<div class="rule-tips"> <div class="rule-tips">
<div :class="isLengthValid ? 'tip pass' : 'tip neutral'"> <div :class="isLengthValid ? 'tip pass' : 'tip neutral'">
<el-icon> <el-icon>
<component :is="isLengthValid ? SuccessFilled : SuccessFilled"/>
<!-- 动态组件 -->
<component :is="isLengthValid ? SuccessFilled : CircleCloseFilled"/>
</el-icon> </el-icon>
密码由8-16位数字字母或符号组成 密码由8-16位数字字母或符号组成
</div> </div>
<div :class="isComplexValid ? 'tip pass' : 'tip neutral'"> <div :class="isComplexValid ? 'tip pass' : 'tip neutral'">
<el-icon> <el-icon>
<component :is="isComplexValid ? SuccessFilled : SuccessFilled"/>
<component :is="isComplexValid ? SuccessFilled : CircleCloseFilled"/>
</el-icon> </el-icon>
至少含2种以上字符 至少含2种以上字符
</div> </div>

2
src/components/dialogs/ConfirmDialog.vue

@ -1,4 +1,6 @@
<!-- 用于审核通过驳回的对话框 -->
<template> <template>
<!-- close-on-click-modal="false" 禁止点击遮罩层关闭对话框 -->
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:width="width" :width="width"

21
src/views/audit/bean/beanAudit.vue

@ -108,6 +108,7 @@
</div> </div>
</el-card> </el-card>
<!-- 废弃不用的对话框 -->
<!-- <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px"> <!-- <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px">
<el-form> <el-form>
<el-form-item label="驳回理由" required> <el-form-item label="驳回理由" required>
@ -122,11 +123,21 @@
</template> </template>
</el-dialog> --> </el-dialog> -->
<ConfirmDialog v-model="rejectDialogVisible" message="驳回该记录!" @confirm="handleReject" @cancel="handleRejectCancel"
@close="handleRejectClose" />
<ConfirmDialog v-model="approveDialogVisible" message="通过该记录!" @confirm="handleApproveConfirm"
@cancel="handleApproveCancel" @close="handleApproveClose" />
<ConfirmDialog
v-model="rejectDialogVisible"
message="驳回该记录!"
@confirm="handleReject"
@cancel="handleRejectCancel"
@close="handleRejectClose"
/>
<ConfirmDialog
v-model="approveDialogVisible"
message="通过该记录!"
@confirm="handleApproveConfirm"
@cancel="handleApproveCancel"
@close="handleApproveClose"
/>
</template> </template>

1
src/views/audit/gold/rechargeAudit.vue

@ -166,6 +166,7 @@
</div> </div>
</el-card> </el-card>
<!-- 废弃不用的对话框 -->
<!-- <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px"> <!-- <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px">
<el-form> <el-form>
<el-form-item label="驳回理由" required> <el-form-item label="驳回理由" required>

1
src/views/audit/gold/refundAudit.vue

@ -153,6 +153,7 @@
@current-change="handleCurrentChange"></el-pagination> @current-change="handleCurrentChange"></el-pagination>
</el-card> </el-card>
<!-- 废弃不用的对话框 -->
<!-- <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px"> <!-- <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px">
<el-form> <el-form>
<el-form-item label="驳回理由" required> <el-form-item label="驳回理由" required>

Loading…
Cancel
Save