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 | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 3ac91de..30b2d1a 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -10,12 +10,12 @@
</view>
<view class="form-cell form-cell-flex">
<label class="form-label highlight-label">浣跨敤涓婇檺锛�</label>
- <input class="input small-font input-use-limit" type="number" v-model="useLimitInput" placeholder="姣忔涓嬪垁鍚庢墜濉笂闄�" :disabled="!selectedToolNo || loadingForm" />
+ <input class="input small-font input-use-limit" type="number" v-model="useLimitInput" placeholder="姣忔涓婂垁鏃舵墜濉笂闄�" :disabled="!selectedToolNo || loadingForm" />
<label class="form-label" style="margin-left:16px;">瀵垮懡姣旈璀﹀�硷細</label>
<view class="input-with-unit">
<input class="input small-font input-life-warn"
v-model="lifeWarnInput"
- placeholder="濡�90鎴�0.90"
+ placeholder="濡�90"
:disabled="!selectedToolNo || loadingForm" />
<span class="unit-text">%</span>
</view>
@@ -38,11 +38,15 @@
<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 -->
<!-- 鎿嶄綔鎸夐挳 - 绉诲嚭 top-section-grid -->
<view class="button-row">
- <button class="save-btn" @click="handleUpTool" :disabled="submitting || loadingForm">涓婂垁鎻愪氦=璋冩満寮�濮�</button>
+ <button class="save-btn" @click="handleUpTool" :disabled="submitting || loadingForm">涓婂垁鎻愪氦(=璋冩満寮�濮�)</button>
<button class="save-btn" @click="handleDownTool" :disabled="submitting || loadingForm">涓嬪垁鎻愪氦</button>
<button class="cancel-btn" @click="cancel" :disabled="submitting || loadingForm">鍙栨秷</button>
</view>
@@ -102,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>
@@ -175,6 +181,40 @@
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('鍒锋柊瀹屾垚');
+ },
// 鑷姩淇濆瓨锛氬惎鍔�
startAutoSave() {
if (!this.autoSaveEnabled) return;
@@ -348,10 +388,10 @@
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
if (!this.selectedToolNo) { this.$showMessage('鍒�鍏风紪鍙蜂笉鑳戒负绌�'); return; }
- //涓婂垁涓嶅己鍒跺綍鍏ヤ娇鐢ㄤ笂闄�
- //if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
+ //涓婂垁寮哄埗褰曞叆浣跨敤涓婇檺
+ if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
const useLimit = Number(this.useLimitInput);
- //if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
// sdjs 浣跨敤宸ュ崟 currentCjNum
const sdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
@@ -401,9 +441,10 @@
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
if (!this.selectedToolNo) { this.$showMessage('鍒�鍏风紪鍙蜂笉鑳戒负绌�'); return; }
- if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
+ //涓嬪垁涓嶅己鍒跺綍鍏ヤ娇鐢ㄤ笂闄�
+ //if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
const useLimit = Number(this.useLimitInput);
- if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ //if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
// 涓嬪垁璁℃暟鍚屾牱鍙栧伐鍗曟渶鏂伴噰闆嗘暟
const xdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
@@ -634,7 +675,7 @@
}
// 鍚姩鑷姩淇濆瓨瀹氭椂鍣�
- this.startAutoSave();
+ //this.startAutoSave();
},
beforeDestroy() {
// 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
--
Gitblit v1.9.3