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

Merge branch 'bd-dev' of gitee.com:cabbage_qd/web-base-admin into bd-test

This commit is contained in:
woody 2025-06-17 13:44:38 +08:00
parent 15d3542ad2 b3a378f3b7
commit 0f67baa1ef
5 changed files with 102 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/configManage/paySet/index.vue
View File

@ -27,14 +27,14 @@
border>京东收银台（H5）</el-checkbox> border>京东收银台（H5）</el-checkbox>
<el-checkbox v-model="formData.pay6" <el-checkbox v-model="formData.pay6"
border>京东收银台（PC）</el-checkbox> border>京东收银台（PC）</el-checkbox>
<el-checkbox v-model="formData.pay11" <!-- <el-checkbox v-model="formData.pay11"-->
border>宝付微信</el-checkbox> <!-- border>宝付微信</el-checkbox>-->
<el-checkbox v-model="formData.pay12" <!-- <el-checkbox v-model="formData.pay12"-->
border>宝付微信扫码</el-checkbox> <!-- border>宝付微信扫码</el-checkbox>-->
<el-checkbox v-model="formData.pay13" <!-- <el-checkbox v-model="formData.pay13"-->
border>汇付微信</el-checkbox> <!-- border>汇付微信</el-checkbox>-->
<el-checkbox v-model="formData.pay15" <!-- <el-checkbox v-model="formData.pay15"-->
border>汇付银行卡</el-checkbox> <!-- border>汇付银行卡</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay20"--> <!-- <el-checkbox v-model="formData.pay20"-->
<!-- border>微信APP</el-checkbox>--> <!-- border>微信APP</el-checkbox>-->
<el-checkbox v-model="formData.pay32" <el-checkbox v-model="formData.pay32"
@ -78,10 +78,10 @@ export default {
// pay4: false, // pay4: false,
pay5: false, pay5: false,
pay6: false, pay6: false,
pay11: false, // pay11: false,
pay12: false, // pay12: false,
pay13: false, // pay13: false,
pay15: false, // pay15: false,
pay20: false, pay20: false,
pay32: false, pay32: false,
pay33: false, pay33: false,
@ -112,10 +112,10 @@ export default {
// pay4: res.data.pay4, // pay4: res.data.pay4,
pay5: res.data.pay5, pay5: res.data.pay5,
pay6: res.data.pay6, pay6: res.data.pay6,
pay11: res.data.pay11, // pay11: res.data.pay11,
pay12: res.data.pay12, // pay12: res.data.pay12,
pay13: res.data.pay13, // pay13: res.data.pay13,
pay15: res.data.pay15, // pay15: res.data.pay15,
pay20: res.data.pay20, pay20: res.data.pay20,
pay32: res.data.pay32, pay32: res.data.pay32,
pay33: res.data.pay33, pay33: res.data.pay33,

32
src/views/logistics/commodity/ckspdd.vue
View File

@ -54,6 +54,21 @@
<el-input v-model="queryParams.memberName" clearable /> <el-input v-model="queryParams.memberName" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'隶属体系'" prop="vertexId">
<el-select
v-model="queryParams.vertexId"
clearable
>
<el-option
v-for="item in vertexList"
:key="item.pkId"
:label="item.vertexName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'联系方式'" prop="phone"> <el-form-item :label="'联系方式'" prop="phone">
<el-input v-model="queryParams.phone" clearable /> <el-input v-model="queryParams.phone" clearable />
@ -321,6 +336,12 @@
prop="memberName" prop="memberName"
:label="'会员姓名'" :label="'会员姓名'"
/> />
<el-table-column
align="center"
prop="vertexName"
:label="'隶属体系'"
min-width="120"
/>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
@ -475,7 +496,7 @@ import topBar from '@/components/topBar'
import * as log from '@/api/logistics' import * as log from '@/api/logistics'
import * as del from '@/api/delivery' import * as del from '@/api/delivery'
import { getStatus } from '@/api/notice' import { getStatus } from '@/api/notice'
import { getVartexList } from '@/api/affiliatedteam'
export default { export default {
name: 'Ckspdd', name: 'Ckspdd',
components: { components: {
@ -507,14 +528,16 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
orderCode: '', orderCode: '',
orderStatus: '' orderStatus: '',
vertexId: ''
}, },
orderStatusList: [], orderStatusList: [],
tableData: [], tableData: [],
orderTypeList: [], orderTypeList: [],
shippingTypeList: [], shippingTypeList: [],
payTypeList: [], payTypeList: [],
total: 0 total: 0,
vertexList: []
} }
}, },
created() { created() {
@ -522,6 +545,9 @@ export default {
this.getOthers() this.getOthers()
this.getSearch() this.getSearch()
this.getOrderStatus() this.getOrderStatus()
getVartexList().then((res) => {
this.vertexList = res.data
})
}, },
methods: { methods: {
getOrderStatus() { getOrderStatus() {

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

@ -19,7 +19,21 @@
<el-input v-model="queryParams.memberName" clearable /> <el-input v-model="queryParams.memberName" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'隶属体系'" prop="vertexId">
<el-select
v-model="queryParams.vertexId"
clearable
>
<el-option
v-for="item in vertexList"
:key="item.pkId"
:label="item.vertexName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'联系方式'" prop="phone"> <el-form-item :label="'联系方式'" prop="phone">
<el-input v-model="queryParams.phone" clearable /> <el-input v-model="queryParams.phone" clearable />
@ -58,8 +72,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'收货人'" prop="recName"> <el-form-item :label="'收货人'" prop="recName">
<el-input v-model="queryParams.recName" clearable /> <el-input v-model="queryParams.recName" clearable />
@ -97,20 +110,21 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item
:label="`${'购买人' + '姓名'}`"
prop="buyMemberName"
>
<el-input
v-model="queryParams.buyMemberName"
clearable
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-collapse-transition> <el-collapse-transition>
<el-row v-show="isActive"> <el-row v-show="isActive">
<el-col :span="4">
<el-form-item
:label="`${'购买人' + '姓名'}`"
prop="buyMemberName"
>
<el-input
v-model="queryParams.buyMemberName"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'支付方式'" prop="payType"> <el-form-item :label="'支付方式'" prop="payType">
<el-select <el-select
@ -236,6 +250,12 @@
prop="memberCode" prop="memberCode"
:label="'会员编号'" :label="'会员编号'"
/> />
<el-table-column
align="center"
prop="vertexName"
:label="'隶属体系'"
min-width="120"
/>
<el-table-column <el-table-column
v-if="dataList[3].key" v-if="dataList[3].key"
align="center" align="center"
@ -410,6 +430,7 @@
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 { getVartexList } from '@/api/affiliatedteam'
import { getRoleMenu, roleDetails, getStatus } from '@/api/notice' import { getRoleMenu, roleDetails, getStatus } from '@/api/notice'
export default { export default {
name: 'Spdd', name: 'Spdd',
@ -419,6 +440,7 @@ export default {
data() { data() {
return { return {
moren: 'spdd', moren: 'spdd',
vertexList: [],
dataList: [ dataList: [
{ {
name: 'orderCode', name: 'orderCode',
@ -523,6 +545,7 @@ export default {
multipleSelection: [], multipleSelection: [],
queryParams: { queryParams: {
vertexId: '',
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
shoppingAddress: [], shoppingAddress: [],
@ -623,6 +646,9 @@ export default {
log.getOrderPayType().then((res) => { log.getOrderPayType().then((res) => {
this.paywayList = res.data this.paywayList = res.data
}) })
getVartexList().then((res) => {
this.vertexList = res.data
})
}, },
// 展开折叠 // 展开折叠
changeActive() { changeActive() {

12
src/views/settlementCenter/topPerformance/index.vue
View File

@ -46,7 +46,7 @@
</el-col> --> </el-col> -->
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'业绩时间'"> <el-form-item :label="'统计时间'">
<el-date-picker <el-date-picker
v-model="creationTime" v-model="creationTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -59,7 +59,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="顶点"> <el-form-item label="系统编号">
<el-select v-model="select.pkVertex"> <el-select v-model="select.pkVertex">
<el-option <el-option
v-for="item in verList" v-for="item in verList"
@ -192,13 +192,13 @@ export default {
}, },
{ {
id: 31, id: 31,
text: '顶点名称', text: '系统名称',
checked: true, checked: true,
prop: 'memberName' prop: 'memberName'
}, },
{ {
id: 27, id: 27,
text: '业绩时间', text: '统计时间',
checked: false, checked: false,
prop: 'creationTime' prop: 'creationTime'
}, },
@ -374,7 +374,7 @@ export default {
moren: '/settlementCenter/topPerformance', moren: '/settlementCenter/topPerformance',
topList: [ topList: [
{ {
name: '顶点奖金拨比列表统计', name: '零线系统拨比统计',
path: '/settlementCenter/topPerformance', path: '/settlementCenter/topPerformance',
url: 'topPerformance', url: 'topPerformance',
changed: false changed: false
@ -515,7 +515,7 @@ export default {
this.download( this.download(
'/member/manage/bonus-vertex-statis/export', '/member/manage/bonus-vertex-statis/export',
Object.assign({}, this.queryParams, this.select), Object.assign({}, this.queryParams, this.select),
`顶点奖金拨比列表统计-${new Date().getTime()}.xlsx` `零线系统拨比统计-${new Date().getTime()}.xlsx`
) )
}) })
}, },

22
vue.config.js
View File

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