From 22f79cc9003f5a62873ca144a38e8015da9f2b28 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 十二月 2025 15:17:29 +0800
Subject: [PATCH] 刷新表格 currentCjNum
---
components/mold.vue | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 4c09323..30b2d1a 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -20,10 +20,6 @@
<span class="unit-text">%</span>
</view>
</view>
- <!-- 鏂板锛氬埛鏂版寜閽� -->
- <view class="form-cell" style="flex:0 0 auto; margin-left:16px;">
- <button class="btn-blue large-btn" @click="handleRefresh" :disabled="loadingForm || submitting">鍒锋柊</button>
- </view>
</view>
<!-- 绗簩琛岋細鍦ㄦ渶鍚庢坊鍔犲垁鍏风洰褰曟寜閽� -->
@@ -41,6 +37,10 @@
<!-- 鍒�鍏风洰褰曟寜閽彸绉� -->
<view class="form-cell tool-dir-cell">
<button class="btn-blue large-btn" @click="openToolDialog" :disabled="loadingTools">鍒�鍏风洰褰�</button>
+ </view>
+ <!-- 鏂板锛氬埛鏂版寜閽� -->
+ <view class="form-cell" style="flex:0 0 auto; margin-left:16px;">
+ <button class="btn-blue large-btn" @click="handleRefresh" :disabled="loadingForm || submitting">鍒锋柊</button>
</view>
</view>
</view> <!-- 杩欓噷闂悎 top-section-grid -->
@@ -106,7 +106,9 @@
<td>{{ item.upTime }}</td>
<td class="num">{{ item.upCount != null ? item.upCount : '' }}</td>
<td>{{ item.downTime }}</td>
- <td class="num">{{ item.downCount != null ? item.downCount : '' }}</td>
+ <!--<td class="num">{{ item.downCount != null ? item.downCount : '' }}</td>-->
+ <!-- 涓嬪垁璁℃暟鏀逛负瀹炴椂鏄剧ず currentCjNum -->
+ <td class="num">{{ item.currentCjNum != null ? item.currentCjNum : '' }}</td>
<td class="num">{{ item.useCount != null ? item.useCount : '' }}</td>
<td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td>
<td class="num">{{ item.lifePercent }}</td>
@@ -179,13 +181,37 @@
toolModel() { this.isDirty = true; }
},
methods: {
+ //鏌ヨ褰撳墠鏁伴噰鏁帮紝浣滀负涓嬪垁璁℃暟瀹炴椂鏄剧ず
+ async fetchCurrentCjNum(toolNo) {
+ if (!this.machineNo) return null;
+ try {
+ const res = await this.$post({
+ url: '/Womdaa/GetWomdaasByShow',
+ data: JSON.stringify({ machineNo: this.machineNo }),
+ headers: { 'Content-Type': 'application/json' }
+ });
+ if (res.status === 0 && Array.isArray(res.data?.tbBillList)) {
+ const found = res.data.tbBillList.find(x =>
+ x.cutterId === toolNo || x.cutteR_ID === toolNo
+ );
+ return found ? (found.CurrentCjNum ?? found.currentCjNum ?? null) : null;
+ }
+ } catch (e) {
+ console.warn('鑾峰彇currentCjNum澶辫触', e);
+ }
+ return null;
+ },
+
// 鏂板锛氬埛鏂版寜閽鐞嗘柟娉�
async handleRefresh() {
- // 鍒锋柊鍒�鍏峰垪琛ㄥ拰琛ㄥ崟鏁版嵁
this.fetchTools('');
if (this.machineNo && this.workOrderNo) {
await this.fetchFormData();
await this.fetchDefaultToolFromWorkOrder();
+ // 鏂板锛氬埛鏂拌〃鏍� currentCjNum
+ for (const item of this.toolRecords) {
+ item.currentCjNum = await this.fetchCurrentCjNum(item.no);
+ }
}
this.$showMessage('鍒锋柊瀹屾垚');
},
@@ -649,7 +675,7 @@
}
// 鍚姩鑷姩淇濆瓨瀹氭椂鍣�
- this.startAutoSave();
+ //this.startAutoSave();
},
beforeDestroy() {
// 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
--
Gitblit v1.9.3