Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

fuintAdmin/src/layout/components/Navbar.vue

@@ -67,7 +67,8 @@
       title="修改密码"
       :visible.sync="dialogVisible"
       width="30%"
-      :modal="false"
+      :modal-append-to-body="false"
+      :append-to-body="true"
       :before-close="handleClose">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">
         <el-form-item label="新密码" prop="password">

fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue

@@ -75,8 +75,8 @@
                 </el-input>
               </div>
 
-              <div v-for="(item,index) in couponList" :key="index" style="display: flex;font-size: 14px;margin: 15px 0">
+              <div v-for="(item,index) in couponList" :key="index" style="display: flex;font-size: 14px;margin: 20px 0">
-                <div style="width: 9.5%">赠送</div>
+                <div style="width: 9.5%;">赠送</div>
                 <el-select v-model="item.vouchersId" style="width: 45%" placeholder="请选择">
                   <el-option
                     v-for="(item1,index1) in cardCouponList"

fuintAdmin/src/views/EventMarketing/newCertificate/index.vue

@@ -59,7 +59,7 @@
           </el-table-column>
           <el-table-column prop="tfGetNum" label="已领/投放数量">
             <template slot-scope="scope">
-              <span>{{ scope.row.tfGetNum || 0 }}</span>
+              <span>{{ scope.row.tfGetNum || 0 }}/{{ scope.row.tfTotal || 0 }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="createTime" label="已核销"></el-table-column>
@@ -122,10 +122,10 @@
                class="demo-ruleForm">
         <div class="d-s" style="justify-content: space-between">
           <el-form-item label="优惠券编号" required style="width: 45%;">
-            <el-input v-model="ruleForm.number" placeholder="请输入优惠券编号"></el-input>
+            <el-input v-model="ruleForm.number" :disabled="ruleForm.id" placeholder="请输入优惠券编号"></el-input>
           </el-form-item>
           <el-form-item label="优惠券名称" required style="width: 50%;">
-            <el-input v-model="ruleForm.name" placeholder="请输入优惠券名称"></el-input>
+            <el-input v-model="ruleForm.name" :disabled="ruleForm.id" placeholder="请输入优惠券名称"></el-input>
           </el-form-item>
 
         </div>
@@ -137,7 +137,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="优惠券类型" required style="width: 50%;">
-            <el-select v-model="ruleForm.type" placeholder="请选择优惠券类型" style="width: 100%">
+            <el-select v-model="ruleForm.type" placeholder="请选择优惠券类型" style="width: 100%" :disabled="ruleForm.id">
               <el-option v-for="dict in dict.type.CardCoupon_type" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
@@ -149,7 +149,7 @@
           <el-form-item label="消费条件" required style="width: 45%;"
                         v-if="ruleForm.type=='1' || ruleForm.type=='5'">
             <div class="d-s">
-              <el-select v-model="ruleForm.useType" placeholder="请选择金额">
+              <el-select v-model="ruleForm.useType" :disabled="ruleForm.id" placeholder="请选择金额">
                 <el-option label="订单金额" value="1"/>
                 <el-option label="实收金额" value="2"/>
                 <el-option label="兑换券" value="3"/>
@@ -158,23 +158,23 @@
                 <el-option label="单品代金券" value="6"/>
               </el-select>
               <div style="margin: 0px 5px;">满</div>
-              <el-input placeholder="" v-model="ruleForm.reachAmount" style="width: 140px">
+              <el-input placeholder="" v-model="ruleForm.reachAmount" :disabled="ruleForm.id" style="width: 140px">
                 <template slot="append">元</template>
               </el-input>
               <div style="width: 60px;text-align: center">优惠</div>
-              <el-input placeholder="" v-model="ruleForm.reduceAmount" style="width: 140px">
+              <el-input placeholder="" v-model="ruleForm.reduceAmount" :disabled="ruleForm.id" style="width: 140px">
                 <template slot="append">元</template>
               </el-input>
             </div>
           </el-form-item>
 
           <el-form-item label="兑换内容" required style="width: 45%;" v-if="ruleForm.type=='2'">
-            <el-input placeholder="" v-model="ruleForm.exchangeContent"></el-input>
+            <el-input placeholder="" v-model="ruleForm.exchangeContent" :disabled="ruleForm.id"></el-input>
           </el-form-item>
 
           <el-form-item label="优惠条件" required style="width: 45%;" v-if="ruleForm.type=='3'">
             <div class="d-s">
-              <el-select v-model="ruleForm.useType" placeholder="请选择" style="width: 110px">
+              <el-select v-model="ruleForm.useType" placeholder="请选择" style="width: 110px" :disabled="ruleForm.id">
                 <el-option label="订单金额" value="1"/>
                 <el-option label="实收金额" value="2"/>
                 <el-option label="兑换券" value="3"/>
@@ -183,15 +183,15 @@
                 <el-option label="单品代金券" value="6"/>
               </el-select>
               <div style="width: 60px;text-align: center">范围</div>
-              <el-input placeholder="" v-model="ruleForm.zkStartAmount" style="width: 110px">
+              <el-input placeholder="" v-model="ruleForm.zkStartAmount" :disabled="ruleForm.id" style="width: 110px">
                 <template slot="append">元</template>
               </el-input>
               <div style="margin: 0px 5px;">~</div>
-              <el-input placeholder="" v-model="ruleForm.zkEndAmount" style="width: 110px">
+              <el-input placeholder="" v-model="ruleForm.zkEndAmount" :disabled="ruleForm.id" style="width: 110px">
                 <template slot="append">元</template>
               </el-input>
               <div style="width: 60px;text-align: center">优惠</div>
-              <el-input placeholder="" v-model="ruleForm.zkData" style="width: 110px">
+              <el-input placeholder="" v-model="ruleForm.zkData" :disabled="ruleForm.id" style="width: 110px">
                 <template slot="append">折</template>
               </el-input>
             </div>
@@ -199,7 +199,7 @@
 
           <el-form-item label="消费条件" required style="width: 45%;" v-if="ruleForm.type=='4'">
             <div class="d-s">
-              <el-select v-model="ruleForm.useType" placeholder="请选择金额">
+              <el-select v-model="ruleForm.useType" :disabled="ruleForm.id" placeholder="请选择金额">
                 <el-option label="订单金额" value="1"/>
                 <el-option label="实收金额" value="2"/>
                 <el-option label="兑换券" value="3"/>
@@ -208,15 +208,15 @@
                 <el-option label="单品代金券" value="6"/>
               </el-select>
               <div style="margin: 0px 5px;">满</div>
-              <el-input placeholder="" v-model="ruleForm.reachAmount" style="width: 140px">
+              <el-input placeholder="" v-model="ruleForm.reachAmount" :disabled="ruleForm.id" style="width: 140px">
                 <template slot="append">元</template>
               </el-input>
               <div style="width: 60px;text-align: center">每</div>
-              <el-input placeholder="" v-model="ruleForm.ljOilNum" style="width: 140px">
+              <el-input placeholder="" v-model="ruleForm.ljOilNum" :disabled="ruleForm.id" style="width: 140px">
                 <template slot="append">L</template>
               </el-input>
               <div style="width: 60px;text-align: center">减</div>
-              <el-input placeholder="" v-model="ruleForm.ljOilAmount" style="width: 140px">
+              <el-input placeholder="" v-model="ruleForm.ljOilAmount" :disabled="ruleForm.id" style="width: 140px">
                 <template slot="append">元</template>
               </el-input>
             </div>

fuintAdmin/src/views/handover/HandoverDetails.vue

@@ -40,7 +40,7 @@
       </div>
 
       <el-card style="margin-top: 20px; padding-top:  0px; height: 70vh;overflow: auto" class="box-card">
-        <div class="title_" style="position: sticky; top: 0;height: 50px; padding-top: 20px; background-color: white; z-index: 1;">
+        <div class="title_" style="height: 50px; padding-top: 20px; background-color: white; ">
           门店交接单
           <span style="position: absolute; right: 10px; cursor: pointer; color: blue;font-weight: 400;" >打印预览</span>
         </div>

fuintAdmin/src/views/integral/gift/index.vue

@@ -37,9 +37,6 @@ export default {
         {
           name: '礼品分类',
         },
-        {
-          name: 'aaa',
-        },
       ]
     }
   },

fuintAdmin/src/views/integral/settings/index.vue

@@ -44,7 +44,7 @@
       </el-row>
       <div style="width: 100%; ">
 
-        <el-form-item style="width: 24%" v-for="item,index in dataForm.pointsObtained" :key="index" :prop="'pointsObtained' + index" :label="item.day">
+        <el-form-item style="width: 24%" v-for="(item,index) in dataForm.pointsObtained" :key="index" :prop="'pointsObtained' + index" :label="item.day">
           <el-input v-model.number="item.integral" placeholder="？？？">
             <template slot="append">积分</template>
           </el-input>

fuintAdmin/src/views/power/message.vue

@@ -367,7 +367,7 @@
     </div>
     <!-- 短信模板添加/修改 -->
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
-      <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+      <el-form ref="form" :rules="rules" :model="form" label-width="95px">
 
         <el-form-item label="短信模板ID" prop="messageId">
           <el-input v-model="form.messageId" placeholder="请输入短信模板ID"></el-input>
@@ -455,10 +455,10 @@
           </div>
         </el-form-item>
 
-        <el-form-item>
+        <div style="text-align: center">
-          <el-button type="primary" @click="submitForm('form')">提交</el-button>
           <el-button @click="open = false">取 消</el-button>
-        </el-form-item>
+          <el-button type="primary" @click="submitForm('form')">提交</el-button>
+        </div>
       </el-form>
 
     </el-dialog>
@@ -485,9 +485,9 @@
           <el-input v-model="form2.mobile"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="open2 = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm2">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -514,15 +514,15 @@
         <el-form-item label="短信条数" prop="messageNum">
           <el-input v-model="form3.messageNum" placeholder="自动获取短信条数" disabled></el-input>
         </el-form-item>
-        <el-form-item>
+        <div style="text-align: center">
-          <el-button type="primary" @click="submitForm3">确 定</el-button>
           <el-button @click="open3 = false">取 消</el-button>
-        </el-form-item>
+          <el-button type="primary" @click="submitForm3">确 定</el-button>
+        </div>
       </el-form>
     </el-dialog>
     <!-- 发送短信框 -->
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="sendOpen" width="35%" append-to-body>
-      <el-form ref="sendForm" :model="sendForm" label-width="120px">
+      <el-form ref="sendForm" :model="sendForm" label-width="90px">
         <el-form-item label="短信接收人" prop="messageSendee">
           <el-input v-model="sendForm.messageSendee"
                     placeholder="请输入手机号,多个手机号用英文逗号隔开"></el-input>
@@ -547,10 +547,10 @@
             </el-date-picker>
           </div>
         </el-form-item>
-        <el-form-item>
+        <div style="text-align: center">
-          <el-button type="primary" @click="sendSubmitForm">确 定</el-button>
           <el-button @click="sendOpen = false">取 消</el-button>
-        </el-form-item>
+          <el-button type="primary" @click="sendSubmitForm">确 定</el-button>
+        </div>
       </el-form>
     </el-dialog>