wk/wk_app.git - Gitblit

			@@ -35,7 +35,7 @@
			</view>

			<view class="container">


			<mescroll-uni ref="mescrollRef" @init="mescrollInit" :top="top" @down="downCallback" @up="upCallback">
			<!-- 列表信息开始 -->
			<view class="content">
			@@ -44,27 +44,27 @@
			<view class="flex">
			<view class="flex-sub text-light bg-white padding-xs margin-xs radius">流程名称:</view>
			<view class="flex-sub bg-white padding-xs margin-xs text-bold radius text-right">
			{{item.partName}}
			{{item.procDefName}}
			</view>
			</view>
			<view class="flex">
			<view class="flex-sub text-light bg-white padding-xs margin-xs radius">流程描述:</view>
			<view class="flex-sub bg-white padding-xs margin-xs radius text-right">
			{{item.taskType}}
			{{item.description}}
			</view>
			</view>
			<view class="flex">
			<view class="flex-sub text-light bg-white padding-xs margin-xs radius">流程发起人:</view>
			<view class="flex-sub bg-white padding-xs margin-xs text-blue radius text-right">
			{{item.priority}}
			{{item.startUserName}}
			</view>
			</view>




			<view class="flex">
			<view class="flex-sub text-light bg-white padding-xs margin-xs radius">任务名称:</view>
			<view class="flex-sub bg-white padding-xs margin-xs radius text-right">
			{{item.taskDesc}}
			{{item.taskName}}
			</view>
			</view>
			</uni-card>
			@@ -81,7 +81,7 @@
			data() {
			return {
			type: 'top',
			scrollLeft:0,
			scrollLeft: 0,
			formData: {
			num: '',
			partNumNameModel: ''
			@@ -90,8 +90,7 @@
			colorIndex: 0,
			activeColor: '#5277A6',
			url: {

			stallList: "/assign/flow/finishedList"
			stallList: "assign/flow/finishedList"
			},

			upOption: {
			@@ -112,15 +111,7 @@
			color: '#2979FF',
			borderColor: '#2979FF'
			},
			msgList: [{
			partName: "设备A",
			taskType: "维护",
			taskDesc: "定期检查",
			priority: "高",
			dueaDate: "2023-10-10",
			ssignee: "张三",
			status: 1
			}], //列表数据
			msgList: [], //列表数据
			announcement1: [],
			msg1Count: 0,
			msg2Count: 0,
			@@ -148,97 +139,55 @@

			created() {},
			methods: {


			/**
			* @param {Object} item
			* 详情页面
			*/
			// onClickProductionTask(item) {
			// let keyword = this.TabCur
			// uni.navigateTo({
			// url: '/pages/mes/om/workSheetOpToolingBorrowDeils/workSheetOpToolingBorrowDeils?keyword=' + keyword
			// })
			onClickProductionTask(item) {
			uni.navigateTo({
			url: '/pages/TaskManager/TaskManagerDeils/TaskManagerDeils?item=' +
			encodeURIComponent(JSON.stringify(item))

			// },

			})

			},

			search() {
			this.$refs.popup.open();
			},


			// upCallback(page) {
			// let keyword = this.TabCur
			// if (keyword == 0) {

			// this.$http.get(this.url.stallList, {
			// params: {
			// pageNo: page.num,
			// pageSize: page.size,
			// order: 'asc',
			// column: 'createTime',
			// status: 1
			// },
			upCallback(page) {
			this.$http.get(this.url.stallList, {
			params: {
			pageNo: page.num,
			pageSize: page.size
			},

			// }).then(res => {
			// this.announcement1 = res.data.result.records
			// this.mescroll.endSuccess(this.announcement1.length);
			// console.log("url", res)
			// //设置列表数据
			// if (res.data.success) {
			// console.log("res", res.data)
			// this.msg1Count = res.data.result.total
			// this.msg1Title = "通知(" + res.data.result.total + ")";
			// for (let annItem of this.announcement1) {
			// this.msgList.push(annItem)
			// }
			// }
			// if (page.num == 1) {
			// this.msgList = []; //如果是第一页需手动制空列表
			// this.msgList = this.msgList.concat(this.announcement1); //追加新数据
			// }
			}).then(res => {
			this.announcement1 = res.data.result.records
			this.mescroll.endSuccess(this.announcement1.length);
			console.log("url", res)
			//设置列表数据
			if (res.data.success) {
			console.log("res", res.data)
			this.msg1Count = res.data.result.total
			this.msg1Title = "通知(" + res.data.result.total + ")";
			for (let annItem of this.announcement1) {
			this.msgList.push(annItem)
			}
			}
			if (page.num == 1) {
			this.msgList = []; //如果是第一页需手动制空列表
			this.msgList = this.msgList.concat(this.announcement1); //追加新数据
			}

			// }).catch(() => {
			// //联网失败, 结束加载
			// this.mescroll.endErr();
			// })
			// } else if (keyword == 1) {

			// this.$http.get(this.url.stallList, {
			// params: {
			// pageNo: page.num,
			// pageSize: page.size,
			// order: 'desc',
			// status: 3,
			// column: 'createTime'
			// },

			// }).then(res => {
			// this.announcement1 = res.data.result.records
			// this.mescroll.endSuccess(this.announcement1.length);
			// console.log("url", res)
			// //设置列表数据
			// if (res.data.success) {
			// console.log("res", res.data)
			// this.msg2Count = res.data.result.total
			// this.msg1Title = "通知(" + res.data.result.total + ")";
			// for (let annItem of this.announcement1) {
			// this.msgList.push(annItem)
			// }
			// }
			// if (page.num == 1) {
			// this.msgList = []; //如果是第一页需手动制空列表
			// this.msgList = this.msgList.concat(this.announcement1); //追加新数据
			// }

			// }).catch(() => {
			// //联网失败, 结束加载
			// this.mescroll.endErr();
			// })

			// }


			// },
			}).catch(() => {
			//联网失败, 结束加载
			this.mescroll.endErr();
			})
			},


			resetTask() {
			@@ -383,7 +332,6 @@
			</script>

			<style>

			.is-hover {
			color: rgba(255, 255, 255, 0.6);
			background-color: #55aaff;
			@@ -391,7 +339,7 @@
			}




			.content {
			margin-top: 5px;
			}