diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index eb1c577..3e61667 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -179,6 +179,13 @@ export default { ['expand-change']: (row, expanded) => this.$emit('expand-change', { row, expanded }) }} > + + { tableItem.map((item, index) => { //自定义表格内容 diff --git a/src/views/budget/upload.vue b/src/views/budget/upload.vue index 6aa47d7..8e24b61 100644 --- a/src/views/budget/upload.vue +++ b/src/views/budget/upload.vue @@ -57,11 +57,7 @@ export default { total: 0, table: [ { - type: "index", - width: 60 - }, - { - label: "项目所属年份", + label: "所属年份", prop: "year", width:160 }, diff --git a/vue.config.js b/vue.config.js index b7e48ea..e8a8772 100644 --- a/vue.config.js +++ b/vue.config.js @@ -49,6 +49,13 @@ module.exports = { }, //before: require('./mock/mock-server.js') proxy: { + '^/old':{ + target: process.env.VUE_APP_OUT_OLD, + changeOrigin: true, //配置跨域 + pathRewrite: { + ['^/old']: process.env.VUE_APP_OUT_OLD + } + }, '^/oa': { target: process.env.VUE_APP_OUT_URL, changeOrigin: true, //配置跨域 @@ -62,13 +69,6 @@ module.exports = { pathRewrite: { ['^' + process.env.VUE_APP_DOMIAN]: process.env.VUE_APP_DOMIAN } - }, - '^/old':{ - target: process.env.VUE_APP_OUT_OLD, - changeOrigin: true, //配置跨域 - pathRewrite: { - ['^/old']: process.env.VUE_APP_OUT_OLD - } } } },