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 @@
-
+ *
姓名
+ *
手机号
+ *
身份证号
+ *
证件照
{
+ this.formData = res
+ this.fileList = [this.vuex_host+res.photo]
+ })
+ },
+ getVisitor(){
+ this.$u.api.visitorDetail(this.formData.id).then(res=>{
+ this.formData = res
+ this.fileList = [this.vuex_host+res.photo]
+ })
+ },
saveVisitor(){
if(this.rparty!==''){
let obj = {...this.formData};
obj.rparty = this.rparty;
- this.$u.api.remployeeCreate(obj).then(res=>{
- uni.navigateBack({
- delta: 1
+ if(this.formData.id){
+ this.$u.api.remployeeUpdate(obj.id, obj).then(res=>{
+ uni.showToast({
+ title:'保存成功',
+ icon: 'none'
+ })
+ uni.navigateBack({
+ delta: 1
+ })
})
- })
+ }else{
+ this.$u.api.remployeeCreate(obj).then(res=>{
+ uni.showToast({
+ title:'保存成功',
+ icon: 'none'
+ })
+ uni.navigateBack({
+ delta: 1
+ })
+ })
+ }
+
}else{
- this.$u.api.visitorCreate(this.formData).then(res=>{
+ if(this.formData.id){
+ this.$u.api.visitorUpdate(this.formData.id, this.formData).then(res=>{
+ uni.showToast({
+ title:'保存成功',
+ icon: 'none'
+ })
+ uni.navigateBack({
+ delta: 1
+ })
+ })
+
+ }
+ else{this.$u.api.visitorCreate(this.formData).then(res=>{
+ uni.showToast({
+ title:'创建成功',
+ icon: 'none'
+ })
uni.navigateBack({
delta: 1
})
})
+ }
}
},
goBack() {
diff --git a/pages/workSpace/operation/oplDetail.vue b/pages/workSpace/operation/oplDetail.vue
index 5ca29d1..1b8998d 100644
--- a/pages/workSpace/operation/oplDetail.vue
+++ b/pages/workSpace/operation/oplDetail.vue
@@ -92,8 +92,8 @@
{{item.duty}}
{{item.certificates.length}}张
- 绑卡
- 解绑
+
diff --git a/pages/workSpace/rpj/remployee.vue b/pages/workSpace/rpj/remployee.vue
new file mode 100644
index 0000000..3e60f8e
--- /dev/null
+++ b/pages/workSpace/rpj/remployee.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+ 姓名：{{val.name}}
+ 手机号：{{val.phone}}
+ 创建时间：{{val.create_time}}
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/workSpace/rpj/rpjDetail.vue b/pages/workSpace/rpj/rpjDetail.vue
index 3301ba5..590e496 100644
--- a/pages/workSpace/rpj/rpjDetail.vue
+++ b/pages/workSpace/rpj/rpjDetail.vue
@@ -90,8 +90,10 @@
{{item.duty}}
{{item.rcertificates.length}}张
+
绑卡
解绑
+
diff --git a/pages/workSpace/visit/visitDetail.vue b/pages/workSpace/visit/visitDetail.vue
index d9a0dd1..9ed1259 100644
--- a/pages/workSpace/visit/visitDetail.vue
+++ b/pages/workSpace/visit/visitDetail.vue
@@ -79,8 +79,10 @@
是
+
绑卡
解绑
+
@@ -238,8 +240,12 @@
this.visitorItem = null;
},
preView(srcImg){
- this.preImgSrc = srcImg;
- this.$refs.imgPreView.open();
+ let imgs = [];
+ imgs.push(srcImg)
+ uni.previewImage({
+ urls: imgs,
+ current: 0,
+ });
},
cancelPreView(){
this.preImgSrc = '';
diff --git a/pages/workSpace/visit/visitor.vue b/pages/workSpace/visit/visitor.vue
new file mode 100644
index 0000000..6ca71d7
--- /dev/null
+++ b/pages/workSpace/visit/visitor.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+ 姓名：{{val.name}}
+ 手机号：{{val.phone}}
+ 创建时间：{{val.create_time}}
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+