diff --git a/api/index/index.js b/api/index/index.js index cfa02ae..130047e 100644 --- a/api/index/index.js +++ b/api/index/index.js @@ -54,4 +54,24 @@ export function toDoListApi(data) { }) } +/** + * @data 消息通知列表 + */ +export function getNoticeApi(data) { + return request({ + url: '/certificate/certificate_system/certificateInfo/notice', + method: 'post', + data + }) +} +/** + * @data 设置已读 + */ +export function updateNoticeApi(data) { + return request({ + url: '/certificate/certificate_system/certificateInfo/updateNotice', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/api/mine/index.js b/api/mine/index.js index a3b84dc..774e367 100644 --- a/api/mine/index.js +++ b/api/mine/index.js @@ -55,7 +55,7 @@ export function uploadPhotoGenCodeForAppApi(data) { // 投诉建议 //投诉建议（提交） -export function postCanteenPlaintApi(data) { +export function postFeedBackApi(data) { return request({ url: '/certificate/certificate_feedback/certificateInfo/addFeedBack', method: 'post', diff --git a/pages.json b/pages.json index 9f7ee79..59104b4 100644 --- a/pages.json +++ b/pages.json @@ -252,6 +252,12 @@ "navigationStyle": "custom" } }, + { + "path": "pages/mine/announcement/aDetails", + "style": { + "navigationStyle": "custom" + } + }, { //修改密码 "path": "pages/mine/changPassword/index", "style": { @@ -285,12 +291,7 @@ "navigationBarTitleText": "个人信息" } }, - { - "path": "pages/mine/announcement/aDetails", - "style": { - "navigationBarTitleText": "通知公告详情" - } - }, + { "path": "pages/mine/me/basicInfo", diff --git a/pages/certificateExamCenter/certificateApply/applyAdd.vue b/pages/certificateExamCenter/certificateApply/applyAdd.vue index 1beed76..de5c687 100644 --- a/pages/certificateExamCenter/certificateApply/applyAdd.vue +++ b/pages/certificateExamCenter/certificateApply/applyAdd.vue @@ -7,8 +7,8 @@ - 证件* - + 证件编号* + 证件用途* @@ -16,7 +16,7 @@ 事由* - + 计划出国（境）地点* @@ -32,7 +32,7 @@ 允许他人代办* - + 代办人姓名* @@ -44,7 +44,7 @@ 备注 - + 附件 @@ -112,23 +112,19 @@ export default { checkBoxLocalData3: [{text: '是',value: 1}, {text: '否',value: 2}], isSumbit:false, apply:{ - applyType:2, + applyType:1, applyReason:1, applyLocation:"", isThrid:1, - thridIdName:"", + thridId:"", + thridName:"", thridIdNumber:"", applyDetail:"", - - idNumber:"", - birthday:"", - birthAddr:"", - certificateType:"", - certificateNo:"", - issueAddr:"", - issueDay:"", - issueLifespan:"", - isEle:0 + exitAddr:"", + exitTime:"", + entryTime:"", + remark:"", + certificateNos:[], }, fileList: [], } @@ -145,7 +141,8 @@ export default { const params = { applyType:this.apply.applyType, userId:uni.getStorageSync("userId") - } + } + this.$set(this.apply,"certificateNos",[]) this.certificateList=[] try { const res = await applyCertificateNoListApi(params) @@ -177,15 +174,24 @@ export default { console.log(error) } }, + //更改申请类型 changeApplyType(e){ console.log('e:',this.apply.applyType); this.getCertificateList() + this.$set(this.apply,"exitAddr","") + this.$set(this.apply,"exitTime","") + this.$set(this.apply,"entryTime","") + }, + changeIsThrid(e){ + this.$set(this.apply,'thridId',"") + this.$set(this.apply,'thridName',"") + this.$set(this.apply,'thridIdNumber',"") }, changThridId(e){ console.log('e:',e); let index = this.thridManList.findIndex(v=>v.value==e) console.log(index) - this.$set(this.apply,'thridIdName',this.thridManList[index].text) + this.$set(this.apply,'thridName',this.thridManList[index].text) this.$set(this.apply,'thridIdNumber',this.thridManList[index].idNumber) }, submitApply() { @@ -203,30 +209,55 @@ export default { this.apply.fileNames = arr1 const regex = /(^\d{15}$)|(^\d{17}([0-9]|X)$)/; console.log(this.apply) - if(this.apply.certificateNo==""){ - uni.$u.toast(`请选择证件！`) + if(this.apply.certificateNos.length==0){ + uni.$u.toast(`请选择证件编号！`) }else if(this.apply.applyDetail==""){ uni.$u.toast(`事由不能为空`) - }else if(this.apply.exitAddr==""){ - uni.$u.toast(`计划出国（境）地点不能为空`) - }else if(this.apply.exitTime==""){ - uni.$u.toast(`计划出国（境）日期不能为空`) - }else if(this.apply.entryTime==""){ - uni.$u.toast(`计划回国（境）日期不能为空`) - }else if(this.apply.isThrid==1){ - if(this.apply.thridIdName==""){ + }else if(this.apply.isThrid==1){ + if(this.apply.thridName==""){ uni.$u.toast(`代办人姓名不能为空`) }else if(this.apply.thridIdNumber==""){ uni.$u.toast(`代办人身份证号不能为空`) + }else if(this.apply.applyType==2){ + if(this.apply.exitAddr==""){ + uni.$u.toast(`计划出国（境）地点不能为空`) + return false + }else if(this.apply.exitTime==""){ + uni.$u.toast(`计划出国（境）日期不能为空`) + return false + }else if(this.apply.entryTime==""){ + uni.$u.toast(`计划回国（境）日期不能为空`) + return false + }else if(!this.isSumbit){ + console.log("请求添加") + this.insertApply(); + } + }else if(!this.isSumbit){ + console.log("请求添加") + this.insertApply(); } }else if(this.apply.isThrid==2){ this.apply.thridId="" - this.apply.thridIdName="" - this.apply.thridIdNumber="" - }else{ - if(!this.isSumbit){ - // this.insertApply(); - } + this.apply.thridName="" + this.apply.thridIdNumber="" + if(this.apply.applyType==2){ + if(this.apply.exitAddr==""){ + uni.$u.toast(`计划出国（境）地点不能为空`) + return false + }else if(this.apply.exitTime==""){ + uni.$u.toast(`计划出国（境）日期不能为空`) + return false + }else if(this.apply.entryTime==""){ + uni.$u.toast(`计划回国（境）日期不能为空`) + return false + }else if(!this.isSumbit){ + console.log("请求添加") + this.insertApply(); + } + }else if(!this.isSumbit){ + console.log("请求添加") + this.insertApply(); + } } }, async insertApply(){ diff --git a/pages/certificateExamCenter/certificateApply/applyDetail.vue b/pages/certificateExamCenter/certificateApply/applyDetail.vue index 52b5c69..1391252 100644 --- a/pages/certificateExamCenter/certificateApply/applyDetail.vue +++ b/pages/certificateExamCenter/certificateApply/applyDetail.vue @@ -8,100 +8,100 @@ 证件编号：{{apply.certificateNo}} 申请时间：{{apply.createTime}} - + 证件 - + - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} @@ -201,33 +201,31 @@ export default { checkBoxLocalData3: [{text: '是',value: 1}, {text: '否',value: 2}], isSumbit:false, apply:{ - applyType:0, - useType:1, - applyReason:"", + applyType:1, + applyReason:1, applyLocation:"", - proxyAble:1, - proxyName:"", - proxyNumber:"", + isThrid:1, + thridId:"", + thridName:"", + thridIdNumber:"", applyDetail:"", - - idNumber:"", - birthday:"", - birthAddr:"", - certificateType:"", - certificateNo:"", - issueAddr:"", - issueDay:"", - issueLifespan:"", - isEle:0 - }, + exitAddr:"", + exitTime:"", + entryTime:"", + remark:"", + certificateNos:[], + }, checkProcess:[], showPic:false, - imagerUrl:"" + imagerUrl:"", + certificateList:[] } }, onLoad(options) { this.apply = JSON.parse(options.apply) console.log(this.apply) + this.certificateList = this.apply.details; + console.log(this.certificateList) this.getCheckProcess() }, methods: { diff --git a/pages/certificateExamCenter/certificateApply/index.vue b/pages/certificateExamCenter/certificateApply/index.vue index 7bac19c..3840c9e 100644 --- a/pages/certificateExamCenter/certificateApply/index.vue +++ b/pages/certificateExamCenter/certificateApply/index.vue @@ -13,7 +13,7 @@ - {{item.name}}的申请 + {{item.userName}}的申请 存证 取证 @@ -48,11 +48,7 @@ export default { pageNum: 1, pageSize: 10, total: 0, - infoList: [ - {name:"张三",idNumber:'23000020302030230230',time:'2025-10-09 16:23',status:1}, - {name:"张四",idNumber:'23000020302030230230',time:'2025-10-09 16:23',status:2}, - {name:"张五",idNumber:'23000020302030230230',time:'2025-10-09 16:23',status:3}, - ], + infoList: [], status: 'loadmore', } }, diff --git a/pages/certificateExamCenter/certificateExam/examDetail.vue b/pages/certificateExamCenter/certificateExam/examDetail.vue index a0bed4e..c9362ed 100644 --- a/pages/certificateExamCenter/certificateExam/examDetail.vue +++ b/pages/certificateExamCenter/certificateExam/examDetail.vue @@ -8,100 +8,100 @@ 证件编号：{{apply.certificateNo}} 申请时间：{{apply.createTime}} - + 证件 - + - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} @@ -150,7 +150,7 @@ 备注 {{apply.remark}} - + 附件 @@ -204,33 +204,31 @@ export default { checkBoxLocalData3: [{text: '是',value: 1}, {text: '否',value: 2}], isSumbit:false, apply:{ - applyType:0, - useType:1, - applyReason:"", + applyType:1, + applyReason:1, applyLocation:"", - proxyAble:1, - proxyName:"", - proxyNumber:"", + isThrid:1, + thridId:"", + thridName:"", + thridIdNumber:"", applyDetail:"", - - idNumber:"", - birthday:"", - birthAddr:"", - certificateType:"", - certificateNo:"", - issueAddr:"", - issueDay:"", - issueLifespan:"", - isEle:0 - }, + exitAddr:"", + exitTime:"", + entryTime:"", + remark:"", + certificateNos:[], + }, checkProcess:[], showPic:false, - imagerUrl:"" + imagerUrl:"", + certificateList:[] } }, onLoad(options) { this.apply = JSON.parse(options.apply) console.log(this.apply) + this.certificateList = this.apply.details; + console.log(this.certificateList) this.getCheckProcess() }, methods: { diff --git a/pages/certificateExamCenter/certificateExam/examView.vue b/pages/certificateExamCenter/certificateExam/examView.vue index 6d1bb48..fa6a0b6 100644 --- a/pages/certificateExamCenter/certificateExam/examView.vue +++ b/pages/certificateExamCenter/certificateExam/examView.vue @@ -8,100 +8,100 @@ 证件编号：{{apply.certificateNo}} 申请时间：{{apply.createTime}} - + 证件 - + - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} - + - {{apply.certificateTypeName}} - {{apply.certificateNo}} - {{apply.stateName}} + {{item.certificateTypeName}} + {{item.certificateNo}} + {{item.stateName}} 有效期 - {{ apply.issueDay }} 至 {{ apply.issueLifespan }} + {{ item.issueDay }} 至 {{ item.issueLifespan }} 姓名 - {{apply.name}} + {{item.name}} 证件柜 - {{apply.deviceName||'无'}} + {{item.deviceName||'无'}} 槽位 - {{apply.slotNo||'无'}} + {{item.slotNo||'无'}} 位置 - {{apply.deviceAddr||'无'}} + {{item.deviceAddr||'无'}} @@ -150,7 +150,7 @@ 备注 {{apply.remark}} - + 附件 @@ -204,33 +204,31 @@ export default { checkBoxLocalData3: [{text: '是',value: 1}, {text: '否',value: 2}], isSumbit:false, apply:{ - applyType:0, - useType:1, - applyReason:"", + applyType:1, + applyReason:1, applyLocation:"", - proxyAble:1, - proxyName:"", - proxyNumber:"", + isThrid:1, + thridId:"", + thridName:"", + thridIdNumber:"", applyDetail:"", - - idNumber:"", - birthday:"", - birthAddr:"", - certificateType:"", - certificateNo:"", - issueAddr:"", - issueDay:"", - issueLifespan:"", - isEle:0 - }, + exitAddr:"", + exitTime:"", + entryTime:"", + remark:"", + certificateNos:[], + }, checkProcess:[], showPic:false, - imagerUrl:"" + imagerUrl:"", + certificateList:[] } }, onLoad(options) { this.apply = JSON.parse(options.apply) console.log(this.apply) + this.certificateList = this.apply.details; + console.log(this.certificateList) this.getCheckProcess() }, methods: { diff --git a/pages/certificateExamCenter/certificateExam/index.vue b/pages/certificateExamCenter/certificateExam/index.vue index c666937..0c159e6 100644 --- a/pages/certificateExamCenter/certificateExam/index.vue +++ b/pages/certificateExamCenter/certificateExam/index.vue @@ -13,7 +13,7 @@ - {{item.name}}的申请 + {{item.userName}}的申请 存证 取证 diff --git a/pages/index.vue b/pages/index.vue index abd4716..0282a95 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,9 +1,14 @@