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

feat(global): 全部美元符号替换

This commit is contained in:
woody 2025-06-16 11:43:35 +08:00
parent 6443f3e54e
commit 40f1eb3438
5 changed files with 1474 additions and 1619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1531
src/views/information/business/order.vue
View File

File diff suppressed because it is too large Load Diff

12
src/views/information/realInfo/index.vue
View File

@ -192,17 +192,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </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-col :span="8">
<el-form-item :label="'认证日期'" prop="code"> <el-form-item :label="'认证日期'" prop="code">
<el-date-picker <el-date-picker

1208
src/views/information/specialBusiness/emptyOrder/dataList.vue
View File

File diff suppressed because it is too large Load Diff

12
src/views/information/specialBusiness/emptyOrder/index.vue
View File

@ -433,13 +433,13 @@
align="center" align="center"
width="150" width="150"
prop="registerAchieve" prop="registerAchieve"
label="注册业绩($)" label="注册业绩(¥)"
> >
<template <template
slot="header" slot="header"
slot-scope="scope" slot-scope="scope"
> >
<div>注册业绩($)</div> <div>注册业绩(¥)</div>
<el-input <el-input
v-model="changeData.registerAchieve" v-model="changeData.registerAchieve"
clearable clearable
@ -640,13 +640,13 @@
align="center" align="center"
width="150" width="150"
prop="settlementAchieve" prop="settlementAchieve"
label="结算业绩($)" label="结算业绩(¥)"
> >
<template <template
slot="header" slot="header"
slot-scope="scope" slot-scope="scope"
> >
<div>结算业绩($)</div> <div>结算业绩(¥)</div>
<el-input <el-input
v-model="changeData.settlementAchieve" v-model="changeData.settlementAchieve"
clearable clearable
@ -667,13 +667,13 @@
align="center" align="center"
width="150" width="150"
prop="transferAchieve" prop="transferAchieve"
label="上传业绩($)" label="上传业绩(¥)"
> >
<template <template
slot="header" slot="header"
slot-scope="scope" slot-scope="scope"
> >
<div>上传业绩($)</div> <div>上传业绩(¥)</div>
<el-input <el-input
v-model="changeData.transferAchieve" v-model="changeData.transferAchieve"
clearable clearable

330
src/views/logistics/commodity/index.vue
View File

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