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

feat(removeOrderList): 撤单列表移除无用字段

This commit is contained in:
woody 2025-05-14 19:27:44 +08:00
parent 1b576d7613
commit f928104906
1 changed files with 61 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
src/views/information/removeOrderList/index.vue
View File

@ -1,9 +1,3 @@
<!--
* @Descripttion:
* @version:
* @Author: kBank
* @Date: 2022-10-24 15:45:01
-->
<template> <template>
<div class="page"> <div class="page">
<topBar v-if="topList.length > 0" :top-list="topList" :moren="moren" /> <topBar v-if="topList.length > 0" :top-list="topList" :moren="moren" />
@ -203,7 +197,6 @@
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'" :end-placeholder="'结束日期'"
@change="changeTime1" @change="changeTime1"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -221,7 +214,6 @@
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'" :end-placeholder="'结束日期'"
@change="changeTime3" @change="changeTime3"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -239,7 +231,6 @@
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'" :end-placeholder="'结束日期'"
@change="changeTime2" @change="changeTime2"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -263,9 +254,9 @@
<div class="maintop"> <div class="maintop">
<div class="mainbtn"> <div class="mainbtn">
<el-button <el-button
v-hasButtons="['removeOrderExport']"
size="small" size="small"
class="thebtn2" class="thebtn2"
v-hasButtons="['removeOrderExport']"
@click="exports" @click="exports"
> {{ '导出' }}</el-button> > {{ '导出' }}</el-button>
</div> </div>
@ -290,9 +281,9 @@
<div class="maintable"> <div class="maintable">
<div class="itemTrading"> <div class="itemTrading">
<el-table <el-table
v-loading="loading"
:data="tableData.censusSummaryList" :data="tableData.censusSummaryList"
style="width: 100%" style="width: 100%"
v-loading="loading"
:header-cell-style="{ background: '#EEEEEE' }" :header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
:summary-method="getSummaries" :summary-method="getSummaries"
@ -417,45 +408,30 @@
:label="'消费业绩'+`(${isLocalSymbol()})`" :label="'消费业绩'+`(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="menuList[1].checked==true" v-if="getColumnVisibleByColumnNames('vertexName')"
align="center"
prop="orderAmountDollar"
width="130"
:formatter="stateFormat"
:label="'消费金额'+`(${isLocals()})`"
/>
<el-table-column
v-if="menuList[2].checked==true"
align="center"
prop="orderAchieveDollar"
width="130"
:formatter="stateFormat"
:label="'消费业绩'+`(${isLocals()})`"
/>
<el-table-column
v-if="menuList[3].checked==true"
align="center" align="center"
prop="vertexName" prop="vertexName"
width="130" width="130"
:label="'隶属体系'" :label="'隶属体系'"
/> />
<el-table-column <el-table-column
v-if="menuList[4].checked==true" v-if="getColumnVisibleByColumnNames('pkTeamName')"
align="center" align="center"
prop="pkTeamName" prop="pkTeamName"
width="130" width="130"
:label="'隶属团队'" :label="'隶属团队'"
/> />
<el-table-column <el-table-column
v-if="menuList[5].checked==true" v-if="getColumnVisibleByColumnNames('recName')"
align="center" align="center"
prop="recName" prop="recName"
width="200" width="200"
:label="'收货人'" :label="'收货人'"
/> />
<el-table-column <el-table-column
v-if="menuList[6].checked==true" v-if="getColumnVisibleByColumnNames('recPhone')"
align="center" align="center"
prop="recPhone" prop="recPhone"
width="200" width="200"
@ -469,28 +445,28 @@
<!-- &lt;!&ndash; :label="'收货电话'"&ndash;&gt;--> <!-- &lt;!&ndash; :label="'收货电话'"&ndash;&gt;-->
<!-- &lt;!&ndash; />&ndash;&gt;--> <!-- &lt;!&ndash; />&ndash;&gt;-->
<el-table-column <el-table-column
v-if="menuList[7].checked==true" v-if="getColumnVisibleByColumnNames('recProvinceStr')"
align="center" align="center"
prop="recProvinceStr" prop="recProvinceStr"
width="130" width="130"
:label="'省'" :label="'省'"
/> />
<el-table-column <el-table-column
v-if="menuList[8].checked==true" v-if="getColumnVisibleByColumnNames('recCityStr')"
align="center" align="center"
prop="recCityStr" prop="recCityStr"
width="130" width="130"
:label="'市'" :label="'市'"
/> />
<el-table-column <el-table-column
v-if="menuList[9].checked==true" v-if="getColumnVisibleByColumnNames('recCountyStr')"
align="center" align="center"
prop="recCountyStr" prop="recCountyStr"
width="130" width="130"
:label="'区/县'" :label="'区/县'"
/> />
<el-table-column <el-table-column
v-if="menuList[10].checked==true" v-if="getColumnVisibleByColumnNames('recAddress')"
align="center" align="center"
prop="recAddress" prop="recAddress"
width="130" width="130"
@ -553,30 +529,7 @@
:label="'订单总额'+`(${isLocalSymbol()})`" :label="'订单总额'+`(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
v-if="menuList[11].checked==true"
align="center"
prop="pricesDollar"
width="130"
:label="'产品总额'+'($)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="menuList[12].checked==true"
align="center"
prop="postageDollar"
width="130"
:label="'订单邮费'+'($)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="menuList[13].checked==true"
align="center"
prop="orderAmountDollar"
width="130"
:label="'订单总额'+'($)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="orderStatusStr" prop="orderStatusStr"
@ -584,7 +537,7 @@
:label="'订单状态'" :label="'订单状态'"
/> />
<el-table-column <el-table-column
v-if="menuList[14].checked==true" v-if="getColumnVisibleByColumnNames('logisticsCompany')"
align="center" align="center"
prop="" prop=""
width="130" width="130"
@ -597,7 +550,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="menuList[15].checked==true" v-if="getColumnVisibleByColumnNames('logisticsCode')"
align="center" align="center"
prop="" prop=""
width="130" width="130"
@ -610,102 +563,98 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="menuList[16].checked==true" v-if="getColumnVisibleByColumnNames('creationTime')"
align="center" align="center"
prop="creationTime" prop="creationTime"
width="200" width="200"
:label="'创建日期'" :label="'创建日期'"
/> />
<el-table-column <el-table-column
v-if="menuList[17].checked==true" v-if="getColumnVisibleByColumnNames('payTime')"
align="center" align="center"
prop="payTime" prop="payTime"
width="200" width="200"
:label="'支付日期'" :label="'支付日期'"
/> />
<el-table-column <el-table-column
v-if="menuList[18].checked==true" v-if="getColumnVisibleByColumnNames('deliveryTime')"
align="center" align="center"
prop="deliveryTime" prop="deliveryTime"
width="200" width="200"
:label="'发货日期'" :label="'发货日期'"
> />
</el-table-column>
<el-table-column <el-table-column
v-if="menuList[19].checked==true" v-if="getColumnVisibleByColumnNames('deliveryWayStr')"
align="center" align="center"
prop="deliveryWayStr" prop="deliveryWayStr"
width="130" width="130"
:label="'发货方式'" :label="'发货方式'"
/> />
<el-table-column <el-table-column
v-if="menuList[20].checked==true" v-if="getColumnVisibleByColumnNames('operateScopeStr')"
align="center" align="center"
prop="operateScopeStr" prop="operateScopeStr"
width="130" width="130"
:label="'销售方式'" :label="'销售方式'"
/> />
<el-table-column <el-table-column
v-if="menuList[21].checked==true" v-if="getColumnVisibleByColumnNames('tranTypeStr')"
align="center" align="center"
prop="tranTypeStr" prop="tranTypeStr"
width="130" width="130"
:label="'运输方式'" :label="'运输方式'"
/> />
<el-table-column <el-table-column
v-if="menuList[29].checked==true" v-if="getColumnVisibleByColumnNames('preSaleStatusStr')"
align="center" align="center"
prop="preSaleStatusStr" prop="preSaleStatusStr"
width="130" width="130"
:label="'预售状态'" :label="'预售状态'"
> />
</el-table-column>
<el-table-column <el-table-column
v-if="menuList[23].checked==true" v-if="getColumnVisibleByColumnNames('payTypeStr')"
align="center" align="center"
prop="payTypeStr" prop="payTypeStr"
width="130" width="130"
:label="'支付方式'" :label="'支付方式'"
/> />
<el-table-column <el-table-column
v-if="menuList[24].checked==true" v-if="getColumnVisibleByColumnNames('cancelOrderTime')"
align="center" align="center"
prop="cancelOrderTime" prop="cancelOrderTime"
width="200" width="200"
:label="'撤单日期'" :label="'撤单日期'"
> />
</el-table-column>
<el-table-column <el-table-column
v-if="menuList[25].checked==true" v-if="getColumnVisibleByColumnNames('creatorName')"
align="center" align="center"
prop="creatorName" prop="creatorName"
width="130" width="130"
:label="'撤单人'" :label="'撤单人'"
/> />
<el-table-column <el-table-column
v-if="menuList[22].checked==true" v-if="getColumnVisibleByColumnNames('approvalStatus')"
align="center" align="center"
prop="approvalStatus" prop="approvalStatus"
width="130" width="130"
:label="'审核状态'" :label="'审核状态'"
/> />
<el-table-column <el-table-column
v-if="menuList[26].checked==true" v-if="getColumnVisibleByColumnNames('lastInstanceDate')"
align="center" align="center"
prop="lastInstanceDate" prop="lastInstanceDate"
width="200" width="200"
:label="'终审日期'" :label="'终审日期'"
/> />
<el-table-column <el-table-column
v-if="menuList[27].checked==true" v-if="getColumnVisibleByColumnNames('lastInstanceApprover')"
align="center" align="center"
prop="lastInstanceApprover" prop="lastInstanceApprover"
width="130" width="130"
:label="'终审人'" :label="'终审人'"
/> />
<el-table-column <el-table-column
v-if="menuList[28].checked==true" v-if="getColumnVisibleByColumnNames('lastInstanceRemark')"
align="center" align="center"
prop="lastInstanceRemark" prop="lastInstanceRemark"
width="130" width="130"
@ -880,18 +829,7 @@ export default {
text: '全选', text: '全选',
checked: false checked: false
}, },
{
id: 1,
text: '消费金额' + '($)',
checked: true,
prop: 'orderAmountDollar'
},
{
id: 2,
text: '消费业绩' + '($)',
checked: true,
prop: 'orderAchieveDollar'
},
{ {
id: 3, id: 3,
text: '隶属体系', text: '隶属体系',
@ -940,24 +878,7 @@ export default {
checked: true, checked: true,
prop: 'recAddress' prop: 'recAddress'
}, },
{
id: 11,
text: '产品总额' + '($)',
checked: true,
prop: 'priceDollar'
},
{
id: 12,
text: '订单邮费' + '($)',
checked: true,
prop: 'postageDollar'
},
{
id: 13,
text: '订单总额' + '($)',
checked: true,
prop: 'orderAmountDollar'
},
{ {
id: 14, id: 14,
text: '物流公司', text: '物流公司',
@ -1068,7 +989,7 @@ export default {
addOrEdit: '', addOrEdit: '',
total: 0, total: 0,
dialogVisible: false, dialogVisible: false,
loading:false, loading: false,
tableData: { tableData: {
censusSummaryList: [] censusSummaryList: []
}, },
@ -1105,7 +1026,7 @@ export default {
transportTypeList: [], transportTypeList: [],
gyList: [], gyList: [],
deliveryWayList: [], deliveryWayList: [],
sourceList:[] sourceList: []
} }
}, },
mounted() { mounted() {
@ -1115,6 +1036,9 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getColumnVisibleByColumnNames(columnName) {
return !!this.menuList.find(item => item.prop === columnName)?.checked
},
isLocalSymbol, isLocalSymbol,
isLocals, isLocals,
exports() { exports() {
@ -1210,32 +1134,32 @@ export default {
}) })
}, },
changeTime(val) { changeTime(val) {
if(!val){ if (!val) {
val = ['',''] val = ['', '']
} }
this.select.startCreationTime = val[0]||'' this.select.startCreationTime = val[0] || ''
this.select.endCreationTime = val[1]||'' this.select.endCreationTime = val[1] || ''
}, },
changeTime1(val) { changeTime1(val) {
if(!val){ if (!val) {
val = ['',''] val = ['', '']
} }
this.select.startPayTime = val[0]||'' this.select.startPayTime = val[0] || ''
this.select.endPayTime = val[1]||'' this.select.endPayTime = val[1] || ''
}, },
changeTime2(val) { changeTime2(val) {
if(!val){ if (!val) {
val = ['',''] val = ['', '']
} }
this.select.startLastInstanceDate = val[0]||'' this.select.startLastInstanceDate = val[0] || ''
this.select.endLastInstanceDate = val[1]||'' this.select.endLastInstanceDate = val[1] || ''
}, },
changeTime3(val) { changeTime3(val) {
if(!val){ if (!val) {
val = ['',''] val = ['', '']
} }
this.select.startCancelOrderTime = val[0]||'' this.select.startCancelOrderTime = val[0] || ''
this.select.endCancelOrderTime = val[1]||'' this.select.endCancelOrderTime = val[1] || ''
}, },
// 点击修改 // 点击修改
toFixed(id) { toFixed(id) {
@ -1333,12 +1257,12 @@ export default {
this.loading = true this.loading = true
api_s.orderChargeLog(Object.assign({}, this.queryParams, this.select)).then((res) => { api_s.orderChargeLog(Object.assign({}, this.queryParams, this.select)).then((res) => {
res.rows.forEach((element) => { res.rows.forEach((element) => {
if(element.approvalStatus == 1){ if (element.approvalStatus == 1) {
element.approvalStatus='审核中' element.approvalStatus = '审核中'
}else if(element.approvalStatus == 2){ } else if (element.approvalStatus == 2) {
element.approvalStatus='审核通过' element.approvalStatus = '审核通过'
}else if(element.approvalStatus == 3){ } else if (element.approvalStatus == 3) {
element.approvalStatus='审核驳回' element.approvalStatus = '审核驳回'
} }
}) })
this.tableData.censusSummaryList = res.rows this.tableData.censusSummaryList = res.rows