diff --git a/fuintAdmin/src/components/map/mapComponent.vue b/fuintAdmin/src/components/map/mapComponent.vue index f9db3a163..ef1d86fd5 100644 --- a/fuintAdmin/src/components/map/mapComponent.vue +++ b/fuintAdmin/src/components/map/mapComponent.vue @@ -3,13 +3,21 @@

省市区

- +

选择区域

+ {{form.lng}} + {{form.lat}} + {{form.address}}

详细地址： { this.options = response.data.list; @@ -73,11 +86,11 @@ export default { AMapLoader.load({ key: "b5abec514cab7c71cb0572765131e6fc", // 申请好的Web端开发者Key，首次调用 load 时必填 version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15 - plugins: ["AMap.Geocoder", "AMap.AutoComplete"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等 + plugins: ["AMap.Geocoder", "AMap.AutoComplete","AMap.DistrictSearch"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等 }).then((AMap) => { this.map = new AMap.Map("container", { - viewMode: "3D", //是否为3D地图模式 - zoom: 5, //初始化地图级别 + viewMode: "2D", //是否为3D地图模式 + zoom: 11, //初始化地图级别 center: [_this.form.lng, _this.form.lat], //初始化地图中心点位置 }); //地址逆解析插件 @@ -129,17 +142,31 @@ export default { }, // 搜索 remoteMethod(query) { - console.log(query); + let _this = this; if (query !== "") { this.loading = true; setTimeout(() => { this.loading = false; - this.AutoComplete.search(query, (status, result) => { - this.options = result.tips; + // this.AutoComplete.search(query, (status, result) => { + // console.log(result.tips); + // }); + var opts = { + subdistrict: 0, //返回下一级行政区 + extensions: "all", //返回行政区边界坐标组等具体信息 + level: "city" //查询行政级别为 市 + }; + this.district = new AMap.DistrictSearch(opts); //行政区查询插件 + //进入就显示整个国家范围 + this.district.search(query, function(status, result) { + _this.form.lng = result.districtList[0].center.lng + _this.form.lat = result.districtList[0].center.lat + _this.toGeoCoder(); + _this.initAMap(); }); }, 200); } else { - // this.options = []; + // this.form = this.pform; + this.initAMap(); } }, // 选中提示 diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue index 10c1a2da6..252a846a5 100644 --- a/fuintAdmin/src/views/staff/list.vue +++ b/fuintAdmin/src/views/staff/list.vue @@ -252,6 +252,14 @@ :value="dict.value" /> +
+ +

加油时选择加油员场景使用,选择不显示加油员将无法被指定
(需系统开启加油选择加油员功能)终端支持:(PC、POS、小程序)
+ 加油时选择加油员场景使用,选择... + @@ -264,6 +272,14 @@ :value="dict.value" /> +
+ +
启用后,当前账户登录POS端后油品收银必选加油员才可进行
下步操作(需系统开启加油选择加油员功能)
+ 启用后,当前账户登录POS端后油... + @@ -276,6 +292,14 @@ :value="dict.value" /> +
+ +
交易订单显示信息、终端支持:(PC、
POS、小程序)
+ 交易订单显示信息、终端支持:(PC... + @@ -290,6 +314,14 @@ :value="dict.value" /> +
+ +
收款成功接收的公众号模板消息通知,需
关注公众号,且本站小程序中会员手机号
信息与当前员工手机号一致
+ 收款成功接收的公众号模板消息... + @@ -302,6 +334,8 @@ :value="dict.value" /> +
+ 多选,已选油枪号的交易将发送模板消息 @@ -314,6 +348,14 @@ :value="dict.value" /> +
+ +
当前账户下可查看交易的时间范围(PC、
POS端)
+ 当前账户下可查看交易的时间范... + @@ -328,6 +370,8 @@ :value="dict.value" /> +
+ 根据需求自行选择模式 @@ -340,6 +384,14 @@ :value="dict.value" /> +
+ +
若无权限,则无法查看交班统计信息和
进行交班操作
+ 若无权限,则无法查看交班统计... + @@ -352,6 +404,8 @@ :value="dict.value" /> +
+ 进行交班处理后是否退出当前账户 @@ -366,6 +420,14 @@ :value="dict.value" /> +
+ +
全部记录:查看所有员工交班记录,名下
记录:员工自己名下记录(需有交班权限才可查看),
禁用权限:无权限查看交班记录,记录为空
+ 全部记录:查看所有员工交班记录... + @@ -378,6 +440,14 @@ :value="dict.value" /> +
+ +
交班信息是否显示商户号统计信息,禁
用后当前员工则无商户号统计信息
+ 交班信息是否显示商户号统计信... + @@ -390,6 +460,14 @@ :value="dict.value" /> +
+ +
交易信息是否可以筛选员工进行查
询,启用后可筛选、则反之
+ 交易信息是否可以筛选员工进行... + @@ -403,6 +481,8 @@ :props="props" @change="handleNodeClick1" clearable> +
+ POS手持机中功能对应操作权限 @@ -415,6 +495,8 @@ :props="props" @change="handleNodeClick2" clearable> +
+ 小程序管理端功能对应操作权限 @@ -428,6 +510,14 @@ :value="dict.value" /> +
+ +
状态禁用后,当前账户则无法进行
登录和操作
+ 状态禁用后,当前账户则无法进行登... + @@ -458,6 +548,7 @@ export default { 'jbjl','official','notice','special_prem','role'], data() { return { + drawer: false, // 标题 title: "", // 遮罩层 @@ -575,6 +666,9 @@ export default { // this.getStoreList(); }, methods: { + showDesc(){ + this.drawer = true; + }, handleNodeClick1(data) { this.form.posPrem = JSON.stringify(data); }, @@ -691,8 +785,8 @@ export default { this.$refs["form"].validate(valid => { if (valid) { if (!this.form.id) { - this.form.posPrem = JSON.parse(this.form.posPrem); - this.form.appletPrem = JSON.parse(this.form.appletPrem); + this.form.posPrem = JSON.stringify(this.form.posPrem); + this.form.appletPrem = JSON.stringify(this.form.appletPrem); addStaff(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; diff --git a/fuintAdmin/src/views/staff/storeInfo/index.vue b/fuintAdmin/src/views/staff/storeInfo/index.vue index 494d0bf26..56282096a 100644 --- a/fuintAdmin/src/views/staff/storeInfo/index.vue +++ b/fuintAdmin/src/views/staff/storeInfo/index.vue @@ -7,6 +7,10 @@ +

详细地址：

店铺福利： diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilName.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilName.java index ad4e855be..4ae676ed4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilName.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilName.java @@ -1,5 +1,7 @@ package com.fuint.business.petrolStationManagement.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fuint.repository.model.base.BaseEntity; import io.swagger.annotations.ApiModel; @@ -16,6 +18,7 @@ import lombok.Data; @Data public class OilName extends BaseEntity { @ApiModelProperty("商户名") + @TableId(value = "id", type = IdType.AUTO) public Long id; //id（主键) private String oilType; // 油品类型 private String oilName; //油品名称 @@ -26,5 +29,7 @@ public class OilName extends BaseEntity { private String ifDelete; // private String receivingUnits; // private String unit; // + private Integer storeId; // + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilNumber.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilNumber.java index 10ac46eea..21df264f3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilNumber.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilNumber.java @@ -1,5 +1,7 @@ package com.fuint.business.petrolStationManagement.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fuint.repository.model.base.BaseEntity; import io.swagger.annotations.ApiModel; @@ -17,6 +19,7 @@ import lombok.Data; @Data public class OilNumber extends BaseEntity { @ApiModelProperty("商户名") + @TableId(value = "number_id", type = IdType.AUTO) public Integer numberId; //id（主键) private String oilType; // 油品类型 private String oilName; //油品名称 @@ -30,6 +33,6 @@ public class OilNumber extends BaseEntity { private String remark; // private String ifDelete; // private String unit; // - private String storeId; // + private Integer storeId; // } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilPresetPrices.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilPresetPrices.java index 51ae78fd9..8a03ce422 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilPresetPrices.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilPresetPrices.java @@ -1,5 +1,7 @@ package com.fuint.business.petrolStationManagement.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fuint.repository.model.base.BaseEntity; import lombok.Data; @@ -16,18 +18,19 @@ import java.util.Date; @Data public class OilPresetPrices extends BaseEntity { + @TableId(value = "number_id", type = IdType.AUTO) private Long presetId; // id（主键) private Long oilType; // 预设油号 id private Double currentPetrolPrices; // 当前油站价 private Double presetOilPrices; // 预设油站价 private Double currentGbPrice; // 当前国标价 private Double presetGbPrice; // 预设国标价 -// private String createTime; // 创建时间 -// private String updateTime; // 更新时间 private String effectiveTime; // 生效时间（时间戳） private Integer ifDelete; // 是否删除（0未删除|1删除） private Integer state; // 状态 private Integer numberId; // 状态 + private Integer storeId; // 关联的店铺id + // /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml index a476ab150..23fb217ed 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml @@ -75,18 +75,17 @@ update oil_number - oil_type= #{oilType}, - oil_name= #{oilName}, - oil_price= #{oilPrice}, - gb_price= #{gbPrice}, - receiving_units= #{receivingUni}, + oil_type= #{oilType}, + oil_name= #{oilName}, + oil_price= #{oilPrice}, + gb_price= #{gbPrice}, + receiving_units= #{receivingUnits}, create_time= #{createTime}, update_time= #{updateTime}, - state = #{state}, - sort= #{sort}, - remark= #{remark}, - if_delete= #{ifDelete}, - unit= #{unit}, + state = #{state}, + sort= #{sort}, + remark= #{remark}, + unit= #{unit}, where number_id = #{numberId} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java index 449768667..e90f74032 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java @@ -14,6 +14,7 @@ import com.fuint.quartz.domain.SysJob; import com.fuint.quartz.service.ISysJobService; import org.quartz.SchedulerException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -52,6 +53,7 @@ public class OilPresetPricesServiceImpl extends ServiceImpl i dto.setCity(new ArrayList<>()); regionDto.setLabel(mtRegion.getName()); - regionDto.setValue(mtRegion.getCode()); + regionDto.setValue(mtRegion.getName()); regionDto.setChildren(new ArrayList<>()); treeData.add(dto); list.add(regionDto); @@ -69,7 +69,7 @@ public class LJRegionServiceImpl extends ServiceImpl i dto.setLevel(mtRegion.getLevel() + ""); regionDto.setLabel(mtRegion.getName()); - regionDto.setValue(mtRegion.getCode()); + regionDto.setValue(mtRegion.getName()); List regionArr = new ArrayList<>(); List region = new ArrayList<>(); @@ -85,7 +85,7 @@ public class LJRegionServiceImpl extends ServiceImpl i dto1.setLevel(mtRegion1.getLevel() + ""); regionDto1.setLabel(mtRegion1.getName()); - regionDto1.setValue(mtRegion1.getCode()); + regionDto1.setValue(mtRegion1.getName()); regionArr.add(dto1); region.add(regionDto1);