From e0e1a8f1c761a842db266882060cb287caaf9659 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Fri, 5 May 2023 10:29:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E5=8D=B0=E4=BC=A0=E5=8F=82=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/Enum/enum.js | 8 +++++++ src/views/Login.vue | 5 +++-- src/views/baseMes/index.vue | 44 ++++++++++++++++++++++--------------- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/utils/Enum/enum.js b/src/utils/Enum/enum.js index 33f93ca..33bc33b 100644 --- a/src/utils/Enum/enum.js +++ b/src/utils/Enum/enum.js @@ -6,3 +6,11 @@ export const PERMISSION = new Esenum([ { label: '预览+下载', value: "2" } ]) +// 基础设置的枚举 +// export const basMessage = new Esenum([ +// {name:"水印前缀" ,value: "WATERMARK_PREFIX"} +// ]) +export const basMessage = new Esenum({ + mark: {name: "水印前缀", value: "WATERMARK_PREFIX",index:0} +}) + diff --git a/src/views/Login.vue b/src/views/Login.vue index 24fea97..af45ce0 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -38,11 +38,12 @@ + + diff --git a/src/views/System/dictionaryDetail.vue b/src/views/System/dictionaryDetail.vue new file mode 100644 index 0000000..1072adf --- /dev/null +++ b/src/views/System/dictionaryDetail.vue @@ -0,0 +1,390 @@ + + + + + + From b987dc4e9677963b6352a790cf50e9c98318199f Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Fri, 5 May 2023 11:36:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/System/dataDictionary.vue | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/views/System/dataDictionary.vue b/src/views/System/dataDictionary.vue index 170786b..3e4868a 100644 --- a/src/views/System/dataDictionary.vue +++ b/src/views/System/dataDictionary.vue @@ -123,16 +123,7 @@ export default { }, // 获取所有字典 sysUserList () { - this.$api.user.sysUserList(this.q).then(({ data }) => { - this.tableData = data.records - this.total = data.total - this.q.pageNo = data.current - this.q.pageSize = data.size - if (!data.records.length && this.q.pageNo !== 1) { - this.q.pageNo = 1 - this.sysUserList() - } - }) + }, // 重置 reset () { @@ -248,10 +239,10 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$api.user.sysUserDelete({ ids }).then(_ => { + // this.$api.user.sysUserDelete({ ids }).then(_ => { this.$message.success('操作成功') this.sysUserList() - }) + // }) }) }, From 2b32ef9201a9858ecc6d4eda9d2b206574032c7f Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Fri, 5 May 2023 17:49:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3=20=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E7=9A=84=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/dictionary.js | 31 ++ src/components/newTranslate.vue | 190 +++++++ src/views/System/dataDictionary.vue | 101 ++-- .../reportProcess/components/reportForm.vue | 481 ++++++++++++------ src/views/reportProcess/launch.vue | 10 +- 5 files changed, 596 insertions(+), 217 deletions(-) create mode 100644 src/api/modules/dictionary.js create mode 100644 src/components/newTranslate.vue diff --git a/src/api/modules/dictionary.js b/src/api/modules/dictionary.js new file mode 100644 index 0000000..1a818b8 --- /dev/null +++ b/src/api/modules/dictionary.js @@ -0,0 +1,31 @@ +import { instance as request } from '@/utils/request' + +export default { + addDic (data) { + return request({ + url: '/api/sys/dict/add', + method: 'post', + data + }) + }, + editDic (data) { + return request({ + url: '/api/sys/dict/edit', + method: 'put', + data + }) + }, + getDic (data) { + return request({ + url: '/api/sys/dict/page', + method: 'get', + params:data + }) + }, + delDic (data) { + return request({ + url: '/api/sys/dict/'+data, + method: 'get', + }) + }, +} diff --git a/src/components/newTranslate.vue b/src/components/newTranslate.vue new file mode 100644 index 0000000..e6df410 --- /dev/null +++ b/src/components/newTranslate.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/src/views/System/dataDictionary.vue b/src/views/System/dataDictionary.vue index 3e4868a..79902a1 100644 --- a/src/views/System/dataDictionary.vue +++ b/src/views/System/dataDictionary.vue @@ -8,9 +8,9 @@
- + - +
@@ -36,9 +36,9 @@ {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }} - - - + + + - - - + + + + + @@ -69,21 +71,22 @@
- - - + + + + + + - - - - - + + - - + +
@@ -99,55 +102,105 @@ export default { name: 'standLawsAttrDetails', data(){ + const validateData= (rule, value, callback) =>{ + let test=/^[0-9]*$/ + if (!test.test(value)) { + callback(new Error('请输入数字值')); + }else{ + callback() + } + } return{ form:{ - + itemName:'', + itemValue:'', + itemDescription:'', + itemOrder:'' }, total:0, q:{ pageNo:1, pageSize:10, - account:'' + itemName:'' }, tableData:[{inde:1}], mode:'', - dialogUser:false + dialogUser:false, + dicId:'', + dicName:'', + formRule:{ + itemName:[{ + required:true, + message:'选项不能为空', + trigger:'change' + }], + itemValue:[{ + required:true, + message:'选项值不能为空', + trigger:'change' + }], + itemOrder:[{ + required:true, + message:'排序不能为空', + trigger:'change' + },{ + validator:validateData, trigger:'change' + }], + } } }, + mounted() { + this.dicName=this.$route.query.pName + this.dicId=this.$route.query.pId + this.loadData() + }, methods:{ // 编辑查看用户 openRowData (mode, row) { this.mode = mode - this.form = { - account: row.ACCOUNT, // 用户名 - cellPhoneNumber: row.CELLPHONE_NUMBER, // 手机号 - department: row.DEPARTMENT, // 部门 - email: row.EMAIL, // 邮箱 - password: '', // 密码 - usid: row.USID, // 用户ID - usname: row.USNAME, // 姓名 - roleIdList: [row.ROLEID] // 角色 - } + this.form=JSON.parse(JSON.stringify(row)) this.dialogUser = true }, sysUserAddUser(){ + this.$refs.addForm.validate(v=>{ + if(v){ + if(this.mode=='add'){ + this.$api.dictionary.addItemDic(this.form).then((res)=>{ + this.$message.success("新增成功") + this.loadData() + }) + }else{ + this.$api.dictionary.editItemDic(this.form).then((res)=>{ + this.$message.success("编辑成功") + this.loadData() + }) + } + + this.dialogUser = false + }else{ + this.$message.warning("请检查表单") + } + }) + + }, // 新增 add () { this.mode = 'add' this.form = { - account: '', // 用户名 - cellPhoneNumber: '', // 手机号 - department: '', // 部门 - email: '', // 邮箱 - password: '', // 密码 - usid: '', - usname: '', // 姓名 - roleIdList: [''] // 角色 + itemName:'', + itemValue:'', + itemDescription:'', + itemOrder:'', + dicId:this.dicId } this.dialogUser = true + this.$nextTick(()=>{ + this.$refs.addForm.clearValidate() + + }) }, // 批量删除 getSelectUser () { @@ -169,9 +222,9 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$api.user.sysUserDelete({ ids }).then(_ => { + this.$api.dictionary.delItemDic({ ids }).then(_ => { this.$message.success('操作成功') - this.sysUserList() + this.loadData() }) }) }, @@ -184,7 +237,10 @@ export default { this.loadData() }, loadData(){ - + this.$api.dictionary.getItemDic({...this.q,dicId:this.dicId}).then((res)=>{ + this.tableData = res.data.records + this.total=res.data.total + }) }, search() { this.q.pageNo = 1 @@ -194,7 +250,8 @@ export default { this.q = { pageNo:1, pageSize:10, - account:'' + itemName:'', + dicId: this.dicId } this.loadData() }, @@ -312,7 +369,7 @@ export default { padding-right: 79px; .el-form-item { - margin-bottom: 10px; + //margin-bottom: 10px; .el-form-item__label { height: 36px;