From 7bbe6d2997b410eeea11e6fc9d1f8da594d29901 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Tue, 19 Nov 2024 17:38:21 +0800
Subject: [PATCH] 11.19

---
 .../views/EventMarketing/SaveBlock/index.vue  | 19 +++++++++----------
 .../src/views/EventMarketing/center/index.vue |  2 +-
 .../openCardGift/TimeLimited.vue              | 14 +++++++-------
 .../src/views/integral/settings/index.vue     |  3 ++-
 .../views/oilConfig/oilInventory/order.vue    |  7 +++++--
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index c2b46a689..2ac0d6995 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -189,11 +189,11 @@
           <el-form :model="form" ref="ruleForm" :rules="rules" :inline="true" :label-position="labelPosition" label-width="100px" >
 
               <el-form-item   label="活动名称"  prop="activeName">
-                <el-input style="width: 300px" v-model="form.activeName"></el-input>
+                <el-input  style="width: 270px" v-model="form.activeName"></el-input>
               </el-form-item>
 
                 <el-form-item   label="充值" label-width="" prop="rechargeBalance">
-                  <div style="width: 300px">
+                  <div style="width:270px">
                     <el-input type="number" v-model="form.rechargeBalance" autocomplete="off">
                       <template slot="append">元</template>
                     </el-input>
@@ -201,7 +201,7 @@
                 </el-form-item>
 
                 <el-form-item label="赠送" label-width="" prop="">
-                  <div style="width: 300px">
+                  <div style="width: 270px">
                     <el-input type="number" v-model="form.giftBalance" autocomplete="off">
                       <template slot="append">元</template>
                     </el-input>
@@ -209,7 +209,7 @@
                 </el-form-item>
 
                 <el-form-item label="赠送积分" :label-width="formLabelWidth" prop="">
-                  <div style="width: 300px">
+                  <div style="width: 270px">
                     <el-input type="number" v-model="form.points" autocomplete="off">
                       <template slot="append">分</template>
                     </el-input>
@@ -218,7 +218,7 @@
 
 
                 <el-form-item  label="赠送成长值" :label-width="formLabelWidth" prop="">
-                  <div style="width: 300px">
+                  <div style="width: 270px">
                     <el-input type="number" v-model="form.growthValue" autocomplete="off">
                       <template slot="append">成长值</template>
                     </el-input>
@@ -251,7 +251,7 @@
                   </el-radio-group>
                 </el-form-item>
 
-                <el-form-item label="时间范围" v-if="form.activeTime == 2" :label-width="formLabelWidth" prop="startTime" style="margin-right: 45px">
+                <el-form-item label="时间范围" v-if="form.activeTime == 2" :label-width="formLabelWidth" prop="endTime" style="margin-right: 45px">
                   <el-date-picker
                     v-model="form.startTime"
                     type="datetime"
@@ -571,6 +571,9 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
           startTime: [
             { required: true, message: '不能为空', trigger: 'blur' },
           ],
+          endTime: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
           participationNo: [
             { required: true, message: '不能为空', trigger: 'blur' },
           ],
@@ -1109,11 +1112,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
     align-items: center;
     font-size: 18px;
   }
-  .xh-box{
 
-
-
-  }
   .demo-drawer__content{
     width: 100%;
     box-sizing: border-box;
diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
index a53e9c237..5a628ce2a 100644
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -733,7 +733,7 @@ export default {
 
 .bai-box {
   width: 100%;
-  height: 83vh;
+  height: 85vh;
   background: #fff;
   border-radius: 10px;
   box-sizing: border-box;
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
index 5f31ae220..3be7a3e91 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
@@ -227,7 +227,7 @@
         <el-form-item label="限时优惠名称" prop="title">
           <el-input v-model="ruleForm.title" style="width: 100%"></el-input>
         </el-form-item>
-        <el-form-item label="类型" prop="category">
+        <el-form-item label="类型" prop="category" style="margin-bottom: 0px">
           <el-select style="width: 100%" v-model="ruleForm.category" placeholder="请选择类型">
             <el-option label="固定价格" value="1"></el-option>
             <el-option label="折扣" value="2"></el-option>
@@ -239,7 +239,7 @@
         </el-form-item>
         <el-form-item label="折扣" required prop="disValue" v-if="ruleForm.category == '2' ">
           <el-input v-model="ruleForm.disValue" style="width: 100%"></el-input>
-          <div>折扣请填写0~1的数字。例如输入0.8，表示打8折</div>
+          <div style="height: 26px">折扣请填写0~1的数字。例如输入0.8，表示打8折</div>
         </el-form-item>
         <el-form-item label="减价金额" required  prop="disValue" v-if="ruleForm.category == '3' ">
           <el-input v-model="ruleForm.disValue" style="width: 100%"></el-input>
@@ -426,7 +426,7 @@
             <el-form-item label="生效时间" required>
               <el-col :span="11">
                 <el-form-item prop="activeStartTime">
-                  <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm1.activeStartTime"
+                  <el-date-picker type="date" placeholder="开始日期" v-model="ruleForm1.activeStartTime"
                                   style="width: 100%"
                   ></el-date-picker>
                 </el-form-item>
@@ -436,7 +436,7 @@
               </el-col>
               <el-col :span="11">
                 <el-form-item prop="activeEndTime">
-                  <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm1.activeEndTime"
+                  <el-date-picker type="date" placeholder="结束日期" v-model="ruleForm1.activeEndTime"
                                   style="width: 100%"
                   ></el-date-picker>
                 </el-form-item>
@@ -454,7 +454,7 @@
                   {{ item }}
                   <el-select v-model="weekDay" v-if="item=='每周'" placeholder="请选择每月固定日期" multiple
                              :disabled="tindex3!=0"
-                             style="margin-left: 20px;">
+                             style="margin-left: 20px; ">
                     <el-option
                       v-for="(item,index) in weekList"
                       :key="index"
@@ -481,7 +481,7 @@
                     format="HH:mm"
                     value-format="HH:mm"
                     style="width: 45%"
-                    placeholder="请选择开始时间点">
+                    placeholder="开始时间">
                   </el-time-picker>
                   至
                   <el-time-picker
@@ -489,7 +489,7 @@
                     format="HH:mm"
                     value-format="HH:mm"
                     style="width: 45%"
-                    placeholder="请选择结束时间点">
+                    placeholder="结束时间">
                   </el-time-picker>
                 </el-form-item>
               </div>
diff --git a/fuintAdmin/src/views/integral/settings/index.vue b/fuintAdmin/src/views/integral/settings/index.vue
index 588d8959d..21cd0d1e8 100644
--- a/fuintAdmin/src/views/integral/settings/index.vue
+++ b/fuintAdmin/src/views/integral/settings/index.vue
@@ -500,6 +500,7 @@ valiNumberPass(rule, value, callback, fieldName)
 .cor {
   box-sizing: border-box;
   padding: 10px;
+  padding-bottom: 0px;
   background: #f9f9f9;
 
 }
@@ -509,7 +510,7 @@ valiNumberPass(rule, value, callback, fieldName)
   background: #fff;
   box-sizing: border-box;
   padding: 10px;
-  height: 86vh;
+  height: 87vh;
 }
 
 .qizhi {
diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
index 17f0c05c1..f36aca226 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
@@ -38,7 +38,7 @@
             <el-form ref="myForm" label-width="100px">
               <el-form-item label="盘点单号">
                 <el-input  v-model="inventoryNo.inventoryNo" @change="saveJudgment" :disabled="numberInput"
-                           style="width: 220Px">
+                           style="width: 220px">
                   <el-button slot="append" @click="refresh()" icon="el-icon-refresh"></el-button>
                 </el-input>
               </el-form-item>
@@ -90,7 +90,7 @@
         </el-col>
         <!--        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
       </el-row>
-      <div style="height: 71vh;overflow: auto; scrollbar-width: none">
+      <div style="height: 70vh;overflow: auto; scrollbar-width: none">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="orderList"
@@ -912,4 +912,7 @@ export default {
     padding: 15px;
     margin: 10px;
   }
+  .el-form-item {
+    margin-bottom: 10px !important;
+  }
 </style>