From 6bc782bdc612428785b537b0c1e0e970bca5beea Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 31 十月 2025 15:22:32 +0800
Subject: [PATCH] 不合格重新送检改为包含匹配
---
components/machine.vue | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/components/machine.vue b/components/machine.vue
index 10b2cdb..6b2adbe 100644
--- a/components/machine.vue
+++ b/components/machine.vue
@@ -10,9 +10,11 @@
<view class="middle-section">
<view class="item" style="height: 100px;">
<h4>
- 璇存槑:1.鐐瑰嚮'璋冩満寮�濮�'鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥' 2.鐐瑰嚮'閫佹鍛煎彨'鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥'<br />
- 3.涓荤晫闈㈤妫�鍚堟牸鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥'<br />
- 4.棣栨涓嶅悎鏍煎啀鐐瑰嚮'淇濆瓨鐢熸晥'浼氭竻绌洪�佹鏃堕棿
+ <!--璇存槑:
+ 1.鐐瑰嚮'璋冩満寮�濮�'銆�'閫佹鍛煎彨'鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥'<br />
+ 2.涓荤晫闈㈤妫�鍚堟牸鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥'<br />
+ 3.棣栨涓嶅悎鏍煎啀鐐瑰嚮'淇濆瓨鐢熸晥'浼氭竻绌洪�佹鏃堕棿<br />
+ 4.娓呯┖閫佹鏃堕棿鍚庣偣鍑烩�樻楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨鈥欏啀淇濆瓨-->
</h4>
</view>
<view class="item">
@@ -52,21 +54,21 @@
<input class="txt-inp" v-model="maEndTime" placeholder="棣栨棣栨纭閫氳繃鍐欏叆" disabled="true" />
</view>
- <!--绂佺敤璇ュ姛鑳�-->
- <!-- 鏂板锛氭楠屼笉鍚堟牸閫佹鍛煎彨 鎸夐挳锛堝姛鑳戒笌閫佹鍛煎彨涓�鏍凤紝浠呭湪鐗瑰畾 remark 涓嬪彲浠ョ偣鍑伙級 -->
- <!--<view class="item">-->
- <!-- 妫�楠屼笉鍚堟牸閫佹鍛煎彨鎸夐挳锛屼粎鍦� remark 涓烘寚瀹氭枃鏈� 涓� 褰撳墠鏃犻�佹鏃堕棿 鏃跺彲鐐瑰嚮 -->
- <!--<button :class="canFailResend ? 'btn-blue' : 'btn-disabled'"
+ <!--鍚敤璇ュ姛鑳�-->
+ <!--鏂板锛氭楠屼笉鍚堟牸閫佹鍛煎彨 鎸夐挳锛堝姛鑳戒笌閫佹鍛煎彨涓�鏍凤紝浠呭湪鐗瑰畾 remark 涓嬪彲浠ョ偣鍑伙級-->
+ <view class="item">
+ <!--妫�楠屼笉鍚堟牸閫佹鍛煎彨鎸夐挳锛屼粎鍦� remark 涓烘寚瀹氭枃鏈� 涓� 褰撳墠鏃犻�佹鏃堕棿 鏃跺彲鐐瑰嚮-->
+ <button :class="canFailResend ? 'btn-blue' : 'btn-disabled'"
:disabled="!canFailResend"
@click="ReHandleMaShoutTime">
妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
- </button>-->
- <!-- 浠嶅鐢ㄥ悓涓�閫佹鏃堕棿瀛楁锛岄伩鍏嶉噸澶嶇姸鎬� -->
- <!--<input class="txt-inp"
+ </button>
+ <!--浠嶅鐢ㄥ悓涓�閫佹鏃堕棿瀛楁锛岄伩鍏嶉噸澶嶇姸鎬�-->
+ <input class="txt-inp"
v-model="maShoutTime"
placeholder="棣栨涓嶅悎鏍奸噸鏂板懠鍙椂鐐瑰嚮鎸夐挳甯﹀嚭閫佹鏃堕棿"
disabled="true" />
- </view>-->
+ </view>
</view>
@@ -101,11 +103,12 @@
},
computed: {
// 婊¤冻棣栨涓嶅悎鏍奸噸鏂板懠鍙潯浠朵笖褰撳墠灏氭湭閲嶆柊鐢熸垚閫佹鏃堕棿 => 鎸夐挳鍙敤
- canFailResend() {
- return this.statusForm &&
- this.statusForm.remark === this.failedRemark &&
- !this.maShoutTime;
- }
+ canFailResend() {
+ return this.statusForm &&
+ this.statusForm.remark &&
+ this.statusForm.remark.includes('涓嶅悎鏍奸噸鏂伴�佹') && // 鏀逛负鍖呭惈鍖归厤
+ !this.maShoutTime;
+ }
},
created() {
// 缁勪欢鍒涘缓鏃惰嚜鍔ㄥ姞杞藉伐鍗曟暟鎹�
@@ -195,7 +198,7 @@
break;
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:// 妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
this.maShoutTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
@@ -222,7 +225,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