From d9a0ff312546e2623912e740746a4c3359d6e447 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Mon, 28 Oct 2024 09:35:42 +0800
Subject: [PATCH] 10.26

---
 .../src/components/ImageUpload/index.vue      |   2 +
 .../src/views/EventMarketing/center/index.vue |   1 +
 .../EventMarketing/newCertificate/index.vue   | 578 ++++++++----------
 .../openCardGift/TimeLimited.vue              |  21 +-
 .../EventMarketing/openCardGift/separate.vue  |  33 +-
 .../reconciliation/tab/ref.vue                |   5 -
 .../src/views/oilConfig/oilPurchase/list.vue  | 169 +++--
 7 files changed, 413 insertions(+), 396 deletions(-)

diff --git a/fuintAdmin/src/components/ImageUpload/index.vue b/fuintAdmin/src/components/ImageUpload/index.vue
index c4744ce69..e003b7a5a 100644
--- a/fuintAdmin/src/components/ImageUpload/index.vue
+++ b/fuintAdmin/src/components/ImageUpload/index.vue
@@ -105,6 +105,8 @@ export default {
           this.fileList = [];
           return [];
         }
+
+
       },
       deep: true,
       immediate: true
diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
index cc6d798fe..503685fa3 100644
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -30,6 +30,7 @@
             </div>
           </div>
 
+
           <div class="nr-box">
             <div class="nr-top">
               <img src="./imgs/理财@2x.png">
diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index 15a42b1cd..5eb28d99b 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -122,288 +122,129 @@
       <el-form :model="ruleForm" :rules="rules" :label-position="labelPosition" ref="ruleForm" label-width="120px"
                class="demo-ruleForm">
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="优惠券编号" required prop="number" style="width: 45%;">
-            <el-input v-model="ruleForm.number" placeholder="请输入优惠券编号" disabled></el-input>
-          </el-form-item>
-
-          <el-button type="primary" icon="el-icon-refresh" circle @click="refreshNumber()"
-                     v-if="!this.disabledBol"></el-button>
-
-          <el-form-item label="优惠券名称" required prop="name" style="width: 50%;">
-            <el-input v-model="ruleForm.name" placeholder="请输入优惠券名称" :disabled="disabledBol"></el-input>
-          </el-form-item>
-
-        </div>
-        <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="投放类型" required prop="putType" style="width: 45%;">
-            <el-select v-model="ruleForm.putType" placeholder="请选择投放类型" style="width: 100%">
-              <el-option v-for="dict in dict.type.putType_type" :key="dict.value" :label="dict.label"
-                         :value="dict.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="优惠券类型" prop="type" required style="width: 50%;">
-            <el-select v-model="ruleForm.type" placeholder="请选择优惠券类型" style="width: 100%" :disabled="disabledBol">
-              <el-option v-for="dict in dict.type.CardCoupon_type" :key="dict.value" :label="dict.label"
-                         :value="dict.value"/>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="d-s" style="justify-content: space-between">
-
-
-          <el-form-item label="消费条件" required style="width: 45%;"
-                        v-if="ruleForm.type=='1'"
-                        prop="useType">
-            <div class="d-s">
-              <el-select v-model="ruleForm.useType" placeholder="请选择金额" :disabled="disabledBol">
-                <el-option label="订单金额" value="1"/>
-                <el-option label="加油升数" value="2"/>
-              </el-select>
-              <div style="margin: 0px 5px;">满</div>
-              <el-input placeholder="" v-model="ruleForm.reachAmount" style="width: 140px" :disabled="disabledBol">
-                <template slot="append">{{ ruleForm.useType == '1' ? '元' : '升' }}</template>
-              </el-input>
-              <div style="width: 60px;text-align: center">优惠</div>
-              <el-input placeholder="" v-model="ruleForm.reduceAmount" style="width: 140px" :disabled="disabledBol">
-                <template slot="append">元</template>
-              </el-input>
+<!--          左-->
+          <div class="dialog-lift">
+            <div style="display: flex;align-items: center">
+              <el-form-item label="优惠券编号 " label-width="180px" required prop="number" style="width: 100%;margin-bottom: 0px;margin-right: 10px">
+                <el-input v-model="ruleForm.number" placeholder="请输入优惠券编号" disabled></el-input>
+              </el-form-item>
+              <el-button type="primary" icon="el-icon-refresh" circle @click="refreshNumber()"
+                         v-if="!this.disabledBol"></el-button>
             </div>
-          </el-form-item>
-
-          <el-form-item label="消费条件" required style="width: 45%;"
-                        v-if="ruleForm.type=='5'"
-                        prop="useType">
-            <div class="d-s">
-              <el-select v-model="ruleForm.useType" placeholder="请选择金额" :disabled="disabledBol">
-                <el-option label="订单金额" value="1"/>
-              </el-select>
-              <div style="margin: 0px 5px;">满</div>
-              <el-input placeholder="" v-model="ruleForm.reachAmount" style="width: 140px" :disabled="disabledBol">
-                <template slot="append">元</template>
-              </el-input>
-              <div style="width: 60px;text-align: center">优惠</div>
-              <el-input placeholder="" v-model="ruleForm.reduceAmount" style="width: 140px" :disabled="disabledBol">
-                <template slot="append">元</template>
-              </el-input>
-            </div>
-          </el-form-item>
-
-          <el-form-item label="兑换内容" required style="width: 45%;" v-if="ruleForm.type=='2'" prop="exchangeContent">
-            <el-input placeholder="" v-model="ruleForm.exchangeContent" :disabled="disabledBol"></el-input>
-          </el-form-item>
-
-          <el-form-item label="优惠条件" required style="width: 45%;" v-if="ruleForm.type=='3'" prop="useType">
-            <div class="d-s">
-              <el-select v-model="ruleForm.useType" placeholder="请选择" style="width: 110px" :disabled="disabledBol">
-                <el-option label="订单金额" value="1"/>
-                <el-option label="加油升数" value="2"/>
-              </el-select>
-              <div style="width: 50px;text-align: center">范围</div>
-              <el-input placeholder="" v-model="ruleForm.zkStartAmount" style="width: 130px" :disabled="disabledBol">
-                <template slot="append">{{ ruleForm.useType == '1' ? '元' : '升' }}</template>
-              </el-input>
-              <div style="margin: 0px 5px;">~</div>
-              <el-input placeholder="" v-model="ruleForm.zkEndAmount" style="width: 130px" :disabled="disabledBol">
-                <template slot="append">{{ ruleForm.useType == '1' ? '元' : '升' }}</template>
-              </el-input>
-              <div style="width: 50px;text-align: center">优惠</div>
-              <el-input placeholder="" v-model="ruleForm.zkData" style="width: 130px" :disabled="disabledBol">
-                <template slot="append">折</template>
-              </el-input>
-            </div>
-          </el-form-item>
-
-          <el-form-item label="消费条件" required style="width: 45%;" v-if="ruleForm.type=='4'" prop="useType">
-            <div class="d-s">
-              <el-select v-model="ruleForm.useType" placeholder="请选择金额" :disabled="disabledBol">
-                <el-option label="订单金额" value="1"/>
-                <el-option label="加油升数" value="2"/>
-              </el-select>
-              <div style="margin: 0px 5px;">满</div>
-              <el-input placeholder="" v-model="ruleForm.reachAmount" style="width: 160px" :disabled="disabledBol">
-                <template slot="append">{{ ruleForm.useType == '1' ? '元' : '升' }}</template>
-              </el-input>
-              <div style="width: 40px;text-align: center">每</div>
-              <el-input placeholder="" v-model="ruleForm.ljOilNum" style="width: 160px" :disabled="disabledBol">
-                <template slot="append">L</template>
-              </el-input>
-              <div style="width: 40px;text-align: center">减</div>
-              <el-input placeholder="" v-model="ruleForm.ljOilAmount" style="width: 160px" :disabled="disabledBol">
-                <template slot="append">元</template>
-              </el-input>
-            </div>
-          </el-form-item>
-
-          <!--  适用油品油号      oilNumber  -->
-          <el-form-item label="适用油品油号" required style="width: 50%;" prop="oilLimit"
-                        v-if="ruleForm.type=='1' || ruleForm.type=='3' || ruleForm.type=='4'  ">
-            <div class="d-s">
-              <el-radio-group v-model="ruleForm.oilLimit">
-                <el-radio :label="'1'">不限</el-radio>
-                <el-radio :label="'2'">自定义</el-radio>
+            <el-form-item label="是否允许收银台送券" label-width="180px" required style="width: 100%;margin-bottom: 2px" prop="sySend">
+              <el-radio-group v-model="ruleForm.sySend">
+                <el-radio :label="'0'">否</el-radio>
+                <el-radio :label="'1'">是</el-radio>
               </el-radio-group>
-              <el-select v-model="ruleForm.oilNumber" multiple placeholder="请选择" style="margin-left: 5px">
-                <el-option v-for="(item,index) in oilNumberList" :key="index"
-                           :label="getOilNamess(oilNameList,item.oilName)" :value="item.oilName"></el-option>
-              </el-select>
-            </div>
-          </el-form-item>
-        </div>
-
-        <div class="d-s" style="justify-content: space-between" v-if="ruleForm.type=='3'|| ruleForm.type=='4' ">
-          <el-form-item label="最大优惠金额" required style="width: 45%;" prop="zkMaxAmount">
-            <el-input placeholder="" v-model="ruleForm.zkMaxAmount" :disabled="disabledBol">
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-        </div>
-
-        <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="适用会员等级" required style="width: 45%;" prop="membershipLevel">
-            <el-select v-model="ruleForm.membershipLevel" multiple placeholder="请选择" style="width: 100%">
-              <el-option
-                v-for="(item,index) in membership"
-                :label="item.name"
-                :value="item.id.toString()"
-                :key="index"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否允许收银台送券" label-width="160px" required style="width: 50%;" prop="sySend">
-
-            <el-radio-group v-model="ruleForm.sySend">
-              <el-radio :label="'0'">否</el-radio>
-              <el-radio :label="'1'">是</el-radio>
-
-            </el-radio-group>
-
-          </el-form-item>
-        </div>
-        <div class="d-s" style="justify-content: space-between">
-
-          <!-- 生效日期设置 timeType 字段 -->
-          <el-form-item label="生效日期设置" required style="width: 45%;" prop="timeType">
-            <div class="d-s">
-              <el-radio-group v-model="ruleForm.timeType">
-                <el-radio :label="'1'">领取
-                  <el-input v-model="ruleForm.validityDay" placeholder=""
-                            style="width: 80px;margin: 0px 10px"></el-input>
-                  <span>天内有效</span></el-radio>
-                <el-radio :label="'2'">指定使用日期</el-radio>
-              </el-radio-group>
-            </div>
-          </el-form-item>
-
-          <el-form-item v-if="ruleForm.type == '5'" label="适用商品" prop="productLimit" style="width: 50%;">
-            <el-radio v-model="ruleForm.productLimit" label="1">不限</el-radio>
-            <el-radio v-model="ruleForm.productLimit" label="2">自定义</el-radio>
-            <el-select multiple v-if="ruleForm.productLimit == 2" v-model="ruleForm.productIdList"
-                       placeholder="请选择商品名称（可多选）" style="margin-left: 10px;width:300px">
-              <el-option
-                v-for="item in goodsList"
-                :key="item.id+''"
-                :label="item.name"
-                :value="item.id+''"></el-option>
-            </el-select>
-          </el-form-item>
-          <!-- 生效日期  effectiveDateStart 字段 -->
-          <el-form-item label="生效日期" required style="width: 50%;" v-if="ruleForm.timeType=='2'"
-                        prop="effectiveDateStart">
-            <el-date-picker
-              v-model="ruleForm.effectiveDateStart"
-              style="width: 160px"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="开始日期">
-            </el-date-picker>
-            <span style="margin: 0 5px">至</span>
-            <el-date-picker
-              v-model="ruleForm.effectiveDateEnd"
-              style="width: 160px"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="结束日期">
-            </el-date-picker>
-          </el-form-item>
-        </div>
-        <!-- 是否与其他优惠同时使用 useWithOther -->
-        <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="是否与其他优惠同时使用" label-width="180px" required style="width: 45%;" prop="useWithOther">
-
-            <el-radio-group v-model="ruleForm.useWithOther">
-              <el-radio :label="'0'">不可以</el-radio>
-              <el-radio :label="'1'">可以</el-radio>
-
-            </el-radio-group>
-
-          </el-form-item>
-          <el-form-item label="使用次数限制" required style="width: 50%;" prop="limitTotalDay">
-            <div class="d-s">
-              <div style="margin: 0px 5px;">每</div>
-              <el-input placeholder="" v-model="ruleForm.limitTotalDay" style="width: 140px">
-                <template slot="append">天</template>
-              </el-input>
-              <div style="margin: 0px 5px;">限制使用</div>
-              <el-input placeholder="" v-model="ruleForm.limitTotalNum" style="width: 140px">
-                <template slot="append">次</template>
-              </el-input>
-            </div>
-          </el-form-item>
-          <!-- 每人领卷限制 getNumLimit -->
-
-        </div>
-        <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="时间段设置" prop="availableOrUn" required>
-            <el-radio-group v-model="ruleForm.availableOrUn">
-              <el-radio :label="'0'">适用时间段</el-radio>
-              <el-radio :label="'1'">不可用时间段</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <div v-if="ruleForm.availableOrUn == '0'" style="margin-right: 220px">
-            <el-form-item label="适用时间段" prop="availableType" required>
-
-              <el-radio-group v-model="ruleForm.availableType">
-                <div style="display: flex; width: 500px;margin-bottom: 15px;">
-                  <el-radio :label="'1'">每周</el-radio>
-                  <el-checkbox-group v-model="weekDay" style="margin-left: 20px"
-                                     :disabled="ruleForm.availableType!='1'">
-                    <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
-                  </el-checkbox-group>
-                </div>
-
-                <el-radio :label="'2'">每月
-                  <el-select :disabled="ruleForm.availableType!='2'" v-model="monthDay" placeholder="请选择每月固定日期" multiple
-                             style="margin-left: 20px">
-                    <el-option
-                      v-for="item in 31"
-                      :key="item+''"
-                      :label="item+'日'"
-                      :value="item+''">
-                    </el-option>
-                  </el-select>
-                </el-radio>
-              </el-radio-group>
-
             </el-form-item>
-            <el-form-item label="时间段" label-width="70px" prop="availablePeriodStart" required>
-              <el-time-picker
-                v-model="ruleForm.availablePeriodStart"
-                format="HH:mm"
-                value-format="HH:mm"
-                placeholder="请选择开始时间点">
-              </el-time-picker>
-              至
-              <el-time-picker
-                v-model="ruleForm.availablePeriodEnd"
-                format="HH:mm"
-                value-format="HH:mm"
-                placeholder="请选择结束时间点">
-              </el-time-picker>
+            <el-form-item label="生效日期设置" label-width="180px" required style="width: 100%;margin-bottom: 2px" prop="timeType">
+              <div class="d-s">
+                <el-radio-group v-model="ruleForm.timeType">
+                  <el-radio :label="'1'">领取
+                    <el-input v-model="ruleForm.validityDay" placeholder=""
+                              style="width: 80px;margin: 0px 10px"></el-input>
+                    <span>天内有效</span></el-radio>
+                  <el-radio :label="'2'">指定使用日期</el-radio>
+                </el-radio-group>
+              </div>
             </el-form-item>
-          </div>
+            <el-form-item label="生效日期" label-width="180px" required style="width: 100%;margin-bottom: 2px" v-if="ruleForm.timeType=='2'"
+                          prop="effectiveDateStart">
+              <el-date-picker
+                v-model="ruleForm.effectiveDateStart"
+                style="width: 160px"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="开始日期">
+              </el-date-picker>
+              <span style="margin: 0 5px">至</span>
+              <el-date-picker
+                v-model="ruleForm.effectiveDateEnd"
+                style="width: 160px"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="是否与其他优惠同时使用" label-width="180px" required style="width: 100%;margin-bottom: 2px" prop="useWithOther">
+              <el-radio-group v-model="ruleForm.useWithOther">
+                <el-radio :label="'0'">不可以</el-radio>
+                <el-radio :label="'1'">可以</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="使用次数限制"  label-width="180px" required style="width: 100%;" prop="limitTotalDay">
+              <div class="d-s">
+                <div style="margin: 0px 5px;">每</div>
+                <el-input placeholder="" v-model="ruleForm.limitTotalDay" style="width: 140px">
+                  <template slot="append">天</template>
+                </el-input>
+                <div style="margin: 0px 5px;">限制使用</div>
+                <el-input placeholder="" v-model="ruleForm.limitTotalNum" style="width: 140px">
+                  <template slot="append">次</template>
+                </el-input>
+              </div>
+            </el-form-item>
+            <el-form-item  label="时间段设置" label-width="180px" prop="availableOrUn" required>
+              <el-radio-group v-model="ruleForm.availableOrUn">
+                <el-radio :label="'0'">适用时间段</el-radio>
+                <el-radio :label="'1'">不可用时间段</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label-width="180px" v-if="ruleForm.type == '5'" label="适用商品" prop="productLimit" style="width: 100%;">
+              <el-radio v-model="ruleForm.productLimit" label="1">不限</el-radio>
+              <el-radio v-model="ruleForm.productLimit" label="2">自定义</el-radio>
+              <el-select multiple v-if="ruleForm.productLimit == 2" v-model="ruleForm.productIdList"
+                         placeholder="请选择商品名称（可多选）" style="margin-left: 10px;width:300px">
+                <el-option
+                  v-for="item in goodsList"
+                  :key="item.id+''"
+                  :label="item.name"
+                  :value="item.id+''"></el-option>
+              </el-select>
+            </el-form-item>
+            <div v-if="ruleForm.availableOrUn == '0'" >
+              <el-form-item label-width="180px" label="适用时间段" prop="availableType" required>
 
-          <div v-if="ruleForm.availableOrUn == '1'" style="margin-right: 220px">
-            <el-form-item label="不适用时间段" prop="unAvailableType" required>
+                <el-radio-group v-model="ruleForm.availableType">
+                  <div style="display: flex; width: 500px;margin-top: 10px;margin-bottom: 10px">
+                    <el-radio :label="'1'">每周</el-radio>
+                    <el-checkbox-group v-model="weekDay" style="margin-left: 20px"
+                                       :disabled="ruleForm.availableType!='1'">
+                      <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
+                    </el-checkbox-group>
+                  </div>
+
+                  <el-radio :label="'2'">每月
+                    <el-select :disabled="ruleForm.availableType!='2'" v-model="monthDay" placeholder="请选择每月固定日期" multiple
+                               style="margin-left: 20px;width: 385px">
+                      <el-option
+                        v-for="item in 31"
+                        :key="item+''"
+                        :label="item+'日'"
+                        :value="item+''">
+                      </el-option>
+                    </el-select>
+                  </el-radio>
+                </el-radio-group>
+
+              </el-form-item>
+              <el-form-item label="时间段" label-width="180px" v-if="ruleForm.availableOrUn == '0'"  prop="availablePeriodStart" required>
+                <el-time-picker
+                  v-model="ruleForm.availablePeriodStart"
+                  format="HH:mm"
+                  value-format="HH:mm"
+                  placeholder="请选择开始时间点">
+                </el-time-picker>
+                至
+                <el-time-picker
+                  v-model="ruleForm.availablePeriodEnd"
+                  format="HH:mm"
+                  value-format="HH:mm"
+                  placeholder="请选择结束时间点">
+                </el-time-picker>
+              </el-form-item>
+            </div>
+            <el-form-item label="不适用时间段" v-if="ruleForm.availableOrUn == '1'" prop="unAvailableType" required>
 
               <el-radio-group v-model="ruleForm.unAvailableType">
                 <div style="display: flex; width: 500px;margin-bottom: 15px;">
@@ -428,7 +269,7 @@
               </el-radio-group>
 
             </el-form-item>
-            <el-form-item label="时间段" label-width="70px" prop="unAvailablePeriodStart" required>
+            <el-form-item label="时间段" v-if="ruleForm.availableOrUn == '1'" label-width="70px" prop="unAvailablePeriodStart" required>
               <el-time-picker
                 v-model="ruleForm.unAvailablePeriodStart"
                 format="HH:mm"
@@ -443,41 +284,154 @@
                 placeholder="请选择结束时间点">
               </el-time-picker>
             </el-form-item>
+            <el-form-item label="背景图" label-width="180px" style="width: 100%;" required prop="backgroundImage">
+              <imgUpload :limit="1"  v-model="ruleForm.backgroundImage"></imgUpload>
+            </el-form-item>
+
           </div>
+<!--          右-->
+          <div class="dialog-right">
 
-        </div>
-        <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="每人领券限制" required style="width: 45%;" prop="getNumLimit">
-            <el-input v-model="ruleForm.getNumLimit" placeholder="请输入内容"></el-input>
-          </el-form-item>
-          <el-form-item label="每日领券限制" required style="width: 50%;" prop="dayGetLimit">
-            <el-input v-model="ruleForm.dayGetLimit" placeholder="请输入内容"></el-input>
-          </el-form-item>
+            <el-form-item label="优惠券名称" required prop="name" style="width: 100%;">
+              <el-input v-model="ruleForm.name" placeholder="请输入优惠券名称" :disabled="disabledBol"></el-input>
+            </el-form-item>
+            <el-form-item label="投放类型" required prop="putType" style="width: 100%;">
+              <el-select v-model="ruleForm.putType" placeholder="请选择投放类型" style="width: 100%">
+                <el-option v-for="dict in dict.type.putType_type" :key="dict.value" :label="dict.label"
+                           :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="适用会员等级" required style="width: 100%;" prop="membershipLevel">
+              <el-select v-model="ruleForm.membershipLevel" multiple placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="(item,index) in membership"
+                  :label="item.name"
+                  :value="item.id.toString()"
+                  :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="优惠券类型" prop="type" required style="width: 100%;">
+              <el-select v-model="ruleForm.type" placeholder="请选择优惠券类型" style="width: 100%" :disabled="disabledBol">
+                <el-option v-for="dict in dict.type.CardCoupon_type" :key="dict.value" :label="dict.label"
+                           :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="消费条件" required style="width: 100%;"
+                          v-if="ruleForm.type=='1'"
+                          prop="useType">
+              <div class="d-s">
+                <el-select v-model="ruleForm.useType" placeholder="请选择金额" :disabled="disabledBol">
+                  <el-option label="订单金额" value="1"/>
+                  <el-option label="加油升数" value="2"/>
+                </el-select>
+                <div style="margin: 0px 5px;">满</div>
+                <el-input placeholder="" v-model="ruleForm.reachAmount" style="width: 140px" :disabled="disabledBol">
+                  <template slot="append">{{ ruleForm.useType == '1' ? '元' : '升' }}</template>
+                </el-input>
+                <div style="width: 60px;text-align: center">优惠</div>
+                <el-input placeholder="" v-model="ruleForm.reduceAmount" style="width: 140px" :disabled="disabledBol">
+                  <template slot="append">元</template>
+                </el-input>
+              </div>
+            </el-form-item>
+            <el-form-item label="消费条件" required style="width: 100%;"
+                          v-if="ruleForm.type=='5'"
+                          prop="useType">
+              <div class="d-s">
+                <el-select v-model="ruleForm.useType" placeholder="请选择金额" :disabled="disabledBol">
+                  <el-option label="订单金额" value="1"/>
+                </el-select>
+                <div style="margin: 0px 5px;">满</div>
+                <el-input placeholder="" v-model="ruleForm.reachAmount" style="width: 140px" :disabled="disabledBol">
+                  <template slot="append">元</template>
+                </el-input>
+                <div style="width: 60px;text-align: center">优惠</div>
+                <el-input placeholder="" v-model="ruleForm.reduceAmount" style="width: 140px" :disabled="disabledBol">
+                  <template slot="append">元</template>
+                </el-input>
+              </div>
+            </el-form-item>
+            <el-form-item label="兑换内容" required style="width: 100%;" v-if="ruleForm.type=='2'" prop="exchangeContent">
+              <el-input placeholder="" v-model="ruleForm.exchangeContent" :disabled="disabledBol"></el-input>
+            </el-form-item>
+            <el-form-item label="优惠条件" required style="width: 100%;" v-if="ruleForm.type=='3'" prop="useType">
+              <div class="d-s">
+                <el-select v-model="ruleForm.useType" placeholder="请选择" style="width: 110px" :disabled="disabledBol">
+                  <el-option label="订单金额" value="1"/>
+                  <el-option label="加油升数" value="2"/>
+                </el-select>
+                <div style="width: 50px;text-align: center">范围</div>
+                <el-input placeholder="" v-model="ruleForm.zkStartAmount" style="width: 130px" :disabled="disabledBol">
+                  <template slot="append">{{ ruleForm.useType == '1' ? '元' : '升' }}</template>
+                </el-input>
+                <div style="margin: 0px 5px;">~</div>
+                <el-input placeholder="" v-model="ruleForm.zkEndAmount" style="width: 130px" :disabled="disabledBol">
+                  <template slot="append">{{ ruleForm.useType == '1' ? '元' : '升' }}</template>
+                </el-input>
+                <div style="width: 50px;text-align: center">优惠</div>
+                <el-input placeholder="" v-model="ruleForm.zkData" style="width: 130px" :disabled="disabledBol">
+                  <template slot="append">折</template>
+                </el-input>
+              </div>
+            </el-form-item>
+            <el-form-item label="消费条件" required style="width: 100%;" v-if="ruleForm.type=='4'" prop="useType">
+              <div class="d-s">
+                <el-select v-model="ruleForm.useType" placeholder="请选择金额" :disabled="disabledBol">
+                  <el-option label="订单金额" value="1"/>
+                  <el-option label="加油升数" value="2"/>
+                </el-select>
+                <div style="margin: 0px 5px;">满</div>
+                <el-input placeholder="" v-model="ruleForm.reachAmount" style="width: 160px" :disabled="disabledBol">
+                  <template slot="append">{{ ruleForm.useType == '1' ? '元' : '升' }}</template>
+                </el-input>
+                <div style="width: 40px;text-align: center">每</div>
+                <el-input placeholder="" v-model="ruleForm.ljOilNum" style="width: 160px" :disabled="disabledBol">
+                  <template slot="append">L</template>
+                </el-input>
+                <div style="width: 40px;text-align: center">减</div>
+                <el-input placeholder="" v-model="ruleForm.ljOilAmount" style="width: 160px" :disabled="disabledBol">
+                  <template slot="append">元</template>
+                </el-input>
+              </div>
+            </el-form-item>
+            <el-form-item label="适用油品油号" required style="width: 100%;" prop="oilLimit"
+                          v-if="ruleForm.type=='1' || ruleForm.type=='3' || ruleForm.type=='4'  ">
+              <div class="d-s">
+                <el-radio-group v-model="ruleForm.oilLimit">
+                  <el-radio :label="'1'">不限</el-radio>
+                  <el-radio style="margin-top: 10px" :label="'2'">自定义</el-radio>
+                </el-radio-group>
+                <el-select v-model="ruleForm.oilNumber" multiple placeholder="请选择" style="margin-left: 5px">
+                  <el-option v-for="(item,index) in oilNumberList" :key="index"
+                             :label="getOilNamess(oilNameList,item.oilName)" :value="item.oilName"></el-option>
+                </el-select>
+              </div>
+            </el-form-item>
+            <el-form-item label="最大优惠金额" v-if="ruleForm.type=='3'|| ruleForm.type=='4' " required style="width: 100%;" prop="zkMaxAmount">
+              <el-input placeholder="" v-model="ruleForm.zkMaxAmount" :disabled="disabledBol">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="每人领券限制" required style="width: 100%;" prop="getNumLimit">
+              <el-input v-model="ruleForm.getNumLimit" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="每日领券限制" required style="width: 100%;" prop="dayGetLimit">
+              <el-input v-model="ruleForm.dayGetLimit" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="投放总数" required style="width: 100%;" prop="tfTotal">
+              <el-input v-model="ruleForm.tfTotal" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="使用条件" style="width: 100%;">
+              <el-input type="textarea" v-model="ruleForm.useCondition"></el-input>
+            </el-form-item>
+            <el-form-item label="备注" style="width: 100%;">
+              <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="ruleForm.remark">
+              </el-input>
+            </el-form-item>
+          </div>
         </div>
 
-        <div class="d-s" style="justify-content: space-between">
 
-          <!-- 每日领卷限制 dayGetLimit -->
-
-          <el-form-item label="投放总数" required style="width: 45%;" prop="tfTotal">
-            <el-input v-model="ruleForm.tfTotal" placeholder="请输入内容"></el-input>
-          </el-form-item>
-          <el-form-item label="使用条件" style="width: 50%;">
-            <el-input type="textarea" v-model="ruleForm.useCondition"></el-input>
-          </el-form-item>
-        </div>
-        <!-- 使用条件  useCondition -->
-        <div class="d-s" style="justify-content: space-between">
-        </div>
-        <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="背景图" style="width: 45%;" required prop="backgroundImage">
-            <imgUpload :limit="1" v-model="ruleForm.backgroundImage"></imgUpload>
-          </el-form-item>
-          <el-form-item label="备注" style="width: 50%;">
-            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="ruleForm.remark">
-            </el-input>
-          </el-form-item>
-        </div>
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -1431,7 +1385,7 @@ export default {
 
 .d-s {
   display: flex;
-  align-items: center;
+
 }
 
 .butoon {
@@ -1495,4 +1449,10 @@ export default {
 .malou {
   width: 60px;
 }
+.dialog-lift{
+  width: 48%;
+}
+.dialog-right{
+  width: 48%;
+}
 </style>
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
index 59baeb12e..efdfb096d 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
@@ -219,15 +219,15 @@
       />
     </div>
     <el-dialog
-      title="新增/修改限时优惠"
+      :title="titles"
       :visible.sync="centerDialogVisible"
-      width="48%">
+      width="40%">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
         <el-form-item label="限时优惠名称" prop="title">
-          <el-input v-model="ruleForm.title" style="width: 217px"></el-input>
+          <el-input v-model="ruleForm.title" style="width: 100%"></el-input>
         </el-form-item>
         <el-form-item label="类型" prop="category">
-          <el-select v-model="ruleForm.category" placeholder="请选择类型">
+          <el-select style="width: 100%" v-model="ruleForm.category" placeholder="请选择类型">
             <el-option label="固定价格" value="1"></el-option>
             <el-option label="折扣" value="2"></el-option>
             <el-option label="减价" value="3"></el-option>
@@ -237,11 +237,11 @@
           </div>
         </el-form-item>
         <el-form-item label="折扣" required prop="disValue" v-if="ruleForm.category == '2' ">
-          <el-input v-model="ruleForm.disValue" style="width: 217px"></el-input>
+          <el-input v-model="ruleForm.disValue" style="width: 100%"></el-input>
           <div>折扣请填写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: 217px"></el-input>
+          <el-input v-model="ruleForm.disValue" style="width: 100%"></el-input>
           <div>减价金额不能小于 0.01</div>
         </el-form-item>
 
@@ -272,11 +272,13 @@
           >
             <template slot-scope="scope">
               <el-form-item
+                label-width="0px"
                 :prop="'oilList.' + scope.$index + '.price'"
                 :rules="rules['oilList.*.price']"
                 class="custom-form-itemMy100989"
               >
                 <el-input
+                  style="width: 100%"
                   v-model="scope.row.price"
                   type="number"
                   controls-position="right"
@@ -311,7 +313,7 @@
         </span>
     </el-dialog>
     <el-dialog
-      title="新增/修改活动规则"
+      :title="titles1"
       :visible.sync="showDialogVisible"
       width="60%">
       <el-form :model="ruleForm1" :rules="rules" ref="ruleForm1" label-width="120px" class="demo-ruleForm">
@@ -530,6 +532,8 @@ export default {
         pageSize: 1000,
         activeType: 2
       },
+      titles:'',
+      titles1:'',
       total: 0,
       total1: 0,
       ruleForm: {
@@ -777,6 +781,7 @@ export default {
     },
     // 添加活动规则
     addActiveRule() {
+      this.titles1 = "新增活动规则"
       this.resetRule()
       this.getTimeShareList()
       this.listUserGrade()
@@ -845,6 +850,7 @@ export default {
     },
     // 修改
     modifySeparateList(id) {
+      this.titles = "修改分时优惠"
       getID(id).then(res => {
         console.log(res)
         if (res.code == 200) {
@@ -894,6 +900,7 @@ export default {
     },
     // 新增限时
     Timeshare() {
+      this.titles="新增限时优惠"
       this.Blank()
       oilNumberList1().then(res => {
         this.ruleForm.oilList = res.data.records
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
index 9e2202575..2ddda8bec 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
@@ -219,15 +219,16 @@
       />
     </div>
     <el-dialog
-      title="新增/修改分时优惠"
+      :title="titles"
       :visible.sync="centerDialogVisible"
-      width="48%">
+      center
+      width="35%">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
         <el-form-item label="分时优惠名称" prop="title">
-          <el-input v-model="ruleForm.title" style="width: 217px"></el-input>
+          <el-input v-model="ruleForm.title" style="width: 100%"></el-input>
         </el-form-item>
         <el-form-item label="类型" prop="category">
-          <el-select v-model="ruleForm.category" placeholder="请选择类型">
+          <el-select v-model="ruleForm.category"  style="width: 100%" placeholder="请选择类型">
             <el-option label="固定价格" value="1"></el-option>
             <el-option label="折扣" value="2"></el-option>
             <el-option label="减价" value="3"></el-option>
@@ -237,11 +238,11 @@
           </div>
         </el-form-item>
         <el-form-item label="折扣" prop="disValue" required v-if="ruleForm.category == '2' ">
-          <el-input v-model="ruleForm.disValue" style="width: 217px"></el-input>
+          <el-input v-model="ruleForm.disValue" style="width: 100%"></el-input>
           <div>折扣请填写0~1的数字。例如输入0.8，表示打8折</div>
         </el-form-item>
         <el-form-item label="减价金额" prop="disValue" required v-if="ruleForm.category == '3' ">
-          <el-input v-model="ruleForm.disValue" style="width: 217px"></el-input>
+          <el-input v-model="ruleForm.disValue" style="width:  100%"></el-input>
           <div>减价金额不能小于 0.01</div>
         </el-form-item>
 
@@ -311,7 +312,8 @@
         </span>
     </el-dialog>
     <el-dialog
-      title="新增/修改活动规则"
+      :title="titles1"
+      center
       :visible.sync="showDialogVisible"
       width="60%">
       <el-form :model="ruleForm1" :rules="rules" ref="ruleForm1" label-width="120px" class="demo-ruleForm">
@@ -494,7 +496,7 @@
         </div>
         <!--          -->
 
-        <el-form-item style="text-align: center">
+        <el-form-item label-width="0px" style="text-align: center;margin-left: 0px">
           <el-button @click="showDialogVisible = !showDialogVisible">取消</el-button>
           <el-button type="primary" @click="submitRuleForm()">保存</el-button>
         </el-form-item>
@@ -527,6 +529,8 @@ export default {
         pageSize: 10000,
         activeType: 1
       },
+      titles:'',
+      titles1:'',
       total: 0,
       total1: 0,
       ruleForm: {
@@ -726,6 +730,7 @@ export default {
     },
     // 修改活动规则
     editRule(data) {
+      this.titles1 = "修改活动规则"
       this.resetRule()
       getPriceRule(data.id).then(res => {
 
@@ -780,6 +785,7 @@ export default {
     },
     // 添加活动规则
     addActiveRule() {
+      this.titles1 = "新增活动规则"
       this.resetRule()
       this.getTimeShareList()
       this.listUserGrade()
@@ -848,6 +854,7 @@ export default {
     },
     // 修改
     modifySeparateList(id) {
+      this.titles = "修改分时优惠"
       getID(id).then(res => {
         console.log(res)
         if (res.code == 200) {
@@ -897,6 +904,7 @@ export default {
     // 新增分时
     Timeshare() {
       this.Blank()
+      this.titles = "新增分时优惠"
       oilNumberList1().then(res => {
         this.ruleForm.oilList = res.data.records
         for (let i = 0; i < this.ruleForm.oilList.length; i++) {
@@ -1027,11 +1035,10 @@ export default {
 .acvtive {
   color: #FF770F !important;
 }
-</style>
-
-<!--  elementUi  有些是行内样式  只能通过 多重选择器 来改变样式 -->
-<style>
-.custom-form-itemMy100989 .el-form-item__content {
+.el-form-item__content{
   margin-left: 0 !important;
 }
 </style>
+
+<!--  elementUi  有些是行内样式  只能通过 多重选择器 来改变样式 -->
+
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
index 8a405c926..91dd507c7 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
@@ -510,16 +510,11 @@ export default {
   text-align: right;
 }
 .size-bole{
-  //font-weight: bold;
-
-  //width: 53px;
   height: 31px;
-  //font-family: YouSheBiaoTiHei;
   font-size: 24px;
   color: #0DC291;
   font-weight: 600;
   font-size: 24px;
-  //line-height: 0px;
   text-align: left;
   font-style: normal;
   text-transform: none;
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
index 8e0838806..765361f23 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
@@ -1,71 +1,67 @@
 <template>
   <div class="app-container">
     <div class="card-change">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="" prop="purchaseNo">
-          <el-input v-model="queryParams.purchaseNo" placeholder="请输入进货单号"/>
-        </el-form-item>
-        <el-form-item label="" prop="supplierId">
-          <el-select v-model="queryParams.supplierId" placeholder="请选择供应商" clearable>
-            <el-option
-              v-for="option in suppliersList"
-              :key="option.id"
-              :label="option.supplierName"
-              :value="option.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+      <div class="box-gang">
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole">0/0</div>
+          </el-tooltip>
+          <div class="size-hui">
+            <div class="dian" style="background: #0DC291"></div>
+            <div class="nei">采购吨数</div>
+          </div>
+        </div>
 
-        <el-form-item label="" prop="numberId">
-          <el-select v-model="queryParams.numberId" placeholder="请选择油品油号">
-            <el-option
-              v-for="option in selectOilTypeByPrice"
-              :key="option.numberId"
-              :label="option.oilType +' '+option.oilName"
-              :value="option.numberId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" v-model="queryParams.status" prop="status">
-          <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-            <el-option
-              v-for="dict in dict.type.oilPurchasedStatus"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole" style="color: #00CAFF">0/0</div>
+          </el-tooltip>
+          <div class="size-hui">
+            <div class="dian" style="background: #00CAFF"></div>
+            <div class="nei">采购升数</div>
+          </div>
+        </div>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole">0/0</div>
+          </el-tooltip>
+          <div class="size-hui">
+            <div class="dian" style="background: #0DC291"></div>
+            <div class="nei">采购总额（元）</div>
+          </div>
+        </div>
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+          <div>
+            <el-form-item label="进货单号" prop="purchaseNo">
+              <el-input v-model="queryParams.purchaseNo" placeholder="请输入进货单号"/>
+            </el-form-item>
+          </div>
+          <div>
+            <el-form-item label="进货时间" prop="purchaseNo">
+              <el-date-picker
+                v-model="beginTime"
+                style="width: 200px"
+                type="date"
+                placeholder="开始日期">
+              </el-date-picker>
+            </el-form-item>
+          </div>
+        </el-form>
+        <div>
+          <el-button type="primary" >取消</el-button>
+          <el-button type="primary">保存</el-button>
+          <el-button type="primary">保存并审核</el-button>
+        </div>
 
-        <el-form-item label="">
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 160px"
-            type="date"
-            placeholder="开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 160px"
-            type="date"
-            placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item style="display:flex;justify-content: end">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          <el-button
-            type="primary"
-            @click="purchaseAdd"
-            v-hasPermi="['oilConfig:oilPurchase:list:add']"
+      </div>
+      <el-button
+        type="primary"
+        @click="purchaseAdd"
+      >新增采购
+      </el-button>
 
-          >新增采购
-          </el-button>
-        </el-form-item>
-      </el-form>
+      <div style="height: 70vh;overflow: auto;scrollbar-width: none">
 
-      <div style="height: 70vh;overflow: auto">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="purchaseList"
@@ -284,7 +280,56 @@ export default {
 }
 
 .el-form--inline .el-form-item {
-  margin-right: 44px;
+  margin-right: 4px;
 }
+.box-gang{
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+.box{
+  padding: 5px;
+  padding-left: 20px;
+  width: 280px;
+  height: 60px;
+  background:#fff;
+  border-radius: 10px;
+  border: 1px solid #FF9655;
+  margin-right: 15px;
+}
+.size-hui{
+  display: flex;
+  align-items: center;
+  font-family: Source Han Sans CN, Source Han Sans CN;
+  font-weight: 400;
+  font-size: 13px;
+  color: #888888;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
 
+  .nei {
+    color: #333333;
+    width: 100%;
+  }
+}
+.dian{
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  margin-right: 5px;
+}
+.size-bole{
+  height: 31px;
+  font-size: 24px;
+  color: #0DC291;
+  font-weight: 600;
+  font-size: 24px;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>