From a240efebce056b05387cfff820f209b9f4737df7 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 十二月 2025 16:05:25 +0800
Subject: [PATCH] 实时计算使用次数
---
components/mold.vue | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 4c09323..e1eafc8 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,8 +106,25 @@
<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.useCount != null ? item.useCount : '' }}</td>
+ <!-- 鍙湁绗竴琛屾樉绀� currentCjNum锛屽叾瀹冭鏄剧ず downCount -->
+ <td class="num">
+ <template v-if="idx === 0">
+ {{ item.currentCjNum != null ? item.currentCjNum : '' }}
+ </template>
+ <template v-else>
+ {{ item.downCount != null ? item.downCount : '' }}
+ </template>
+ </td>
+ <!--<td class="num">{{ item.useCount != null ? item.useCount : '' }}</td>--><!--浣跨敤娆℃暟-->
+ <td class="num">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛屽疄鏃惰绠椾娇鐢ㄦ鏁� -->
+ {{item.currentCjNum != null && item.upCount != null ? (Number(item.currentCjNum) - Number(item.upCount)) : (item.useCount != null ? item.useCount : '') }}
+ </template>
+ <template v-else>
+ {{ item.useCount != null ? item.useCount : '' }}
+ </template>
+ </td>
<td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td>
<td class="num">{{ item.lifePercent }}</td>
<td class="num">{{ item.lifeWarn }}</td>
@@ -179,13 +196,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
+ if (this.toolRecords.length > 0) {
+ this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum);
+ }
}
this.$showMessage('鍒锋柊瀹屾垚');
},
@@ -638,18 +679,21 @@
this.fetchTools('');
this.machineNo = uni.getStorageSync('machineNo') || '';
this.workOrderNo = uni.getStorageSync('daa001') || '';
- // 鍘婚櫎榛樿棰勮鍊� (90% -> 0.9)
- //this.lifeWarnInput = '90';
if (this.machineNo && this.workOrderNo) {
- this.fetchFormData();
- this.fetchDefaultToolFromWorkOrder();
+ this.fetchFormData().then(async () => {
+ await this.fetchDefaultToolFromWorkOrder();
+ // 杩涘叆椤甸潰鏃惰祴鍊肩涓�琛� currentCjNum
+ if (this.toolRecords.length > 0) {
+ this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum);
+ }
+ });
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
// 鍚姩鑷姩淇濆瓨瀹氭椂鍣�
- this.startAutoSave();
+ //this.startAutoSave();
},
beforeDestroy() {
// 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
--
Gitblit v1.9.3