From b4b88b0cd78a2e7c1ba8e172df6d53e20e038fd2 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Sun, 15 Jun 2025 10:44:00 +0800
Subject: [PATCH] 2.0.2

---
 manifest.config.ts                           |  4 +-
 src/components/Esign/SinopecEsignPage.vue    |  1 -
 src/manifest.json                            |  4 +-
 src/pages-bpm/unconventional/index.vue       |  1 -
 src/pages-bpm/unconventional/stamp.vue       | 16 ++-----
 src/pages-process/components/DynamicLink.vue | 44 +++++++++++++-------
 src/pages-process/taskHandle.vue             | 14 ++++---
 src/pages.json                               |  3 +-
 src/types/uni-pages.d.ts                     |  8 ++--
 9 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/manifest.config.ts b/manifest.config.ts
index 522f21c..63e1ec6 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -17,8 +17,8 @@ export default defineManifestConfig({
   name: VITE_APP_TITLE,
   appid: VITE_UNI_APPID,
   description: '',
-  versionName: '2.0.0',
-  versionCode: '20250605',
+  versionName: '2.0.2',
+  versionCode: '20250615',
   transformPx: false,
   locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
   /* 5+App特有相关 */
diff --git a/src/components/Esign/SinopecEsignPage.vue b/src/components/Esign/SinopecEsignPage.vue
index 218a3a0..1e41d35 100644
--- a/src/components/Esign/SinopecEsignPage.vue
+++ b/src/components/Esign/SinopecEsignPage.vue
@@ -62,7 +62,6 @@
 	 	if(ifH5.value){
 		  return	signH5.value.signValidator();
 		}else{
-		  console.log(3435)
 		  return	signAPP.value.signValidator()
 		}
 	 }
diff --git a/src/manifest.json b/src/manifest.json
index df63d6a..dcdea7e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
   "name": "数智产销",
   "appid": "__UNI__9F097F0",
   "description": "",
-  "versionName": "2.0.0",
-  "versionCode": "20250605",
+  "versionName": "2.0.2",
+  "versionCode": "20250615",
   "transformPx": false,
   "app-plus": {
     "usingComponents": true,
diff --git a/src/pages-bpm/unconventional/index.vue b/src/pages-bpm/unconventional/index.vue
index 84f6298..0b6079e 100644
--- a/src/pages-bpm/unconventional/index.vue
+++ b/src/pages-bpm/unconventional/index.vue
@@ -34,7 +34,6 @@
 
 	const queryData = ()=>{
 		queryUnData({id:props.formData.dataId}).then(res=>{
-			console.log(res)
 			info.value  = res.result.records[0]
 		})
 	}
diff --git a/src/pages-bpm/unconventional/stamp.vue b/src/pages-bpm/unconventional/stamp.vue
index 010f279..c5e37a3 100644
--- a/src/pages-bpm/unconventional/stamp.vue
+++ b/src/pages-bpm/unconventional/stamp.vue
@@ -12,7 +12,7 @@
 		  	<wd-cell title="盖章位置" :value="info.gzwz" />
 	  </wd-collapse-item>
 	  <wd-collapse-item custom-body-style="padding:0;"  title="盖章文件" name="item2">
-		  <SinopecEsignPage :valiData="valiData" ref="sign" :procInsId="props.formData.procInsId"  :path="props.formData.path" :fileName="info.wjdict" @stampSuccess="getStampSuccess"></SinopecEsignPage>
+		  <SinopecEsignPage :valiData="valiData" ref="sign" :procInsId="props.formData.procInsId"  :path="props.formData.path" :fileName="info.wjdict" @stampSuccess="getStampSuccess" ></SinopecEsignPage>
 	  </wd-collapse-item>
 	</wd-collapse>
 </template>
@@ -37,7 +37,7 @@
 	const value = ref([]);
 	const info = ref({});
 	const valiData = ref({});
-	
+	const ifEsign = ref(true);
 	const props = defineProps({
 		formData: {
 			type: Object,
@@ -51,33 +51,26 @@
 
 	const queryData = ()=>{
 		queryUnData({id:props.formData.dataId}).then(res=>{
-			console.log(res)
 			info.value  = res.result.records[0]
 			initValiData(info.value); //处理验证data by 闵
 			let lj = info.value.wj.split("/");
 			let ljurl = lj[2] + '/' + lj[3];
 			info.value.wjdict = ljurl;
-			console.log(info.value)
 		})
 	}
 	
 	const  initValiData = (data)=>{
 		//处理验证data by 闵
 		let name = userStore.userInfo.realname;
-		console.log(name)
-		// name = '王飞'
 		let num = null;
 		if(data.lds){
 		  let ldsMap = JSON.parse(data.lds);
 		  if(ldsMap[name]) num = ldsMap[name]
 		}
-		console.log(data)
 		if(data.clds){
 		  let cldsMap = JSON.parse(data.clds);
 		  if(cldsMap[name]) num = cldsMap[name]
 		}
-		console.log(name)
-		console.log(num)
 		if(num){
 		  valiData.value.flag = true;
 		  valiData.value.num = num;
@@ -87,9 +80,7 @@
 
 	const initValtime = ()=>{
 		processHistoryList(props.formData.procInsId).then(res=>{
-			console.log(res)
 			if (res.success) {
-			  console.log(res.result.records)
 			  valiData.value.time = res.result.records[0].startTime
 			} else {
 				console.log("加载失败")
@@ -114,7 +105,8 @@
 	
 	
 	defineExpose({ //暴露方法
-	  signValidator
+	  signValidator,
+	  ifEsign
 	})
 </script>
 <style lang="scss" scoped>
diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue
index dc9c5e3..39aa385 100644
--- a/src/pages-process/components/DynamicLink.vue
+++ b/src/pages-process/components/DynamicLink.vue
@@ -1,18 +1,19 @@
 <!-- component标签可以变换组件 -->
 <template>
 	<view>
-		<component :is="asyncComponent" :formData="formData" :history="history" :activeKey="activeKey"
-			v-if="asyncComponent" @getStampSuc="getStampSuccess"></component>
+		<component ref="comptRef" :is="asyncComponent" :formData="formData" :history="history" :activeKey="activeKey" v-if="asyncComponent"
+			@getStampSuc="getStampSuccess"></component>
 		<view v-else>该模块暂未建立审批页面！</view>
-		<wd-tabbar v-if="false">
-			<wd-tabbar-item></wd-tabbar-item>
-		</wd-tabbar>
 	</view>
 </template>
-<script setup lang="ts">
+<script setup>
+	import { ref, reactive, onMounted, computed, watch, nextTick } from 'vue';
 	const compName = ref('');
 	const asyncComponent = ref(null);
 	const modules = import.meta.glob('/src/pages-bpm/**/*.vue');
+	const comptRef = ref();
+
+
 	defineOptions({
 		name: 'DynamicLink',
 		options: {
@@ -40,18 +41,21 @@
 	})
 	// 监听 option 变化
 	watch(() => props.path, (newVal) => {
-		if (newVal) {
+		if (newVal){
 			compName.value = newVal;
-			if (newVal.indexOf('index') == -1) {
-				compName.value = newVal + '/index'
-			}
-		}
+		} 
 		//动态加载页面
 		const comp = modules[`/src/pages-bpm/${compName.value}.vue`]
+		if(!comp){
+			if(newVal.indexOf('index')==-1){
+				compName.value = newVal+'/index'
+				comp = modules[`/src/pages-bpm/${compName.value}.vue`]
+			}
+		}
 		comp().then((myModule) => {
 			asyncComponent.value = myModule.default
 		}).catch(() => {
-
+		
 		})
 	}, {
 		deep: true,
@@ -60,7 +64,11 @@
 		// #endif
 	});
 
-
+	const signValidator = ()=>{
+		//这里进行电子签章验证
+		return comptRef.value.signValidator()
+	}
+	
 	const getStampSuccess = (val) => {
 		// this.$emit('getStampSuc', val)
 		// //在<component>标签动态组件使用vuex，没有保存成功。
@@ -69,4 +77,12 @@
 		//   esignTag: val
 		// });
 	}
-</script>
\ No newline at end of file
+	
+	defineExpose({ //暴露方法
+	  signValidator
+	})
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/pages-process/taskHandle.vue b/src/pages-process/taskHandle.vue
index 74c433d..d44c959 100644
--- a/src/pages-process/taskHandle.vue
+++ b/src/pages-process/taskHandle.vue
@@ -165,15 +165,17 @@
 	      flag: false,
 	      type: 0,
 	    }
-		console.log(linkRef.value)
-		let data = await linkRef.value.signValidator()
-		if(data==false||data==true){
-			callData.flag = data;
-			callData.type = 1;
+		if(linkRef.value.ifEsign){
+			let data = await linkRef.value.signValidator()
+			if(data==false||data==true){
+				callData.flag = data;
+				callData.type = 1;
+			}else{
+				callData.flag = true;
+			}
 		}else{
 			callData.flag = true;
 		}
-		console.log(callData)
 	    callback(callData);
 	  }
 
diff --git a/src/pages.json b/src/pages.json
index ac882b8..c5bf3e1 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -536,7 +536,8 @@
         {
           "path": "unconventional/stamp",
           "type": "page"
-        }        {
+        },
+        {
           "path": "zbkh/index",
           "type": "page"
         }
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 0a1baf6..181b6cd 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -57,12 +57,12 @@ interface NavigateToOptions {
        "/pages-process/myApplyProcess" |
        "/pages-process/taskHandle" |
        "/pages-bpm/carRental/index" |
- 
+       "/pages-bpm/document/index" |
        "/pages-bpm/leaveApplication/index" |
        "/pages-bpm/unconventional/index" |
-       "/pages-bpm/unconventional/stamp";       "/pages-bpm/document/index" |
-       "/pages-bpm/leaveApplication/index" |
-       "/pages-bpm/zbkh/index";}
+       "/pages-bpm/unconventional/stamp" |
+       "/pages-bpm/zbkh/index";
+}
 interface RedirectToOptions extends NavigateToOptions {}
 
 interface SwitchTabOptions {