已选油品
{{ getName(oilNameList,form.oilName) }}
@@ -1427,7 +1423,7 @@
{value:"￥300"},
],
// 会员信息
- member:{},
+ member:{id:""},
// 会员等级信息
grade:{},
// 会员列表信息
@@ -1631,7 +1627,7 @@
this.getStaff();
this.getList();
this.getCouponList();
- this.getUnitList();
+ // this.getUnitList();
},
directives: {
// 注册一个局部的自定义指令 v-focus
@@ -1673,7 +1669,6 @@
// realName: data.realName,
// staffMobile: data.staffMobile,
// },
- // console.log('Received data in parent:', data);
this.cardFuelDieselForm.mtStaffId = data.mtStaffId
this.cardFuelDieselForm.realName = data.realName
@@ -1706,9 +1701,7 @@
await getCardValueListApi(quy).then(res => {
this.cardValueList = res.data.records;
this.cardValueList.sort((a, b) => a.rechargeBalance - b.rechargeBalance);
- // console.log("this.grade.name",this.grade)
})
- // console.log("this.cardValueList", this.grade)
if (this.cardValueList.length > 0) {
// 过滤
@@ -1761,7 +1754,6 @@
},
selectOilType(status, oilType) {
this.tabOilType = oilType;
- // console.log("453",oilType)
this.tabOilTypeClick(oilType);
},
// 会员充值
@@ -1788,7 +1780,6 @@
// this.cardValueForm.amount = null
this.$set(this.cardValueForm, 'amount', data);
- // console.log("data17.16", this.cardValueForm.amount)
if (!data) {
this.cardValueForm.amount = ''
@@ -1936,7 +1927,6 @@
this_.isPay = false;
this_.isPaySuccess = false;
this_.isAwait = true;
- console.log("t3")
}, 15000)
} else if (this.flag === 2) {
@@ -1955,7 +1945,6 @@
actualPayment = this.authCode
makeChange = this.seekZero
}
- // console.log("cardFuelDieselForm",this.cardFuelDieselForm)
this.cardFuelDieselForm.mtUserId = userForm.id
this.cardFuelDieselForm.name = userForm.name
this.cardFuelDieselForm.mobile = userForm.mobile
@@ -1963,7 +1952,6 @@
this.cardFuelDieselForm.actualPayment = actualPayment
this.cardFuelDieselForm.makeChange = makeChange
- // console.log("this.cardFuelDieselForm",this.cardFuelDieselForm)
let id;
@@ -2027,7 +2015,6 @@
},
// 选择余额充值金额
rechargeCard(index, item) {
- // console.log("index", index)
// this.cardValueForm.amount = null,
this.cardValueForm.rechargeType = 0
@@ -2061,7 +2048,6 @@
this.cardValueForm.percentageCommissions = file.percentageCommissions
this.cardValueForm.amountCommission = file.amountCommission
- // console.log("file.royaltyType ", file.royaltyType )
// 计算员工提成金额
if (file.royaltyType === "3") {
@@ -2077,7 +2063,6 @@
},
// 根据油品过滤查询存油卡
async tabOilTypeClick(data) {
- // console.log("aaaaaaaaaaaaaa",data)
await this.getCardFuelDieselList()
this.cardFuelDieselList = this.sourceCardFuelDieselList.filter(item => {
@@ -2145,7 +2130,6 @@
let file = {}
// 拿到金额
file = this.cardFuelDieselList[index]
- // console.log("file",file)
this.cardFuelDieselForm.points = file.points
this.cardFuelDieselForm.rechargeBalance = file.rechargeBalance
this.cardFuelDieselForm.oilType = file.oilType
@@ -2276,7 +2260,6 @@
// LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
// let preview = LODOP.PREVIEW();
- // console.log("preview",preview);
LODOP.PRINT();
}
}catch (e){
@@ -2290,7 +2273,6 @@
}
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
- console.log(LODOP)
if (LODOP) {
LODOP.PRINT_INIT();
var bodyStyle = `
diff --git a/fuintAdmin/src/api/EventMarketing/activeConsumption.js b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
index e6f22c120..9d8f1ae2d 100644
--- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js
+++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
@@ -78,7 +78,7 @@ export function updateActiveConsumption(data) {
// 删除消费有礼活动
export function delActiveConsumption(id) {
return request({
- url: '/business/marketingActivity/activeConsumption/' + id,
+ url: 'business/marketingActivity/activeConsumption/delById/' + id,
method: 'delete'
})
}
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 9c5a34e8f..f478f9c63 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -71,18 +71,24 @@
- 优惠券：{{scope.row.youhuiTotal || 0}}/兑换券：{{scope.row.duihuanTotal || 0}}
+ 优惠券：{{scope.row.youhuiTotal || 0}}
+ 兑换券：{{scope.row.duihuanTotal || 0}}
+
- 优惠券：{{scope.row.youhuiTotaled || 0}}/兑换券：{{scope.row.duihuanTotaled || 0}}
+ 优惠券：{{scope.row.youhuiTotaled || 0}}
+ 兑换券：{{scope.row.duihuanTotaled || 0}}
+
- {{scope.row.activeStartTime || 0}}-{{scope.row.activeEndTime || 0}}
+ {{scope.row.activeStartTime || 0}}
+ {{scope.row.activeEndTime || 0}}
+
@@ -98,11 +104,11 @@
-
-
- {{scope.row.activeStartTime || 0}}-{{scope.row.activeEndTime || 0}}
-
-
+
+
+
+
+
{{scope.row.updateTime || '暂无更新'}}
@@ -130,7 +136,15 @@
@click="handleDeletexia(scope.row)"
v-if="scope.row.isonline == 0"
>下线
+ 删除
+
@@ -151,7 +165,7 @@
-
+
{
this.form = response.data;
- this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
- this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
- this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4')
+ if(response.data.activeConsumptionChildList&&response.data.activeConsumptionChildList.length >1){
+ this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
+ this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
+ this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4')
+ }
+
+
this.open = true;
this.title = "修改消费有礼活动";
});
@@ -1099,16 +1117,19 @@ export default {
}
});
},
- /** 删除按钮操作 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() {
- return delActiveConsumption(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("删除成功");
- }).catch(() => {});
+ Deleteshan(row){
+
+ const ids = row.id || this.ids;
+ this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() {
+ return delActiveConsumption(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ }).catch(() => {});
+
},
+ /** 删除按钮操作 */
+
/** 导出按钮操作 */
handleExport() {
this.download('business/marketingActivity/activeConsumption/export', {
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index bc56750d4..5834fabb6 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -181,78 +181,66 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{scope.row.activeStartTime || 0}}-{{scope.row.activeEndTime || 0}}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 启用
+ 禁用
+
+
+
+
+ {{scope.row.points || 0}}
+
+
+
+
+ {{scope.row.growthValue || 0}}
+
+
+
+
+ {{scope.row.updateTime || '暂无更新'}}
+
+
+
+
+
+ 修改
+ 下线
+
+
+
+
@@ -474,6 +462,7 @@ export default {
points: null,
growthValue: null,
},
+ activeFullminusList: [],
// 表单参数
form: {
id:1,
@@ -508,11 +497,19 @@ export default {
};
},
created() {
+ this.getList()
// this.handleUpdate();
},
methods: {
/** 查询新人有礼活动列表 */
getList() {
+ this.loading = true;
+ getActiveNewlyweds(1).then(res=>{
+ this.activeFullminusList = res.data;
+ this.total = res.data.total;
+ console.log(res)
+ this.loading = false;
+ })
// this.loading = true;
// listActiveNewlyweds(this.queryParams).then(response => {
// this.activeNewlywedsList = response.data.records;