This commit is contained in:
yangzhq68909 2025-06-15 10:44:00 +08:00
parent c5d9e0c8b9
commit b4b88b0cd7
9 changed files with 52 additions and 43 deletions

View File

@ -17,8 +17,8 @@ export default defineManifestConfig({
name: VITE_APP_TITLE, name: VITE_APP_TITLE,
appid: VITE_UNI_APPID, appid: VITE_UNI_APPID,
description: '', description: '',
versionName: '2.0.0', versionName: '2.0.2',
versionCode: '20250605', versionCode: '20250615',
transformPx: false, transformPx: false,
locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
/* 5+App特有相关 */ /* 5+App特有相关 */

View File

@ -62,7 +62,6 @@
if(ifH5.value){ if(ifH5.value){
return signH5.value.signValidator(); return signH5.value.signValidator();
}else{ }else{
console.log(3435)
return signAPP.value.signValidator() return signAPP.value.signValidator()
} }
} }

View File

@ -2,8 +2,8 @@
"name": "数智产销", "name": "数智产销",
"appid": "__UNI__9F097F0", "appid": "__UNI__9F097F0",
"description": "", "description": "",
"versionName": "2.0.0", "versionName": "2.0.2",
"versionCode": "20250605", "versionCode": "20250615",
"transformPx": false, "transformPx": false,
"app-plus": { "app-plus": {
"usingComponents": true, "usingComponents": true,

View File

@ -34,7 +34,6 @@
const queryData = ()=>{ const queryData = ()=>{
queryUnData({id:props.formData.dataId}).then(res=>{ queryUnData({id:props.formData.dataId}).then(res=>{
console.log(res)
info.value = res.result.records[0] info.value = res.result.records[0]
}) })
} }

View File

@ -37,7 +37,7 @@
const value = ref([]); const value = ref([]);
const info = ref({}); const info = ref({});
const valiData = ref({}); const valiData = ref({});
const ifEsign = ref(true);
const props = defineProps({ const props = defineProps({
formData: { formData: {
type: Object, type: Object,
@ -51,33 +51,26 @@
const queryData = ()=>{ const queryData = ()=>{
queryUnData({id:props.formData.dataId}).then(res=>{ queryUnData({id:props.formData.dataId}).then(res=>{
console.log(res)
info.value = res.result.records[0] info.value = res.result.records[0]
initValiData(info.value); //data by initValiData(info.value); //data by
let lj = info.value.wj.split("/"); let lj = info.value.wj.split("/");
let ljurl = lj[2] + '/' + lj[3]; let ljurl = lj[2] + '/' + lj[3];
info.value.wjdict = ljurl; info.value.wjdict = ljurl;
console.log(info.value)
}) })
} }
const initValiData = (data)=>{ const initValiData = (data)=>{
//data by //data by
let name = userStore.userInfo.realname; let name = userStore.userInfo.realname;
console.log(name)
// name = ''
let num = null; let num = null;
if(data.lds){ if(data.lds){
let ldsMap = JSON.parse(data.lds); let ldsMap = JSON.parse(data.lds);
if(ldsMap[name]) num = ldsMap[name] if(ldsMap[name]) num = ldsMap[name]
} }
console.log(data)
if(data.clds){ if(data.clds){
let cldsMap = JSON.parse(data.clds); let cldsMap = JSON.parse(data.clds);
if(cldsMap[name]) num = cldsMap[name] if(cldsMap[name]) num = cldsMap[name]
} }
console.log(name)
console.log(num)
if(num){ if(num){
valiData.value.flag = true; valiData.value.flag = true;
valiData.value.num = num; valiData.value.num = num;
@ -87,9 +80,7 @@
const initValtime = ()=>{ const initValtime = ()=>{
processHistoryList(props.formData.procInsId).then(res=>{ processHistoryList(props.formData.procInsId).then(res=>{
console.log(res)
if (res.success) { if (res.success) {
console.log(res.result.records)
valiData.value.time = res.result.records[0].startTime valiData.value.time = res.result.records[0].startTime
} else { } else {
console.log("加载失败") console.log("加载失败")
@ -114,7 +105,8 @@
defineExpose({ // defineExpose({ //
signValidator signValidator,
ifEsign
}) })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -1,18 +1,19 @@
<!-- component标签可以变换组件 --> <!-- component标签可以变换组件 -->
<template> <template>
<view> <view>
<component :is="asyncComponent" :formData="formData" :history="history" :activeKey="activeKey" <component ref="comptRef" :is="asyncComponent" :formData="formData" :history="history" :activeKey="activeKey" v-if="asyncComponent"
v-if="asyncComponent" @getStampSuc="getStampSuccess"></component> @getStampSuc="getStampSuccess"></component>
<view v-else>该模块暂未建立审批页面</view> <view v-else>该模块暂未建立审批页面</view>
<wd-tabbar v-if="false">
<wd-tabbar-item></wd-tabbar-item>
</wd-tabbar>
</view> </view>
</template> </template>
<script setup lang="ts"> <script setup>
import { ref, reactive, onMounted, computed, watch, nextTick } from 'vue';
const compName = ref(''); const compName = ref('');
const asyncComponent = ref(null); const asyncComponent = ref(null);
const modules = import.meta.glob('/src/pages-bpm/**/*.vue'); const modules = import.meta.glob('/src/pages-bpm/**/*.vue');
const comptRef = ref();
defineOptions({ defineOptions({
name: 'DynamicLink', name: 'DynamicLink',
options: { options: {
@ -42,12 +43,15 @@
watch(() => props.path, (newVal) => { watch(() => props.path, (newVal) => {
if (newVal){ if (newVal){
compName.value = newVal; compName.value = newVal;
if (newVal.indexOf('index') == -1) {
compName.value = newVal + '/index'
}
} }
// //
const comp = modules[`/src/pages-bpm/${compName.value}.vue`] 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) => { comp().then((myModule) => {
asyncComponent.value = myModule.default asyncComponent.value = myModule.default
}).catch(() => { }).catch(() => {
@ -60,6 +64,10 @@
// #endif // #endif
}); });
const signValidator = ()=>{
//
return comptRef.value.signValidator()
}
const getStampSuccess = (val) => { const getStampSuccess = (val) => {
// this.$emit('getStampSuc', val) // this.$emit('getStampSuc', val)
@ -69,4 +77,12 @@
// esignTag: val // esignTag: val
// }); // });
} }
defineExpose({ //
signValidator
})
</script> </script>
<style lang="scss" scoped>
</style>

View File

@ -165,7 +165,7 @@
flag: false, flag: false,
type: 0, type: 0,
} }
console.log(linkRef.value) if(linkRef.value.ifEsign){
let data = await linkRef.value.signValidator() let data = await linkRef.value.signValidator()
if(data==false||data==true){ if(data==false||data==true){
callData.flag = data; callData.flag = data;
@ -173,7 +173,9 @@
}else{ }else{
callData.flag = true; callData.flag = true;
} }
console.log(callData) }else{
callData.flag = true;
}
callback(callData); callback(callData);
} }

View File

@ -536,7 +536,8 @@
{ {
"path": "unconventional/stamp", "path": "unconventional/stamp",
"type": "page" "type": "page"
} { },
{
"path": "zbkh/index", "path": "zbkh/index",
"type": "page" "type": "page"
} }

View File

@ -57,12 +57,12 @@ interface NavigateToOptions {
"/pages-process/myApplyProcess" | "/pages-process/myApplyProcess" |
"/pages-process/taskHandle" | "/pages-process/taskHandle" |
"/pages-bpm/carRental/index" | "/pages-bpm/carRental/index" |
"/pages-bpm/document/index" |
"/pages-bpm/leaveApplication/index" | "/pages-bpm/leaveApplication/index" |
"/pages-bpm/unconventional/index" | "/pages-bpm/unconventional/index" |
"/pages-bpm/unconventional/stamp"; "/pages-bpm/document/index" | "/pages-bpm/unconventional/stamp" |
"/pages-bpm/leaveApplication/index" | "/pages-bpm/zbkh/index";
"/pages-bpm/zbkh/index";} }
interface RedirectToOptions extends NavigateToOptions {} interface RedirectToOptions extends NavigateToOptions {}
interface SwitchTabOptions { interface SwitchTabOptions {