forked from angelo/web-retail-admin
feat(global): 全部美元符号替换
This commit is contained in:
parent
6443f3e54e
commit
40f1eb3438
File diff suppressed because it is too large
Load Diff
|
@ -192,17 +192,7 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="'邮箱地址'" prop="parMemberName">
|
||||
<el-input
|
||||
v-model="queryParams.email"
|
||||
clearable
|
||||
placeholder=""
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="'认证日期'" prop="code">
|
||||
<el-date-picker
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -433,13 +433,13 @@
|
|||
align="center"
|
||||
width="150"
|
||||
prop="registerAchieve"
|
||||
label="注册业绩($)"
|
||||
label="注册业绩(¥)"
|
||||
>
|
||||
<template
|
||||
slot="header"
|
||||
slot-scope="scope"
|
||||
>
|
||||
<div>注册业绩($)</div>
|
||||
<div>注册业绩(¥)</div>
|
||||
<el-input
|
||||
v-model="changeData.registerAchieve"
|
||||
clearable
|
||||
|
@ -640,13 +640,13 @@
|
|||
align="center"
|
||||
width="150"
|
||||
prop="settlementAchieve"
|
||||
label="结算业绩($)"
|
||||
label="结算业绩(¥)"
|
||||
>
|
||||
<template
|
||||
slot="header"
|
||||
slot-scope="scope"
|
||||
>
|
||||
<div>结算业绩($)</div>
|
||||
<div>结算业绩(¥)</div>
|
||||
<el-input
|
||||
v-model="changeData.settlementAchieve"
|
||||
clearable
|
||||
|
@ -667,13 +667,13 @@
|
|||
align="center"
|
||||
width="150"
|
||||
prop="transferAchieve"
|
||||
label="上传业绩($)"
|
||||
label="上传业绩(¥)"
|
||||
>
|
||||
<template
|
||||
slot="header"
|
||||
slot-scope="scope"
|
||||
>
|
||||
<div>上传业绩($)</div>
|
||||
<div>上传业绩(¥)</div>
|
||||
<el-input
|
||||
v-model="changeData.transferAchieve"
|
||||
clearable
|
||||
|
|
|
@ -92,9 +92,9 @@
|
|||
prop="buyMemberCode"
|
||||
>
|
||||
<el-input
|
||||
clearable
|
||||
v-model="queryParams.buyMemberCode"
|
||||
></el-input>
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
|
@ -103,9 +103,9 @@
|
|||
prop="buyMemberName"
|
||||
>
|
||||
<el-input
|
||||
clearable
|
||||
v-model="queryParams.buyMemberName"
|
||||
></el-input>
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
@ -114,13 +114,13 @@
|
|||
<el-row>
|
||||
<el-col :span="4">
|
||||
<el-form-item :label="$t('系统类型')">
|
||||
<el-select clearable v-model="queryParams.systemType">
|
||||
<el-select v-model="queryParams.systemType" clearable>
|
||||
<el-option
|
||||
v-for="item in systemTypes"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
@ -192,8 +192,7 @@
|
|||
<el-col :span="4">
|
||||
<div class="searchbox">
|
||||
<el-button class="searchbtn" @click="getSearch">
|
||||
{{ '搜索' }}</el-button
|
||||
>
|
||||
{{ '搜索' }}</el-button>
|
||||
<el-button @click="reChongzhi"> {{ '重置' }}</el-button>
|
||||
</div>
|
||||
</el-col>
|
||||
|
@ -207,21 +206,20 @@
|
|||
<div class="maintop">
|
||||
<div class="mainbtn">
|
||||
<el-button
|
||||
size="small"
|
||||
v-hasButtons="['CommodityExport']"
|
||||
size="small"
|
||||
class="thebtn2"
|
||||
@click="handleExport"
|
||||
>
|
||||
{{ '导出' }}</el-button
|
||||
>
|
||||
{{ '导出' }}</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="main">
|
||||
<div class="maintable">
|
||||
<el-table
|
||||
v-if="flag"
|
||||
:data="tableData"
|
||||
v-loading="loading"
|
||||
:data="tableData"
|
||||
style="width: 100%"
|
||||
height="600px"
|
||||
:header-cell-style="{ background: '#EEEEEE' }"
|
||||
|
@ -232,140 +230,140 @@
|
|||
<el-table-column type="selection" />
|
||||
|
||||
<el-table-column
|
||||
v-if="dataList[0].key"
|
||||
align="center"
|
||||
min-width="200px"
|
||||
prop="orderCode"
|
||||
:label="'订单编号'"
|
||||
v-if="dataList[0].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[1].key"
|
||||
align="center"
|
||||
prop="orderTypeStr"
|
||||
:label="'订单类型'"
|
||||
v-if="dataList[1].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[2].key"
|
||||
align="center"
|
||||
min-width="120px"
|
||||
prop="memberCode"
|
||||
:label="'会员编号'"
|
||||
v-if="dataList[2].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[3].key"
|
||||
align="center"
|
||||
prop="memberName"
|
||||
:label="'会员姓名'"
|
||||
v-if="dataList[3].key"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="dataList[4].key"
|
||||
align="center"
|
||||
min-width="120px"
|
||||
prop="phone"
|
||||
:label="'联系方式'"
|
||||
v-if="dataList[4].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[5].key"
|
||||
align="center"
|
||||
prop="recName"
|
||||
:label="'收货人'"
|
||||
v-if="dataList[5].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[6].key"
|
||||
align="center"
|
||||
min-width="120px"
|
||||
prop="recPhone"
|
||||
:label="'收货电话'"
|
||||
v-if="dataList[6].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[19].key"
|
||||
align="center"
|
||||
min-width="120px"
|
||||
prop="buyMemberCode"
|
||||
v-if="dataList[19].key"
|
||||
:label="`${'购买人' + '编号'}`"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[20].key"
|
||||
align="center"
|
||||
min-width="120px"
|
||||
prop="buyMemberName"
|
||||
v-if="dataList[20].key"
|
||||
:label="`${'购买人' + '姓名'}`"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[7].key"
|
||||
align="center"
|
||||
prop="recProvinceName"
|
||||
:label="'省'"
|
||||
v-if="dataList[7].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[8].key"
|
||||
align="center"
|
||||
prop="recCityName"
|
||||
:label="'市'"
|
||||
v-if="dataList[8].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[9].key"
|
||||
align="center"
|
||||
prop="recCountryName"
|
||||
:label="'区/县'"
|
||||
v-if="dataList[9].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[10].key"
|
||||
align="center"
|
||||
min-width="200px"
|
||||
prop="recAddress"
|
||||
:label="'详细地址'"
|
||||
v-if="dataList[10].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[11].key"
|
||||
align="center"
|
||||
min-width="100px"
|
||||
prop="orderAmount"
|
||||
:label="`${'订单金额'}(${isLocalSymbol()})`"
|
||||
v-if="dataList[11].key"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="dataList[21].key"
|
||||
align="center"
|
||||
min-width="100px"
|
||||
prop="orderAssAchieve"
|
||||
:label="'商品订单' + 'BV'"
|
||||
v-if="dataList[21].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[12].key"
|
||||
align="center"
|
||||
min-width="100px"
|
||||
prop="postage"
|
||||
:label="'订单邮费'"
|
||||
v-if="dataList[12].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[13].key"
|
||||
align="center"
|
||||
min-width="100px"
|
||||
prop="orderAchieve"
|
||||
:label="'订单业绩' + '($)'"
|
||||
v-if="dataList[13].key"
|
||||
:label="'订单业绩' + '(¥)'"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[14].key"
|
||||
align="center"
|
||||
prop="deliveryWayStr"
|
||||
:label="'发货方式'"
|
||||
min-width="100px"
|
||||
v-if="dataList[14].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[15].key"
|
||||
min-width="100px"
|
||||
align="center"
|
||||
prop="payTypeStr"
|
||||
:label="'支付方式'"
|
||||
v-if="dataList[15].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[16].key"
|
||||
min-width="100px"
|
||||
align="center"
|
||||
prop="remark"
|
||||
:label="'备注'"
|
||||
v-if="dataList[16].key"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
|
@ -375,26 +373,26 @@
|
|||
<template slot-scope="scope">
|
||||
<div
|
||||
v-for="item in systemTypes"
|
||||
:key="item.value"
|
||||
v-if="scope.row.systemType == item.value"
|
||||
:key="item.value"
|
||||
>
|
||||
{{ item.label }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="dataList[17].key"
|
||||
min-width="150px"
|
||||
align="center"
|
||||
prop="creationTime"
|
||||
:label="'创建日期'"
|
||||
v-if="dataList[17].key"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[18].key"
|
||||
min-width="150px"
|
||||
align="center"
|
||||
prop="payTime"
|
||||
:label="'支付日期'"
|
||||
v-if="dataList[18].key"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
|
@ -407,8 +405,8 @@
|
|||
<template slot-scope="scope">
|
||||
<div>
|
||||
<el-button
|
||||
type="text"
|
||||
v-hasButtons="['CommodityOpen']"
|
||||
type="text"
|
||||
size="small"
|
||||
@click.native.prevent="findDetail(scope.row, tableData)"
|
||||
>
|
||||
|
@ -431,118 +429,118 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import topBar from "@/components/topBar";
|
||||
import * as log from "@/api/logistics";
|
||||
import * as api from "@/api/site.js";
|
||||
import { getRoleMenu, roleDetails, getStatus } from "@/api/notice";
|
||||
import topBar from '@/components/topBar'
|
||||
import * as log from '@/api/logistics'
|
||||
import * as api from '@/api/site.js'
|
||||
import { getRoleMenu, roleDetails, getStatus } from '@/api/notice'
|
||||
export default {
|
||||
name: "Spdd",
|
||||
name: 'Spdd',
|
||||
components: {
|
||||
topBar,
|
||||
topBar
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
moren: "spdd",
|
||||
moren: 'spdd',
|
||||
dataList: [
|
||||
{
|
||||
name: "orderCode",
|
||||
key: "",
|
||||
name: 'orderCode',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "orderTypeStr",
|
||||
key: "",
|
||||
name: 'orderTypeStr',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "memberCode",
|
||||
key: "",
|
||||
name: 'memberCode',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "memberName",
|
||||
key: "",
|
||||
name: 'memberName',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "phone",
|
||||
key: "",
|
||||
name: 'phone',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "recName",
|
||||
key: "",
|
||||
name: 'recName',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "recPhone",
|
||||
key: "",
|
||||
name: 'recPhone',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "recProvinceName",
|
||||
key: "",
|
||||
name: 'recProvinceName',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "recCityName",
|
||||
key: "",
|
||||
name: 'recCityName',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "recCountryName",
|
||||
key: "",
|
||||
name: 'recCountryName',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "recAddress",
|
||||
key: "",
|
||||
name: 'recAddress',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "orderAmount",
|
||||
key: "",
|
||||
name: 'orderAmount',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "postage",
|
||||
key: "",
|
||||
name: 'postage',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "orderAchieve",
|
||||
key: "",
|
||||
name: 'orderAchieve',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "deliveryWayStr",
|
||||
key: "",
|
||||
name: 'deliveryWayStr',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "payTypeStr",
|
||||
key: "",
|
||||
name: 'payTypeStr',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "remark",
|
||||
key: "",
|
||||
name: 'remark',
|
||||
key: ''
|
||||
},
|
||||
|
||||
{
|
||||
name: "creationTime",
|
||||
key: "",
|
||||
name: 'creationTime',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "payTime",
|
||||
key: "",
|
||||
name: 'payTime',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "buyMemberCode",
|
||||
key: "",
|
||||
name: 'buyMemberCode',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "buyMemberName",
|
||||
key: "",
|
||||
name: 'buyMemberName',
|
||||
key: ''
|
||||
},
|
||||
{
|
||||
name: "orderAssAchieve",
|
||||
key: "",
|
||||
},
|
||||
name: 'orderAssAchieve',
|
||||
key: ''
|
||||
}
|
||||
],
|
||||
topList: [
|
||||
{
|
||||
name: '商品订单',
|
||||
path: "spdd",
|
||||
path: 'spdd'
|
||||
},
|
||||
{
|
||||
name: '订单详情',
|
||||
path: "ckspdd",
|
||||
},
|
||||
path: 'ckspdd'
|
||||
}
|
||||
],
|
||||
|
||||
multipleSelection: [],
|
||||
|
@ -550,24 +548,24 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
shoppingAddress: [],
|
||||
orderCode: "", // 订单编号
|
||||
memberCode: "", // 会员编号
|
||||
memberName: "", // 会员名称
|
||||
phone: "", // 电话
|
||||
orderType: "", // 订单类型
|
||||
deliveryWay: "", // 发货方式
|
||||
payType: "", // 支付方式
|
||||
recName: "", // 收货人
|
||||
recPhone: "", // 收货电话
|
||||
recProvince: "",
|
||||
recCity: "",
|
||||
recCountry: "",
|
||||
recAddress: "", // 详细地址
|
||||
startCreateDate: "",
|
||||
endCreateDate: "",
|
||||
startPayDate: "",
|
||||
endPayDate: "",
|
||||
orderStatus: "",
|
||||
orderCode: '', // 订单编号
|
||||
memberCode: '', // 会员编号
|
||||
memberName: '', // 会员名称
|
||||
phone: '', // 电话
|
||||
orderType: '', // 订单类型
|
||||
deliveryWay: '', // 发货方式
|
||||
payType: '', // 支付方式
|
||||
recName: '', // 收货人
|
||||
recPhone: '', // 收货电话
|
||||
recProvince: '',
|
||||
recCity: '',
|
||||
recCountry: '',
|
||||
recAddress: '', // 详细地址
|
||||
startCreateDate: '',
|
||||
endCreateDate: '',
|
||||
startPayDate: '',
|
||||
endPayDate: '',
|
||||
orderStatus: ''
|
||||
},
|
||||
loading: false,
|
||||
tableData: [],
|
||||
|
@ -575,113 +573,113 @@ export default {
|
|||
isActive: false,
|
||||
areaData: [],
|
||||
regionParams: {
|
||||
label: "name",
|
||||
value: "id",
|
||||
children: "children",
|
||||
expandTrigger: "hover",
|
||||
label: 'name',
|
||||
value: 'id',
|
||||
children: 'children',
|
||||
expandTrigger: 'hover'
|
||||
},
|
||||
typeList: [],
|
||||
fhwayList: [],
|
||||
paywayList: [],
|
||||
orderStatusList: [],
|
||||
total: 0,
|
||||
flag: false,
|
||||
};
|
||||
flag: false
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getData();
|
||||
this.getSearch();
|
||||
this.getUserRole();
|
||||
this.getOrderStatus();
|
||||
this.getData()
|
||||
this.getSearch()
|
||||
this.getUserRole()
|
||||
this.getOrderStatus()
|
||||
},
|
||||
methods: {
|
||||
getOrderStatus() {
|
||||
getStatus().then((res) => {
|
||||
this.orderStatusList = res.data;
|
||||
});
|
||||
this.orderStatusList = res.data
|
||||
})
|
||||
},
|
||||
|
||||
getUserRole() {
|
||||
getRoleMenu("Commodity").then((res) => {
|
||||
getRoleMenu('Commodity').then((res) => {
|
||||
this.dataList.forEach((item) => {
|
||||
res.data.forEach((items) => {
|
||||
if (item.name == items) {
|
||||
item.key = items;
|
||||
item.key = items
|
||||
}
|
||||
this.flag = true;
|
||||
});
|
||||
});
|
||||
});
|
||||
this.flag = true
|
||||
})
|
||||
})
|
||||
})
|
||||
},
|
||||
// 导出
|
||||
handleExport() {
|
||||
this.$confirm('是否确认导出所有数据项?', '警告', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: "warning",
|
||||
type: 'warning'
|
||||
}).then((_) => {
|
||||
this.download(
|
||||
"/sale/manage/order/get-order-list-export",
|
||||
'/sale/manage/order/get-order-list-export',
|
||||
{ ...this.queryParams },
|
||||
`${'商品订单'}${new Date().getTime()}.xlsx`
|
||||
);
|
||||
});
|
||||
)
|
||||
})
|
||||
},
|
||||
handleChange1() {},
|
||||
findDetail(row, data) {
|
||||
this.$router.push({
|
||||
path: "/logistics/commodity/ckspdd",
|
||||
query: { orderCode: row.orderCode },
|
||||
});
|
||||
path: '/logistics/commodity/ckspdd',
|
||||
query: { orderCode: row.orderCode }
|
||||
})
|
||||
},
|
||||
getData() {
|
||||
api.areaList().then((res) => {
|
||||
this.areaData = res.data;
|
||||
});
|
||||
this.areaData = res.data
|
||||
})
|
||||
log.getOrderType().then((res) => {
|
||||
this.typeList = res.data;
|
||||
});
|
||||
this.typeList = res.data
|
||||
})
|
||||
log.getDeliveryList().then((res) => {
|
||||
this.fhwayList = res.data;
|
||||
});
|
||||
this.fhwayList = res.data
|
||||
})
|
||||
log.getOrderPayType().then((res) => {
|
||||
this.paywayList = res.data;
|
||||
});
|
||||
this.paywayList = res.data
|
||||
})
|
||||
},
|
||||
// 展开折叠
|
||||
changeActive() {
|
||||
this.isActive = !this.isActive;
|
||||
this.isActive = !this.isActive
|
||||
},
|
||||
changeCjsj(val) {
|
||||
this.queryParams.startCreateDate = val[0];
|
||||
this.queryParams.endCreateDate = val[1];
|
||||
this.queryParams.startCreateDate = val[0]
|
||||
this.queryParams.endCreateDate = val[1]
|
||||
},
|
||||
changeZfsj(val) {
|
||||
this.queryParams.startPayDate = val[0];
|
||||
this.queryParams.endPayDate = val[1];
|
||||
this.queryParams.startPayDate = val[0]
|
||||
this.queryParams.endPayDate = val[1]
|
||||
},
|
||||
getSearch() {
|
||||
this.loading = true;
|
||||
this.queryParams.recProvince = this.queryParams.shoppingAddress[0];
|
||||
this.queryParams.recCity = this.queryParams.shoppingAddress[1];
|
||||
this.queryParams.recCountry = this.queryParams.shoppingAddress[2];
|
||||
this.loading = true
|
||||
this.queryParams.recProvince = this.queryParams.shoppingAddress[0]
|
||||
this.queryParams.recCity = this.queryParams.shoppingAddress[1]
|
||||
this.queryParams.recCountry = this.queryParams.shoppingAddress[2]
|
||||
log.getOrderList(this.queryParams).then((res) => {
|
||||
this.tableData = res.rows;
|
||||
this.total = res.total;
|
||||
this.loading = false;
|
||||
});
|
||||
this.tableData = res.rows
|
||||
this.total = res.total
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
// 重置
|
||||
reChongzhi() {
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
shoppingAddress: [],
|
||||
};
|
||||
this.getSearch();
|
||||
shoppingAddress: []
|
||||
}
|
||||
this.getSearch()
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val;
|
||||
this.multipleSelection = val
|
||||
},
|
||||
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
||||
// if (columnIndex === 0) {
|
||||
|
@ -700,14 +698,14 @@ export default {
|
|||
},
|
||||
tableRowClassName({ row, rowIndex }) {
|
||||
if (rowIndex % 2 == 1) {
|
||||
return "warning-row";
|
||||
return 'warning-row'
|
||||
} else if (rowIndex % 2 == 0) {
|
||||
return "success-row";
|
||||
return 'success-row'
|
||||
}
|
||||
return "";
|
||||
},
|
||||
},
|
||||
};
|
||||
return ''
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
Loading…
Reference in New Issue