diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development index 49559362f..53ce3f580 100644 --- a/fuintAdmin/.env.development +++ b/fuintAdmin/.env.development @@ -14,3 +14,4 @@ VUE_APP_PUBLIC_PATH = '/' VUE_APP_SERVER_URL = 'http://192.168.0.178:8008/' + diff --git a/fuintAdmin/src/api/EventMarketing/activeConsumption.js b/fuintAdmin/src/api/EventMarketing/activeConsumption.js index 604a7cd39..e6f22c120 100644 --- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js +++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js @@ -16,8 +16,6 @@ export function getoilName(query) { }) } - - // 查询消费有礼活动列表 export function listActiveConsumption(query) { return request({ diff --git a/fuintAdmin/src/api/EventMarketing/yijian.js b/fuintAdmin/src/api/EventMarketing/yijian.js new file mode 100644 index 000000000..00caec967 --- /dev/null +++ b/fuintAdmin/src/api/EventMarketing/yijian.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + + +export function issueCardFavorable(data) { + return request({ + url: 'business/marketingActivity/cardFavorableRecord/issueCardFavorable', + method: 'post', + data:data + }) +} +export function getCardFavorableLists(status) { + return request({ + url: 'business/marketingActivity/cardFavorableRecord/getCardFavorableLists', + method: 'get', + params: status + }) +} diff --git a/fuintAdmin/src/components/Fuint/Doc/index.vue b/fuintAdmin/src/components/Fuint/Doc/index.vue index 13a36eb3f..74c123a64 100644 --- a/fuintAdmin/src/components/Fuint/Doc/index.vue +++ b/fuintAdmin/src/components/Fuint/Doc/index.vue @@ -1,5 +1,5 @@ - + diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue index f4999b916..49a3fd05a 100644 --- a/fuintAdmin/src/views/staff/list.vue +++ b/fuintAdmin/src/views/staff/list.vue @@ -277,6 +277,14 @@ > +
+ +
可设置当前员工是否有油品/商品入库、盘点、审核废止等权限
+ 可设置当前员工是否有... + diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue index a976a89db..070fb5b07 100644 --- a/fuintAdmin_zt/src/views/components/Service/staff.vue +++ b/fuintAdmin_zt/src/views/components/Service/staff.vue @@ -141,7 +141,7 @@ - + @@ -320,7 +320,7 @@ { required: true, message: "手机号不能为空", trigger: "blur" }, { min: 11, max: 20, message: '手机号长度必须11', trigger: 'blur' } ], - role: [ + roleId: [ { required: true, message: "请选择员工角色", trigger: "blur" } ], isRefuel: [ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java index c69471fc9..fc1531ef8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java @@ -49,8 +49,8 @@ public class Const { public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB"; //异步通知(回调地址) - public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify"; -// public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; +// public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify"; + public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; //下单 public static String fuiou_21_url = "https://fundwx.fuiou.com/preCreate"; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java index 5bc1279b1..827ab6901 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java @@ -110,6 +110,10 @@ public class LJGoods extends BaseEntity implements Serializable { */ @ApiModelProperty("是否在回收站：0不在回收站，1在回收站") private String isRecovery; + /** + * 是否删除：0未删除，1已删除 + */ + private String ifDelete; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/StockStatistic.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/StockStatistic.java index b57abc31b..6869446b1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/StockStatistic.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/StockStatistic.java @@ -49,6 +49,10 @@ public class StockStatistic extends BaseEntity implements Serializable { */ @ApiModelProperty("成本金额") private Double costAmount; + /** + * 是否删除：0未删除，1已删除 + */ + private String ifDelete; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml index 8629d20fc..9e7ec919f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml @@ -8,7 +8,7 @@ - st.store_id = #{stock.storeId} + st.store_id = #{stock.storeId} and if_delete = '0' and st.cvs_good_id = #{stock.cvsGoodId} @@ -39,14 +39,14 @@ parameterType="java.lang.Integer"> - st.id = #{id} + st.id = #{id} and if_delete = '0'