From c975e87cd694c12b32d1f9b91a164d5b86462f3a Mon Sep 17 00:00:00 2001 From: woody Date: Tue, 29 Apr 2025 10:35:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat(recharge):=20=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=A1=E6=B7=BB=E5=8A=A0=E6=B3=95=E5=AE=9D?= =?UTF-8?q?=E5=88=B8=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rechargeCard/addRechargeCard.vue | 93 ++++++++++++++----- src/views/marketing/rechargeCard/index.vue | 71 +++++++------- .../marketing/rechargeCard/rechargeQc.vue | 43 ++++----- vue.config.js | 10 +- 4 files changed, 133 insertions(+), 84 deletions(-) diff --git a/src/views/marketing/rechargeCard/addRechargeCard.vue b/src/views/marketing/rechargeCard/addRechargeCard.vue index 16e18e4..0241c92 100644 --- a/src/views/marketing/rechargeCard/addRechargeCard.vue +++ b/src/views/marketing/rechargeCard/addRechargeCard.vue @@ -30,8 +30,9 @@ {{ '添加' }} + >添加 - {{ '会员编号' }} - {{ '会员名称' }} - {{ '产品名称' }} - {{ '产品规格' }} - {{ '提货基数' }} + 会员编号 + 会员名称 + 产品名称 + 产品规格 + 提货基数 可提数量 增加数量 - {{ '截止日期' }} - {{ '包邮类型' }} - + 截止日期 + 包邮类型 + 提货来源 + - + @@ -139,22 +144,24 @@ + + + + + + + @@ -394,14 +410,10 @@ import * as api from '@/api/giftGoods.js' import * as apis from '@/api/product.js' import * as api_s from '@/api/financial.js' import topBar from '@/components/topBar' -import ImageUpload from '@/components/ImageUpload' -import { getMemberName } from '@/api/financial' -import { getQueryString } from '@/utils' import { pickDetail } from '@/api/manage' export default { components: { - topBar, - ImageUpload + topBar }, data() { return { @@ -454,9 +466,24 @@ export default { text: '不包邮', val: 1 } + ], + pickTypeList: [ + { + text: '提货产品', + val: 0 + }, + { + text: '法宝券', + val: 8 + } ] } }, + computed: { + addBtnDisabled() { + return this.allData.some(item => item.consumeRuleConfigList.length > 0) + } + }, mounted() { const geturl = window.location.href const getqyinfo = geturl.split('?')[1] @@ -495,6 +522,7 @@ export default { usableQuantity: res.data.usableQuantity, quantity: 0, isFreeMail: res.data.isFreeMail, + pickType: res.data.pickType, waresGiftConfigList: [ { pkProduct: res.data.detailList[0].pkProduct, @@ -514,6 +542,7 @@ export default { usableQuantity: res.data.usableQuantity, quantity: 0, isFreeMail: res.data.isFreeMail, + pickType: res.data.pickType, waresGiftConfigList: [ { pkProduct: '', @@ -555,14 +584,21 @@ export default { }, saveDate() { const dataList = [] - this.allData[0].consumeRuleConfigList.forEach((res) => { + this.allData[0].consumeRuleConfigList.forEach((item) => { dataList.push( - { 'memberCode': res.memberCode, 'pkProduct': res.waresGiftConfigList[0].pkProduct, 'memberName': res.memberName, - 'productName': res.waresGiftConfigList[0].productName + res.waresGiftConfigList[0].specsName, - 'receiveTime': res.receiveTime, - 'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId, - 'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage, - 'pkId': res.pkId ? res.pkId : '' + { 'memberCode': item.memberCode, + 'pkProduct': item.waresGiftConfigList[0].pkProduct, + 'memberName': item.memberName, + 'productName': item.waresGiftConfigList[0].productName + item.waresGiftConfigList[0].specsName, + 'receiveTime': item.receiveTime, + 'specsName': item.waresGiftConfigList[0].specsName, + 'specsNameId': item.waresGiftConfigList[0].specsNameId, + 'baseQuantity': item.baseQuantity, + 'quantity': item.quantity, + 'isFreeMail': item.isFreeMail, + 'pkPostage': item.pkPostage, + 'pkId': item.pkId ? item.pkId : '', + 'pickType': item.pickType } ) }) @@ -813,8 +849,10 @@ export default { specsName: '', specsNameId: '', quantity: '' + } - ] + ], + pickType: 0 }) } }) @@ -906,6 +944,11 @@ export default { return 'success-row' } return '' + }, + pickTypeChange(val, item) { + if (val === 8) { + this.$set(item, 'baseQuantity', '1') + } } } } diff --git a/src/views/marketing/rechargeCard/index.vue b/src/views/marketing/rechargeCard/index.vue index e908ca2..c074a16 100644 --- a/src/views/marketing/rechargeCard/index.vue +++ b/src/views/marketing/rechargeCard/index.vue @@ -111,22 +111,22 @@
{{'添加'}} + >{{ '添加' }} {{ '导出' }} + > 导出
@@ -195,7 +195,7 @@
{{ '取消' }} - {{'确认'}} + {{ '确认' }}
@@ -427,10 +427,6 @@ export default { this.gradeRangList = res.data }) }, - addRules() { - this.types = 1 - this.ruleShow = true - }, submit() { this.ruleSubmit() }, @@ -438,23 +434,6 @@ export default { // 添加角色 this.ruleShow = false }, - updateShow(item) { - this.types = 2 - // 更新角色信息 - this.formId = item.roleId - api.roleDetails(item.roleId).then((res) => { - if (res.code === 200) { - this.ruleShow = true - this.table = { 'roleName': res.data.roleName, 'roleSort': res.data.roleSort, - 'roleKey': res.data.roleKey, 'status': res.data.status === 0 ? ['正常'] : ['停用'] } - } else { - Message({ - message: res.msg, - type: 'error' - }) - } - }) - }, delRole(item) { // 删除角色信息 this.$confirm('确认要删除该角色吗?', '提示', { @@ -486,20 +465,20 @@ export default { }) return } - if(this.memberList==null){ - this.memberList=[] + if (this.memberList == null) { + this.memberList = [] } - if(this.orderList==null){ - this.orderList=[] + if (this.orderList == null) { + this.orderList = [] } console.error(this.memberList) - if (datas.sendScope == 1 && this.memberList.length==0) { + if (datas.sendScope == 1 && this.memberList.length == 0) { Message({ message: '请选择指定会员' }) return } - if (datas.sendScope == 2 && this.orderList.length==0) { + if (datas.sendScope == 2 && this.orderList.length == 0) { Message({ message: '请选择订单短信' }) diff --git a/src/views/configManage/barcodeConfiguration/details.vue b/src/views/configManage/barcodeConfiguration/details.vue index 2852679..5651145 100644 --- a/src/views/configManage/barcodeConfiguration/details.vue +++ b/src/views/configManage/barcodeConfiguration/details.vue @@ -19,39 +19,39 @@ + /> + /> + /> - + + /> @@ -61,46 +61,42 @@ - + @change="changeTime2" + /> - + @change="changeTime1" + /> + /> - {{ '搜索' }} + {{ '搜索' }} - {{ '重置' }} + {{ '重置' }} @@ -111,12 +107,13 @@
-->
- - {{ '导出' }} - 导出明细 + + {{ '导出' }} + 导出明细
@@ -128,21 +125,18 @@ :row-class-name="tableRowClassName" @selection-change="handleSelectionChange" > - + - + /> - - - + /> + diff --git a/src/views/information/dealer/index.vue b/src/views/information/dealer/index.vue index ceec450..bf9b3c3 100644 --- a/src/views/information/dealer/index.vue +++ b/src/views/information/dealer/index.vue @@ -167,17 +167,17 @@
{{'审核'}} + >{{ '审核' }} {{ '导出' }}
@@ -207,9 +207,9 @@
- - - - - - - - - + + + + 发起签呈 {{ '驳回' }} { if (res.code == '200') { @@ -645,16 +648,16 @@ export default { path: 'JxsQc', query: { data: JSON.stringify([row]), - approvalBusiness: 143, - }, + approvalBusiness: 143 + } }) }, // details(code) { // this.$router.push('/information/dealer/detail?code=' + code) // }, - details(code,index) { - index = index||0 - this.$router.push('/information/dealer/detail?code=' + code+'&index='+index) + details(code, index) { + index = index || 0 + this.$router.push('/information/dealer/detail?code=' + code + '&index=' + index) }, exports() { this.download( @@ -704,8 +707,8 @@ export default { api.vertexList().then((res) => { this.verList = res.data }) - // 获取证件状态 - api.certificate_status().then((res) => { + // 获取证件状态 + api.certificate_status().then((res) => { this.cerList = res.data }) // 获取隶属团队 @@ -822,22 +825,6 @@ export default { this.total = res.total }) }, - handleSelectionChange(val) {}, - /** 导出按钮操作 */ - handleExport() { - const queryParams = this.queryParams - this.$confirm( '是否确认导出所有数据项?', '警告', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(function() { - return api.exportClassIfy(queryParams) - }) - .then((response) => { - this.download(response) - }) - }, tableRowClassName({ row, rowIndex }) { if (rowIndex % 2 == 1) { return 'warning-row' diff --git a/src/views/information/memberFind/index.vue b/src/views/information/memberFind/index.vue index 4c2188d..3fa4892 100644 --- a/src/views/information/memberFind/index.vue +++ b/src/views/information/memberFind/index.vue @@ -2,63 +2,63 @@
+ />
- + + /> + /> + /> @@ -67,20 +67,18 @@ - + @change="changeTime1" + /> - {{ '搜索' }} + {{ '搜索' }} {{ '重置' }} @@ -89,26 +87,25 @@
- {{ '导出' }} + {{ '导出' }}
- + @@ -153,127 +150,122 @@