diff --git a/common/http.api.js b/common/http.api.js index b28db6b..adf7224 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -76,6 +76,7 @@ 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 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查询 @@ -156,6 +157,7 @@ const install = (Vue, vm) => { rpartyList, remployee, + remployeeCreate, rcertificate, rpjItem, rpjList, diff --git a/manifest.json b/manifest.json index 9352b5e..06fcb5f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "曲阳金隅EHS", "appid" : "__UNI__B00D419", "description" : "曲阳金隅EHS", - "versionName" : "1.00.13", - "versionCode" : 10013, + "versionName" : "1.01.00", + "versionCode" : 10100, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/workSpace/newWork/addUser.vue b/pages/workSpace/newWork/addUser.vue index 1638783..b04f66b 100644 --- a/pages/workSpace/newWork/addUser.vue +++ b/pages/workSpace/newWork/addUser.vue @@ -48,23 +48,37 @@ phone: "", id_number: "" }, + rparty:'', upHeader:'', fileList:[] } }, - onLoad(){ - this.getHeader() + onLoad(params) { + if(params.rparty){ + this.rparty = params.rparty; + } + this.getHeader(); }, methods: { getHeader(){ this.upHeader = {Authorization: "Bearer " + this.vuex_token} }, saveVisitor(){ - this.$u.api.visitorCreate(this.formData).then(res=>{ - uni.navigateBack({ - delta: 1 + if(this.rparty!==''){ + let obj = {...this.formData}; + obj.rparty = this.rparty; + this.$u.api.remployeeCreate(obj).then(res=>{ + uni.navigateBack({ + delta: 1 + }) }) - }) + }else{ + this.$u.api.visitorCreate(this.formData).then(res=>{ + uni.navigateBack({ + delta: 1 + }) + }) + } }, goBack() { uni.navigateBack({ diff --git a/pages/workSpace/rpj/rpjCreate.vue b/pages/workSpace/rpj/rpjCreate.vue index 39b7b54..69bd3de 100644 --- a/pages/workSpace/rpj/rpjCreate.vue +++ b/pages/workSpace/rpj/rpjCreate.vue @@ -214,7 +214,7 @@ that.$u.api.rpjUpdate(that.rpj, that.formData).then(res => { if (res.err_msg) { } else { - let params = `?rpj=${that.rpj}`; + let params = `?rpj=${that.rpj}&rparty=${that.formData.rparty}`; uni.navigateTo({ url: '/pages/workSpace/rpj/rpjFiles' + params }) @@ -222,8 +222,9 @@ }) } else { that.$u.api.rpjCreate(that.formData).then(res => { + debugger; if (res.err_msg) {} else { - let params = `?rpj=${res.id}`; + let params = `?rpj=${res.id}&rparty=${that.formData.rparty}`; uni.navigateTo({ url: '/pages/workSpace/rpj/rpjFiles' + params }) diff --git a/pages/workSpace/rpj/rpjFiles.vue b/pages/workSpace/rpj/rpjFiles.vue index efd6891..6a87839 100644 --- a/pages/workSpace/rpj/rpjFiles.vue +++ b/pages/workSpace/rpj/rpjFiles.vue @@ -76,7 +76,9 @@ //文件下载 downFiles: {}, uploadImgsList: [], - fileList :[] + fileList :[], + rpj:'', + rparty:'' } }, @@ -84,6 +86,7 @@ onLoad(params) { if (params.rpj) { this.rpj = params.rpj; + this.rparty = params.rparty; } this.showBtns = true; }, @@ -180,7 +183,7 @@ nextStep() { let that = this; - let params = `?rpj=${that.rpj}`; + let params = `?rpj=${that.rpj}&rparty=${that.rparty}`; uni.navigateTo({ url: '/pages/workSpace/rpj/rpjWorkers' + params }) diff --git a/pages/workSpace/rpj/rpjWorkers.vue b/pages/workSpace/rpj/rpjWorkers.vue index bcafb9f..80bd3e2 100644 --- a/pages/workSpace/rpj/rpjWorkers.vue +++ b/pages/workSpace/rpj/rpjWorkers.vue @@ -3,6 +3,11 @@ + + 已选{{workerList.length}}工作人员 + + + @@ -17,7 +22,7 @@ - + @@ -53,7 +58,7 @@ - +