Merge remote-tracking branch 'origin/main'

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' },
           ],
@@ -879,7 +882,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
         const id = row.id || this.ids
         mmc(id).then(response => {
           this.form = response.data;
-          this.youhuiquanlist = response.data.cardValueChildList.filter(item => item.activeGift == '1')
+          this.youhuiquanlist = response.data.cardValueChildList
           this.duihuanquanlist = response.data.cardValueChildList.filter(item => item.activeGift == '2')
           this.dialog = true
           if (this.form.isonline==1) {
@@ -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;

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;

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>

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 {

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>

fuintAdmin_zt/src/views/Site/components/afterff.vue

@@ -47,6 +47,7 @@ export default {
       })
     },
     getList() {
+      
       getAfterListApi({deptId : this.deptId}).then(res => {
         this.tableData = res.data.records
       })
@@ -155,9 +156,8 @@ export default {
         align="center"
         label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">未开始</span>
+          <span v-if="scope.row.status == 1">未支付</span>
-          <span v-if="scope.row.status == 1">进行中</span>
+          <span v-if="scope.row.status == 0">已支付</span>
-          <span v-if="scope.row.status == 2">已完成</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -186,9 +186,11 @@ export default {
         <template slot-scope="scope">
           <el-button
             size="mini"
+            v-if="scope.row.status == 1"
             @click="handleEdit(scope.row)">修改</el-button>
           <el-button
             size="mini"
+            v-if="scope.row.status == 1"
             @click="handleEditshoukuan(scope.row)">收款</el-button>
         </template>
 

fuintAdmin_zt/src/views/Site/components/before.vue

@@ -7,10 +7,13 @@ import {
   updateBeforerApi
 } from "@/api/system/Site/compant";
 
+import { getDeptName} from '@/api/indexBanner/index'
+
 export default {
   name: "beforeff",
   data() {
     return {
+      deptName:'',
       dialogVisible:false,
       tableData: [ ],
       form: {
@@ -40,8 +43,14 @@ export default {
   created() {
     this.getList()
     this.getData()
+    this.getDeptName();
   },
   methods: {
+    getDeptName(){
+      getDeptName().then(res=>{
+        this.deptName = res.data.deptName
+      })
+    },
     getList() {
       getBeforeListApi({deptId : this.deptId}).then(res => {
         this.tableData = res.data.records
@@ -155,9 +164,8 @@ export default {
         align="center"
         label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">未开始</span>
+          <span v-if="scope.row.remainingTransactionVolume > 0">进行中</span>
-          <span v-if="scope.row.status == 1">进行中</span>
+          <span v-if="scope.row.remainingTransactionVolume == 0">已完成</span>
-          <span v-if="scope.row.status == 2">已完成</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -170,7 +178,8 @@ export default {
         align="center"
         label="创建人">
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
+        v-if = "this.deptName === '百业兴总部'"
         align="center">
         <template slot="header" slot-scope="scope">
           <el-button
@@ -183,7 +192,7 @@ export default {
             size="mini"
             @click="handleEdit( scope.row)">修改</el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <el-dialog
       title="新增"

fuintAdmin_zt/src/views/Site/components/yearff.vue

@@ -1,6 +1,7 @@
 <script>
 import {addYearApi, getYearListApi, updateYearApi} from "@/api/system/Site/compant";
 import {parseTime} from "@/utils/fuint";
+import { getDeptName} from '@/api/indexBanner/index'
 
 export default {
   name: "yearff",
@@ -8,6 +9,7 @@ export default {
   data() {
 
     return {
+      deptName:'',
       dialogVisible:false,
       tableData: [ ],
       form: {
@@ -27,10 +29,16 @@ export default {
     status: Boolean
   },
   created() {
+    this.getDeptName();
     console.log("deptId",this.deptId)
     this.getList()
   },
   methods: {
+    getDeptName(){
+      getDeptName().then(res=>{
+        this.deptName = res.data.deptName
+      })
+    },
     getList() {
       console.log(this.status)
       if(this.status){
@@ -124,9 +132,9 @@ export default {
       align="center"
       label="状态">
       <template slot-scope="scope">
-        <span v-if="scope.row.status == 0">未开始</span>
+        <span v-if="parseTime(scope.row.systemValidityPeriodStart) > parseTime(new Date())">未开始</span>
-        <span v-if="scope.row.status == 1">进行中</span>
+        <span v-if="parseTime(scope.row.systemValidityPeriodStart) < parseTime(new Date()) && parseTime(scope.row.systemValidityPeriodEnd) > parseTime(new Date())">进行中</span>
-        <span v-if="scope.row.status == 2">已完成</span>
+        <span v-if="parseTime(scope.row.systemValidityPeriodEnd) < parseTime(new Date())">已完成</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -139,7 +147,8 @@ export default {
       align="center"
       label="创建人">
     </el-table-column>
-    <!-- <el-table-column
+    <el-table-column
+      v-if = "this.deptName === '百业兴总部'"
       align="center">
       <template slot="header" slot-scope="scope">
         <el-button
@@ -149,12 +158,12 @@ export default {
       </template>
       <template slot-scope="scope">
         <el-button
-          v-if="scope.row.status == 0"
+          v-if="parseTime(scope.row.systemValidityPeriodEnd) > parseTime(new Date())"
           size="mini"
           @click="handleEdit(scope.row)">修改</el-button>
 
       </template>
-    </el-table-column> -->
+    </el-table-column>
 
   </el-table>
   <el-dialog

fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptServiceFeeInfoMapper.xml

@@ -32,6 +32,7 @@ service_fee_statistics,service_fee_limit,status,create_name,create_time
             dept_id = #{info.deptId}
 
         </where>
+        order by create_time desc
     </select>
 <!--    <if test="id != null">-->
 <!--        and id = #{id}-->
@@ -102,7 +103,7 @@ service_fee_statistics,service_fee_limit,status,create_name,create_time
         select
             id,deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistics,service_fee_limit,status
         from dept_service_fee_info
-        where  dept_id = #{deptId}
+        where  dept_id = #{deptId} and status = 1
     </select>
 
     <!--新增所有列-->

fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java

@@ -92,7 +92,7 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
         }
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         deptPriceInfo.setCreateName(nowAccountInfo.getRealName());
-        deptPriceInfo.setDeptId(nowAccountInfo.getDeptId());
+        deptPriceInfo.setDeptId(deptPriceInfo.getDeptId());
 
         boolean isValid = isDateInRange(deptPriceInfo.getSystemValidityPeriodStart(),deptPriceInfo.getSystemValidityPeriodEnd());
 
@@ -113,14 +113,14 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
      */
     @Override
     public DeptPriceInfo update(DeptPriceInfo deptPriceInfo) {
-        int countByTime = getCountByTime(deptPriceInfo);
+        // int countByTime = getCountByTime(deptPriceInfo);
-        if (countByTime>0) {
+        // if (countByTime>0) {
-            throw new RuntimeException("该时间段已有数据");
+        //     throw new RuntimeException("该时间段已有数据");
-        }
+        // }
         boolean isValid = isDateInRange(deptPriceInfo.getSystemValidityPeriodStart(),deptPriceInfo.getSystemValidityPeriodEnd());
 
         if (isValid) {
-            deptPriceInfo.setStatus(1);
+            deptPriceInfo.setStatus(0);
             deptPriceInfoMapper.updateStatus(deptPriceInfo);
         }
         this.deptPriceInfoMapper.update(deptPriceInfo);

fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptServiceFeeInfoServiceImpl.java

@@ -132,6 +132,7 @@ public class DeptServiceFeeInfoServiceImpl implements DeptServiceFeeInfoService
      */
     @Override
     public DeptServiceFeeInfo update(DeptServiceFeeInfo deptServiceFeeInfo) {
+        deptServiceFeeInfo.setStatus(0);
         this.deptServiceFeeInfoMapper.update(deptServiceFeeInfo);
         return this.queryById(deptServiceFeeInfo.getId());
     }