From 973a92fd255cb13bf1f2f17b5b8a87d0fb98efc1 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 18 Jul 2022 08:35:57 +0800 Subject: [PATCH 1/3] ticketDetail --- src/views/wf/visitdetail.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/views/wf/visitdetail.vue b/src/views/wf/visitdetail.vue index fba83349..0c8da213 100644 --- a/src/views/wf/visitdetail.vue +++ b/src/views/wf/visitdetail.vue @@ -46,10 +46,10 @@ - + {{ticketDetail.sn }} - + {{rpjDetail.name }} @@ -194,9 +194,16 @@ this.ticketId = this.$route.query.id; this.type = this.$route.query.type; this.projectId = this.$route.query.projectId; + this.cateType = this.$route.query.catetype; + if(this.cateType==='visit'){ + this.getVisit(); + }else if(this.cateType==='rparty'){ + this.getVisit(); + } this.getticketItem(); - this.getVisit(); + this.getBtns(); + this.getRpj(); }, methods: { @@ -222,7 +229,9 @@ //入厂项目详情 getRpj(){ - + this.$API.rpmrpj.item.req(this.projectId).then((res) => { + this.rpjDetail = res; + }); }, //加签处理-start addNode(){ From 72b64fcddd0d205cae820ce41cb60ca42160fd09 Mon Sep 17 00:00:00 2001 From: "2309368887@qq.com" <2309368887@qq.com> Date: Mon, 18 Jul 2022 08:57:58 +0800 Subject: [PATCH 2/3] caidanpeiquan --- src/config/route.js | 54 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/src/config/route.js b/src/config/route.js index f1ac6524..3fb25c3a 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -43,6 +43,7 @@ const routes = [ "title": "控制台", "icon": "el-icon-monitor", "affix": true, + "perms": ["dashboard"] }, "component": "home" }, @@ -52,7 +53,8 @@ const routes = [ "meta": { "title": "驾驶舱", "icon": "el-icon-position", - "fullpage": true + "fullpage": true, + "perms": ["bigScreen"] }, "component": "bigScreen" }, @@ -61,7 +63,8 @@ const routes = [ "path": "/usercenter", "meta": { "title": "帐号信息", - "icon": "el-icon-user" + "icon": "el-icon-user", + "perms": ["userCenter"] }, "component": "userCenter" } @@ -114,6 +117,7 @@ const routes = [ "meta": { "title": "我的事件", "icon": "el-icon-document-remove", + "perms": ["myevent"] }, "component": "ecm/myevent" }, @@ -123,6 +127,7 @@ const routes = [ "meta": { "title": "提醒配置", "icon": "el-icon-setting", + "perms": ["notify_setting"] }, "component": "ecm/notify_setting" }, @@ -133,6 +138,7 @@ const routes = [ "meta": { "title": "算法配置", "icon": "el-icon-setting", + "perms": ["algo"] }, "component": "ecm/algo" } @@ -153,6 +159,7 @@ const routes = [ "meta": { "title": "工作流", "icon": "el-icon-guide", + "perms": ["workflow"] }, "component": "wf/workflow" }, @@ -173,6 +180,7 @@ const routes = [ "meta": { "title": "全部工单", "icon": "el-icon-folder", + "perms": ["allwork"] }, "component": "wf/allwork" @@ -183,7 +191,7 @@ const routes = [ "meta": { "title": "我创建的", "icon": "el-icon-folder-add", - + "perms": ["ownerwork"] }, "component": "wf/ownerwork" } @@ -195,7 +203,7 @@ const routes = [ "meta": { "title": "待办工单", "icon": "el-icon-folder-opened", - + "perms": ["duyt"] }, "component": "wf/dutywork" }, @@ -205,7 +213,7 @@ const routes = [ "meta": { "title": "我处理的", "icon": "el-icon-expand", - + "perms": ["worked"] }, "component": "wf/worked" }, @@ -215,7 +223,7 @@ const routes = [ "meta": { "title": "抄送我的", "icon": "el-icon-edit-pen", - + "perms": ["ccwork"] }, "component": "wf/ccwork" }, @@ -249,6 +257,7 @@ const routes = [ "meta": { "title": "作业列表", "icon": "el-icon-tickets", + "perms": ["operation"] }, "component": "opm/operation" }, @@ -258,6 +267,7 @@ const routes = [ "meta": { "title": "许可证分类", "icon": "el-icon-ticket", + "perms": ["oplcate"] }, "component": "opm/oplcate" }, @@ -378,6 +388,7 @@ const routes = [ "meta": { "title": "相关方列表", "icon": "el-icon-tickets", + "perms": ["rparty"] }, "component": "rpm/rparty" }, @@ -387,6 +398,7 @@ const routes = [ "meta": { "title": "相关方人员", "icon": "el-icon-user", + "perms": ["remployee"] }, "component": "rpm/remployee" }, @@ -396,6 +408,7 @@ const routes = [ "meta": { "title": "人员证书", "icon": "el-icon-postcard", + "perms": ["rcertificate"] }, "component": "rpm/rcertificate" }, @@ -405,6 +418,7 @@ const routes = [ "meta": { "title": "资料库", "icon": "el-icon-shopping-bag", + "perms": ["rfile"] }, "component": "rpm/rfile" }, @@ -414,6 +428,7 @@ const routes = [ "meta": { "title": "入厂项目", "icon": "el-icon-calendar", + "perms": ["rpj"] }, "component": "rpm/rpj" }, @@ -445,6 +460,7 @@ const routes = [ "meta": { "title": "来访项目", "icon": "el-icon-tickets", + "perms": ["visit"] }, "component": "vm/visit" }, @@ -454,6 +470,7 @@ const routes = [ "meta": { "title": "来访人员", "icon": "el-icon-user", + "perms": ["visitor"] }, "component": "vm/visitor" },{ @@ -495,6 +512,7 @@ const routes = [ "meta": { "title": "区域列表", "icon": "el-icon-tickets", + "perms": ["area"] }, "component": "am/area" }, @@ -504,6 +522,7 @@ const routes = [ "meta": { "title": "门禁通道", "icon": "el-icon-phone", + "perms": ["eqm"] }, "component": "am/em1" }, @@ -513,6 +532,7 @@ const routes = [ "meta": { "title": "视频通道", "icon": "el-icon-video-camera", + "perms": ["monitor"] }, "component": "am/monitor" }, @@ -522,6 +542,7 @@ const routes = [ "meta": { "title": "喇叭通道", "icon": "el-icon-mic", + "perms": ["audio"] }, "component": "am/audio" },{ @@ -530,6 +551,7 @@ const routes = [ "meta": { "title": "定位标签", "icon": "el-icon-map-location", + "perms": ["blt"] }, "component": "am/blt" }, @@ -551,6 +573,7 @@ const routes = [ "meta": { "title": "企业员工", "icon": "el-icon-user", + "perms": ["employee"] }, "component": "hrm/employee" } @@ -561,6 +584,7 @@ const routes = [ "meta": { "title": "证书列表", "icon": "el-icon-tickets", + "perms": ["certificates"] }, "component": "hrm/certificates" } @@ -593,7 +617,8 @@ const routes = [ "meta": { "title": "账户管理", "icon": "el-icon-user-filled", - "type": "menu" + "type": "menu", + "perms": ["user"] }, "component": "sys/user" }, @@ -603,7 +628,8 @@ const routes = [ "meta": { "title": "部门管理", "icon": "sc-icon-organization", - "type": "menu" + "type": "menu", + "perms": ["dept"] }, "component": "sys/dept" }, @@ -613,7 +639,8 @@ const routes = [ "meta": { "title": "岗位管理", "icon": "sc-icon-organization", - "type": "menu" + "type": "menu", + "perms": ["post"] }, "component": "sys/post" }, @@ -623,7 +650,8 @@ const routes = [ "meta": { "title": "角色管理", "icon": "el-icon-notebook", - "type": "menu" + "type": "menu", + "perms": ["role"] }, "component": "sys/role" }, @@ -633,7 +661,8 @@ const routes = [ "meta": { "title": "字典管理", "icon": "el-icon-document", - "type": "menu" + "type": "menu", + "perms": ["dict"] }, "component": "sys/dict" }, @@ -643,7 +672,8 @@ const routes = [ "meta": { "title": "计划任务", "icon": "el-icon-alarm-clock", - "type": "menu" + "type": "menu", + "perms": ["task"] }, "component": "sys/task" } From b3c432c35d564f05577c92e3dcf354105b402007 Mon Sep 17 00:00:00 2001 From: "2309368887@qq.com" <2309368887@qq.com> Date: Mon, 18 Jul 2022 09:59:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/system.js | 9 - src/config/route.js | 3 +- src/views/sys/post.vue | 438 ++++++++++++++++++------------- src/views/sys/post_role_form.vue | 7 +- 4 files changed, 254 insertions(+), 203 deletions(-) diff --git a/src/api/model/system.js b/src/api/model/system.js index c1b3b76d..155fa53c 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -262,15 +262,6 @@ export default { return await http.post(this.url,data); } }, - /*update: { - name: "更新岗位", - req: async function(id, data){ - return await http.put( - `${config.API_URL}/system/post_role/${id}/`, - data - ); - } - },*/ delete: { name: "删除岗位", req: async function(id){ diff --git a/src/config/route.js b/src/config/route.js index f83a9376..5f60b9b9 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -603,7 +603,8 @@ const routes = [ "meta": { "title": "相关证书", "icon": "el-icon-menu", - "hidden": true + "hidden": true, + "perms": ["certificates"] }, "component": "hrm/certificate" }, diff --git a/src/views/sys/post.vue b/src/views/sys/post.vue index d32c9869..cf39ccd6 100644 --- a/src/views/sys/post.vue +++ b/src/views/sys/post.vue @@ -1,199 +1,259 @@