From 77cc3af3cea60471fb2d45ab5da10c4673a6f559 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 18 四月 2025 13:23:31 +0800
Subject: [PATCH] 提交
---
pages/TaskManager/TaskManagerList.vue | 232 ++++++++++++---------------------------------------------
1 files changed, 50 insertions(+), 182 deletions(-)
diff --git a/pages/TaskManager/TaskManagerList.vue b/pages/TaskManager/TaskManagerList.vue
index 33d6b69..fcacc98 100644
--- a/pages/TaskManager/TaskManagerList.vue
+++ b/pages/TaskManager/TaskManagerList.vue
@@ -2,7 +2,7 @@
<view class="container">
<cu-custom :bgColor="NavBarColor" :isBack="true" backRouterName="productionTask">
<block slot="backText">杩斿洖</block>
- <block slot="content">浠诲姟绠＄悊</block>
+ <block slot="content">宸插姙</block>
</cu-custom>
<view style="width: 100%;">
@@ -36,114 +36,61 @@
<view class="container">
- <uni-badge absolute="rightTop" :offset="[-30, 15]" :text="msg1Count" type="error" />
-
- <uni-badge absolute="rightTop" :offset="[-270, 15]" :text="msg2Count" type="error" />
-
- <view class="solid-bottom">
- <scroll-view scroll-x class="nav text-center ">
- <view class="flex text-center justify-around">
- <view class="cu-item" :class="item.value==TabCur?'text-blue cur':''"
- v-for="(item,index) in tabs" :key="index" @tap="tabSelect" :data-id="item.value">
- {{item.title}}
- </view>
- </view>
- </scroll-view>
-
- </view>
-
-
<mescroll-uni ref="mescrollRef" @init="mescrollInit" :top="top" @down="downCallback" @up="upCallback">
<!-- 鍒楄〃淇℃伅寮�濮� -->
<view class="content">
<uni-card margin="10px" spacing="1px" v-for="(item,index) in msgList" :key="index"
@click="onClickProductionTask(item)">
<view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">浠诲姟鍚嶇О:</view>
+ <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 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 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 text-blue radius text-right">
- {{item.ssignee}}
- </view>
- </view>
-
- <view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">浠诲姟鎻忚堪:</view>
+ <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}}
- </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.dueaDate}}
- </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-bold text-green radius text-right"
- v-if="item.status == '1'">
- 寰呭鐞�
- </view>
- <view
- class="flex-sub bg-white padding-xs margin-xs text-bold text-green radius text-right"
- v-if="item.status == '3'">
- 宸插畬鎴�
+ {{item.taskName}}
</view>
</view>
</uni-card>
</view>
-
</mescroll-uni>
</view>
</view>
</template>
<script>
- const tabs = [{
- title: '寰呭姙',
- value: 0
- }, {
- title: '宸插姙',
- value: 1
- }];
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
export default {
mixins: [MescrollMixin], // 浣跨敤mixin
data() {
return {
- TabCur: 0,
type: 'top',
- scrollLeft:0,
+ scrollLeft: 0,
formData: {
num: '',
partNumNameModel: ''
},
NavBarColor: this.NavBarColor,
- tabs,
- current: 0,
colorIndex: 0,
activeColor: '#5277A6',
url: {
-
- stallList: "/mom/partTakeRollingDetail/list"
+ stallList: "assign/flow/finishedList"
},
upOption: {
@@ -164,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,
@@ -200,125 +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))
- // },
- tabSelect(e) {
- this.TabCur = e.currentTarget.dataset.id;
- this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
- this.msgList = [] // 鍏堢疆绌哄垪琛�,鏄剧ず鍔犺浇杩涘害
- this.mescroll.resetUpScroll() // 鍐嶅埛鏂板垪琛ㄦ暟鎹�
+ })
+
},
-
-
-
- ListTouchStart(e) {
- this.listTouchStart = e.touches[0].pageX
- },
-
- // ListTouch璁＄畻鏂瑰悜
- ListTouchMove(e) {
- this.listTouchDirection = e.touches[0].pageX - this.listTouchStart > 0 ? 'right' : 'left'
- },
-
- // ListTouch璁＄畻婊氬姩
- ListTouchEnd(e) {
- if (this.listTouchDirection == 'left') {
- this.modalName = e.currentTarget.dataset.target
- } else {
- this.modalName = null
- }
- this.listTouchDirection = null
- },
-
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() {
@@ -463,7 +332,6 @@
</script>
<style>
-
.is-hover {
color: rgba(255, 255, 255, 0.6);
background-color: #55aaff;
@@ -471,7 +339,7 @@
}
-
+
.content {
margin-top: 5px;
}
--
Gitblit v1.9.3