diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 9b0d791..4ccd172 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -13,7 +13,7 @@
"type" : "uniCloud"
},
{
- "playground" : "standard",
+ "playground" : "custom",
"type" : "uni-app:app-android"
}
]
diff --git a/pages/realName/index/pages/personDetail.vue b/pages/realName/index/pages/personDetail.vue
index 17259e1..f37551b 100644
--- a/pages/realName/index/pages/personDetail.vue
+++ b/pages/realName/index/pages/personDetail.vue
@@ -1,254 +1,392 @@
-
-
-
-
- 基本信息
-
-
-
-
- {{detailData.workerType}}
-
-
-
- {{detailData.name}}
- {{detailData.lightStatus}}
-
-
-
-
-
- {{detailData.postName}}
- {{detailData.phone}}
- {{detailData.einStatus}}
- {{detailData.subName}}
- {{detailData.proName}}
-
-
-
-
-
- 安全培训考试
-
-
-
-
-
-
- {{item.name}}
- {{item.name}}
-
- 未完成
- 完成
-
-
-
-
-
- 今日考勤
-
-
- 上班：{{detailData.isToWork}}
- 下班：{{detailData.isOffWork}}
- 未打卡
- 已打卡
-
-
-
-
- 今日作业计划
-
-
- 作业内容
-
-
- {{detailData.zynr}}
-
-
-
-
- 合同信息
-
-
-
-
-
-
- {{item.contractType}}
- {{item.contractType}}
-
- 未签订
- 已签订
-
-
-
-
-
- 持证信息
-
-
-
-
-
-
- {{item.certificateName}}
- {{item.certificateName}}
-
- 无效
- 有效
-
-
-
-
-
-
-
-
-
- 红绿灯
-
-
-
- 红灯
-
- 安全教育培训考试未完成
-
-
-
-
- 黄灯
-
- 安全教育培训考试已完成
- 合同/工资卡未上传，分包班组未绑定
-
-
-
- 绿灯
-
- 安全教育培训考试已完成
- 合同/工资卡已上传，分包班组已绑定
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
- {{item.name}}
-
- 未完成
- 完成
- {{item.score}}
-
-
-
-
-
-
-
-
-
-
-
- 合同照片
-
-
-
-
-
-
-
-
- 合同编号
-
-
-
-
-
- 合同期限类型
-
-
-
-
-
- 合同签订日期
-
-
-
-
-
- 合同终止日期
-
-
-
-
-
- 合同类型
-
-
-
-
-
- 工资核定方式
-
-
-
-
-
- 工资核定标准
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 证件名称
-
-
-
-
-
- 证件有效期
-
-
-
-
-
- 是否有效
-
-
-
-
-
-
- 证件附件
- 附件查看
- 无附件
-
-
-
-
-
-
-
-
+
+
+
+ 基本信息
+
+
+
+ {{ detailData.workerType }}
+
+
+
+ {{ detailData.name }}
+ {{ detailData.lightStatus }}
+
+
+
+
+
+ {{ detailData.postName }}
+ {{ detailData.phone }}
+ {{ detailData.einStatus }}
+ {{ detailData.subName }}
+ {{ detailData.proName }}
+
+
+
+
+ 安全培训考试
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.name }}
+
+
+ 未完成
+ 完成
+
+
+
+
+ 今日考勤
+
+ 上班：{{ detailData.isToWork }}
+ 下班：{{ detailData.isOffWork }}
+ 未打卡
+ 已打卡
+
+
+
+ 今日作业计划
+ 作业内容
+
+ {{ detailData.zynr }}
+
+
+
+ 合同信息
+
+
+
+
+
+
+ {{ item.contractType }}
+
+
+ {{ item.contractType }}
+
+
+ 未签订
+ 已签订
+
+
+
+
+ 持证信息
+
+
+
+
+
+
+ {{ item.certificateName }}
+
+
+ {{ item.certificateName }}
+
+
+ 无效
+ 有效
+
+
+
+
+
+
+
+
+
+ 红绿灯
+
+
+
+
+ 红灯
+
+
+ 安全教育培训考试未完成
+
+
+
+
+ 黄灯
+
+
+ 安全教育培训考试已完成
+ 合同/工资卡未上传，分包班组未绑定
+
+
+
+
+ 绿灯
+
+
+ 安全教育培训考试已完成
+ 合同/工资卡已上传，分包班组已绑定
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.name }}
+
+
+ 未完成
+ 完成
+ {{ item.score }}
+
+
+
+
+
+
+
+
+
+
+
+ 合同照片
+
+
+
+
+
+
+
+
+ 合同编号
+
+
+
+
+
+ 合同期限类型
+
+
+
+
+
+ 合同签订日期
+
+
+
+
+
+ 合同终止日期
+
+
+
+
+
+ 合同类型
+
+
+
+
+
+ 工资核定方式
+
+
+
+
+
+ 工资核定标准
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证件名称
+
+
+
+
+
+ 证件有效期
+
+
+
+
+
+ 是否有效
+
+
+
+
+
+
+ 证件附件
+
+ 附件查看
+
+
+ 无附件
+
+
+
+
+
+
@@ -257,195 +395,266 @@ import config from '@/config'
export default {
data() {
return {
- idNumber:'',
- detailData:{},
- faceImgUrl:'',
- showPopup1:false,//信息
- showPopup2:false,//培训考试
- contractData:{},//合同
- contractImgUrl:"",
- contractWitnessType:"",
- showPopup3:false,//合同
- listCertificate:{},//持证
- showPopup4:false,//持证
+ idNumber: '',
+ detailData: {},
+ faceImgUrl: '',
+ showPopup1: false, //信息
+ showPopup2: false, //培训考试
+ contractData: {}, //合同
+ contractImgUrl: '',
+ contractWitnessType: '',
+ showPopup3: false, //合同
+ listCertificate: {}, //持证
+ showPopup4: false //持证
}
},
onLoad(option) {
- console.log(option)
- this.idNumber=option.idNumber||"";
- if(this.idNumber!=""){
- this.selectPersonQualificationsContent()
- }
- },
- onShow() {
- },
- methods: {
- // 获取详情
- selectPersonQualificationsContent(){
- let param={
- idNumber:this.idNumber,
- }
- uni.request({
- url: config.realAppUrl+'/BasePerson/selectPersonQualificationsContent',
- method: 'post',
- data: param,
- header: {
- 'Content-Type': 'application/json;charset=UTF-8;',
- Authorization: uni.getStorageSync('realNameToken')
- },
- success: res => {
- console.log(res)
- res = res.data;
- if(res.code==200){
- this.detailData=res.data;
- this.faceImgUrl=config.realBaseUrl+res.data.facePhoto;
- }else{
- uni.showToast({
- title: res.msg,
- icon: 'none'
- })
- }
- },
- fail: err => {
- console.log(err)
- }
- })
- },
- openInfo(){
- this.showPopup1=true;
- },
- closePopup1(){
- this.showPopup1=false;
- },
- openTrain(){
- this.showPopup2=true;
- },
- closePopup2(){
- this.showPopup2=false;
- },
- openContract(){
- this.contractData = this.detailData.listContract[0]
- if(this.contractData.witnessPath&&this.contractData.witnessPath.split(".")[1]=="pdf"){
- this.contractWitnessType="file"
- }else{
- this.contractWitnessType="img"
- }
- this.contractImgUrl=config.realFileUrl+this.contractData.witnessPath;
- this.showPopup3=true;
- },
- closePopup3(){
- this.showPopup3=false;
- },
- openListCertificate(){
- this.listCertificate = this.detailData.listCertificate[0]
- this.showPopup4=true;
- },
- closePopup4(){
- this.showPopup4=false;
- },
- openPdf(){
- console.log("附件打开",this.listCertificate.certificateTypeFile)
- uni.navigateTo({
- url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.listCertificate.certificateTypeFile}`
- })
- },
- openPdf2(){
- console.log("附件打开",this.contractImgUrl)
- // let url = config.realFileUrl+this.contractData.witnessPath
- uni.navigateTo({
- url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.contractImgUrl}`
- })
- },
- leftClick() {
- console.log('返回')
- uni.navigateBack({
- delta: 1 // 返回
- });
+ console.log(option)
+ this.idNumber = option.idNumber || ''
+ if (this.idNumber != '') {
+ this.selectPersonQualificationsContent()
}
},
-
+ onShow() {},
+ methods: {
+ // 获取详情
+ selectPersonQualificationsContent() {
+ let param = {
+ idNumber: this.idNumber
+ }
+ uni.request({
+ url: config.realAppUrl + '/BasePerson/selectPersonQualificationsContent',
+ method: 'post',
+ data: param,
+ header: {
+ 'Content-Type': 'application/json;charset=UTF-8;',
+ Authorization: uni.getStorageSync('realNameToken')
+ },
+ success: res => {
+ console.log(res)
+ res = res.data
+ if (res.code == 200) {
+ this.detailData = res.data
+ this.faceImgUrl = config.realBaseUrl + res.data.facePhoto
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ }
+ },
+ fail: err => {
+ console.log(err)
+ }
+ })
+ },
+ openInfo() {
+ this.showPopup1 = true
+ },
+ closePopup1() {
+ this.showPopup1 = false
+ },
+ openTrain() {
+ this.showPopup2 = true
+ },
+ closePopup2() {
+ this.showPopup2 = false
+ },
+ openContract() {
+ this.contractData = this.detailData.listContract[0]
+ if (this.contractData.witnessPath && this.contractData.witnessPath.split('.')[1] == 'pdf') {
+ this.contractWitnessType = 'file'
+ } else {
+ this.contractWitnessType = 'img'
+ }
+ this.contractImgUrl = config.realFileUrl + this.contractData.witnessPath
+ this.showPopup3 = true
+ },
+ closePopup3() {
+ this.showPopup3 = false
+ },
+ openListCertificate() {
+ this.listCertificate = this.detailData.listCertificate[0]
+ this.showPopup4 = true
+ },
+ closePopup4() {
+ this.showPopup4 = false
+ },
+ openPdf() {
+ console.log('附件打开', this.listCertificate.certificateTypeFile)
+ uni.navigateTo({
+ url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.listCertificate.certificateTypeFile}`
+ })
+ },
+ openPdf2() {
+ console.log('附件打开', this.contractImgUrl)
+ // let url = config.realFileUrl+this.contractData.witnessPath
+ uni.navigateTo({
+ url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.contractImgUrl}`
+ })
+ },
+ leftClick() {
+ console.log('返回')
+ uni.navigateBack({
+ delta: 1 // 返回
+ })
+ }
+ },
+ onShow() {},
+ methods: {
+ // 获取详情
+ selectPersonQualificationsContent() {
+ let param = {
+ idNumber: this.idNumber
+ }
+ uni.request({
+ url: config.realAppUrl + '/BasePerson/selectPersonQualificationsContent',
+ method: 'post',
+ data: param,
+ header: {
+ 'Content-Type': 'application/json;charset=UTF-8;',
+ Authorization: uni.getStorageSync('realNameToken')
+ },
+ success: res => {
+ console.log(res)
+ res = res.data
+ if (res.code == 200) {
+ this.detailData = res.data
+ this.faceImgUrl = config.realBaseUrl + res.data.facePhoto
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ }
+ },
+ fail: err => {
+ console.log(err)
+ }
+ })
+ },
+ openInfo() {
+ this.showPopup1 = true
+ },
+ closePopup1() {
+ this.showPopup1 = false
+ },
+ openTrain() {
+ this.showPopup2 = true
+ },
+ closePopup2() {
+ this.showPopup2 = false
+ },
+ openContract() {
+ this.contractData = this.detailData.listContract[0]
+ this.contractImgUrl = config.realBaseUrl + this.contractData.witnessPath
+ this.showPopup3 = true
+ },
+ closePopup3() {
+ this.showPopup3 = false
+ },
+ openListCertificate() {
+ this.listCertificate = this.detailData.listCertificate[0]
+ this.showPopup4 = true
+ },
+ closePopup4() {
+ this.showPopup4 = false
+ },
+ openPdf() {
+ console.log('附件打开')
+ uni.navigateTo({
+ url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.listCertificate.certificateTypeFile}`
+ })
+ },
+ leftClick() {
+ console.log('返回')
+ uni.navigateBack({
+ delta: 1 // 返回
+ })
+ }
+ }
}
diff --git a/pages/workPlan/workPlan-details/index.vue b/pages/workPlan/workPlan-details/index.vue
index c8ed0b7..e6e90cb 100644
--- a/pages/workPlan/workPlan-details/index.vue
+++ b/pages/workPlan/workPlan-details/index.vue
@@ -102,7 +102,7 @@