Bladeren bron

fix:样式修改换行问题

Mcal 1 week geleden
bovenliggende
commit
7afc879e92
52 gewijzigde bestanden met toevoegingen van 101 en 86 verwijderingen
  1. 1 1
      src/components/Page/index.vue
  2. 1 1
      src/views/balance/list.vue
  3. 1 1
      src/views/balance/setting.vue
  4. 1 1
      src/views/book/components/bookCate.vue
  5. 1 1
      src/views/book/components/bookCateForm.vue
  6. 2 2
      src/views/book/components/bookForm.vue
  7. 1 1
      src/views/book/item.vue
  8. 1 1
      src/views/cashier/components/noGoodsCashier.vue
  9. 2 2
      src/views/commission/cash/index.vue
  10. 2 2
      src/views/commission/log/index.vue
  11. 2 2
      src/views/commission/relation/index.vue
  12. 1 1
      src/views/commission/rule/index.vue
  13. 1 1
      src/views/content/article/index.vue
  14. 2 2
      src/views/content/banner/list.vue
  15. 1 1
      src/views/coupon/confirm/index.vue
  16. 1 1
      src/views/coupon/confirmLog/index.vue
  17. 2 2
      src/views/coupon/coupon/index.vue
  18. 1 1
      src/views/coupon/give/index.vue
  19. 2 2
      src/views/coupon/group/index.vue
  20. 1 1
      src/views/coupon/sendLog/index.vue
  21. 2 2
      src/views/coupon/userCoupon/index.vue
  22. 2 2
      src/views/currency/list.vue
  23. 2 2
      src/views/goods/cate/index.vue
  24. 3 3
      src/views/goods/goods/goodsForm.vue
  25. 4 4
      src/views/goods/goods/index.vue
  26. 1 1
      src/views/material/order/formUI.vue
  27. 1 1
      src/views/member/balanceRecharge.vue
  28. 2 2
      src/views/member/group/index.vue
  29. 2 2
      src/views/member/index.vue
  30. 1 1
      src/views/member/pointRecharge.vue
  31. 2 2
      src/views/merchant/index.vue
  32. 2 2
      src/views/openGift/index.vue
  33. 20 5
      src/views/order/index.vue
  34. 1 1
      src/views/point/list.vue
  35. 3 3
      src/views/printer/index.vue
  36. 2 2
      src/views/refund/index.vue
  37. 2 2
      src/views/settlement/index.vue
  38. 2 2
      src/views/smsManager/index.vue
  39. 2 2
      src/views/smsTemplate/index.vue
  40. 2 2
      src/views/stock/index.vue
  41. 1 1
      src/views/store/info.vue
  42. 2 2
      src/views/store/list.vue
  43. 2 2
      src/views/subMessage/index.vue
  44. 1 1
      src/views/system/account/index.vue
  45. 1 1
      src/views/system/config/index.vue
  46. 1 1
      src/views/system/dict/data.vue
  47. 1 1
      src/views/system/dict/index.vue
  48. 2 2
      src/views/system/genCode/index.vue
  49. 1 1
      src/views/system/logs/index.vue
  50. 1 1
      src/views/system/notice/index.vue
  51. 1 1
      src/views/tool/gen/index.vue
  52. 2 2
      src/views/userGrade/index.vue

+ 1 - 1
src/components/Page/index.vue

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

+ 1 - 1
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"

+ 1 - 1
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">

+ 1 - 1
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

+ 1 - 1
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">

+ 2 - 2
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>

+ 1 - 1
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"

+ 1 - 1
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">

+ 2 - 2
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">

+ 2 - 2
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">

+ 2 - 2
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">

+ 1 - 1
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"

+ 1 - 1
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"

+ 2 - 2
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">

+ 1 - 1
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="卡券类型:">

+ 1 - 1
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"

+ 2 - 2
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">

+ 1 - 1
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"

+ 2 - 2
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">

+ 1 - 1
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"

+ 2 - 2
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="卡券类型:">

+ 2 - 2
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">

+ 2 - 2
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">

+ 3 - 3
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>

+ 4 - 4
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" />

+ 1 - 1
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>

+ 1 - 1
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="会员信息:">

+ 2 - 2
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">

+ 2 - 2
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">

+ 1 - 1
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="会员信息:">

+ 2 - 2
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>

+ 2 - 2
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">

+ 20 - 5
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
@@ -80,6 +80,7 @@
           type="datetime"
           style="width: 190px"
           :placeholder="$t('orderList.startTime')"
+          :picker-options="pickerOptions"
         ></el-date-picker>
         <span class="sp">~</span>
         <el-date-picker
@@ -88,6 +89,8 @@
           type="datetime"
           style="width: 190px"
           :placeholder="$t('orderList.endTime')"
+          :picker-options="pickerOptions"
+
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -230,6 +233,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 +297,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 +360,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 +406,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 +471,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 +550,13 @@ export default {
   },
   data() {
     return {
+        // 配置日期选择器的选项
+      pickerOptions: {
+        // 禁用大于当前日期时间的选项
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
       // 遮罩层
       loading: true,
       // 标题
@@ -696,6 +707,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;

+ 1 - 1
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"

+ 3 - 3
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">

+ 2 - 2
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">

+ 2 - 2
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="请选择商户">

+ 2 - 2
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">

+ 2 - 2
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">

+ 2 - 2
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">

+ 1 - 1
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">

+ 2 - 2
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">

+ 2 - 2
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">

+ 1 - 1
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

+ 1 - 1
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"

+ 1 - 1
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

+ 1 - 1
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"

+ 2 - 2
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">

+ 1 - 1
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

+ 1 - 1
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"

+ 1 - 1
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"

+ 2 - 2
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">