From 418f4a9b326e054bf052d967e329a106e42b92e0 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 31 十月 2025 15:48:23 +0800
Subject: [PATCH] BUG
---
components/machine.vue | 77 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/components/machine.vue b/components/machine.vue
index 2658bff..90c6533 100644
--- a/components/machine.vue
+++ b/components/machine.vue
@@ -55,15 +55,15 @@
</view>
<!--鍚敤璇ュ姛鑳�-->
- <!--鏂板锛氭楠屼笉鍚堟牸閫佹鍛煎彨 鎸夐挳锛堝姛鑳戒笌閫佹鍛煎彨涓�鏍凤紝浠呭湪鐗瑰畾 remark 涓嬪彲浠ョ偣鍑伙級-->
+ <!--鏂板锛氭楠屼笉鍚堟牸閫佹鍛煎彨 鎸夐挳锛堝姛鑳戒笌閫佹鍛煎彨涓�鏍凤紝浠呭湪鐗瑰畾 remark 涓嬪彲浠ョ偣鍑伙級-->
<view class="item">
- <!--妫�楠屼笉鍚堟牸閫佹鍛煎彨鎸夐挳锛屼粎鍦� remark 涓烘寚瀹氭枃鏈� 涓� 褰撳墠鏃犻�佹鏃堕棿 鏃跺彲鐐瑰嚮-->
+ <!--妫�楠屼笉鍚堟牸閫佹鍛煎彨鎸夐挳锛屼粎鍦� remark 涓烘寚瀹氭枃鏈� 涓� 褰撳墠鏃犻�佹鏃堕棿 鏃跺彲鐐瑰嚮-->
<button :class="canFailResend ? 'btn-blue' : 'btn-disabled'"
:disabled="!canFailResend"
@click="ReHandleMaShoutTime">
妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
</button>
- <!--浠嶅鐢ㄥ悓涓�閫佹鏃堕棿瀛楁锛岄伩鍏嶉噸澶嶇姸鎬�-->
+ <!--浠嶅鐢ㄥ悓涓�閫佹鏃堕棿瀛楁锛岄伩鍏嶉噸澶嶇姸鎬�-->
<input class="txt-inp"
v-model="maShoutTime"
placeholder="棣栨涓嶅悎鏍奸噸鏂板懠鍙椂鐐瑰嚮鎸夐挳甯﹀嚭閫佹鏃堕棿"
@@ -130,12 +130,12 @@
this.stateCheck(1);
}
},
- // 棣栨涓嶅悎鏍奸噸鍛煎彨锛歠lag = 2
- ReHandleMaShoutTime() {
- if (!this.maShoutTime && this.canFailResend) {
- this.stateCheck(2);
- }
- },
+ // 棣栨涓嶅悎鏍奸噸鍛煎彨锛歠lag = 2
+ ReHandleMaShoutTime() {
+ if (!this.maShoutTime && this.canFailResend) {
+ this.stateCheck(2);
+ }
+ },
// 澶勭悊璋冩満瀹屾垚鎸夐挳鐐瑰嚮
handleMaEndTime() {
if (!this.maEndTime) {
@@ -151,17 +151,18 @@
console.log('璋冩満瀹屾垚鎸夐挳琚偣鍑�');
this.maEndTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
},
- // 鍒锋柊宸ュ崟鏁版嵁
+ // 鍒锋柊宸ュ崟鏁版嵁锛堝眬閮ㄥ埛鏂板綋鍓嶇粍浠讹級
refresh() {
this.findByOrderId();
},
// 淇濆瓨骞剁敓鏁堬紝灏嗘椂闂寸瓑淇℃伅鎻愪氦鍒板悗绔�
+ // 鍙樻洿锛氳繑鍥� Promise锛涙垚鍔熷悗灞�閮ㄥ埛鏂帮紙璋冪敤 findByOrderId锛夎�屼笉鏄暣椤� reload
save() {
if (!this.statusForm.id) {
this.$showMessage("id涓虹┖锛屼笉鍏佽鎺ㄩ��");
- return;
+ return Promise.resolve();
}
- this.$post({
+ return this.$post({
url: "/MesOrderSta/ChangeMachineTime",
data: {
maStartTime: this.maStartTime,
@@ -173,14 +174,22 @@
flag: this.flag
}
}).then(res => {
- if (res.data.tbBillList) {
+ if (res && res.data && res.data.tbBillList) {
this.$showMessage("鍛煎彨鎴愬姛");
+ // 灞�閮ㄥ埛鏂帮細閲嶆柊鎷夊彇褰撳墠宸ュ崟鐘舵�佸苟鏇存柊褰撳墠缁勪欢鏁版嵁
this.findByOrderId();
+ // 濡傛灉闇�瑕佸湪淇濆瓨鍚庡叧闂璇濇鎴栬繑鍥炰笂涓�绾э紝鍙湪杩欓噷澶勭悊
} else {
this.$showMessage("鍛煎彨澶辫触");
this.cancel();
}
- })
+ return res;
+ }).catch(err => {
+ // 淇濇寔鍙嬪ソ鐨勯敊璇彁绀哄苟灏嗛敊璇姏鍑轰互渚垮閮ㄩ摼寮忓鐞�
+ console.error('淇濆瓨澶辫触锛�', err);
+ this.$showMessage("淇濆瓨鏃跺彂鐢熼敊璇�");
+ throw err;
+ });
},
// 鍙栨秷鎿嶄綔锛屾仮澶嶄负涓婃淇濆瓨鐨勬暟鎹�
cancel() {
@@ -189,23 +198,23 @@
this.maEndTime = this.statusForm.maEndTime;
},
// 閫佹鍛煎彨锛宨tem=1鏃惰缃�佹鍛煎彨鏃堕棿
- // 閫佹鍛煎彨涓庨噸鏂伴�佹鍛煎彨浠ュ強璋冩満寮�濮嬪搴旂殑 flag 鍊�
- // flag 璇存槑锛�-1 = 璋冩満寮�濮嬶紱1 = 棣栨閫佹鍛煎彨锛�2 = 涓嶅悎鏍奸噸鏂伴�佹鍛煎彨
- stateCheck(item) {
+ // 閫佹鍛煎彨涓庨噸鏂伴�佹鍛煎彨浠ュ強璋冩満寮�濮嬪搴旂殑 flag 鍊�
+ // flag 璇存槑锛�-1 = 璋冩満寮�濮嬶紱1 = 棣栨閫佹鍛煎彨锛�2 = 涓嶅悎鏍奸噸鏂伴�佹鍛煎彨
+ stateCheck(item) {
switch (item) {
case 0:
break;
- case 1:// 棣栨閫佹鍛煎彨
+ case 1:// 棣栨閫佹鍛煎彨
this.maShoutTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
//this.flag = -1; // 閫佹鍛煎彨鏈夊�煎悗锛宖lag濮嬬粓涓�-1
break;
- case 2:// 妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
- this.maShoutTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
- //this.flag = -1; // 閫佹鍛煎彨鏈夊�煎悗锛宖lag濮嬬粓涓�-1
+ case 2:// 妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
+ this.maShoutTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
+ //this.flag = -1; // 閫佹鍛煎彨鏈夊�煎悗锛宖lag濮嬬粓涓�-1
break;
- default:
- // 鍏跺畠鍊间笉澶勭悊
- break;
+ default:
+ // 鍏跺畠鍊间笉澶勭悊
+ break;
}
this.flag = item;
},
@@ -225,16 +234,16 @@
})
}
},
- mounted() {
- // 椤甸潰鍔犺浇鏃讹紝鍚姩瀹氭椂鍣紝姣忛殧5鍒嗛挓鑷姩淇濆瓨
- this.autoSaveTimer = setInterval(() => {
- this.save(); // 鐩存帴璋冪敤宸叉湁鐨勪繚瀛樻柟娉�
- }, 1 * 30 * 1000); // 30绉�
- },
- beforeDestroy() {
- // 椤甸潰鍗歌浇鏃舵竻鐞嗗畾鏃跺櫒
- clearInterval(this.autoSaveTimer);
- },
+ mounted() {
+ // 椤甸潰鍔犺浇鏃讹紝鍚姩瀹氭椂鍣紝姣忛殧5鍒嗛挓鑷姩淇濆瓨锛堝綋鍓嶇ず渚嬩娇鐢� 30s锛屽彲鏀瑰洖 5 鍒嗛挓锛�
+ this.autoSaveTimer = setInterval(() => {
+ this.save(); // 鐩存帴璋冪敤宸叉湁鐨勪繚瀛樻柟娉曪紙save 宸茶繑鍥� Promise锛�
+ }, 1 * 30 * 1000); // 30绉�
+ },
+ beforeDestroy() {
+ // 椤甸潰鍗歌浇鏃舵竻鐞嗗畾鏃跺櫒
+ clearInterval(this.autoSaveTimer);
+ },
};
</script>
--
Gitblit v1.9.3