feat: 新增需求

pages/workFlow/flowTodo/FlowMixin.js

@@ -103,30 +103,35 @@ const statusMap = {
 
 import {
 	getOperatorList,
-	getFlowLaunchList
+	getFlowLaunchList,
+	getMyPage,
+	getTodoPage,
+	getDonePage,
+	getCcMyPage
 } from '@/api/workFlow/template'
 export default {
 	data() {
 		return {
 			mescrollTop: 206,
 			statusList: [],
+			
 			tabsList: [{
-				fullName: '在办',
+				fullName: '我的消息',
+				category: '1',
+				key: 3,
+				enCode: "workFlow.flowLaunch"
+			},{
+				fullName: '待办任务',
 				category: '2',
 				key: 2,
 				enCode: "workFlow.flowDoing"
 			}, {
-				fullName: '发起',
-				category: null,
-				key: 3,
-				enCode: "workFlow.flowLaunch"
-			}, {
-				fullName: '已办',
+				fullName: '已办任务',
 				category: '3',
 				key: 4,
 				enCode: "workFlow.flowDone"
 			}, {
-				fullName: '抄送',
+				fullName: '抄送任务',
 				category: '4',
 				key: 5,
 				enCode: "workFlow.flowCirculate"
@@ -147,7 +152,7 @@ export default {
 					return
 				}
 				this.statusList = statusMap[this.tabsList[val].key]
-				this.mescrollTop = 322 / 2
+				this.mescrollTop = 220 / 2
 				this.category = this.tabsList[this.current].category
 			},
 			immediate: true,
@@ -182,9 +187,9 @@ export default {
 					}
 				}
 			];
-			configToCheck.forEach(config => {
-				if (this.sysConfigInfo[config.key] === 1) return this.tabsList.unshift(config.tab);
-			});
+			// configToCheck.forEach(config => {
+			// 	if (this.sysConfigInfo[config.key] === 1) return this.tabsList.unshift(config.tab);
+			// });
 			this.menuList = uni.getStorageSync("menuList");
 			let workFlowList = this.menuList.filter(o => o.enCode === 'workFlow')
 			if (!workFlowList.length) return
@@ -203,6 +208,8 @@ export default {
 		/* tab1 */
 		change(index) {
 			let item = this.tabsList[index]
+			console.log(item,'item------------')
+			console.log(index,'index------------')
 			this.current = index;
 			this.status = ''
 			this.keyword = ''
@@ -225,13 +232,13 @@ export default {
 		},
 		/* 列表数据 */
 		upCallback(page) {
-			let methods = this.category ? getOperatorList : getFlowLaunchList;
+			let methods = this.getList(this.category)
 			let query = {
-				currentPage: page.num,
+				pageNo: page.num,
 				pageSize: page.size,
 				keyword: this.keyword,
-				category: this.tabsList[this.current].category,
-				status: this.status
+				// category: this.tabsList[this.current].category,
+				// status: this.status
 			}
 			methods(query, {
 				load: page.num == 1
@@ -245,11 +252,32 @@ export default {
 					'swipeAction': this.swipeAction(o.status),
 					...o
 				}))
+				console.log(list,'list---')
 				this.list = this.list.concat(list);
 			}).catch(() => {
 				this.mescroll.endErr();
 			})
 		},
+		// 流程列表接口
+		getList(category){
+			let methods = '' 
+			console.log(category,'category---')
+			switch(category){
+				case '1':
+					methods = getMyPage
+				break;
+				case '2':
+					methods = getTodoPage
+				break;
+				case '3':
+					methods = getDonePage
+				break;
+				case '4':
+					methods = getCcMyPage
+				break;
+			}
+			return methods
+		},
 		swipeAction(status) {
 			let swipeAction = true
 			if (this.tabsList[this.current].key === 3 && !this.category && (status == '0' || status == '9'))

pages/workFlow/flowTodo/flowList.vue

@@ -11,20 +11,27 @@
 									<view class='common-lable-entrust' v-if="item.delegateUser">
 										{{!category ? '委托' : '代理' }}
 									</view>
-									<view class='common-lable'
-										:class="{'urgent-lable':item.flowUrgent==2,'important-lable':item.flowUrgent==3}">
-										{{getLableValue(item.flowUrgent)}}
+									<view class='common-lable'>
+										单号
 									</view>
-									<text class="title u-font-28 u-line-1">{{item.fullName}}</text>
+									<text class="title u-font-28 u-line-1">{{item.businessInfo.billNo}}</text>
 								</view>
-								<text class="title u-line-1 u-font-24">审批节点：{{item.currentNodeName}}<text
+								<text class="title u-line-1 u-font-24">单据类型：{{item.name || item.processInstanceName}}<text
 										class="titInner">{{item.thisStep ? item.thisStep : ''}}</text></text>
 								<text class="time title u-font-24">发起时间：<text
-										class="titInner">{{item.startTime?$u.timeFormat(item.startTime, 'yyyy-mm-dd hh:MM:ss'):''}}</text></text>
+										class="titInner">{{item.createTime?$u.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss'):''}}</text></text>
 							</view>
-							<view class="item-right">
-								<image :src="item.flowStatus" mode="widthFix" class="item-right-img">
-								</image>
+							<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-else src="./img/wanc.png" mode="widthFix" class="item-right-img" />
+							</view>
+							<view v-else class="item-right">
+								<image v-if="item.result == 1" src="./img/doing.png" mode="widthFix" class="item-right-img" />
+								<image v-if="item.result == 2" src="./img/togo.png" mode="widthFix" class="item-right-img" />
+								<image v-if="item.result == 3" src="./img/pass.png" mode="widthFix" class="item-right-img" />
+								<image v-if="item.result == 4" src="./img/quxiao.png" mode="widthFix" class="item-right-img" />
+								<image v-if="item.result == 5" src="./img/REJECTED.png" mode="widthFix" class="item-right-img" />
+								<image v-if="item.result == 6" src="./img/weipai.png" mode="widthFix" class="item-right-img" />
 							</view>
 						</view>
 					</template>
@@ -105,24 +112,6 @@
 					this.list.splice(index, 1)
 				})
 			},
-			getLableValue(value) {
-				var lableValue = ''
-				switch (value) {
-					case 1:
-						lableValue = '普通'
-						break;
-					case 2:
-						lableValue = '重要'
-						break;
-					case 3:
-						lableValue = '紧急'
-						break;
-					default:
-						lableValue = '普通'
-						break;
-				}
-				return lableValue
-			}
 		}
 	};
 </script>

pages/workFlow/flowTodo/index.vue

@@ -10,11 +10,11 @@
 				<u-tabs ref="tabs" :list="tabsList" active-color="#0177FF" inactive-color="#303133" font-size="30"
 					v-model="current" name="fullName" @change="change" height="80" :is-scroll="false"></u-tabs>
 			</view>
-			<view class="flow-status-tabs" v-if="statusList.length">
+			<!-- <view class="flow-status-tabs" v-if="statusList.length">
 				<u-subsection :list="statusList" :current="subsectionIndex" name="name" active-color="#2979FF"
 					inactive-color="#999999" bg-color="#F2F3F7" font-size="24" :bold="false"
 					@change="subsection"></u-subsection>
-			</view>
+			</view> -->
 		</view>
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
 			:up="upOption" :top="mescrollTop">