From 42cca39d6f957eaf49acb15d48164ba5fde0cf08 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 3 Mar 2022 18:51:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/App.vue | 3 + jero-web/src/components/addForm/index.vue | 14 +- .../src/components/libraryAddForm/index.vue | 15 +- jero-web/src/views/system/RoleUserList.vue | 319 ++++-------------- jero-web/src/views/system/UserList.vue | 104 +----- 5 files changed, 95 insertions(+), 360 deletions(-) diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index ee203d038..d98c88647 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -104,4 +104,7 @@ .ant-layout { background: transparent !important; } + .ant-table-tbody > tr.ant-table-row-selected td{ + background:transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/components/addForm/index.vue b/jero-web/src/components/addForm/index.vue index db4dc073d..80a9c777c 100644 --- a/jero-web/src/components/addForm/index.vue +++ b/jero-web/src/components/addForm/index.vue @@ -316,32 +316,33 @@ this.ruleList.forEach((res, index) => { const rule = [] if (res.field_must_input == 0) { - if (res.field_show_type === 'text') { + if (res.field_show_type === '1') { rule.push({ required: true, message: res.db_field_txt + '不能为空', trigger: 'blur' }) - } else if (res.field_show_type === 'CHECKBOX' || res.field_show_type === 'list_multi' || - res.field_show_type === 'date' || res.field_show_type === 'file') { + } else if (res.field_show_type === '4' || res.field_show_type === '6' || + res.field_show_type === '5' || res.field_show_type === '7' + ) { rule.push({ required: true, message: res.db_field_txt + '不能为空', trigger: 'change' }) - } else if (res.field_show_type === 'NUMBER') { + } else if (res.field_show_type === '2') { rule.push({ required: true, message: res.db_field_txt + '不能为空', trigger: 'blur' }) - } else if (res.field_show_type === 'TEXTAREA') { + } else if (res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10') { rule.push({ required: true, message: res.db_field_txt + '不能为空', trigger: 'blur' }) - } else if (res.field_show_type === 'RADIO' || res.field_show_type === 'list') { + } else if (res.field_show_type === '3') { rule.push({ required: true, message: res.db_field_txt + '不能为空', @@ -353,7 +354,6 @@ rules[res.db_field_name] = rule } }) - console.log(rules) this.$set(this, 'rules', rules) this.isFormInline = true this.confirmLoading = false diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index ad2e80340..a824dbe75 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -393,7 +393,7 @@ } /** 赋值给当前对应的表单文件 */ this.formInline[this.uploadName] = attIdList.join(',') - this.formInline = { ...this.formInline } + this.formInline = {...this.formInline } }, handleInput(value) { this.$nextTick(() => { @@ -407,32 +407,33 @@ this.ruleList.forEach((res, index) => { const rule = [] if (res.field_must_input == 0) { - if (res.field_show_type === 'text') { + if (res.field_show_type === '1') { rule.push({ required: true, message: res.db_field_txt + '不能为空', trigger: 'blur' }) - } else if (res.field_show_type === 'CHECKBOX' || res.field_show_type === 'list_multi' || - res.field_show_type === 'date' || res.field_show_type === 'file') { + } else if (res.field_show_type === '4' || res.field_show_type === '6' || + res.field_show_type === '5' || res.field_show_type === '7' + ) { rule.push({ required: true, message: res.db_field_txt + '不能为空', trigger: 'change' }) - } else if (res.field_show_type === 'NUMBER') { + } else if (res.field_show_type === '2') { rule.push({ required: true, message: res.db_field_txt + '不能为空', trigger: 'blur' }) - } else if (res.field_show_type === 'TEXTAREA') { + } else if (res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10') { rule.push({ required: true, message: res.db_field_txt + '不能为空', trigger: 'blur' }) - } else if (res.field_show_type === 'RADIO' || res.field_show_type === 'list') { + } else if (res.field_show_type === '3') { rule.push({ required: true, message: res.db_field_txt + '不能为空', diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue index 48e662af5..b595ee862 100644 --- a/jero-web/src/views/system/RoleUserList.vue +++ b/jero-web/src/views/system/RoleUserList.vue @@ -1,181 +1,56 @@ diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 54f400429..c7d982999 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -64,46 +64,18 @@
- {{$t('addUser')}} - {{$t('export')}} - - {{$t('import')}} - - {{$t('recycleBin')}} - - - - - {{$t('delete')}} - - - - {{$('frozen')}} - - - - {{$t('thaw')}} - - - - {{$t('batchOperation')}} - - - - + + + + + +
-
- {{$t('selected')}} {{ selectedRowKeys.length }}{{$t('term')}} - {{$t('empty')}} -
-
- - - {{$t('edit')}} - - - - - - {{$t('more')}} - - - - {{$t('details')}} - - - - {{$t('password')}} - - - - - {{$t('delete')}} - - - - - - {{$t('frozen')}} - - - - - - {{$t('thaw')}} - - - - - - - @@ -202,19 +133,12 @@ title: this.$t('serialNumber'), dataIndex: '', key:'rowIndex', - width:60, + width:20, align:"center", customRender:function (t,r,index) { return parseInt(index)+1; } }, - // { - // title: '头像', - // align: "center", - // width: 120, - // dataIndex: 'avatar', - // scopedSlots: {customRender: "avatarslot"} - // }, { title: this.$t('userAccount'), align: "center", @@ -265,13 +189,13 @@ width: 80, dataIndex: 'status_dictText' }, - { - title: this.$t('operation'), - dataIndex: 'action', - scopedSlots: {customRender: 'action'}, - align: "center", - width: 170 - } + // { + // title: this.$t('operation'), + // dataIndex: 'action', + // scopedSlots: {customRender: 'action'}, + // align: "center", + // width: 170 + // } ], superQueryFieldList: [ { type: 'input', value: 'username', text: this.$t('userAccount'), },