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

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

This commit is contained in:
woody 2025-06-26 14:10:52 +08:00
parent 0ed383a561 2035f30228
commit d240fab3ec
2 changed files with 112 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
src/views/information/specialBusiness/waterPv.vue
View File

@ -202,6 +202,7 @@
align="center" align="center"
prop="vertexName" prop="vertexName"
:label="'隶属体系'" :label="'隶属体系'"
min-width="150px"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -660,126 +661,126 @@ export default {
text: '全选', text: '全选',
checked: true checked: true
}, },
{ // {
id: 21, // id: 21,
text: `${'变更后左区真实业绩'}(${isOther()})`, // text: `${'变更后左区真实业绩'}(${isOther()})`,
checked: true, // checked: true,
prop: 'asumRealModifyPv' // prop: 'asumRealModifyPv'
}, // },
{ // {
id: 22, // id: 22,
text: `${'变更后右区真实业绩'}(${isOther()})`, // text: `${'变更后右区真实业绩'}(${isOther()})`,
checked: true, // checked: true,
prop: 'bsumRealModifyPv' // prop: 'bsumRealModifyPv'
}, // },
{ {
id: 23, id: 23,
text: `${'变更后左区首购业绩'}(${isOther()})`, text: `${'变更后左区业绩'}(${isOther()})`,
checked: true, checked: true,
prop: 'afirstModifyPv' prop: 'afirstModifyPv'
}, },
{ {
id: 24, id: 24,
text: `${'变更后右区首购业绩'}(${isOther()})`, text: `${'变更后右区业绩'}(${isOther()})`,
checked: true, checked: true,
prop: 'bfirstModifyPv' prop: 'bfirstModifyPv'
}, },
{ {
id: 25, id: 25,
text: `${'变更后左区首购结余'}`, text: `${'变更后左区结余'}`,
checked: true, checked: true,
prop: 'repAFirstModifyBalance' prop: 'repAFirstModifyBalance'
}, },
{ {
id: 26, id: 26,
text: `${'变更后右区首购结余'}`, text: `${'变更后右区结余'}`,
checked: true, checked: true,
prop: 'repBFirstModifyBalance' prop: 'repBFirstModifyBalance'
},
{
id: 27,
text: `${'变更后左区复购业绩'}(${isOther()})`,
checked: true,
prop: 'repAModifySumPv'
},
{
id: 28,
text: `${'变更后右区复购业绩'}(${isOther()})`,
checked: true,
prop: 'repBModifySumPv'
},
{
id: 29,
text: `${'变更后左区复购结余'}`,
checked: false,
prop: 'repAModifyBalance'
},
{
id: 30,
text: `${'变更后右区复购结余'}`,
checked: false,
prop: 'repBModifyBalance'
},
{
id: 31,
text: `${'变更前左区真实业绩'}(${isOther()})`,
checked: false,
prop: 'asumRealPv'
},
{
id: 32,
text: `${'变更前右区真实业绩'}(${isOther()})`,
checked: false,
prop: 'bsumRealPv'
},
{
id: 33,
text: `${'变更前左区首购业绩'}(${isOther()})`,
checked: false,
prop: 'asumPv'
},
{
id: 34,
text: `${'变更前右区首购业绩'}(${isOther()})`,
checked: false,
prop: 'bsumPv'
},
{
id: 35,
text: `${'变更前左区首购结余'}`,
checked: false,
prop: 'abalance'
},
{
id: 36,
text: `${'变更前右区首购结余'}`,
checked: false,
prop: 'bbalance'
},
{
id: 37,
text: `${'变更前左区复购业绩'}(${isOther()})`,
checked: false,
prop: 'repASumPv'
},
{
id: 38,
text: `${'变更前右区复购业绩'}(${isOther()})`,
checked: false,
prop: 'repBSumPv'
},
{
id: 39,
text: `${'变更前左区复购结余'}`,
checked: false,
prop: 'repABalance'
},
{
id: 40,
text: `${'变更前右区复购结余'}`,
checked: false,
prop: 'repBBalance'
} }
// {
// id: 27,
// text: `${'变更后左区复购业绩'}(${isOther()})`,
// checked: true,
// prop: 'repAModifySumPv'
// },
// {
// id: 28,
// text: `${'变更后右区复购业绩'}(${isOther()})`,
// checked: true,
// prop: 'repBModifySumPv'
// },
// {
// id: 29,
// text: `${'变更后左区复购结余'}`,
// checked: false,
// prop: 'repAModifyBalance'
// },
// {
// id: 30,
// text: `${'变更后右区复购结余'}`,
// checked: false,
// prop: 'repBModifyBalance'
// }
// {
// id: 31,
// text: `${'变更前左区真实业绩'}(${isOther()})`,
// checked: false,
// prop: 'asumRealPv'
// },
// {
// id: 32,
// text: `${'变更前右区真实业绩'}(${isOther()})`,
// checked: false,
// prop: 'bsumRealPv'
// },
// {
// id: 33,
// text: `${'变更前左区业绩'}(${isOther()})`,
// checked: false,
// prop: 'asumPv'
// },
// {
// id: 34,
// text: `${'变更前右区业绩'}(${isOther()})`,
// checked: false,
// prop: 'bsumPv'
// },
// {
// id: 35,
// text: `${'变更前左区结余'}`,
// checked: false,
// prop: 'abalance'
// },
// {
// id: 36,
// text: `${'变更前右区结余'}`,
// checked: false,
// prop: 'bbalance'
// }
// {
// id: 37,
// text: `${'变更前左区复购业绩'}(${isOther()})`,
// checked: false,
// prop: 'repASumPv'
// },
// {
// id: 38,
// text: `${'变更前右区复购业绩'}(${isOther()})`,
// checked: false,
// prop: 'repBSumPv'
// },
// {
// id: 39,
// text: `${'变更前左区复购结余'}`,
// checked: false,
// prop: 'repABalance'
// },
// {
// id: 40,
// text: `${'变更前右区复购结余'}`,
// checked: false,
// prop: 'repBBalance'
// }
], // 表头筛选 ], // 表头筛选
headerList: [], headerList: [],
errorData: [], errorData: [],

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: {