Merge branch 'milestone-20250913-现金管理' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250913-现金管理

1 month ago · 009590c8b4
6 changed files with 52 additions and 7 deletions
--- a/src/views/login.vue
+++ b/src/views/login.vue
@ -9,6 +9,8 @@ import {useAdminStore} from '@/store'
 import {filterFirstMenu, findFirstThirdLevelMenu, getRoutePath,} from "../utils/menuUtils.js"
 import {storeToRefs} from "pinia";

+const loading = ref(false) // 登录按钮loading状态
+
 const router = useRouter() // 获取路由实例
 //获取当前浏览器地址
 var url = window.location.href //上传服务器时打开注释并注释掉下一行
@ -38,6 +40,13 @@ const adminStore = useAdminStore()
 //调用方法
 const login = async function () {

+  if(loading.value) {
+    console.log('正在登录，请稍后')
+    return
+  }
+
+  loading.value = true
+
  try {
    const result = await request({
      url: '/admin/login',
@ -177,7 +186,7 @@ onMounted(() => {
              <path fill="white"
                    d="M23.15 2.587L18.21 0.210001C17.9308 0.075557 17.6167 0.031246 17.3113 0.083204C17.0058 0.135162 16.724 0.280818 16.505 0.500001L7.04499 9.13L2.92499 6.002C2.73912 5.86101 2.50976 5.78953 2.27669 5.79994C2.04363 5.81035 1.82156 5.902 1.64899 6.059L0.326993 7.261C0.223973 7.35465 0.141644 7.46878 0.0852761 7.59608C0.0289081 7.72339 -0.00025659 7.86106 -0.000350724 8.00028C-0.000444857 8.1395 0.0285336 8.27721 0.0847294 8.40459C0.140925 8.53197 0.2231 8.64621 0.325993 8.74L3.89899 12L0.325993 15.26C0.2231 15.3538 0.140925 15.468 0.0847294 15.5954C0.0285336 15.7228 -0.000444857 15.8605 -0.000350724 15.9997C-0.00025659 16.1389 0.0289081 16.2766 0.0852761 16.4039C0.141644 16.5312 0.223973 16.6454 0.326993 16.739L1.64999 17.94C1.82256 18.097 2.04463 18.1887 2.27769 18.1991C2.51076 18.2095 2.74012 18.138 2.92599 17.997L7.04599 14.869L16.506 23.499C16.7248 23.7182 17.0064 23.8639 17.3117 23.9159C17.6171 23.9679 17.931 23.9235 18.21 23.789L23.152 21.412C23.4062 21.2893 23.6207 21.0973 23.7707 20.8581C23.9207 20.619 24.0002 20.3423 24 20.06V3.939C24 3.65647 23.9203 3.37967 23.7699 3.14048C23.6195 2.90129 23.4046 2.70943 23.15 2.587ZM18.004 17.448L10.826 12L18.004 6.552V17.448Z"></path>
            </svg>
-            <p class="text">登录</p>
+            <p class="text">{{loading ? '登录中...' : '登录'}}</p>
          </button>
        </el-form-item>
      </el-form>
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@ -43,7 +43,7 @@
                <el-text size="large" style="width:4vw;">退款时间</el-text>
                <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange"
-                    :disabled-date="disabledDate" />
+                    :disabled-date="disabledDate"  :default-time="defaultTime" />
            </div>
            <div>
                <el-button type="primary" @click="getRefund">查询</el-button>
@ -641,6 +641,14 @@ const productList = [
    },

 ]
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1, 23, 59, 59),
+]
+const disabledDate = (time) => {
+  const limitDate = new Date(2025, 0, 1);
+  return time.getTime() < limitDate.getTime();
+}
 const reset = function () {
    searchForm.value = {
        jwcode: '',
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@ -45,7 +45,7 @@
                <el-text size="large" style="width:4vw;">付款时间</el-text>
                <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
-                    :disabled-date="disabledDate" />
+                    :disabled-date="disabledDate" :default-time="defaultTime" />
            </div>
            <div>
                <el-button type="primary" @click="getRefund">查询</el-button>
@ -749,6 +749,14 @@ const showAudit = function (row) {
    auditRow.value = row
    showAudit2.value = true
 }
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1, 23, 59, 59),
+]
+const disabledDate = (time) => {
+  const limitDate = new Date(2025, 0, 1);
+  return time.getTime() < limitDate.getTime();
+}
 onMounted(() => {
    console.log('???????????????????', adminData.value)
    getRefund()
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@ -43,8 +43,8 @@
            <div class="item2" style="width: 28.5vw;">
                <el-text size="large" style="width:4vw;">付款时间</el-text>
                <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
-                    :disabled-date="disabledDate" />
+                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable 
+                    :disabled-date="disabledDate" :default-time="defaultTime" />
            </div>
            <div>
                <el-button type="primary" @click="getRefund">查询</el-button>
@ -815,6 +815,14 @@ const hideReject = function () {
    showReject.value = false
    addForm.value.remark = ''
 }
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1, 23, 59, 59),
+]
+const disabledDate = (time) => {
+  const limitDate = new Date(2025, 0, 1);
+  return time.getTime() < limitDate.getTime();
+}
 onMounted(() => {
    console.log('???????????????????', adminData.value)
    getRefund()
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@ -44,7 +44,7 @@
                <el-text size="large" style="width:4vw;">付款时间</el-text>
                <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
-                    :disabled-date="disabledDate" />
+                    :disabled-date="disabledDate" :default-time="defaultTime" />
            </div>
            <div>
                <el-button type="primary" @click="getRefund">查询</el-button>
@ -778,6 +778,14 @@ const showAudit = function (row) {
    auditRow.value = row
    showAudit2.value = true
 }
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1, 23, 59, 59),
+]
+const disabledDate = (time) => {
+  const limitDate = new Date(2025, 0, 1);
+  return time.getTime() < limitDate.getTime();
+}
 onMounted(() => {
    console.log('???????????????????', adminData.value)
    getRefund()
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@ -43,7 +43,7 @@
            <div class="item2" style="width: 28.5vw;">
                <el-text size="large" style="width:4vw;">付款时间</el-text>
                <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                    end-placeholder="结束时间" style="width:22vw;" :disabled-date="disabledDate" clearable />
+                    end-placeholder="结束时间" style="width:22vw;" :disabled-date="disabledDate" :default-time="defaultTime" clearable />
            </div>
            <div>
                <el-button type="primary" @click="getRefund">查询</el-button>
@ -644,6 +644,10 @@ const disabledDate = (time) => {
 const handleMarketChange = (value) => {
    searchForm.value.market = value || []
 }
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1, 23, 59, 59),
+]
 onMounted(() => {
    getRefund()
    getMarket()