diff --git a/src/views/expelled/list/index.vue b/src/views/expelled/list/index.vue index f15083b..59932fe 100644 --- a/src/views/expelled/list/index.vue +++ b/src/views/expelled/list/index.vue @@ -18,25 +18,29 @@ {{ scope.getPropValue(scope.field.label) }} + -
- 添加 - - 批量导入 - - 下载模板 -
@@ -47,6 +51,14 @@ export default { components: { EditTable }, + props: { + isComponents: { + type: Boolean, + default: () => { + return false + } + } + }, data() { return { data: [], @@ -55,15 +67,10 @@ export default { emitLoadOnCreate: true, tableConfig: { showIndex: true, - selection: false, + selection: this.isComponents, indexWidth: '80px', handlerWidth: '120px', showPagination: true, - tableSelectionProps: { - selectable: (row, index) => { - return row.status === '1' - } - }, tableProps: { headerCellStyle: { background: '#F5F5F5!important', color: '#333333!important', padding: '0px' }, headerRowStyle: { height: '48px' }, @@ -75,7 +82,7 @@ export default { { label: '编辑', type: 'text', - show: true, + show: !this.isComponents, handler: (scope, { row }) => { this.$refs.EditTable.editReady(row) } @@ -83,7 +90,7 @@ export default { { label: '删除', type: 'text', - show: true, + show: !this.isComponents, handler: (scope, { row }) => { this.$confirm('是否确认删除该' + row.entName + '市场主体拟除名名单信息', '提示', { type: 'info', @@ -254,14 +261,14 @@ export default { } ] }, - { - type: 'divider', - label: '市场主体拟除名名单信息', - showInTable: false, - showInForm: ({ meta }) => { - return meta.isForm === true - } - }, + // { + // type: 'divider', + // label: '市场主体拟除名名单信息', + // showInTable: false, + // showInForm: ({ meta }) => { + // return meta.isForm === true + // } + // }, { type: 'input', label: '市场主体名称', @@ -359,6 +366,12 @@ export default { this.$message.success('导入成功') this.$refs.EditTable.search({ reset: true }) }) + }, + confirmRemove() { + if (!this.selected || this.selected.length === 0) { + return this.$message.error('请至少勾选一个主体名单') + } + this.$emit('confirm-remove', this.selected) } } } diff --git a/src/views/expelled/notice/index.vue b/src/views/expelled/notice/index.vue index 974334d..db8e923 100644 --- a/src/views/expelled/notice/index.vue +++ b/src/views/expelled/notice/index.vue @@ -1,11 +1,344 @@ - diff --git a/vue.config.js b/vue.config.js index 4326faa..2f50467 100644 --- a/vue.config.js +++ b/vue.config.js @@ -45,7 +45,7 @@ module.exports = { // 如果有多个mock请往里面继续添加 [process.env.VUE_APP_BASE_API]: { timeout: 60000, - target: `http://219.148.175.145:56666`, + target: `http://localhost:8080`, // target: `http://127.0.0.1:8090`, // target: `http://172.22.80.129`, changeOrigin: true