From 6691ce8f71e8075a4569b182b1a9c6ffde2498c1 Mon Sep 17 00:00:00 2001 From: zxx <47968546@163.com> Date: Wed, 30 Nov 2022 22:21:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8F=8A=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mk/components/toolbar/toolbar.vue | 20 ++++++- src/pages/Middle/Admin/AdminUser/UserList.vue | 17 +++--- .../Middle/Admin/AdminUser/UserUpdate.vue | 2 +- src/pages/Middle/Base/BaseAgent/edit.vue | 6 +- src/pages/Middle/Base/BaseAgent/list.vue | 33 ++++++----- src/pages/Middle/Base/BaseCompany/edit.vue | 57 +++++++++++++------ src/pages/Middle/Base/BaseCompany/list.vue | 44 ++++++++------ src/pages/Middle/Base/BaseConfig/edit.vue | 23 ++++---- src/pages/Middle/Base/BaseConfig/list.vue | 37 +++++++----- src/pages/Middle/Base/BasePermission/edit.vue | 2 +- src/pages/Middle/Base/BasePermission/list.vue | 17 +++--- src/pages/Middle/Base/BaseService/edit.vue | 34 ++++++----- src/pages/Middle/Base/BaseService/list.vue | 47 ++++++++------- .../Base/BaseService/permissionEdit.vue | 2 +- .../Middle/Base/BaseService/routerEdit.vue | 14 ++--- .../Middle/Admin/AdminUser/router.map.js | 2 +- 16 files changed, 222 insertions(+), 135 deletions(-) diff --git a/src/application/mk/components/toolbar/toolbar.vue b/src/application/mk/components/toolbar/toolbar.vue index 5b1356f..c4be6b4 100644 --- a/src/application/mk/components/toolbar/toolbar.vue +++ b/src/application/mk/components/toolbar/toolbar.vue @@ -53,4 +53,22 @@ export default { }, }; - \ No newline at end of file + + \ No newline at end of file diff --git a/src/pages/Middle/Admin/AdminUser/UserList.vue b/src/pages/Middle/Admin/AdminUser/UserList.vue index 517926a..df956d4 100644 --- a/src/pages/Middle/Admin/AdminUser/UserList.vue +++ b/src/pages/Middle/Admin/AdminUser/UserList.vue @@ -82,12 +82,13 @@ export default { title: '左侧', span: 20, children: [ - { field: 'name', title: '名称', span: 7, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } }, - { field: 'nick_name', title: '昵称', span: 7, itemRender: { name: '$input', props: { placeholder: '请输入昵称' } } }, - { span: 10, slots: { default: 'date' } } + { field: 'name', title: '名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } }, + { field: 'nick_name', title: '昵称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入昵称' } } }, + { span: 8, slots: { default: 'date' } }, + { align: 'right', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, + { props: { type: 'reset', content: '重置' } }] } } ] - }, - { align: 'right', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } } + } ], @@ -129,7 +130,7 @@ export default { columns: [ { type: 'checkbox', width: 50 }, { type: 'seq', width: 50 }, - { title: '操作', slots: { default: 'op' },width:100 }, + { title: '操作', slots: { default: 'op' },width:120 }, { field: 'name', sortable: true, title: '名称' }, { field: 'nick_name', sortable: true, title: '昵称', showHeaderOverflow: true }, { field: 'email', sortable: true, title: 'email', showHeaderOverflow: true }, @@ -289,10 +290,10 @@ export default { }; - \ No newline at end of file diff --git a/src/pages/Middle/Base/BaseAgent/edit.vue b/src/pages/Middle/Base/BaseAgent/edit.vue index ebcaf0e..1717603 100644 --- a/src/pages/Middle/Base/BaseAgent/edit.vue +++ b/src/pages/Middle/Base/BaseAgent/edit.vue @@ -177,6 +177,10 @@ export default { }; - diff --git a/src/pages/Middle/Base/BaseAgent/list.vue b/src/pages/Middle/Base/BaseAgent/list.vue index 368feb4..d36fe8e 100644 --- a/src/pages/Middle/Base/BaseAgent/list.vue +++ b/src/pages/Middle/Base/BaseAgent/list.vue @@ -87,13 +87,13 @@ export default { title: '左侧', span: 20, children: [ - { field: 'title', title: '代理商名称', span: 7, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } }, - { field: 'short_name', title: '代理商简写', span: 7, itemRender: { name: '$input', props: { placeholder: '请输入昵称' } } }, - - { span: 10, slots: { default: 'date' } } + { field: 'title', title: '代理商名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入代理商名称' } } }, + { field: 'short_name', title: '代理商简称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入代理商简称' } } }, + { span: 8, slots: { default: 'date' } }, + { align: 'right', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, + { props: { type: 'reset', content: '重置' } }] } } ] - }, - { align: 'right', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } } + } ], @@ -135,11 +135,10 @@ export default { columns: [ { type: 'checkbox', width: 50 }, { type: 'seq', width: 50 }, - { title: '操作', slots: { default: 'op' },width:100 }, { field: 'title', sortable: true, title: '代理商名称' }, - { field: 'short_name', sortable: true, title: '代理商简写', showHeaderOverflow: true }, + { field: 'short_name', sortable: true, title: '代理商简称', showHeaderOverflow: true }, { field: 'company_type', sortable: true, title: '代理商类型', showHeaderOverflow: true }, - { field: 'desc', sortable: true, title: '描述', showHeaderOverflow: true } + { title: '操作', slots: { default: 'op' },width:120 } ] } }; @@ -293,12 +292,20 @@ export default { }; - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/pages/Middle/Base/BaseCompany/edit.vue b/src/pages/Middle/Base/BaseCompany/edit.vue index d8fbfe9..b4d1e5e 100644 --- a/src/pages/Middle/Base/BaseCompany/edit.vue +++ b/src/pages/Middle/Base/BaseCompany/edit.vue @@ -72,7 +72,7 @@ export default { // 页面数据变量 var pageData = { - companyTypeData: ['普通', '星级', '特星级'], + companyTypeData: ['日用陶瓷厂', '卫浴工厂', '公司企业', '贸易公司', '其他'], config_list: [], currentBeid : 0, @@ -100,7 +100,7 @@ export default { "desc": "", "domain": "", "devdomain": "", - "company_type": "", + "company_type": "日用陶瓷厂", "address": "", "longitude": "", "latitude": "", @@ -111,6 +111,10 @@ export default { "status": 1, "short_title": "", "token": "", + "name": "", + "mobile": "", + "password": "", + "email": "", "admin_count": 0, "staff_count": 0, "store_count": 0 @@ -123,8 +127,20 @@ export default { title: [ { required: true, message: '请输入标题' } ], - desc: [ - { required: true, message: '请输入描述' } + beid: [ + { required: true, message: '请选择归属项目' } + ], + company_type: [ + { required: true, message: '请选择公司类型' } + ], + name: [ + { required: true, message: '请输入管理员名称' } + ], + mobile: [ + { required: true, message: '请输入管理员手机号码' } + ], + password: [ + { required: true, message: '请输入管理员密码' } ], }, @@ -132,16 +148,21 @@ export default { { title: '左侧', children: [ - { field: 'title', title: '公司名', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入公司名' } } }, - { title: '归属项目', span: 6, slots: { default: 'beid' } }, - { title: '公司类型', span: 6, slots: { default: 'company_type' } }, - { field: 'logo', title: 'logo', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入LOGO' } } }, - { field: 'domain', title: 'domain', span: 6, itemRender: { name: '$input' } }, - { field: 'devdomain', title: 'devdomain', span: 6, itemRender: { name: '$input' } }, - { field: 'desc', title: '描述', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } }, - { field: 'appid', title: 'appid', span: 6, itemRender: { name: '$input' } }, - { field: 'appsecret', title: 'appsecret', span: 6, itemRender: { name: '$input' } }, - { field: 'token', title: 'token', span: 6, itemRender: { name: '$input' } } + { field: 'title', title: '公司名', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入公司名' } } }, + { field: 'short_title', title: '公司简称', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入公司简称' } } }, + { field: 'desc', title: '描述', span: 16, itemRender: { name: '$textarea', props: { placeholder: '请输入描述' } } }, + { field: 'logo', title: 'Logo', span: 16, itemRender: { name: '$input', props: { placeholder: '请输入LOGO' } } }, + { field: 'domain', title: '域名', span: 10, itemRender: { name: '$input' } }, + { field: 'devdomain', title: '测试域名', span: 10, itemRender: { name: '$input' } }, + { field: 'beid',title: '归属项目', span: 6, slots: { default: 'beid' } }, + { field: 'company_type',title: '公司类型', span: 6, slots: { default: 'company_type' } }, + { field: 'appid', title: 'AppID', span: 20, itemRender: { name: '$input' } }, + { field: 'appsecret', title: 'AppSecret', span: 20, itemRender: { name: '$input' } }, + { field: 'token', title: '企业Token', span: 20, itemRender: { name: '$textarea' , props: { placeholder: '不用填写' }} }, + { field: 'mobile', title: '管理员手机', span: 10, itemRender: { name: '$input', props: { placeholder: '请输入管理员手机号' } } }, + { field: 'password', title: '管理员密码', span: 10, itemRender: { name: '$input' , props: { placeholder: '请输入管理员密码' }} }, + { field: 'name', title: '管理员名称', span: 10, itemRender: { name: '$input', props: { placeholder: '请输入管理员名称' } } }, + { field: 'email', title: '管理员邮箱', span: 10, itemRender: { name: '$input' , props: { placeholder: '请输入管理员邮箱' }} } ] } ] @@ -399,14 +420,14 @@ export default { }; - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/src/pages/Middle/Base/BaseConfig/edit.vue b/src/pages/Middle/Base/BaseConfig/edit.vue index d0abd19..038cf20 100644 --- a/src/pages/Middle/Base/BaseConfig/edit.vue +++ b/src/pages/Middle/Base/BaseConfig/edit.vue @@ -114,14 +114,14 @@ export default { { title: '左侧', children: [ - { field: 'title', title: '项目名', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入项目名' } } }, - { field: 'logo', title: 'logo', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入LOGO' } } }, - { field: 'domain', title: 'domain', span: 6, itemRender: { name: '$input' } }, - { field: 'devdomain', title: 'devdomain', span: 6, itemRender: { name: '$input' } }, - { field: 'desc', title: '描述', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } }, - { field: 'appid', title: 'appid', span: 6, itemRender: { name: '$input' } }, - { field: 'appsecret', title: 'appsecret', span: 6, itemRender: { name: '$input' } }, - { field: 'token', title: 'token', span: 6, itemRender: { name: '$input' } } + { field: 'title', title: '项目名称', span: 16, itemRender: { name: '$input', props: { placeholder: '请输入项目名' } } }, + { field: 'desc', title: '项目描述', span: 16, itemRender: { name: '$textarea', props: { placeholder: '请输入描述' } } }, + { field: 'logo', title: 'Logo', span: 20, itemRender: { name: '$input', props: { placeholder: '请输入LOGO' } } }, + { field: 'domain', title: '网址域名', span: 10, itemRender: { name: '$input' } }, + { field: 'devdomain', title: '开发域名', span: 10, itemRender: { name: '$input' } }, + { field: 'appid', title: 'AppID', span: 20, itemRender: { name: '$textarea' } }, + { field: 'appsecret', title: 'AppSecret', span: 20, itemRender: { name: '$textarea' } }, + { field: 'token', title: '项目Token', span: 20, itemRender: { name: '$textarea' } } ] } ] @@ -356,13 +356,14 @@ export default { }; - \ No newline at end of file + + + + diff --git a/src/pages/Middle/Base/BasePermission/edit.vue b/src/pages/Middle/Base/BasePermission/edit.vue index 07b1bbe..7106146 100644 --- a/src/pages/Middle/Base/BasePermission/edit.vue +++ b/src/pages/Middle/Base/BasePermission/edit.vue @@ -149,6 +149,6 @@ export default { }; - diff --git a/src/pages/Middle/Base/BasePermission/list.vue b/src/pages/Middle/Base/BasePermission/list.vue index 339a22b..2795703 100644 --- a/src/pages/Middle/Base/BasePermission/list.vue +++ b/src/pages/Middle/Base/BasePermission/list.vue @@ -81,12 +81,13 @@ export default { title: '左侧', span: 20, children: [ - { field: 'title', title: '权限名', span: 7, itemRender: { name: '$input', props: { placeholder: '请输入权限名' } } }, - { field: 'permission_code', title: '编号', span: 7, itemRender: { name: '$input', props: { placeholder: '请输入编号' } } }, - { span: 10, slots: { default: 'date' } } + { field: 'title', title: '权限名', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入权限名' } } }, + { field: 'permission_code', title: '编号', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入编号' } } }, + { span: 8, slots: { default: 'date' } }, + { align: 'right', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, + { props: { type: 'reset', content: '重置' } }] } } ] - }, - { align: 'right', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } } + } ], @@ -273,9 +274,9 @@ export default { }; - \ No newline at end of file diff --git a/src/pages/Middle/Base/BaseService/edit.vue b/src/pages/Middle/Base/BaseService/edit.vue index 29d6309..a235fe3 100644 --- a/src/pages/Middle/Base/BaseService/edit.vue +++ b/src/pages/Middle/Base/BaseService/edit.vue @@ -128,11 +128,11 @@ export default { { title: '左侧', children: [ - { field: 'name', title: '服务名', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入服务名' } } }, - { field: 'title', title: '服务标题', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入服务标题' } } }, - { field: 'port', title: '端口', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入端口' } } }, - { field: 'desc', title: '描述', span: 16, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } }, - { field: 'version', title: '版本号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入版本号' } } } + { field: 'name', title: '服务名', span: 16, itemRender: { name: '$input', props: { placeholder: '请输入服务名' } } }, + { field: 'title', title: '服务标题', span: 16, itemRender: { name: '$input', props: { placeholder: '请输入服务标题' } } }, + { field: 'desc', title: '描述', span: 16, itemRender: { name: '$textarea', props: { placeholder: '请输入描述' } } }, + { field: 'port', title: '端口', span: 10, itemRender: { name: '$input', props: { placeholder: '请输入端口' } } }, + { field: 'version', title: '版本号', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入版本号' } } } ] } ] @@ -185,11 +185,10 @@ export default { highlight: true }, columns: [ - { field: 'router', treeNode: true, sortable: true, title: '路由名' }, - { field: 'name', sortable: true, title: '路由标题', showHeaderOverflow: true }, + { field: 'router', treeNode: true, sortable: true, title: '路由Name' }, + { field: 'name', sortable: true, title: '名称', showHeaderOverflow: true }, { field: 'path', sortable: true, title: '路径', showHeaderOverflow: true }, - { field: 'parent_router.name', sortable: true, title: '上级路由', showHeaderOverflow: true }, - { title: '操作', slots: { default: 'op' } } + { title: '操作', slots: { default: 'op' } ,width: 200} ] }, @@ -508,17 +507,22 @@ export default { }; - diff --git a/src/pages/Middle/Base/BaseService/list.vue b/src/pages/Middle/Base/BaseService/list.vue index 92faa84..01055ba 100644 --- a/src/pages/Middle/Base/BaseService/list.vue +++ b/src/pages/Middle/Base/BaseService/list.vue @@ -94,12 +94,13 @@ export default { title: '左侧', span: 20, children: [ - { field: 'name', title: '名称', span: 7, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } }, - { field: 'title', title: '标题', span: 7, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } }, - { span: 10, slots: { default: 'date' } } + { field: 'name', title: '名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } }, + { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } }, + { span: 8, slots: { default: 'date' } }, + { align: 'left', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, + { props: { type: 'reset', content: '重置' } }] } } ] - }, - { align: 'right', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } } + } ], @@ -141,20 +142,20 @@ export default { columns: [ { type: 'checkbox', width: 50 }, { type: 'seq', width: 50 }, - { title: '操作', slots: { default: 'op' },width:100 }, - { field: 'name', sortable: true, title: '名称' ,width:180}, - { field: 'title', sortable: true, title: '标题', showHeaderOverflow: true ,width:180}, - { field: 'desc', sortable: true, title: '描述', showHeaderOverflow: true ,width:180}, + { field: 'name', sortable: true, title: '服务名称' ,width:180}, + { field: 'title', sortable: true, title: '服务中文名', showHeaderOverflow: true ,width:220}, + { field: 'desc',sortable: true, title: '描述', showHeaderOverflow: true ,width:400}, { field: 'port', sortable: true, title: '端口', showHeaderOverflow: true ,width:100 }, { field: 'version', sortable: true, title: '版本', showHeaderOverflow: true ,width:100 }, - { field: 'status', sortable: true, title: '是否启用', slots: { default: 'status' } ,width:100 } + { field: 'status', sortable: true, title: '是否启用', slots: { default: 'status' } ,width:100 }, + { title: '操作', slots: { default: 'op' },width:120 } ] } }; - for(let i = 0;i<20;i++){ - pageData.gridOptions.columns.push({title:'列'+i,width: 100}); - } + // for(let i = 0;i<20;i++){ + // pageData.gridOptions.columns.push({title:'列'+i,width: 100}); + // } pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); @@ -272,7 +273,7 @@ export default { this.$emit("callback", { data: { ids: ids } }); }, - + // 删除 pageDelete(row) { @@ -287,7 +288,7 @@ export default { this.$mk.error("请选择行"); return; } - + // 确认删除 this.$mk.confirm('您确定要删除吗？').then(type => { if (type == 'confirm') { this.$mk.post({ @@ -318,12 +319,20 @@ export default { }; - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/pages/Middle/Base/BaseService/permissionEdit.vue b/src/pages/Middle/Base/BaseService/permissionEdit.vue index 271eab7..e36c917 100644 --- a/src/pages/Middle/Base/BaseService/permissionEdit.vue +++ b/src/pages/Middle/Base/BaseService/permissionEdit.vue @@ -184,7 +184,7 @@ export default { }; -