diff --git a/api/certificateManage/index.js b/api/certificateManage/index.js index d5d4b35..fe7dcbd 100644 --- a/api/certificateManage/index.js +++ b/api/certificateManage/index.js @@ -100,3 +100,15 @@ export function certificateVerifyTaskDetailListApi(data) { params:data }) } + + +/** + * @data 获取出入境时间 + */ +export function getExitEntryApi(data) { + return request({ + url: '/certificate/certificate_manage/certificateInfo/getExitEntry ', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/pages/certificateExamCenter/certificateApply/applyAdd.vue b/pages/certificateExamCenter/certificateApply/applyAdd.vue index 796b311..39b6360 100644 --- a/pages/certificateExamCenter/certificateApply/applyAdd.vue +++ b/pages/certificateExamCenter/certificateApply/applyAdd.vue @@ -32,11 +32,11 @@ 计划出国(境)日期* - + 计划回国(境)日期* - + 允许他人代办* @@ -133,6 +133,8 @@ export default { remark:"", certificateNos:[], }, + startDate: '', // 开始日期 + endDate: '', // 结束日期 fileList: [], deviceList: [], } @@ -339,6 +341,7 @@ export default { Object.assign(item, { status: "success", message: "", + name:'附件'+(i+1), url: result.url, }) ); @@ -374,6 +377,15 @@ export default { deletePic(event) { this.fileList.splice(event.index, 1); }, + handleStartDateChange(value) { + this.startDate = value; + // 更新结束日期的可选范围 + // this.updateEndDateRange(); + }, + handleEndDateChange(value) { + this.endDate = value; + // 如果需要,可以在这里添加额外的逻辑 + }, } } diff --git a/pages/certificateExamCenter/certificateApply/applyDetail.vue b/pages/certificateExamCenter/certificateApply/applyDetail.vue index bac1d20..33026b3 100644 --- a/pages/certificateExamCenter/certificateApply/applyDetail.vue +++ b/pages/certificateExamCenter/certificateApply/applyDetail.vue @@ -173,9 +173,10 @@ 流程 - - + + + 未处理 同意 拒绝 {{item.createTime}} @@ -224,6 +225,7 @@ export default { certificateNos:[], }, checkProcess:[], + currentIndex:0, showPic:false, imagerUrl:"", certificateList:[] @@ -244,7 +246,13 @@ export default { const res = await checkProcessCertificateApplyApi(param); console.log("getCheckProcess",res) if(res.code==200){ - this.checkProcess = res.data + this.checkProcess = res.data||[]; + let index = res.data.findIndex(v=>v.checkState==0) + if(index==-1){ + this.currentIndex = 3 + }else{ + this.currentIndex = index + } }else{ this.checkProcess = [] } diff --git a/pages/certificateExamCenter/certificateApply/applyEdit.vue b/pages/certificateExamCenter/certificateApply/applyEdit.vue index 16d3959..26adf61 100644 --- a/pages/certificateExamCenter/certificateApply/applyEdit.vue +++ b/pages/certificateExamCenter/certificateApply/applyEdit.vue @@ -9,7 +9,7 @@ 证件编号* - + @@ -154,9 +154,8 @@ export default { this.$set(this.apply,"isThrid",Number(this.apply.isThrid)) if(this.apply.fileUrl!=""){ let arr = this.apply.fileUrl.split(',') - let arr2 = this.apply.fileName.split(',') arr.forEach((item,index)=>{ - this.fileList.push({url:item,name:arr2[index]}) + this.fileList.push({url:item,name:"附件"+(index+1)}) }) } @@ -352,6 +351,7 @@ export default { Object.assign(item, { status: "success", message: "", + name:'图片'+(i+1), url: result.url, }) ); diff --git a/pages/certificateExamCenter/certificateExam/examDetail.vue b/pages/certificateExamCenter/certificateExam/examDetail.vue index cc17369..3ed3235 100644 --- a/pages/certificateExamCenter/certificateExam/examDetail.vue +++ b/pages/certificateExamCenter/certificateExam/examDetail.vue @@ -173,9 +173,10 @@ 流程 - - + + + 未处理 同意 拒绝 {{item.createTime}} @@ -227,6 +228,7 @@ export default { certificateNos:[], }, checkProcess:[], + currentIndex:0, showPic:false, imagerUrl:"", certificateList:[] @@ -247,7 +249,13 @@ export default { const res = await checkProcessCertificateApplyApi(param); console.log("getCheckProcess",res) if(res.code==200){ - this.checkProcess = res.data + this.checkProcess = res.data||[]; + let index = res.data.findIndex(v=>v.checkState==0) + if(index==-1){ + this.currentIndex = 3 + }else{ + this.currentIndex = index + } }else{ this.checkProcess = [] } diff --git a/pages/certificateExamCenter/certificateExam/examView.vue b/pages/certificateExamCenter/certificateExam/examView.vue index 5c7f169..b152785 100644 --- a/pages/certificateExamCenter/certificateExam/examView.vue +++ b/pages/certificateExamCenter/certificateExam/examView.vue @@ -173,9 +173,10 @@ 流程 - - + + + 未处理 同意 拒绝 {{item.createTime}} @@ -227,6 +228,7 @@ export default { certificateNos:[], }, checkProcess:[], + currentIndex:0, showPic:false, imagerUrl:"", certificateList:[] @@ -247,7 +249,13 @@ export default { const res = await checkProcessCertificateApplyApi(param); console.log("getCheckProcess",res) if(res.code==200){ - this.checkProcess = res.data + this.checkProcess = res.data||[]; + let index = res.data.findIndex(v=>v.checkState==0) + if(index==-1){ + this.currentIndex = 3 + }else{ + this.currentIndex = index + } }else{ this.checkProcess = [] } diff --git a/pages/certificateManage/certificateInfo/certificateDetail.vue b/pages/certificateManage/certificateInfo/certificateDetail.vue index 8c2c985..2aef304 100644 --- a/pages/certificateManage/certificateInfo/certificateDetail.vue +++ b/pages/certificateManage/certificateInfo/certificateDetail.vue @@ -154,29 +154,29 @@ - + - - - - 入境 - - - 入境时间:暂无 - 入境口岸:暂无 - - 出境 - 出境时间:暂无 - 出境口岸:暂无 + 出境时间:{{tabData4.exitTime || "暂无"}} + + + + + + + 入境 + + + 入境时间:{{tabData4.entryTime || "暂无"}} + @@ -186,6 +186,7 @@ @@ -148,6 +146,7 @@ export default { margin:20rpx 0; background: #fff; position: relative; + padding: 10rpx 0; } .info-text{ font-size: 28rpx;