From 1d18ff904468e4a864312bdcf6d7c6a7c0477721 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 25 四月 2025 14:57:36 +0800
Subject: [PATCH] 项目提交
---
pages/TaskManager/TaskManagerList.vue | 212 +++++++++++++++++++++++++++-------------------------
1 files changed, 111 insertions(+), 101 deletions(-)
diff --git a/pages/TaskManager/TaskManagerList.vue b/pages/TaskManager/TaskManagerList.vue
index db36e09..545dfa2 100644
--- a/pages/TaskManager/TaskManagerList.vue
+++ b/pages/TaskManager/TaskManagerList.vue
@@ -35,7 +35,7 @@
</view>
<view class="container">
-
+
<mescroll-uni ref="mescrollRef" @init="mescrollInit" :top="top" @down="downCallback" @up="upCallback">
<!-- 鍒楄〃淇℃伅寮�濮� -->
<view class="content">
@@ -44,29 +44,30 @@
<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}}
+ <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-orange radius text-right">
+ {{item.taskName}}
</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 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.description}}
</view>
</view>
+
</uni-card>
</view>
</mescroll-uni>
@@ -81,7 +82,7 @@
data() {
return {
type: 'top',
- scrollLeft:0,
+ scrollLeft: 0,
formData: {
num: '',
partNumNameModel: ''
@@ -90,8 +91,7 @@
colorIndex: 0,
activeColor: '#5277A6',
url: {
-
- stallList: "/assign/flow/finishedList"
+ stallList: "assign/flow/finishedList"
},
upOption: {
@@ -112,15 +112,7 @@
color: '#2979FF',
borderColor: '#2979FF'
},
- msgList: [{
- partName: "璁惧A",
- taskType: "缁存姢",
- taskDesc: "瀹氭湡妫�鏌�",
- priority: "楂�",
- dueaDate: "2023-10-10",
- ssignee: "寮犱笁",
- status: 1
- }], //鍒楄〃鏁版嵁
+ msgList: [], //鍒楄〃鏁版嵁
announcement1: [],
msg1Count: 0,
msg2Count: 0,
@@ -129,7 +121,7 @@
},
computed: {
top() {
- return this.CustomBar * 2 + 130
+ return this.CustomBar * 2 + 50
},
style() {
var StatusBar = this.StatusBar;
@@ -148,97 +140,116 @@
created() {},
methods: {
-
+
/**
* @param {Object} item
* 璇︽儏椤甸潰
*/
// onClickProductionTask(item) {
- // let keyword = this.TabCur
- // uni.navigateTo({
- // url: '/pages/mes/om/workSheetOpToolingBorrowDeils/workSheetOpToolingBorrowDeils?keyword=' + keyword
- // })
+ // const name = item.category_dictText
+ // const type= item.taskName
+ // if (name == '璁惧鐐规' && type =='鐝粍闀跨‘璁�') {
+ // uni.navigateTo({
+ // url: '/pages/ToDoList/ToDoListCheckSure/ToDoListCheckSure?item=' +
+ // encodeURIComponent(JSON.stringify(item))
+ // })
+ // }else if(name == '璁惧鍛ㄤ繚' && type =='鐝粍闀跨‘璁�'){
+ // uni.navigateTo({
+ // url: '/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure?item=' +
+ // encodeURIComponent(JSON.stringify(item))
+ // })
+ // }
+
+
+
// },
+ onClickProductionTask(item) {
+ const name = item.taskName;
+ const type = item.category_dictText;
+ let url = '';
+ switch (true) {
+ case (name === '鏄惁闇�瑕侀鐢ㄥ浠�' && type === '璁惧缁翠慨'):
+ url = '/pages/ToDoList/ToDoSpareParts/ToDoSpareParts';
+ break;
+ case (name === '鐐规鎵ц' && type === '璁惧鐐规'):
+ url = '/pages/ToDoList/ToDoListCheckSure/ToDoListCheckSure';
+ break;
+ case (name === '鍛ㄤ繚鎵ц' && type === '璁惧鍛ㄤ繚'):
+ url = '/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure';
+ break;
+ case (name === '鐝粍闀跨‘璁�' && type === '璁惧鐐规'):
+ url = '/pages/ToDoList/ToDoListCheckSure/ToDoListCheckSure';
+ break;
+ case (name === '鐝粍闀跨‘璁�' && type === '璁惧鍛ㄤ繚'):
+ url = '/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure';
+ break;
+ case (name === '璁剧鍛樺垵楠�' && type === '璁惧鍛ㄤ繚'):
+ url = '/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure';
+ break;
+ case (name === '璁捐兘閮ㄧ粓楠�' && type === '璁惧鍛ㄤ繚'):
+ url = '/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure';
+ break;
+ case (name === '绠＄悊鍛橀鐢ㄥ浠�' && type === '璁惧缁翠慨'):
+ url = '/pages/ToDoList/ToDoSpareParts/ToDoSpareParts';
+ break;
+ case (name === '鎿嶄綔宸ョ‘璁�' && type === '璁惧缁翠慨'):
+ url = '/pages/ToDoList/ToDoSpareParts/ToDoSpareParts';
+ break;
+ case (name === '缁翠慨鎵ц' && type === '璁惧缁翠慨'):
+ url = '/pages/ToDoList/ToDoSpareParts/ToDoSpareParts';
+ break;
+ case (name === '鐐规宸ュ崟' && type === '璁惧鐐规'):
+ url = '/pages/ToDoList/ToDoListCheckSure/ToDoListCheckSure';
+ break;
+ default:
+ console.warn(`No URL found for name: ${name} and type: ${type}`);
+ return;
+ }
+
+ if (url) {
+ uni.navigateTo({
+ url: `${url}?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 +394,6 @@
</script>
<style>
-
.is-hover {
color: rgba(255, 255, 255, 0.6);
background-color: #55aaff;
@@ -391,7 +401,7 @@
}
-
+
.content {
margin-top: 5px;
}
--
Gitblit v1.9.3