From 96e5686d9f80fbd0742058f3781486cb2d05a612 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 31 十月 2025 14:51:20 +0800
Subject: [PATCH] 调试
---
components/machine.vue | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 25 deletions(-)
diff --git a/components/machine.vue b/components/machine.vue
index 0e1c057..2658bff 100644
--- a/components/machine.vue
+++ b/components/machine.vue
@@ -9,7 +9,13 @@
<!-- 涓棿鐘舵�侀儴鍒嗭紝涓婁笅缁撴瀯锛屽寘鍚皟鏈烘祦绋嬬殑涓変釜姝ラ -->
<view class="middle-section">
<view class="item" style="height: 100px;">
- <h4>璇存槑:璋冩満寮�濮嬫椂闂撮渶瑕佹墜鍔ㄧ‘璁�</h4>
+ <h4>
+ <!--璇存槑:
+ 1.鐐瑰嚮'璋冩満寮�濮�'銆�'閫佹鍛煎彨'鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥'<br />
+ 2.涓荤晫闈㈤妫�鍚堟牸鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥'<br />
+ 3.棣栨涓嶅悎鏍煎啀鐐瑰嚮'淇濆瓨鐢熸晥'浼氭竻绌洪�佹鏃堕棿<br />
+ 4.娓呯┖閫佹鏃堕棿鍚庣偣鍑烩�樻楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨鈥欏啀淇濆瓨-->
+ </h4>
</view>
<view class="item">
<!-- 璋冩満寮�濮嬫寜閽紝maStartTime鏈夊�兼椂绂佺敤 -->
@@ -19,7 +25,7 @@
璋冩満寮�濮�
</button>
<!-- 鏄剧ず璋冩満寮�濮嬫椂闂� -->
- <input class="txt-inp" v-model="maStartTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭鏃堕棿" disabled="true" />
+ <input class="txt-inp" v-model="maStartTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭璋冩満鏃堕棿" disabled="true" />
</view>
<view class="item">
<!-- 閫佹鍛煎彨鎸夐挳锛宮aShoutTime鏈夊�兼椂绂佺敤 -->
@@ -29,7 +35,7 @@
閫佹鍛煎彨
</button>
<!-- 鏄剧ず閫佹鍛煎彨鏃堕棿 -->
- <input class="txt-inp" v-model="maShoutTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭鏃堕棿" disabled="true" />
+ <input class="txt-inp" v-model="maShoutTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭閫佹鏃堕棿" disabled="true" />
</view>
<!--<view class="item">-->
<!-- 璋冩満瀹屾垚鎸夐挳锛宮aEndTime鏈夊�兼椂绂佺敤 -->
@@ -47,6 +53,23 @@
</button>
<input class="txt-inp" v-model="maEndTime" placeholder="棣栨棣栨纭閫氳繃鍐欏叆" disabled="true" />
</view>
+
+ <!--鍚敤璇ュ姛鑳�-->
+ <!--鏂板锛氭楠屼笉鍚堟牸閫佹鍛煎彨 鎸夐挳锛堝姛鑳戒笌閫佹鍛煎彨涓�鏍凤紝浠呭湪鐗瑰畾 remark 涓嬪彲浠ョ偣鍑伙級-->
+ <view class="item">
+ <!--妫�楠屼笉鍚堟牸閫佹鍛煎彨鎸夐挳锛屼粎鍦� remark 涓烘寚瀹氭枃鏈� 涓� 褰撳墠鏃犻�佹鏃堕棿 鏃跺彲鐐瑰嚮-->
+ <button :class="canFailResend ? 'btn-blue' : 'btn-disabled'"
+ :disabled="!canFailResend"
+ @click="ReHandleMaShoutTime">
+ 妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
+ </button>
+ <!--浠嶅鐢ㄥ悓涓�閫佹鏃堕棿瀛楁锛岄伩鍏嶉噸澶嶇姸鎬�-->
+ <input class="txt-inp"
+ v-model="maShoutTime"
+ placeholder="棣栨涓嶅悎鏍奸噸鏂板懠鍙椂鐐瑰嚮鎸夐挳甯﹀嚭閫佹鏃堕棿"
+ disabled="true" />
+ </view>
+
</view>
<!-- 搴曢儴淇濆瓨/鍙栨秷鎸夐挳 -->
@@ -73,8 +96,17 @@
maShoutTime: '', // 閫佹鍛煎彨鏃堕棿
maStartTime: '', // 璋冩満寮�濮嬫椂闂�
maEndTime: '', // 璋冩満瀹屾垚鏃堕棿
- statusForm: {}, // 宸ュ崟鐘舵�佽〃鍗曟暟鎹�
+ statusForm: {}, // 宸ュ崟鐘舵�佽〃鍗曟暟鎹紙鍖呭惈 remark 瀛楁锛�
flag: -1, // 鎿嶄綔鏍囪
+ failedRemark: '棣栨涓嶅悎鏍硷紝閫佹鏃堕棿宸叉竻绌猴紝璇烽噸鏂伴�佹鍛煎彨鐢熸垚鏂扮殑棣栨鍗�' // 棣栨涓嶅悎鏍煎悗鐢卞悗绔繑鍥炵殑鎻愮ず
+ }
+ },
+ computed: {
+ // 婊¤冻棣栨涓嶅悎鏍奸噸鏂板懠鍙潯浠朵笖褰撳墠灏氭湭閲嶆柊鐢熸垚閫佹鏃堕棿 => 鎸夐挳鍙敤
+ canFailResend() {
+ return this.statusForm &&
+ this.statusForm.remark === this.failedRemark &&
+ !this.maShoutTime;
}
},
created() {
@@ -92,12 +124,18 @@
this.flag = -1; // 璋冩満寮�濮嬫寜閽寜涓嬫椂鍥炰紶鐨刦lag=-1
}
},
- // 澶勭悊閫佹鍛煎彨鎸夐挳鐐瑰嚮
+ // 澶勭悊閫佹鍛煎彨鎸夐挳鐐瑰嚮锛堜笉鍚妫�涓嶅悎鏍奸噸鍛煎彨锛�
handleMaShoutTime() {
if (!this.maShoutTime) {
this.stateCheck(1);
}
},
+ // 棣栨涓嶅悎鏍奸噸鍛煎彨锛歠lag = 2
+ ReHandleMaShoutTime() {
+ if (!this.maShoutTime && this.canFailResend) {
+ this.stateCheck(2);
+ }
+ },
// 澶勭悊璋冩満瀹屾垚鎸夐挳鐐瑰嚮
handleMaEndTime() {
if (!this.maEndTime) {
@@ -116,19 +154,6 @@
// 鍒锋柊宸ュ崟鏁版嵁
refresh() {
this.findByOrderId();
- },
- // 鍏ㄧ晫闈㈠埛鏂帮細娓呯┖鏈湴鐘舵�佸悗閲嶆柊鎷夊彇锛堜笉鍒犻櫎浠讳綍鍘熸湁娉ㄩ噴锛�
- fullReload() {
- // 娓呯┖褰撳墠鏄剧ず鏁版嵁锛岄伩鍏嶆棫鏁版嵁鐭殏闂儊
- this.maShoutTime = '';
- this.maStartTime = '';
- this.maEndTime = '';
- this.statusForm = {};
- this.flag = -1;
- // 涓嬩竴甯ч噸鏂拌幏鍙�
- this.$nextTick(() => {
- this.findByOrderId();
- });
},
// 淇濆瓨骞剁敓鏁堬紝灏嗘椂闂寸瓑淇℃伅鎻愪氦鍒板悗绔�
save() {
@@ -150,8 +175,7 @@
}).then(res => {
if (res.data.tbBillList) {
this.$showMessage("鍛煎彨鎴愬姛");
- // 鍛煎彨鎴愬姛鍚庡埛鏂版暣涓晫闈�
- this.fullReload();
+ this.findByOrderId();
} else {
this.$showMessage("鍛煎彨澶辫触");
this.cancel();
@@ -165,16 +189,23 @@
this.maEndTime = this.statusForm.maEndTime;
},
// 閫佹鍛煎彨锛宨tem=1鏃惰缃�佹鍛煎彨鏃堕棿
- 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
+ //this.flag = -1; // 閫佹鍛煎彨鏈夊�煎悗锛宖lag濮嬬粓涓�-1
break;
- case 2:
+ case 2:// 妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
+ this.maShoutTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
+ //this.flag = -1; // 閫佹鍛煎彨鏈夊�煎悗锛宖lag濮嬬粓涓�-1
break;
+ default:
+ // 鍏跺畠鍊间笉澶勭悊
+ break;
}
this.flag = item;
},
@@ -193,7 +224,17 @@
this.maEndTime = res.data.tbBillList.maEndTime;
})
}
- }
+ },
+ mounted() {
+ // 椤甸潰鍔犺浇鏃讹紝鍚姩瀹氭椂鍣紝姣忛殧5鍒嗛挓鑷姩淇濆瓨
+ this.autoSaveTimer = setInterval(() => {
+ this.save(); // 鐩存帴璋冪敤宸叉湁鐨勪繚瀛樻柟娉�
+ }, 1 * 30 * 1000); // 30绉�
+ },
+ beforeDestroy() {
+ // 椤甸潰鍗歌浇鏃舵竻鐞嗗畾鏃跺櫒
+ clearInterval(this.autoSaveTimer);
+ },
};
</script>
--
Gitblit v1.9.3