feat: 新增需求

pages/workFlow/flowTodo/flowList.vue

@@ -14,7 +14,7 @@
 									<view class='common-lable'>
 										单号
 									</view>
-									<text class="title u-font-28 u-line-1">{{item.businessInfo.billNo}}</text>
+									<text class="title u-font-28 u-line-1">{{item.businessInfo && item.businessInfo.billNo}}</text>
 								</view>
 								<text class="title u-line-1 u-font-24">单据类型：{{item.name || item.processInstanceName}}<text
 										class="titInner">{{item.thisStep ? item.thisStep : ''}}</text></text>
@@ -22,7 +22,7 @@
 										class="titInner">{{item.createTime?$u.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss'):''}}</text></text>
 							</view>
 							<view v-if="category == 2" class="item-right">
-								<image v-if="item.result == 1" src="./img/jihuo.png" mode="widthFix" class="item-right-img" />
+								<image v-if="item.suspensionState == 1" src="./img/jihuo.png" mode="widthFix" class="item-right-img" />
 								<image v-else src="./img/wanc.png" mode="widthFix" class="item-right-img" />
 							</view>
 							<view v-else class="item-right">
@@ -41,6 +41,9 @@
 	</view>
 </template>
 <script>
+	import {
+		getProcessBusinessInfo
+	} from '@/api/apply/visualDev'
 	import {
 		delFlowLaunch
 	} from '@/api/workFlow/template'
@@ -86,15 +89,24 @@
 				})
 			},
 			goDetail(item) {
-				const config = {
-					opType: item.opType,
-					operatorId: item.id,
-					category: this.category,
-					...item
-				}
-				uni.navigateTo({
-					url: '/pages/workFlow/flowBefore/index?config=' +
-						this.jnpf.base64.encode(JSON.stringify(config))
+				const {processInstance,processDefinitionId} = item
+				const id = !!processDefinitionId ? item.id :processInstance.id
+				const name = !!processDefinitionId ? item.name : processInstance.name
+				getProcessBusinessInfo(id).then(res=>{
+					if(res.code == 0){
+						const {dbformId,businessId} = res.data
+						const config = {
+							modelId: dbformId,
+							id: businessId,
+							name: name,
+							btnType: 'btn_process',
+							current: this.category
+						}
+						uni.navigateTo({
+							url: '/pages/apply/dynamicModelList/form?config=' +
+								this.jnpf.base64.encode(JSON.stringify(config))
+						})
+					}
 				})
 			},
 			handleClick(data) {

pages/workFlow/flowTodo/index.vue

@@ -28,6 +28,9 @@
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	import FlowMixin from "./FlowMixin.js";
 	import flowlist from './flowList.vue'
+	import {
+		useUserStore
+	} from '@/store/modules/user'
 	export default {
 		components: {
 			flowlist
@@ -63,6 +66,14 @@
 			}
 		},
 		onShow() {
+			 const fromNonTabBar = uni.getStorageSync('fromNonTabBar');
+			 console.log(fromNonTabBar,'fromNonTabBar---')
+			 if(!fromNonTabBar){
+				this.current = 1
+			 }else {
+				this.current = 0
+			 }
+			 uni.removeStorageSync('fromNonTabBar');
 			uni.$off('operate')
 			uni.$on('refresh', () => {
 				this.list = [];

pages/workFlow/workFlowForm/dynamicForm/index.vue

@@ -38,6 +38,7 @@
 				this.setting = data
 				this.formConf = data.formConf ? JSON.parse(data.formConf) : {}
 				console.log(this.formConf,'formConf112')
+				console.log(data,'data112')
 				this.dataForm.id = data.id || null;
 				this.dataForm.flowId = data.flowId;
 				this.loading = true;