From 1833dd6d7cac01c35840af52fadc1199821e5805 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期四, 15 五月 2025 09:28:16 +0800
Subject: [PATCH] 提交优化项
---
pages/checkList/checkList.vue | 150 ++++++++++++++++++--------------------------------
1 files changed, 54 insertions(+), 96 deletions(-)
diff --git a/pages/checkList/checkList.vue b/pages/checkList/checkList.vue
index 5b30de1..8dcfa39 100644
--- a/pages/checkList/checkList.vue
+++ b/pages/checkList/checkList.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,14 @@
<!-- 鍩虹琛ㄥ崟鏍￠獙 -->
<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="orderNum" label="宸ュ崟鍙�:">
+ <uni-easyinput type="text" v-model="formData.orderNum" placeholder="璇疯緭鍏ラ鏂欑敵璇峰崟鍙锋绱�" />
</uni-forms-item>
- <uni-forms-item name="name" label="棰嗘枡浜у搧:">
- <uni-easyinput v-model="formData.partNumNameModel" placeholder="璇疯緭鍏ラ鏂欎骇鍝�" />
+ <uni-forms-item name="name" label="璁惧缂栧彿:">
+ <zxz-uni-data-select :localdata="equipmentList" dataKey="text"
+ field="value as value, text as text, title as label" dataValue="value"
+ emptyTips="鏆傛棤鏁版嵁" :multiple="false" :filterable='true' @change="changeEquipmentList"
+ placeholder="璇烽�夋嫨璁惧缂栧彿:" :clear='true' />
</uni-forms-item>
</uni-group>
</uni-forms>
@@ -87,17 +95,19 @@
mixins: [MescrollMixin], // 浣跨敤mixin
data() {
return {
+ equipmentList:[],
type: 'top',
scrollLeft: 0,
formData: {
num: '',
- partNumNameModel: ''
+ orderNum: ''
},
NavBarColor: this.NavBarColor,
activeColor: '#5277A6',
url: {
stallList: "eam/eamInspectionOrder/list",
- receive: "eam/eamInspectionOrder/receiveInspectionOrder"
+ receive: "eam/eamInspectionOrder/receiveInspectionOrder",
+ getEquipmentList: 'eam/equipment/list'
},
upOption: {
page: {
@@ -143,8 +153,39 @@
}
},
- created() {},
+ created() {
+ this.getEquipment()
+ },
methods: {
+ getEquipment() {
+ this.$http.get(this.url.getEquipmentList, {
+ params: {
+ pageNo: 1,
+ pageSize: 9999,
+ order: 'desc',
+ column: 'createTime'
+ },
+
+ }).then(res => {
+ //璁剧疆鍒楄〃鏁版嵁
+ if (res.data.success) {
+ this.equipmentList = res.data.result.records
+ } else {
+ uni.showToast({
+ icon: "error",
+ title: res.data.message,
+ duration: 2000
+ });
+
+ }
+ }).catch(() => {
+ this.$tip.error("鑱旂綉澶辫触")
+ })
+ },
+ changeEquipmentList(e) {
+ console.log(e.id)
+ this.formData.num = e.id;
+ },
/**
* 棰嗗彇
*/
@@ -153,7 +194,7 @@
this.$tip.loading();
this.$http.get(this.url.receive, {
params: {
- id: item.id,
+ id: item.id,
},
}).then(res => {
console.log(res)
@@ -238,8 +279,8 @@
resetTask() {
+ this.formData.orderNum = ''
this.formData.num = ''
- this.formData.partNumNameModel = ''
this.$refs.popup.close();
this.mescroll.resetUpScroll()
@@ -247,19 +288,17 @@
/* 妫�绱� */
getSera() {
this.$refs.popup.close();
- let keyword = this.TabCur
this.msgList = [];
-
- 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'
+ inspectionStatus: 'WAIT_INSPECTION',
+ equipmentId: this.formData.num,
+ orderNum: this.formData.orderNum
+
}
}).then(res => {
//鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
@@ -285,87 +324,6 @@
//鑱旂綉澶辫触, 缁撴潫鍔犺浇
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();
- })
-
- }
-
-
-
-
-
},
--
Gitblit v1.9.3