src/api/table.js

@@ -83,7 +83,7 @@ export function addTableInfo(data) {
 export function deleteTableInfo(data) {
   return request({
     url: '/backendApi/table_info/delete/' + data,
-    method: 'post',
+    method: 'delete',
     data: data
   })
 }

src/components/Page/index.vue

@@ -6,7 +6,7 @@
       size="small"
       inline
       v-show="showSearch"
-      label-width="68px"
+      
       v-bind="formProps"
     >
       <slot

src/locales/en.json

@@ -279,6 +279,11 @@
   },
   "storeList": {
     "list": {
+      "serviceFeeRequired": "Service fee is required",
+      "serviceFee": "Service Fee",
+      "pleaseEnterServiceFee": "Please enter the service fee",
+            "serviceFeeMustBeNumber": "Service fee must be a number",
+      "serviceFeeRangeError": "Service fee must be between 0 and 1",
       "storeName": "Store Name",
       "pleaseEnterStoreName": "Please enter the store name",
       "status": "Status",
@@ -346,6 +351,7 @@
     "info": {}
   },
   "tableManagement": {
+    "tableStatus": "Table Status",
     "tableCode": "Table Code",
     "pleaseEnterTableCode": "Please enter the table code",
     "status": "Status",

src/locales/ru.json

@@ -266,6 +266,11 @@
 
       "storeList": {
         "list": {
+          "serviceFeeRequired":"Стоимость услуги обязательна",
+          "serviceFee": "Стоимость услуги",
+          "pleaseEnterServiceFee": "Пожалуйста, введите стоимость услуги",
+                "serviceFeeMustBeNumber": "Стоимость услуги должна быть числом",
+      "serviceFeeRangeError": "Стоимость услуги должна быть между 0 и 1",
           "storeName": "Название магазина",
           "pleaseEnterStoreName": "Пожалуйста, введите название магазина",
           "status": "Статус",
@@ -328,6 +333,7 @@
       },
 
       "tableManagement": {
+          "tableStatus":"Состояние стола",
           "tableCode": "Код стола",
           "pleaseEnterTableCode": "Пожалуйста, введите код стола",
           "status": "Статус",

src/locales/sr.json

@@ -335,6 +335,11 @@
 
   "storeList": {
     "list": {
+      "serviceFeeRequired":"Cena usluge je obavezna",
+      "serviceFee": "Cena usluge",
+      "pleaseEnterServiceFee": "Molimo, unesite cenu usluge",
+            "serviceFeeMustBeNumber": "Cena usluge mora biti broj",
+      "serviceFeeRangeError": "Cena usluge mora biti između 0 i 1",
       "storeName": "Ime prodavnice",
       "pleaseEnterStoreName": "Unesite ime prodavnice",
       "status": "Status",
@@ -404,6 +409,7 @@
   },
 
   "tableManagement": {
+    "tableStatus": "Статус стола",
     "tableCode": "Kod stola",
     "pleaseEnterTableCode": "Unesite kod stola",
     "status": "Status",

src/locales/zh.json

@@ -275,6 +275,11 @@
   },
   "storeList":{
     "list":{
+      "serviceFeeRequired":"服务费是必需的",
+      "serviceFee": "服务费",
+      "pleaseEnterServiceFee": "请输入服务费",
+      "serviceFeeMustBeNumber": "服务费必须是数字",
+      "serviceFeeRangeError": "服务费必须在 0 到 1 之间",
       "storeName": "店铺名称",
       "pleaseEnterStoreName": "请输入店铺名称",
       "status": "状态",
@@ -345,6 +350,7 @@
     }
   },
   "tableManagement": {
+    "tableStatus": "桌码状态",
     "tableCode": "桌码",
     "pleaseEnterTableCode": "请输入桌码",
     "status": "状态",

src/utils/request.js

@@ -52,8 +52,8 @@ service.interceptors.request.use(config => {
       const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请耐心等待';
-        console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
+        // console.warn(`[${s_url}]: ` + message)
+        // return Promise.reject(new Error(message))
       } else {
         cache.session.setJSON('sessionObj', requestObj)
       }
@@ -130,11 +130,52 @@ service.interceptors.response.use(res => {
 )
 
 // 通用下载方法
-export function download(url, params) {
-   url = process.env.VUE_APP_BASE_API + url + '?token='+ getToken() + '&'+ param(params)
-   window.open(url, '_blank')
+// export function download(url, params) {
+//    url = process.env.VUE_APP_BASE_API + url + '?token='+ getToken() + '&'+ param(params)
+//    window.open(url, '_blank')
+// }
+export async function download(baseURL, params) {
+  try {
+      // 构建完整的请求参数，包含 Access-Token
+      const fullParams = {
+          ...params,
+          'Access-Token': getToken()
+      };
+
+      // 使用 axios 原生发起 GET 请求
+      const response = await axios({
+          url: process.env.VUE_APP_BASE_API+baseURL,
+          method: 'get',
+          params: fullParams,
+          responseType: 'blob', // 设置响应类型为 blob，用于处理流式数据
+          headers: {
+              "Accept": "*/*",
+              'Access-Token': getToken()
+          }
+      });
+
+      // 创建 Blob 对象
+      const blob = new Blob([response.data], {
+          type: response.headers['content-type']
+      });
+
+      // 创建一个临时的 URL 对象
+      const url = window.URL.createObjectURL(blob);
+
+      // 创建一个 a 标签
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = 'download.xls';
+      a.click();
+
+      // 释放临时的 URL 对象
+      window.URL.revokeObjectURL(url);
+  } catch (error) {
+      console.error('下载失败:', error);
+  }
 }
 
+
 // 组织参数
 export function param(data) {
    let url = ''

src/views/balance/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="会员ID" prop="userId">
         <el-input
           v-model="queryParams.userId"

src/views/balance/setting.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="main-panel">
-      <el-form ref="form" class="content" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" class="content" :model="form" :rules="rules" >
         <div class="title">充值规则设置</div>
         <el-row v-for="(item, index) in form.rechargeItem" :key="index">
           <el-col :span="24">

src/views/book/components/bookCate.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="cate-container">
     <el-dialog title="预约类别" :visible.sync="showDialog" class="common-dialog" width="950px" @close="close" destroy-on-close>
-      <el-form ref="form" :model="form" label-width="120px" size="small" :inline="true">
+      <el-form ref="form" :model="form"  size="small" :inline="true">
         <el-row>
           <el-form-item label="类别名称" prop="name">
             <el-input

src/views/book/components/bookCateForm.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 添加或修改分类对话框 -->
   <el-dialog :title="title" :visible.sync="showDialog" class="common-dialog" width="700px" :before-close="handleCLose" @close="handleCLose" destroy-on-close>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" >
       <el-row>
         <el-col :span="24">
           <el-form-item label="分类名称" prop="name">

src/views/book/components/bookForm.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 添加或修改对话框 -->
   <el-dialog :title="title" :visible.sync="showDialog" class="common-dialog" width="840px" :before-close="handleCLose" @close="handleCLose" destroy-on-close>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" >
       <el-row>
         <el-col :span="24">
           <el-form-item label="预约名称" prop="name">
@@ -100,7 +100,7 @@
                 }">
               </el-time-select>
               -
-              <el-input-number style="width: 120px" v-model="time.num" :min="0"/>
+              <el-input-number  v-model="time.num" :min="0"/>
               <span class="remove-item el-icon-remove" @click="removeTime(index)"></span>
             </div>
             <div class="form-tips">提示：请填写起始时段、可预约上限人数</div>

src/views/book/item.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="会员ID" prop="userId">
         <el-input
           v-model="queryParams.userId"

src/views/cashier/components/noGoodsCashier.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 积分变更对话框 -->
   <el-dialog title="无商品收款" :visible.sync="showDialog" class="common-dialog" width="700px" @close="close" destroy-on-close>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" >
       <el-row>
         <el-col :span="24">
           <el-form-item label="收款金额：" prop="amount">

src/views/commission/cash/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form size="small" :inline="true" class="main-search" label-width="68px">
+    <el-form size="small" :inline="true" class="main-search" >
       <el-form-item label="所属店铺" prop="storeId">
         <el-select v-model="storeId" filterable clearable placeholder="请选择店铺" style="width: 100%;">
           <el-option
@@ -133,7 +133,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog title="修改提现" :visible.sync="openEdit" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="updateForm" label-width="120px">
+      <el-form ref="form" :model="updateForm" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="佣金金额" prop="amount">

src/views/commission/log/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--查询参数-->
-    <el-form size="small" :inline="true" class="main-search" label-width="68px">
+    <el-form size="small" :inline="true" class="main-search" >
       <el-form-item label="分佣对象" prop="target">
         <el-select v-model="target" placeholder="请选择方案对象" clearable style="width: 100%;">
           <el-option key="" label="全部" value=""/>
@@ -156,7 +156,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog title="修改佣金" :visible.sync="openEdit" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="updateForm" label-width="120px">
+      <el-form ref="form" :model="updateForm" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="订单ID" prop="orderId">

src/views/commission/relation/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="会员ID" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -108,7 +108,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="标题" prop="title">

src/views/commission/rule/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--查询参数-->
-    <el-form size="small" :inline="true" class="main-search" label-width="68px">
+    <el-form size="small" :inline="true" class="main-search" >
       <el-form-item label="方案名称">
         <el-input
           v-model="name"

src/views/content/article/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" >
       <el-form-item label="文章标题" prop="title">
         <el-input
           v-model="queryParams.title"

src/views/content/banner/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -113,7 +113,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="标题" prop="title">

src/views/coupon/confirm/index.vue

@@ -18,7 +18,7 @@
 
     <!--核销对话框 start-->
     <el-dialog title="核销卡券" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="confirmForm" :model="confirmForm" :rules="confirmRules" label-width="120px">
+      <el-form ref="confirmForm" :model="confirmForm" :rules="confirmRules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="卡券类型：">

src/views/coupon/confirmLog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="会员ID" prop="userId">
         <el-input
           v-model="queryParams.userId"

src/views/coupon/coupon/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="卡券ID" prop="couponId">
         <el-input
           v-model="queryParams.id"
@@ -483,7 +483,7 @@
 
     <!--发券对话框 start-->
     <el-dialog title="发放卡券" :visible.sync="openSendCouponDialog" class="common-dialog" width="800px" append-to-body>
-      <el-form ref="sendForm" :model="sendForm" :rules="sendFormRules" label-width="120px">
+      <el-form ref="sendForm" :model="sendForm" :rules="sendFormRules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="卡券名称：" prop="couponName">

src/views/coupon/give/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="会员ID" prop="userId">
         <el-input
           v-model="queryParams.userId"

src/views/coupon/group/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="分组ID" prop="couponId">
         <el-input
           v-model="queryParams.id"
@@ -101,7 +101,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="分组名称" prop="name">

src/views/coupon/sendLog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="会员ID" prop="userId">
         <el-input
           v-model="queryParams.userId"

src/views/coupon/userCoupon/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="ID" prop="id">
         <el-input
           v-model="queryParams.id"
@@ -187,7 +187,7 @@
 
     <!--详情对话框 start-->
     <el-dialog title="详情" :visible.sync="openDetail" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="detailForm" label-width="120px">
+      <el-form ref="detailForm" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="卡券类型：">

src/views/currency/list.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item :label="$t('currency.currency')" prop="name">
         <el-input
@@ -92,7 +92,7 @@
       width="800px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('currency.currencyName')" prop="name">

src/views/goods/cate/index.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item :label="$t('goodList.categoryName')" prop="name">
         <el-input
@@ -162,7 +162,7 @@
       width="700px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('goodList.categoryName')" prop="name">

src/views/goods/goods/goodsForm.vue

@@ -4,7 +4,7 @@
       <el-tabs v-model="activeTab" @tab-click="handleTabClick">
         <el-tab-pane :label="$t('goodList.basicInfo')" name="base">
           <div class="content">
-            <el-form ref="baseForm" :model="baseForm" :rules="baseRules" label-width="120px">
+            <el-form ref="baseForm" :model="baseForm" :rules="baseRules" >
               <!-- <el-row>
                 <el-col :span="24">
                   <el-form-item label="商品类型" prop="cateId">
@@ -135,7 +135,7 @@
         </el-tab-pane>
         <el-tab-pane :label="$t('goodList.extendedInfo')" name="extend">
           <div class="content">
-            <el-form ref="extendForm" :model="extendForm" :rules="extendRules" label-width="120px">
+            <el-form ref="extendForm" :model="extendForm" :rules="extendRules" >
               <!-- <el-row>
                 <el-col :span="24">
                   <el-form-item label="积分抵扣" prop="canUsePoint">
@@ -297,7 +297,7 @@
         </el-tab-pane>
         <el-tab-pane :label="$t('goodList.productDescription')" name="detail">
           <div class="content" style="width: 375px; margin-left: 80px">
-            <el-form ref="detailForm" :model="detailForm" :rules="detailRules" label-width="120px">
+            <el-form ref="detailForm" :model="detailForm" :rules="detailRules" >
               <editor v-model="detailForm.description" :min-height="550" />
             </el-form>
           </div>

src/views/goods/goods/index.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item :label="$t('goodList.productName')" prop="name">
         <el-input
@@ -79,7 +79,7 @@
           v-model="queryParams.isSingleSpec"
           :placeholder="$t('goodList.specificationType')"
           clearable
-          style="width: 120px"
+          
         >
           <el-option key="Y" :label="$t('goodList.singleSpecification')" value="Y" />
           <el-option key="N" :label="$t('goodList.multipleSpecifications')" value="N" />
@@ -90,7 +90,7 @@
           v-model="queryParams.status"
           :placeholder="$t('goodList.shelfStatus')"
           clearable
-          style="width: 120px"
+          
         >
           <el-option key="A" :label="$t('goodList.putOnShelf')" value="A" />
           <el-option key="N" :label="$t('goodList.removeFromShelf')" value="N" />
@@ -101,7 +101,7 @@
           v-model="queryParams.stock"
           :placeholder="$t('goodList.stockStatus')"
           clearable
-          style="width: 120px"
+          
         >
           <el-option key="Y" :label="$t('goodList.inStock')" value="Y" />
           <el-option key="N" :label="$t('goodList.outOfStock')" value="N" />

src/views/material/order/formUI.vue

@@ -2,7 +2,7 @@
   <div>
     <Paragraph title="基础信息">
       <template>
-        <el-form ref="form" size="mini" label-width="120px">
+        <el-form ref="form" size="mini" >
           <el-row :gutter="20">
             <el-col :span="6">
               <el-form-item label="采购订单号" prop="name" required>

src/views/member/balanceRecharge.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 充值对话框 -->
   <el-dialog class="common-dialog" title="余额充值/扣减" :visible.sync="showDialog" width="700px" @close="cancel" destroy-on-close>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" >
       <el-row>
         <el-col :span="24">
           <el-form-item label="会员信息：">

src/views/member/group/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" >
       <el-form-item label="分组ID" prop="id">
         <el-input
           v-model="queryParams.id"
@@ -116,7 +116,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row v-if="form.parentId > 0">
           <el-col :span="24">
             <el-form-item label="上级分组" prop="parentName">

src/views/member/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="会员ID" prop="id">
         <el-input
           v-model="queryParams.id"
@@ -208,7 +208,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="会员名称" prop="name" style="width: 420px">

src/views/member/pointRecharge.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 积分变更对话框 -->
   <el-dialog title="积分变更" :visible.sync="showDialog" class="common-dialog" width="700px" @close="cancel" destroy-on-close>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" >
       <el-row>
         <el-col :span="24">
           <el-form-item label="会员信息：">

src/views/merchant/index.vue

@@ -6,7 +6,7 @@
         size="small"
         :inline="true"
         v-show="showSearch"
-        label-width="68px"
+        
     >
         <el-form-item :label="$t('merchant.merchantNumber')" prop="no">
             <el-input
@@ -27,7 +27,7 @@
             />
         </el-form-item>
         <el-form-item :label="$t('merchant.status')" prop="status">
-            <el-select v-model="queryParams.status" :placeholder="$t('merchant.status')" clearable style="width: 120px">
+            <el-select v-model="queryParams.status" :placeholder="$t('merchant.status')" clearable >
                 <el-option :key="$t('merchant.enabledKey')" :label="$t('merchant.enabled')" :value="A" />
                 <el-option :key="$t('merchant.disabledKey')" :label="$t('merchant.disabled')" :value="N" />
             </el-select>

src/views/openGift/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="卡券ID" prop="couponId">
         <el-input
           v-model="queryParams.couponId"
@@ -111,7 +111,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="会员等级" prop="gradeId">

src/views/order/index.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item :label="$t('orderList.orderNumber')" prop="orderSn">
         <el-input
@@ -74,22 +74,16 @@
         </el-select>
       </el-form-item> -->
       <el-form-item :label="$t('orderList.orderTime')">
-        <el-date-picker
-          v-model="queryParams.startTime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          style="width: 190px"
-          :placeholder="$t('orderList.startTime')"
-        ></el-date-picker>
-        <span class="sp">~</span>
-        <el-date-picker
-          v-model="queryParams.endTime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          style="width: 190px"
-          :placeholder="$t('orderList.endTime')"
-        ></el-date-picker>
-      </el-form-item>
+    <el-date-picker
+      v-model="queryParams.timeRange"
+      value-format="yyyy-MM-dd HH:mm:ss"
+      type="datetimerange"
+      style="width: 400px"
+      :start-placeholder="$t('orderList.startTime')"
+      :end-placeholder="$t('orderList.endTime')"
+      :picker-options="pickerOptions"
+    ></el-date-picker>
+  </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery(false)">
           {{ $t('orderList.query') }}
@@ -230,6 +224,7 @@
       <el-table-column :label="$t('orderList.operation')" align="left" width="130" fixed="right">
         <template slot-scope="scope">
           <el-button
+            v-if="false"
             size="mini"
             type="text"
             v-hasPermi="['order:edit']"
@@ -293,7 +288,7 @@
     width="700px"
     append-to-body
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" >
       <el-row>
         <el-col :span="24">
           <el-form-item :label="$t('orderList.orderNumber')" prop="orderSn">
@@ -356,7 +351,7 @@
     width="700px"
     append-to-body
   >
-    <el-form ref="vForm" :model="vForm" :rules="vFormRules" label-width="120px">
+    <el-form ref="vForm" :model="vForm" :rules="vFormRules" >
       <el-row>
         <el-col :span="24">
           <el-form-item :label="$t('orderList.orderNumber')" prop="orderSn">
@@ -402,7 +397,7 @@
     width="700px"
     append-to-body
   >
-    <el-form ref="eForm" :model="eForm" :rules="eFormRules" label-width="120px">
+    <el-form ref="eForm" :model="eForm" :rules="eFormRules" >
       <el-row>
         <el-col :span="24">
           <el-form-item :label="$t('orderList.orderNumber')" prop="orderSn">
@@ -467,7 +462,7 @@
     width="700px"
     append-to-body
   >
-    <el-form ref="rForm" :model="rForm" :rules="rFormRules" label-width="120px">
+    <el-form ref="rForm" :model="rForm" :rules="rFormRules" >
       <el-row>
         <el-col :span="24">
           <el-form-item :label="$t('orderList.orderNumber')" prop="orderSn" style="width: 450px">
@@ -546,6 +541,27 @@ export default {
   },
   data() {
     return {
+        // 配置日期选择器的选项
+        pickerOptions: {
+        disabledDate(time) {
+          // 禁止选择当前时间之后的日期
+          return time.getTime() > Date.now();
+        },
+        // 当开始时间改变时，动态更新结束时间的可选范围
+        // onPick: ({ maxDate, minDate }) => {
+        //   if (minDate) {
+        //     this.pickerOptions.disabledDate = (time) => {
+        //       // 禁止选择开始时间之前的日期和当前时间之后的日期
+        //       return time.getTime() < minDate.getTime() || time.getTime() > Date.now();
+        //     };
+        //   } else {
+        //     // 如果没有选择开始时间，恢复默认的禁用规则
+        //     this.pickerOptions.disabledDate = (time) => {
+        //       return time.getTime() > Date.now();
+        //     };
+        //   }
+        // }
+      },
       // 遮罩层
       loading: true,
       // 标题
@@ -621,7 +637,8 @@ export default {
         orderMode: '',
         orderSn: '',
         storeIds: '',
-        tableCode: ''
+        tableCode: '',
+        timeRange: [],
       },
       // 表单校验
       rules: {
@@ -684,6 +701,11 @@ export default {
         const app = this;
         app.loading = true;
         app.queryParams.storeIds = app.storeIds ? app.storeIds.join(',') : '';
+        //设置范围
+        if (app.queryParams.timeRange && app.queryParams.timeRange.length > 0) {
+          app.queryParams.startTime = app.queryParams.timeRange[0];
+          app.queryParams.endTime = app.queryParams.timeRange[1];
+        }
         getOrderList(app.queryParams).then((response) => {
             this.list = response.data.paginationResponse.content;
             this.total = response.data.paginationResponse.totalElements;
@@ -696,6 +718,10 @@ export default {
               element.name=this.$t(element.name);
               return element;
             });;
+            // console.log(this.statusList,this.payStatusList)
+            const retainArr = ["A", "B", "C"];
+            this.payStatusList = this.payStatusList.filter(item => retainArr.includes(item.key));
+            this.statusList = this.statusList.filter(item => retainArr.includes(item.key));
             this.orderModeList = response.data.orderModeList;
             this.payTypeList = response.data.payTypeList;
             this.storeList = response.data.storeList;
@@ -725,10 +751,14 @@ export default {
         this.queryParams.orderMode = '';
         this.queryParams.orderSn = '';
         this.queryParams.storeIds = '';
+        this.queryParams.timeRange = [];
+        this.queryParams.startTime = '';
+        this.queryParams.endTime = '';
         this.storeIds = [];
+        
         this.resetForm('queryForm');
         this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
-        this.handleQuery();
+        this.handleQuery(false);
     },
     // 状态修改
     handleStatusChange(row) {

src/views/point/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="会员ID" prop="userId">
         <el-input
           v-model="queryParams.userId"

src/views/printer/index.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item label="设备名称" prop="name">
         <el-input
@@ -157,7 +157,7 @@
       width="700px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="设备名称" prop="name">
@@ -276,7 +276,7 @@
         ref="settingForm"
         :model="settingForm"
         :rules="settingRules"
-        label-width="120px"
+        
       >
         <el-row>
           <el-col :span="24">

src/views/refund/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="订单号" prop="name">
         <el-input
           v-model="queryParams.orderSn"
@@ -154,7 +154,7 @@
 
     <!-- 审核对话框 start-->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="订单号" prop="orderSn">

src/views/settlement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="备注信息" prop="description">
         <el-input
           v-model="queryParams.description"
@@ -100,7 +100,7 @@
 
     <!-- 结算对话框 -->
     <el-dialog title="发起结算" :visible.sync="settleDialog" class="common-dialog" width="80%" append-to-body>
-      <el-form ref="form" :model="form" label-width="120px" size="small" :inline="true">
+      <el-form ref="form" :model="form"  size="small" :inline="true">
         <el-row>
             <el-form-item label="结算商户" prop="merchantId">
               <el-select class="input" v-model="form.merchantId" style="width: 240px" placeholder="请选择商户">

src/views/smsManager/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="手机号" prop="mobile">
         <el-input
           v-model="queryParams.mobile"
@@ -54,7 +54,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="模板名称" prop="name">

src/views/smsTemplate/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="模板编码" prop="code">
         <el-input
           v-model="queryParams.code"
@@ -98,7 +98,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="模板名称" prop="name">

src/views/staff/list.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item :label="$t('employee.employeeCategory')" prop="category">
         <el-select
@@ -65,7 +65,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['staff:list']"
+          v-hasPermi="['staff:add']"
         >
           {{ $t('employee.addEmployee') }}
         </el-button>
@@ -172,7 +172,7 @@
       width="700px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('employee.employeeCategory')" prop="category">
@@ -248,10 +248,10 @@
           <el-col :span="24">
             <el-form-item :label="$t('employee.status')">
               <el-radio-group v-model="form.auditedStatus">
-                <el-radio :key="A" :label="$t('employee.enabled')" :value="A">
+                <el-radio key="A" label="A" value="A">
                   {{ $t('employee.enabled') }}
                 </el-radio>
-                <el-radio :key="N" :label="$t('employee.disabled')" :value="N">
+                <el-radio key="N" label="N" value="N">
                   {{ $t('employee.disabled') }}
                 </el-radio>
               </el-radio-group>

src/views/stock/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" class="main-search" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" class="main-search" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="说明备注" prop="description">
         <el-input
           v-model="queryParams.description"
@@ -116,7 +116,7 @@
     />
     <!--编辑商品库存-->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="80%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="所属店铺" prop="storeId">

src/views/store/info.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container main-panel">
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" >
       <el-row>
         <el-col :span="12">
           <el-form-item label="店铺名称" prop="name">

src/views/store/list.vue

@@ -7,7 +7,7 @@
         size="small"
         :inline="true"
         v-show="showSearch"
-        label-width="68px"
+        
     >
         <el-form-item :label="$t('storeList.list.storeName')" prop="name">
             <el-input
@@ -165,7 +165,7 @@
         width="800px"
         append-to-body
     >
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form ref="form" :model="form" :rules="rules" >
             <el-row>
                 <el-col :span="24">
                     <el-form-item :label="$t('storeList.list.storeName')" prop="name">
@@ -237,6 +237,17 @@
                 </el-col>
             </el-row>
             <el-row>
+              <el-col :span="24">
+              <el-form-item :label="$t('storeList.list.serviceFee')" prop="serviceFeeRate">
+                <el-input
+                  v-model="form.serviceFeeRate"
+                  :placeholder="$t('storeList.list.pleaseEnterServiceFee')"
+                  maxlength="30"
+                />
+              </el-form-item>
+            </el-col>
+            </el-row>
+            <el-row>
                 <el-col :span="24">
                     <el-form-item :label="$t('storeList.list.contactPersonName')" prop="contact">
                         <el-input
@@ -547,6 +558,7 @@ export default {
         bankCardNo: "",
         isDefault: "N",
         status: "A",
+        serviceFeeRate: "",
       },
       // 微信支付证书
       wxCertPath: "",
@@ -622,6 +634,25 @@ export default {
                 trigger: "blur" 
             },
         ],
+        serviceFeeRate: [
+            { 
+                required: true, 
+                message: this.$t('storeList.list.serviceFeeRequired'), 
+                trigger: "blur" 
+            },
+            {
+            validator: (rule, value, callback) => {
+              if (isNaN(value)) {
+                callback(new Error(this.$t('storeList.list.serviceFeeMustBeNumber')));
+              } else if (value < 0 || value > 1) {
+                callback(new Error(this.$t('storeList.list.serviceFeeRangeError')));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur"
+          }
+        ],
     },
     };
   },

src/views/subMessage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="关键字" prop="content">
         <el-input
           v-model="queryParams.title"
@@ -63,7 +63,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="消息类型" prop="name">

src/views/system/account/index.vue

@@ -10,7 +10,7 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="68px"
+          
         >
           <el-form-item label="用户名" prop="accountName">
             <el-input

src/views/system/config/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="参数名称" prop="configName">
         <el-input
           v-model="queryParams.configName"

src/views/system/dict/data.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="字典名称" prop="dictType">
         <el-select v-model="queryParams.dictType">
           <el-option

src/views/system/dict/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="字典名称" prop="dictName">
         <el-input
           v-model="queryParams.dictName"

src/views/system/genCode/index.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item label="表名称" prop="title">
         <el-input
@@ -133,7 +133,7 @@
       width="700px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="表名称" prop="tableName">

src/views/system/logs/index.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item label="操作内容" prop="title">
         <el-input

src/views/system/notice/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="公告标题" prop="noticeTitle">
         <el-input
           v-model="queryParams.noticeTitle"

src/views/table/index.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      
     >
       <el-form-item :label="$t('tableManagement.tableCode')" prop="tableNumber">
         <el-input
@@ -152,7 +152,7 @@
       width="800px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('tableManagement.tableEncoding')" prop="tableNumber">
@@ -445,14 +445,19 @@ export default {
       const confirmMsg = this.$t('tableManagement.confirmDeleteTableCode', { tableCode: code })
       this.$modal
         .confirm(confirmMsg)
-        .then(() => {
-          deleteTableInfo(row.id)
-        })
-        .then(() => {
-          this.getList()
-          this.$modal.msgSuccess(this.$t('tableManagement.deleteSuccess'))
+        .then(async () => {
+          try {
+            await deleteTableInfo(row.id)
+            this.$modal.msgSuccess(this.$t('tableManagement.deleteSuccess'))
+            this.getList()
+          } catch (error) {
+            console.log('error', error)
+          }
+
         })
-        .catch(() => {})
+        
+
+
     }
   }
 }

src/views/tool/gen/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="表名称" prop="tableName">
         <el-input
           v-model="queryParams.tableName"

src/views/userGrade/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="等级名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -113,7 +113,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" >
         <el-row>
           <el-col :span="24">
             <el-form-item label="等级" prop="grade">