angelo
/
web-base-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(recharge): 充值提货卡添加法宝券修改逻辑

This commit is contained in:
woody 2025-04-29 10:35:03 +08:00
parent f208f8fdb2
commit c975e87cd6
4 changed files with 133 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/views/marketing/rechargeCard/addRechargeCard.vue
View File

@ -30,8 +30,9 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
:disabled="addBtnDisabled"
@click="addNewGoods" @click="addNewGoods"
>{{ '添加' }} >添加
</el-button> </el-button>
</th> </th>
<th <th
@ -62,16 +63,16 @@
class="table_b" class="table_b"
> >
<tr style="border-top:0"> <tr style="border-top:0">
<td colspan="2">{{ '会员编号' }}</td> <td colspan="2">会员编号</td>
<td colspan="2">{{ '会员名称' }}</td> <td colspan="2">会员名称</td>
<td colspan="4">{{ '产品名称' }}</td> <td colspan="4">产品名称</td>
<td colspan="4">{{ '产品规格' }}</td> <td colspan="4">产品规格</td>
<td colspan="2">{{ '提货基数' }}</td> <td colspan="2">提货基数</td>
<td colspan="2">可提数量</td> <td colspan="2">可提数量</td>
<td colspan="2">增加数量</td> <td colspan="2">增加数量</td>
<td colspan="2">{{ '截止日期' }}</td> <td colspan="2">截止日期</td>
<td colspan="2">{{ '包邮类型' }}</td> <td colspan="2">包邮类型</td>
<td colspan="2">提货来源</td>
</tr> </tr>
<tr <tr
v-for="ctem,cndex in item.consumeRuleConfigList" v-for="ctem,cndex in item.consumeRuleConfigList"
@ -128,8 +129,12 @@
> >
</div> </div>
</td> </td>
<!-- 提货基数 -->
<td colspan="2" style="border-right: 1px solid #fff"> <td colspan="2" style="border-right: 1px solid #fff">
<el-input v-model="ctem.baseQuantity" :disabled="deled" /> <el-input
v-model="ctem.baseQuantity"
:disabled="deled || ctem.pickType == 8"
/>
</td> </td>
<!-- 可提数量 --> <!-- 可提数量 -->
<td colspan="2" style="border-right: 1px solid #fff"> <td colspan="2" style="border-right: 1px solid #fff">
@ -139,22 +144,24 @@
<td colspan="2" style="border-right: 1px solid #fff"> <td colspan="2" style="border-right: 1px solid #fff">
<el-input v-model="ctem.quantity" :disabled="deled" /> <el-input v-model="ctem.quantity" :disabled="deled" />
</td> </td>
<!-- 截止日期 -->
<td colspan="2" style="border-right: 1px solid #fff"> <td colspan="2" style="border-right: 1px solid #fff">
<!-- <el-input v-model="ctem.orderAchieve"></el-input>--> <!-- <el-input v-model="ctem.orderAchieve"></el-input>-->
<el-date-picker <el-date-picker
v-model="ctem.receiveTime" v-model="ctem.receiveTime"
:disabled="deled" :disabled="deled || (ctem.pickType == 8 && !addFlag)"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
:placeholder="'请选择时间'" :placeholder="'请选择时间'"
/> />
</td> </td>
<!-- 包邮类型 -->
<td colspan="2"> <td colspan="2">
<el-select <el-select
v-model="ctem.isFreeMail" v-model="ctem.isFreeMail"
clearable clearable
:disabled="deled" :disabled="deled || (ctem.pickType == 8 && !addFlag)"
> >
<el-option <el-option
v-for="item in postList" v-for="item in postList"
@ -212,6 +219,15 @@
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</td> </td>
<td colspan="2">
<el-select
v-model="ctem.pickType"
:disabled="disableds"
@change="(val) => pickTypeChange(val, ctem)"
>
<el-option v-for="item in pickTypeList" :key="item.val" :label="item.text" :value="item.val" />
</el-select>
</td>
</tr> </tr>
</table> </table>
</div> </div>
@ -394,14 +410,10 @@ import * as api from '@/api/giftGoods.js'
import * as apis from '@/api/product.js' import * as apis from '@/api/product.js'
import * as api_s from '@/api/financial.js' import * as api_s from '@/api/financial.js'
import topBar from '@/components/topBar' import topBar from '@/components/topBar'
import ImageUpload from '@/components/ImageUpload'
import { getMemberName } from '@/api/financial'
import { getQueryString } from '@/utils'
import { pickDetail } from '@/api/manage' import { pickDetail } from '@/api/manage'
export default { export default {
components: { components: {
topBar, topBar
ImageUpload
}, },
data() { data() {
return { return {
@ -454,9 +466,24 @@ export default {
text: '不包邮', text: '不包邮',
val: 1 val: 1
} }
],
pickTypeList: [
{
text: '提货产品',
val: 0
},
{
text: '法宝券',
val: 8
}
] ]
} }
}, },
computed: {
addBtnDisabled() {
return this.allData.some(item => item.consumeRuleConfigList.length > 0)
}
},
mounted() { mounted() {
const geturl = window.location.href const geturl = window.location.href
const getqyinfo = geturl.split('?')[1] const getqyinfo = geturl.split('?')[1]
@ -495,6 +522,7 @@ export default {
usableQuantity: res.data.usableQuantity, usableQuantity: res.data.usableQuantity,
quantity: 0, quantity: 0,
isFreeMail: res.data.isFreeMail, isFreeMail: res.data.isFreeMail,
pickType: res.data.pickType,
waresGiftConfigList: [ waresGiftConfigList: [
{ {
pkProduct: res.data.detailList[0].pkProduct, pkProduct: res.data.detailList[0].pkProduct,
@ -514,6 +542,7 @@ export default {
usableQuantity: res.data.usableQuantity, usableQuantity: res.data.usableQuantity,
quantity: 0, quantity: 0,
isFreeMail: res.data.isFreeMail, isFreeMail: res.data.isFreeMail,
pickType: res.data.pickType,
waresGiftConfigList: [ waresGiftConfigList: [
{ {
pkProduct: '', pkProduct: '',
@ -555,14 +584,21 @@ export default {
}, },
saveDate() { saveDate() {
const dataList = [] const dataList = []
this.allData[0].consumeRuleConfigList.forEach((res) => { this.allData[0].consumeRuleConfigList.forEach((item) => {
dataList.push( dataList.push(
{ 'memberCode': res.memberCode, 'pkProduct': res.waresGiftConfigList[0].pkProduct, 'memberName': res.memberName, { 'memberCode': item.memberCode,
'productName': res.waresGiftConfigList[0].productName + res.waresGiftConfigList[0].specsName, 'pkProduct': item.waresGiftConfigList[0].pkProduct,
'receiveTime': res.receiveTime, 'memberName': item.memberName,
'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId, 'productName': item.waresGiftConfigList[0].productName + item.waresGiftConfigList[0].specsName,
'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage, 'receiveTime': item.receiveTime,
'pkId': res.pkId ? res.pkId : '' '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: '', specsName: '',
specsNameId: '', specsNameId: '',
quantity: '' quantity: ''
} }
] ],
pickType: 0
}) })
} }
}) })
@ -906,6 +944,11 @@ export default {
return 'success-row' return 'success-row'
} }
return '' return ''
},
pickTypeChange(val, item) {
if (val === 8) {
this.$set(item, 'baseQuantity', '1')
}
} }
} }
} }

71
src/views/marketing/rechargeCard/index.vue
View File

@ -111,22 +111,22 @@
<div class="main_a"> <div class="main_a">
<div class="mainbtn"> <div class="mainbtn">
<el-button <el-button
v-hasButtons="['cardAdd']"
size="small" size="small"
class="addBtn" class="addBtn"
v-hasButtons="['cardAdd']"
@click="openDig" @click="openDig"
>{{'添加'}}</el-button> >{{ '添加' }}</el-button>
<el-button <el-button
v-hasButtons="['cardExport']"
size="small" size="small"
class="thebtn2" class="thebtn2"
v-hasButtons="['cardExport']"
@click="handleExport" @click="handleExport"
> {{ '导出' }}</el-button> > 导出</el-button>
</div> </div>
<div class="maintable"> <div class="maintable">
<el-table <el-table
:data="tableData"
v-loading="loading" v-loading="loading"
:data="tableData"
style="width: 100%" style="width: 100%"
height="73vh" height="73vh"
:header-cell-style="{ background: '#EEEEEE' }" :header-cell-style="{ background: '#EEEEEE' }"
@ -152,6 +152,7 @@
align="center" align="center"
prop="" prop=""
:label="'产品名称(规格)'" :label="'产品名称(规格)'"
min-width="130"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="item in scope.row.detailList"> <div v-for="item in scope.row.detailList">
@ -184,8 +185,8 @@
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="usableQuantity" prop="usableQuantity"
:label="'可用兑换数量'" :label="'可用兑换数量'"
width="120" width="120"
/> />
<el-table-column <el-table-column
@ -220,24 +221,28 @@
width="120" width="120"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="btnHeng"> <div class="btnHeng">
<div @click="toFixed(scope.row.pkId,2)" <div
type="text"
v-if="scope.row.pickType!=8" v-hasButtons="['cardUpdata']"
v-hasButtons="['cardUpdata']" type="text"
style="color:#F3A900" style="color:#F3A900"
size="small"> size="small"
{{ '修改' }} @click="toFixed(scope.row.pkId,2)"
>
{{ '修改' }}
</div>
<div
v-hasButtons="['cardDel']"
type="text"
size="small"
style="color: #C8161D"
@click="toDel(scope.row.pkId)"
>
{{ '删除' }}
</div>
</div> </div>
<div @click="toDel(scope.row.pkId)"
type="text"
v-hasButtons="['cardDel']"
size="small"
style="color: #C8161D">
{{ '删除' }}
</div>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -257,19 +262,19 @@
<script> <script>
import topBar from '@/components/topBar' import topBar from '@/components/topBar'
import * as api from '@/api/giftGoods.js' import * as api from '@/api/giftGoods.js'
import {tgtype} from "@/api/giftGoods.js"; import { tgtype } from '@/api/giftGoods.js'
import {getPickList} from "@/api/manage"; import { getPickList } from '@/api/manage'
export default { export default {
name: 'Bzpz', name: 'Bzpz',
components: { components: {
topBar topBar
}, },
filters: { filters: {
isAgree(val) { isAgree(val) {
if (!val) { if (!val) {
return '允许'; return '允许'
} else { } else {
return '禁止'; return '禁止'
} }
} }
}, },
@ -288,7 +293,7 @@ export default {
total: 0, total: 0,
dialogVisible: false, dialogVisible: false,
tableData: [], tableData: [],
loading:false, loading: false,
moren: 'RechargeCardList', moren: 'RechargeCardList',
topList: [ topList: [
{ {
@ -350,7 +355,7 @@ export default {
} }
}) })
}, },
toDel(id){ toDel(id) {
this.$router.push({ this.$router.push({
name: 'addRechargeCard', name: 'addRechargeCard',
query: { query: {
@ -416,7 +421,7 @@ export default {
// 获取列表 // 获取列表
getDataList() { getDataList() {
this.loading = true this.loading = true
getPickList(Object.assign({},this.queryParams,this.select)) getPickList(Object.assign({}, this.queryParams, this.select))
.then((res) => { .then((res) => {
this.tableData = res.rows this.tableData = res.rows
this.total = res.total this.total = res.total
@ -426,7 +431,7 @@ export default {
handleSelectionChange(val) {}, handleSelectionChange(val) {},
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.$confirm( '是否确认导出所有数据项?', '警告', { this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

43
src/views/marketing/rechargeCard/rechargeQc.vue
View File

@ -13,9 +13,9 @@
/> />
<div class="main"> <div class="main">
<div class="thetable"> <div class="thetable">
<div class="fontTitle"> {{'在线签呈'}}</div> <div class="fontTitle"> {{ '在线签呈' }}</div>
<div class="titleflex"> <div class="titleflex">
<div>{{'编号'}} :</div> <div>{{ '编号' }} :</div>
<div> <div>
<el-radio-group v-model="allData.signType"> <el-radio-group v-model="allData.signType">
<el-radio <el-radio
@ -36,7 +36,7 @@
colspan="1" colspan="1"
width="190px" width="190px"
align="center" align="center"
> {{'发起部门'}} :</td> > {{ '发起部门' }} :</td>
<td <td
v-if="allData.signData" v-if="allData.signData"
colspan="1" colspan="1"
@ -46,7 +46,7 @@
colspan="1" colspan="1"
width="140px" width="140px"
align="center" align="center"
> {{'发起人'}} :</td> > {{ '发起人' }} :</td>
<td <td
v-if="allData.signData" v-if="allData.signData"
colspan="1" colspan="1"
@ -56,7 +56,7 @@
<td <td
colspan="1" colspan="1"
align="center" align="center"
> {{'主旨'}} :</td> > {{ '主旨' }} :</td>
<td <td
v-if="allData.signData" v-if="allData.signData"
colspan="1" colspan="1"
@ -64,7 +64,7 @@
<td <td
colspan="1" colspan="1"
align="center" align="center"
> {{'日期'}} :</td> > {{ '日期' }} :</td>
<td <td
v-if="allData.signData" v-if="allData.signData"
colspan="1" colspan="1"
@ -75,7 +75,7 @@
<td <td
colspan="1" colspan="1"
align="center" align="center"
> {{'审批流程'}}</td> > {{ '审批流程' }}</td>
<td colspan="3"> <td colspan="3">
<div class="disflex"> <div class="disflex">
<span <span
@ -117,7 +117,7 @@
<td <td
colspan="1" colspan="1"
align="center" align="center"
>{{'抄送人'}}</td> >{{ '抄送人' }}</td>
<td colspan="3"> <td colspan="3">
<div class="disflex"> <div class="disflex">
<span <span
@ -159,12 +159,12 @@
<td <td
style="height: 190px" style="height: 190px"
align="center" align="center"
>{{'情况说明'}}</td> >{{ '情况说明' }}</td>
<td <td
colspan="3" colspan="3"
style="padding: 0" style="padding: 0"
> >
<div > <div>
<el-input <el-input
v-model="allData.remark" v-model="allData.remark"
type="textarea" type="textarea"
@ -178,12 +178,12 @@
<td <td
style="height: 193px" style="height: 193px"
align="center" align="center"
> {{'业务诉求'}}</td> > {{ '业务诉求' }}</td>
<td <td
colspan="3" colspan="3"
style="padding: 0;vertical-align: top;" style="padding: 0;vertical-align: top;"
> >
<div > <div>
<el-table <el-table
:data="allData.updateParentParamList" :data="allData.updateParentParamList"
style="width: 100%" style="width: 100%"
@ -202,7 +202,7 @@
style="color: #48B2FD;text-decoration:underline;cursor: pointer" style="color: #48B2FD;text-decoration:underline;cursor: pointer"
@click="details" @click="details"
> >
{{'查看详情'}} {{ '查看详情' }}
</div> </div>
</div> </div>
<div v-show="ctem.value!= 'actExplain'"> <div v-show="ctem.value!= 'actExplain'">
@ -221,7 +221,7 @@
<td <td
style="height: 190px" style="height: 190px"
align="center" align="center"
>{{'附件'}}</td> >{{ '附件' }}</td>
<td <td
colspan="3" colspan="3"
style="padding: 0" style="padding: 0"
@ -239,7 +239,7 @@
<el-button <el-button
size="small" size="small"
type="primary" type="primary"
>{{'点击上传'}}</el-button> >{{ '点击上传' }}</el-button>
</el-upload> </el-upload>
</div> </div>
</td> </td>
@ -289,7 +289,7 @@ export default {
} }
], ],
checkList: [], checkList: [],
typeEd:false, typeEd: false,
allData: { allData: {
remark: '', remark: '',
signType: 1, signType: 1,
@ -378,7 +378,8 @@ export default {
{ 'memberCode': res.memberCode, 'pkProduct': res.pkProduct, 'specsName': res.specsName, { 'memberCode': res.memberCode, 'pkProduct': res.pkProduct, 'specsName': res.specsName,
'specsNameId': res.specsNameId, 'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'specsNameId': res.specsNameId, 'baseQuantity': res.baseQuantity, 'quantity': res.quantity,
'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage ? res.pkPostage : '', 'pkId': res.pkId ? res.pkId : '', 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage ? res.pkPostage : '', 'pkId': res.pkId ? res.pkId : '',
'receiveTime': res.receiveTime ? res.receiveTime : '' 'receiveTime': res.receiveTime ? res.receiveTime : '',
'pickType': res.pickType || 0
} }
) )
}) })
@ -395,10 +396,10 @@ export default {
sendIdList: this.allData.sendIdList // 审批流程[] sendIdList: this.allData.sendIdList // 审批流程[]
} }
let url let url
if(this.typeEd){ if (this.typeEd) {
url = man.rechargeDel url = man.rechargeDel
}else{ } else {
url = man.rechargeConfirm url = man.rechargeConfirm
} }
url(obj).then((res) => { url(obj).then((res) => {
if (res.code == 200) { if (res.code == 200) {

10
vue.config.js
View File

@ -44,11 +44,11 @@ module.exports = {
}, },
proxy: { proxy: {
'/prod-api': { '/prod-api': {
target: 'http://t-mana.beida413.com/', target: 'http://localhost:8080/',
changeOrigin: true changeOrigin: true,
// pathRewrite: { pathRewrite: {
// '^/prod-api': '' '^/prod-api': ''
// } }
} }
} }
// before: require('./mock/mock-server.js') // before: require('./mock/mock-server.js')