From 2d1c3de1ef5ebe61ba90feb3a0b0ab622ec32da9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 28 Oct 2022 16:33:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=91=E7=9A=84=E8=AE=BF?= =?UTF-8?q?=E5=AE=A2=E5=BA=93/=E6=88=91=E7=9A=84=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=96=B9=E4=BA=BA=E5=91=98=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.api.js | 10 +- pages.json | 16 +++ pages/home/detail/eventHandle.vue | 10 +- pages/my/my.vue | 28 ++++- pages/workSpace/newWork/addUser.vue | 73 ++++++++++- pages/workSpace/operation/oplDetail.vue | 4 +- pages/workSpace/rpj/remployee.vue | 153 ++++++++++++++++++++++++ pages/workSpace/rpj/rpjDetail.vue | 2 + pages/workSpace/visit/visitDetail.vue | 10 +- pages/workSpace/visit/visitor.vue | 153 ++++++++++++++++++++++++ 10 files changed, 437 insertions(+), 22 deletions(-) create mode 100644 pages/workSpace/rpj/remployee.vue create mode 100644 pages/workSpace/visit/visitor.vue diff --git a/common/http.api.js b/common/http.api.js index bcc873f..25db38f 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -79,6 +79,8 @@ const install = (Vue, vm) => { let rpartyList = (data = {}) => vm.$u.get(`/rpm/rparty/`, data); //相关方列表 let remployee = (data = {}) => vm.$u.get(`/rpm/remployee/`, data); //相关方人员表 let remployeeCreate = (data = {}) => vm.$u.post(`/rpm/remployee/`, data); //相关方人员表 + let remployeeDetail = (id, data = {}) => vm.$u.get(`/rpm/remployee/${id}/`, data); //人员详情 + let remployeeUpdate = (id, data = {}) => vm.$u.put(`/rpm/remployee/${id}/`, data); //人员编辑 let rcertificate = (data = {}) => vm.$u.get(`/rpm/rcertificate/`, data); //相关方证书 let rpjFileList = (data = {}) => vm.$u.get(`/rpm/rpj_file/`, data); //相关方wenjian let rpjList = (data = {}) => vm.$u.get(`/rpm/rpj/`, data); //rpj查询 @@ -100,8 +102,10 @@ const install = (Vue, vm) => { let vmVisitor = (data = {}) => vm.$u.get(`/vm/visitor/`, data); //来访人员列表 let visitorRegister = (data = {}) => vm.$u.post(`/vm/visitor/register/`, data); //来访人员/司机注册 let visitSubmit = (data = {}) => vm.$u.post(`/vm/visit/${id}/submit/`, data); //司机直接提交不走工单 + let visitorList = (data = {}) => vm.$u.get(`/vm/visitor/`, data); + let visitorDetail = (id, data = {}) => vm.$u.get(`/vm/visitor/${id}/`, data); //来访人员详情 let visitorCreate = (data = {}) => vm.$u.post(`/vm/visitor/`, data); //来访人员添加 - let visitorUpdate = (data = {}) => vm.$u.put(`/vm/visitor/${id}/`, data); //来访人员编辑 + let visitorUpdate = (id, data = {}) => vm.$u.put(`/vm/visitor/${id}/`, data); //来访人员编辑 let vmVpeople = (data = {}) => vm.$u.get(`/vm/vpeople/`, data); //来访人员列表 let vpeopleCreate = (data = {}) => vm.$u.post(`/vm/vpeople/`, data); //来访人员添加 let vpeopleUpdate = (data = {}) => vm.$u.put(`/vm/vpeople/${id}/`, data); //来访人员编辑 @@ -149,6 +153,8 @@ const install = (Vue, vm) => { visitUpdate, visitSubmit, vmVisitor, + visitorList, + visitorDetail, visitorCreate, visitorUpdate, visitDelete, @@ -161,6 +167,8 @@ const install = (Vue, vm) => { rpartyList, remployee, remployeeCreate, + remployeeDetail, + remployeeUpdate, rcertificate, rpjItem, rpjList, diff --git a/pages.json b/pages.json index e475739..149d7b1 100644 --- a/pages.json +++ b/pages.json @@ -377,6 +377,22 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } + }, + { + "path": "pages/workSpace/visit/visitor", + "style": { + "navigationBarTitleText": "我的访客库", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/workSpace/rpj/remployee", + "style": { + "navigationBarTitleText": "我的人员库", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/pages/home/detail/eventHandle.vue b/pages/home/detail/eventHandle.vue index 1f9d72e..696b402 100644 --- a/pages/home/detail/eventHandle.vue +++ b/pages/home/detail/eventHandle.vue @@ -151,18 +151,18 @@ this.preImgSrc = ''; }, //自带preview,但是图片有点小 - /* preView(srcImg){ + preView(srcImg){ let imgs = []; imgs.push(srcImg) uni.previewImage({ urls: imgs, current: 0, }); - }, */ - preView(srcImg){ - this.preImgSrc = srcImg; - this.$refs.imgPreView.open(); }, + // preView(srcImg){ + // this.preImgSrc = srcImg; + // this.$refs.imgPreView.open(); + // }, cancelPreImg(){ this.preImg = false; }, diff --git a/pages/my/my.vue b/pages/my/my.vue index d4b4141..f60d804 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -35,23 +35,29 @@ - 我的资料 - 我的打卡记录 - + 我的访客库 + + + 我的人员库 + + @@ -88,21 +94,31 @@ url: '/pages/my/myCertificates' }) } - if (type == "myData") { + else if (type == "myData") { uni.navigateTo({ url: '/pages/my/myInfo' }) } - if (type == "myDataChange") { + else if (type == "myDataChange") { uni.navigateTo({ url: '/pages/my/myInfoChange' }) } - if (type == "clockIn") { + else if (type == "clockIn") { uni.navigateTo({ url: '/pages/my/clock_in' }) } + else if (type == "visitor") { + uni.navigateTo({ + url: '/pages/workSpace/visit/visitor' + }) + } + else if (type == "remployee") { + uni.navigateTo({ + url: '/pages/workSpace/rpj/remployee' + }) + } }, getUserInfo() { var promise; diff --git a/pages/workSpace/newWork/addUser.vue b/pages/workSpace/newWork/addUser.vue index b04f66b..0cbf615 100644 --- a/pages/workSpace/newWork/addUser.vue +++ b/pages/workSpace/newWork/addUser.vue @@ -1,28 +1,32 @@