From 1833dd6d7cac01c35840af52fadc1199821e5805 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期四, 15 五月 2025 09:28:16 +0800
Subject: [PATCH] 提交优化项
---
pages/TaskManager/TaskManagerList.vue | 318 ++++++++++++++++++++--------------------------------
1 files changed, 123 insertions(+), 195 deletions(-)
diff --git a/pages/TaskManager/TaskManagerList.vue b/pages/TaskManager/TaskManagerList.vue
index 545dfa2..3570fdb 100644
--- a/pages/TaskManager/TaskManagerList.vue
+++ b/pages/TaskManager/TaskManagerList.vue
@@ -3,6 +3,11 @@
<cu-custom :bgColor="NavBarColor" :isBack="true" backRouterName="productionTask">
<block slot="backText">杩斿洖</block>
<block slot="content">宸插姙</block>
+ <block slot="right">
+ <view @click="search">
+ <image class="search" src="/static/icon/sear.png" style="width: 25px; height: 25px;" alt="" />
+ </view>
+ </block>
</cu-custom>
<view style="width: 100%;">
@@ -11,11 +16,12 @@
<!-- 鍩虹琛ㄥ崟鏍￠獙 -->
<uni-forms ref="form" :modelValue="formData" validate-trigger="bind" err-show-type="undertext">
<uni-group title="" top="0">
- <uni-forms-item name="numbers" label="棰嗘枡鐢宠鍗曞彿:">
- <uni-easyinput type="text" v-model="formData.num" placeholder="璇疯緭鍏ラ鏂欑敵璇峰崟鍙锋绱�" />
+ <uni-forms-item name="type" :labelWidth="80" label="娴佺▼鍒嗙被:">
+ <uni-data-select v-model="formData.type" :localdata="storageTypeList"
+ @change="changeSelectType" />
</uni-forms-item>
- <uni-forms-item name="name" label="棰嗘枡浜у搧:">
- <uni-easyinput v-model="formData.partNumNameModel" placeholder="璇疯緭鍏ラ鏂欎骇鍝�" />
+ <uni-forms-item name="num" :labelWidth="80" label="璁惧缂栧彿:">
+ <uni-easyinput v-model="formData.num" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" />
</uni-forms-item>
</uni-group>
</uni-forms>
@@ -84,14 +90,16 @@
type: 'top',
scrollLeft: 0,
formData: {
- num: '',
- partNumNameModel: ''
+ type: '',
+ num:''
},
+ storageTypeList: [],
NavBarColor: this.NavBarColor,
colorIndex: 0,
activeColor: '#5277A6',
url: {
- stallList: "assign/flow/finishedList"
+ stallList: "assign/flow/finishedList",
+ storageType: 'sys/dict/getDictItems/flow_type'
},
upOption: {
@@ -138,81 +146,82 @@
}
},
- created() {},
+ created() {
+ this.storageType();
+ },
methods: {
+ changeSelectType(e) {
+
+ this.formData.type = e
+ },
/**
- * @param {Object} item
- * 璇︽儏椤甸潰
+ * 娴佺▼绫诲瀷
*/
- // onClickProductionTask(item) {
- // 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))
- // })
- // }
+ storageType() {
+ this.$http.get(this.url.storageType).then(res => {
+ //璁剧疆鍒楄〃鏁版嵁
+ if (res.data.success) {
+ this.storageTypeList = res.data.result
+ }
+ }).catch(() => {
+ //鑱旂綉澶辫触,
+ })
+ },
+ onClickProductionTask(item, flag = 'task') {
+ 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;
+ 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({
- // },
- 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))}`
- });
- }
+ url: `${url}?item=${encodeURIComponent(JSON.stringify(item))}&flag=${flag}`
+ });
+ }
},
search() {
@@ -224,7 +233,9 @@
this.$http.get(this.url.stallList, {
params: {
pageNo: page.num,
- pageSize: page.size
+ pageSize: page.size,
+ column: 'createTime',
+ order: 'desc'
},
}).then(res => {
@@ -252,137 +263,54 @@
},
+
+
+ /* 閲嶇疆鏌ヨ鏉′欢 */
resetTask() {
- this.formData.num = ''
- this.formData.partNumNameModel = ''
+ this.formData.type = '',
+ this.formData.num='',
this.$refs.popup.close();
this.mescroll.resetUpScroll()
},
- /* 妫�绱� */
+
+
getSera() {
this.$refs.popup.close();
- let keyword = this.TabCur
this.msgList = [];
+ this.$http.get(this.url.stallList, {
+ params: {
+ pageNo: 1,
+ pageSize: 9999,
+ column: 'createTime',
+ order: 'desc',
+ category: this.formData.type,
+ title:this.formData.num
+ },
- if (keyword == 0) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*',
- status: 'published'
+ }).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)
}
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
+ }
+ if (page.num == 1) {
+ this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
+ this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
+ }
- 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: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- status: 'training',
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*'
-
- }
- }).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.msg2Title = "閫氱煡(" + 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 == 2) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- status: 'completed',
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*'
-
- }
- }).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.msg3Count = 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();
+ })
},
-
mescrollInit(mescroll) {
console.log('mescrollInit')
@@ -411,7 +339,7 @@
}
.popupView {
- margin-top: 85px;
+ margin-top: 45px;
height: auto;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3