From 3f622354a6f2794b80ebfeb8c4f452ef0d2d5ad5 Mon Sep 17 00:00:00 2001
From: lagos <627844378@qq.com>
Date: Wed, 13 Aug 2025 09:26:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8A=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=BE=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.config.ts                          |   2 +-
 src/App.vue                                 |  14 +--
 src/components/Esign/SinopecEsignPageH5.vue |   2 +-
 src/manifest.json                           |   2 +-
 src/pages-bpm/officialReceptions/show.vue   | 105 ++++++++++++++++++++
 src/pages.json                              |   4 +
 src/types/uni-pages.d.ts                    |   1 +
 src/utils/index.ts                          |   2 +
 8 files changed, 122 insertions(+), 10 deletions(-)
 create mode 100644 src/pages-bpm/officialReceptions/show.vue

diff --git a/manifest.config.ts b/manifest.config.ts
index 99bfd68..f31889b 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -17,7 +17,7 @@ export default defineManifestConfig({
   name: VITE_APP_TITLE,
   appid: VITE_UNI_APPID,
   description: '',
-  versionName: '2.1.1',
+  versionName: '2.1.0',
   versionCode: '20250808',
   transformPx: false,
   locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
diff --git a/src/App.vue b/src/App.vue
index 1292763..914932d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,13 +13,13 @@
 			// 定位
 			getLocation()
 			// 处理外部唤醒逻辑 min
-		   if (options.path && options.query) {
-		 	 const path = options.path; // 获取路径，如 "pages/home/index"
-			 const query = options.query; // 获取参数，如 {id: 123}
-			 uni.navigateTo({
-			   url: `/${path}?${Object.keys(query).map(k => `${k}=${query[k]}`).join('&')}`
-			 });
-		   }
+		  //  if (options.path && options.query) {
+		 	//  const path = options.path; // 获取路径，如 "pages/home/index"
+			 // const query = options.query; // 获取参数，如 {id: 123}
+			 // uni.navigateTo({
+			 //   url: `/${path}?${Object.keys(query).map(k => `${k}=${query[k]}`).join('&')}`
+			 // });
+		  //  }
 		},
 		onShow: function (options) {
 			
diff --git a/src/components/Esign/SinopecEsignPageH5.vue b/src/components/Esign/SinopecEsignPageH5.vue
index a10ac8e..dce340d 100644
--- a/src/components/Esign/SinopecEsignPageH5.vue
+++ b/src/components/Esign/SinopecEsignPageH5.vue
@@ -138,7 +138,7 @@
 			if(props.taskDefKey=='task1715564108096'){ //如果是综合办审核，不需要该区
 				return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证
 			}
-			
+			return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证
 			if (sign.value) {
 				return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证
 			} else {
diff --git a/src/manifest.json b/src/manifest.json
index 6b72bf2..712662b 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "name": "数智产销",
   "appid": "__UNI__9F097F0",
   "description": "",
-  "versionName": "2.1.1",
+  "versionName": "2.1.0",
   "versionCode": "20250808",
   "transformPx": false,
   "app-plus": {
diff --git a/src/pages-bpm/officialReceptions/show.vue b/src/pages-bpm/officialReceptions/show.vue
new file mode 100644
index 0000000..56c00bf
--- /dev/null
+++ b/src/pages-bpm/officialReceptions/show.vue
@@ -0,0 +1,105 @@
+<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>
+		<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 { 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>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 6630c2c..c00cee5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -605,6 +605,10 @@
           "path": "officialReceptions/index",
           "type": "page"
         },
+        {
+          "path": "officialReceptions/show",
+          "type": "page"
+        },
         {
           "path": "planReview/index",
           "type": "page"
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 3c9e536..7cc9dd7 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -73,6 +73,7 @@ interface NavigateToOptions {
        "/pages-bpm/leaveApplication/index" |
        "/pages-bpm/OfficeEquipmentMaintenanceApplication/index" |
        "/pages-bpm/officialReceptions/index" |
+       "/pages-bpm/officialReceptions/show" |
        "/pages-bpm/planReview/index" |
        "/pages-bpm/SuperiorSystem/index" |
        "/pages-bpm/unconventional/index" |
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 419f779..3288d04 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -235,7 +235,9 @@ export const useUpdateApp = defineStore('updateApp', () => {
 			if (webApp) {//如果是测试环境 ，upDateAppApi 传递参数 by min
 				path = webApp
 			}
+			console.log(22222222222222222)
 			upDateAppApi(path).then(async (res : any) => {
+				console.log(3333333333)
 				let {
 					result
 				} = res