diff --git a/src/api/FollowUpRecords/followrecords.ts b/src/api/FollowUpRecords/followrecords.ts new file mode 100644 index 0000000..05b8a9e --- /dev/null +++ b/src/api/FollowUpRecords/followrecords.ts @@ -0,0 +1,12 @@ +import { http } from '@/utils/http'; + + + +/*通过id查询数据*/ +export function queryByIdApi(id : string) { + return http({ + url: '/cxcGwjktbHmcAPP/cxcGwjktbHmcAPP/queryById', + method: 'GET', + data: { id } + }) +} \ No newline at end of file diff --git a/src/api/officialReceptions/index.ts b/src/api/officialReceptions/index.ts new file mode 100644 index 0000000..6b0defe --- /dev/null +++ b/src/api/officialReceptions/index.ts @@ -0,0 +1,10 @@ +import { http } from '@/utils/http'; + +/*通过id查询公文数据*/ +export function queryById(id : string) { + return http({ + url: '/CxcGwjdSpd/cxcGwjdSpd/queryByIdBpm', + method: 'GET', + data: { id } + }) +} diff --git a/src/components/Esign/SinopecEsignPage.vue b/src/components/Esign/SinopecEsignPage.vue index 1e41d35..1e03617 100644 --- a/src/components/Esign/SinopecEsignPage.vue +++ b/src/components/Esign/SinopecEsignPage.vue @@ -2,10 +2,10 @@ @@ -40,6 +40,10 @@ path: {//签章验证 type: String, default: "" + }, + taskDefKey: { //流程节点 + type: String, + default: "" } }) diff --git a/src/components/Esign/SinopecEsignPageAPP.vue b/src/components/Esign/SinopecEsignPageAPP.vue index fb275f8..e61c54d 100644 --- a/src/components/Esign/SinopecEsignPageAPP.vue +++ b/src/components/Esign/SinopecEsignPageAPP.vue @@ -45,6 +45,10 @@ export default { path: {//签章验证 type: String, default: "" + }, + taskDefKey: { //流程节点 + type: String, + default: "" } }, emits: ['message'], @@ -107,10 +111,14 @@ export default { } else { return flag = false; } - } else if (props.path == 'modules/gwjdspd/modules/CxcGwjdSpdFromByProcess') { //判断公务接待模块 + } else if (props.path == 'officialReceptions/index') { //判断公务接待模块 //2024.5.16张祥瑞 //如果签章路径是非常规盖章则走这里,验证机制为跳过签章个数验证,只要没签章则不能提交流程 // let flag = false; + if(props.taskDefKey=='task1715564108096'){ //如果是综合办审核,不需要该区 + return flag = true; //只要执行了签章成功操作就返回成功,否则加载个数验证 + } + if (sign.value) { return flag = true; //只要执行了签章成功操作就返回成功,否则加载个数验证 } else { diff --git a/src/components/Esign/SinopecEsignPageH5.vue b/src/components/Esign/SinopecEsignPageH5.vue index 72a21bb..a10ac8e 100644 --- a/src/components/Esign/SinopecEsignPageH5.vue +++ b/src/components/Esign/SinopecEsignPageH5.vue @@ -60,6 +60,10 @@ path: {//签章验证 type: String, default: "" + }, + taskDefKey: { //流程节点 + type: String, + default: "" } }) @@ -90,7 +94,7 @@ const signValidator = async () => { //签章验证 by 闵 - console.log(props.valiData) + console.log(props.path) errorMsg.value = ''; let flag = false; if (props.path == 'unconventional/stamp') { //非常规验证 @@ -126,10 +130,15 @@ } else { return flag = false; } - } else if (props.path == 'modules/gwjdspd/modules/CxcGwjdSpdFromByProcess') { //判断公务接待模块 + } else if (props.path == 'officialReceptions/index') { //判断公务接待模块 //2024.5.16张祥瑞 //如果签章路径是非常规盖章则走这里,验证机制为跳过签章个数验证,只要没签章则不能提交流程 // let flag = false; + console.log(2222) + if(props.taskDefKey=='task1715564108096'){ //如果是综合办审核,不需要该区 + return flag = true; //只要执行了签章成功操作就返回成功,否则加载个数验证 + } + if (sign.value) { return flag = true; //只要执行了签章成功操作就返回成功,否则加载个数验证 } else { diff --git a/src/pages-bpm/FollowUpRecords/index.vue b/src/pages-bpm/FollowUpRecords/index.vue new file mode 100644 index 0000000..12fbfb3 --- /dev/null +++ b/src/pages-bpm/FollowUpRecords/index.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/src/pages-bpm/officialReceptions/index.vue b/src/pages-bpm/officialReceptions/index.vue new file mode 100644 index 0000000..c3d83b7 --- /dev/null +++ b/src/pages-bpm/officialReceptions/index.vue @@ -0,0 +1,109 @@ + + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 8d53ecd..6630c2c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -581,6 +581,10 @@ "path": "document/index", "type": "page" }, + { + "path": "FollowUpRecords/index", + "type": "page" + }, { "path": "khss/index", "type": "page" @@ -597,6 +601,10 @@ "path": "OfficeEquipmentMaintenanceApplication/index", "type": "page" }, + { + "path": "officialReceptions/index", + "type": "page" + }, { "path": "planReview/index", "type": "page" diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index f673204..3c9e536 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -67,10 +67,12 @@ interface NavigateToOptions { "/pages-process/taskHandle" | "/pages-bpm/carRental/index" | "/pages-bpm/document/index" | + "/pages-bpm/FollowUpRecords/index" | "/pages-bpm/khss/index" | "/pages-bpm/lawsAndRegulations/index" | "/pages-bpm/leaveApplication/index" | "/pages-bpm/OfficeEquipmentMaintenanceApplication/index" | + "/pages-bpm/officialReceptions/index" | "/pages-bpm/planReview/index" | "/pages-bpm/SuperiorSystem/index" | "/pages-bpm/unconventional/index" |