dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
wangh 2024-03-05 16:42:59 +08:00
parent 0264b284a3
commit 2e55066c72
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -196,7 +196,7 @@
<el-radio label=3>预付费</el-radio>
<el-radio label=4>后付费</el-radio>
<el-radio label=5>年付费</el-radio>
<el-radio label=6>可创建油站站点数量</el-radio>
<!-- <el-radio label=6>可创建油站站点数量</el-radio>-->
</el-radio-group>
</el-form-item>
</el-col>
@ -314,18 +314,39 @@
</template>
<!-- <el-row v-if="ruleForm.deptType === '3'">-->
<!-- <el-form-item label="时间范围">-->
<!-- <el-date-picker-->
<!-- v-model="timeFrame"-->
<!-- type="daterange"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<el-row v-if="ruleForm.deptType !== '3'">
<el-col span="3">
<el-form-item label="设置油站数量">
<el-switch
v-model="storeNum"
active-color="#13ce66"
inactive-color="#ff4949">
</el-switch>
</el-form-item>
</el-col>
<!-- 可创建油站站点数量-->
<el-col>
<template v-if="storeNum">
<el-col :span="10">
<el-form-item label="可创建油站数量" label-width="110px">
<el-input-number :disabled="isTopDept" v-model="ruleForm.storeNum" @change="handleChangeInputNumber" :min="1"
:max="1000" label="可创建油站数量"></el-input-number>
</el-form-item>
</el-col>
</template>
</el-col>
</el-row>
<el-row>
<el-col :span="12"><div class="grid-content bg-purple"></div></el-col>
<el-col :span="12"><div class="grid-content bg-purple-light"></div></el-col>
</el-row>
<el-form-item label="状态" prop="name">
<el-switch :disabled="isTopDept" v-model="value10" @change="getswitch" ></el-switch>
@ -501,6 +522,7 @@ export default {
dicts: ['node_type'],
data() {
return {
storeNum: false,
isEditDept:true,
isTopDept:true,
@ -866,6 +888,9 @@ export default {
this.ruleForm.turnoverStartTime = this.timeFrame[0]
this.ruleForm.turnoverEndTime = this.timeFrame[1]
}
if (!this.storeNum) {
this.ruleForm.storeNum = null
}
deptadd(this.ruleForm).then(res=>{
if(res.code == 200){
this.$message({
@ -887,7 +912,9 @@ export default {
this.$refs[ruleForm].validate((valid) => {
if (valid) {
if (!this.storeNum) {
this.ruleForm.storeNum = null
}
if (this.timeFrame){
this.ruleForm.turnoverStartTime = this.timeFrame[0]
this.ruleForm.turnoverEndTime = this.timeFrame[1]
@ -1000,6 +1027,9 @@ export default {
const date = new Date(this.ruleForm.turnoverEndTime);
this.timeFrame[1] = date.toString();
}
if (this.ruleForm.storeNum) {
this.storeNum = true
}
if(res.data.status == 'qy'){
this.value10 = true
}else {

2
fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/entity/SysDept.java
View File

@ -1,5 +1,6 @@
package com.fuint.system.dept.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@ -74,6 +75,7 @@ public class SysDept extends BaseEntity
// @JsonFormat(pattern = "yyyy-MM-dd")
private Date turnoverEndTime;
private BigDecimal rates;
@TableField(strategy = FieldStrategy.IGNORED)
private Integer storeNum;
private BigDecimal prepaidAmount;