Merge branch 'minJeecg' into 'master'

Min jeecg

See merge request cxcxt/jeecguniapp!32

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 }
+	})
+}

src/components/Esign/SinopecEsignPage.vue

@@ -2,10 +2,10 @@
 <template>
 	<view>
 		<view v-if="ifH5">
-			<SinopecEsignPageH5 :valiData="props.valiData"  :procInsId="props.procInsId"  :path="props.path" ref="signH5" :fileName="props.fileName" @stampSuccess="getStampSuccess"></SinopecEsignPageH5>
+			<SinopecEsignPageH5 :taskDefKey="props.taskDefKey" :valiData="props.valiData"  :procInsId="props.procInsId"  :path="props.path" ref="signH5" :fileName="props.fileName" @stampSuccess="getStampSuccess"></SinopecEsignPageH5>
 		</view>
 		<view v-else>
-			<SinopecEsignPageAPP :valiData="props.valiData" :procInsId="props.procInsId"  :path="props.path" ref="signAPP" :fileName="props.fileName" @stampSuccess="getStampSuccess"></SinopecEsignPageAPP>
+			<SinopecEsignPageAPP :taskDefKey="props.taskDefKey" :valiData="props.valiData" :procInsId="props.procInsId"  :path="props.path" ref="signAPP" :fileName="props.fileName" @stampSuccess="getStampSuccess"></SinopecEsignPageAPP>
 		</view>
 	</view>
 </template>
@@ -40,6 +40,10 @@
 		path: {//签章验证
 			type: String,
 			default: ""
+		},
+		taskDefKey: { //流程节点
+			type: String,
+			default: ""
 		}
 	})
 

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 {

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 {

src/pages-bpm/officialReceptions/index.vue

@@ -0,0 +1,109 @@
+<template>
+	<view>
+		<wd-collapse v-model="value">
+		  <wd-collapse-item title="表单数据" name="item1">
+			  	<wd-cell title="接待类别" :value="info.jdlb" />
+			  	<wd-cell title="详细类别" :value="info.jdlb2" />
+			  	<wd-cell title="申请时间" :value="info.sqrq" />
+			  	<wd-cell title="申请单位" :value="info.sqdw" />
+			  	<wd-cell title="申请盖章领导" :value="info.gzbmld" />
+			  	<wd-cell title="申请盖章厂领导" :value="info.gzcld" />
+			  	<wd-cell title="活动日期" :value="info.hdrq" />
+			  	<wd-cell title="来宾单位" :value="info.lbdw" />
+			  	<wd-cell title="活动内容" :value="info.hdnr" />
+			  	<wd-cell title="经办人" :value="info.jbr" />
+				<wd-cell title="接待类别" :value="info.jdxm" />
+				<wd-cell v-if="info.jdxm=='工作餐(午餐)'&&info.jdlb2=='业务招待（外部市场）'" title="午餐地点" :value="info.wcddforwbxm" />
+				<wd-cell v-if="info.jdxm=='工作餐(午餐)'&&info.jdlb2!='业务招待（外部市场）'" title="午餐地点" :value="info.gzcjszwdidian" />
+				<wd-cell v-if="info.jdxm=='工作餐(晚餐)'" title="晚餐开始时间" :value="info.nightstarttime" />
+				<wd-cell v-if="info.jdxm=='工作餐(晚餐)'&&info.jdlb2=='业务招待（外部市场）'" title="晚餐地点" :value="info.ninghtddforwbxm" />
+				<wd-cell v-if="info.jdxm=='工作餐(晚餐)'&&info.jdlb2!='业务招待（外部市场）'" title="晚餐地点" :value="info.gzcjswsdidian" />
+				<wd-cell v-if="info.jdxm=='自助餐'"  title="自助餐人数" :value="info.zzcrs" />
+				<wd-cell v-if="info.jdxm=='自助餐'"  title="自助餐次数" :value="info.zzccs" />
+				<wd-cell title="来宾人数" :value="info.lbrs" />
+				<wd-cell title="陪餐人数" :value="info.pcrs" />
+				<wd-cell title="申请金额（元）" :value="info.sqje" />
+				<wd-cell title="备注" :value="info.bz" />
+		  </wd-collapse-item>
+		  <wd-collapse-item custom-body-style="padding:0;"  title="审批附件" name="item2">
+			  <SinopecEsignPage ref="sign" :procInsId="props.formData.procInsId"  :path="props.formData.path" :taskDefKey="props.formData.taskDefKey" :fileName="info.jdsqwj" @stampSuccess="getStampSuccess" ></SinopecEsignPage>
+		  </wd-collapse-item>
+		</wd-collapse>
+		<wd-toast></wd-toast>
+	</view>
+</template>
+
+<script setup>
+	import {
+		queryById
+	} from '@/api/officialReceptions'
+	import {
+		processHistoryList
+	} from '@/api/bpm/sign'
+	import {
+		imgUrl
+	} from '@/utils/index'
+	import SinopecEsignPage from '@/components/Esign/SinopecEsignPage.vue'
+	import { useUserStore } from '@/store/user'
+	import { useToast, useMessage, useNotify, dayjs } from 'wot-design-uni'
+	const userStore = useUserStore()
+	const toast = useToast()
+	const emit = defineEmits(['getStampSuc'])
+
+	const sign = ref(null);
+	const value = ref([]);
+	const info = ref({});
+	const valiData = ref({});
+	const ifEsign = ref(true);
+	const props = defineProps({
+		formData: {
+			type: Object,
+			default: () => {},
+		},
+		fileName: {
+			type: String,
+			default: ""
+		}
+	})
+
+	const queryData = ()=>{
+		console.log(props.formData)
+		queryById(props.formData.dataId).then(res=>{
+			if (res.success) {
+				console.log(res)
+				info.value = res.result.records[0]
+				if(info.value.jdsqwj){
+					info.value.jdsqwj = info.value.jdsqwj.replace("PdfFiles/PdfFile/",'')
+				}
+			}else{
+				toast.error(res.message)
+			}
+		})
+	}
+	
+
+
+	  //获取印章成功事件，并将信号传给确认提交按钮。
+	 const getStampSuccess=(val)=> {
+		emit('getStampSuc', val)
+	  }
+
+	const signValidator = (procInsId,path)=>{
+	 	//这里进行电子签章验证
+		return sign.value.signValidator();
+	 }
+
+	onMounted(() => {
+		queryData();
+	})
+	
+	
+	defineExpose({ //暴露方法
+	  signValidator,
+	  ifEsign
+	})
+</script>
+<style lang="scss" scoped>
+
+	
+</style>

src/pages.json

@@ -597,6 +597,10 @@
           "path": "OfficeEquipmentMaintenanceApplication/index",
           "type": "page"
         },
+        {
+          "path": "officialReceptions/index",
+          "type": "page"
+        },
         {
           "path": "planReview/index",
           "type": "page"

src/types/uni-pages.d.ts

@@ -71,6 +71,7 @@ interface NavigateToOptions {
        "/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" |