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