From 9977c8fc3a2c7df4041ab14eaeb62976f1a607ea Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 04 十二月 2025 11:30:49 +0800
Subject: [PATCH] 备份节点一
---
components/mold.vue | 145 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 116 insertions(+), 29 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index c1c9b89..9acf1a1 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,12 +38,16 @@
<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="handleDownTool" :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>
@@ -82,17 +86,18 @@
<table class="styled-table">
<thead>
<tr>
- <th style="width:8%">鍒�鍏风紪鍙�</th>
- <th style="width:14%">鍒�鍏峰悕绉�</th>
- <th style="width:12%">涓婂垁鏃堕棿</th>
- <th class="num" style="width:8%">涓婂垁璁℃暟</th>
- <th style="width:12%">涓嬪垁鏃堕棿</th>
- <th class="num" style="width:8%">涓嬪垁璁℃暟</th>
- <th class="num" style="width:8%">浣跨敤娆℃暟</th>
- <th class="num" style="width:8%">浣跨敤涓婇檺</th>
- <th class="num" style="width:8%">瀵垮懡姣�%</th>
- <th class="num" style="width:8%">瀵垮懡姣旈璀﹀��</th>
- <th style="width:8%">棰勮鐘舵��</th>
+ <th style="width:7%">鍒�鍏风紪鍙�</th>
+ <th style="width:12%">鍒�鍏峰悕绉�</th>
+ <th style="width:10%">涓婂垁鏃堕棿</th>
+ <th class="num" style="width:7%">涓婂垁璁℃暟</th>
+ <th style="width:10%">涓嬪垁鏃堕棿</th>
+ <th class="num" style="width:7%">涓嬪垁璁℃暟</th>
+ <th class="num" style="width:7%">浣跨敤娆℃暟</th>
+ <th class="num" style="width:7%">浣跨敤涓婇檺</th>
+ <th class="num" style="width:7%">瀵垮懡姣�%</th>
+ <th class="num" style="width:7%">瀵垮懡姣旈璀﹀��</th>
+ <th style="width:7%">棰勮鐘舵��</th>
+ <th style="width:7%">鍒�鍏峰湪鏈虹姸鎬�</th>
</tr>
</thead>
<tbody>
@@ -102,18 +107,63 @@
<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">
+ <!-- 绗竴琛岋細涓嬫満鏃朵笉瀹炴椂鏄剧ず currentCjNum锛屾樉绀� downCount -->
+ <template v-if="!item.downTime">
+ {{ item.currentCjNum != null ? item.currentCjNum : '' }}
+ </template>
+ <template v-else>
+ {{ item.downCount != null ? item.downCount : '' }}
+ </template>
+ </template>
+ <template v-else>
+ {{ item.downCount != null ? item.downCount : '' }}
+ </template>
+ </td>
+ <!--浣跨敤娆℃暟-->
+ <td class="num">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛屽疄鏃惰绠椾娇鐢ㄦ鏁帮紝鑻ヤ负涓嬫満鍒欎笉瀹炴椂鏄剧ず -->
+ <template v-if="!item.downTime">
+ {{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>
+ </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">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛屽疄鏃惰绠楀鍛芥瘮%锛岃嫢涓轰笅鏈哄垯涓嶅疄鏃舵樉绀� -->
+ <template v-if="!item.downTime">
+ {{item.currentCjNum != null && item.upCount != null && item.useLimit != null && Number(item.useLimit) > 0 ? Math.round((Number(item.currentCjNum) - Number(item.upCount)) / Number(item.useLimit) * 100) + '%' : (item.lifePercent != null ? item.lifePercent : '') }}
+ </template>
+ <template v-else>
+ {{ item.lifePercent != null ? item.lifePercent : '' }}
+ </template>
+ </template>
+ <template v-else>
+ {{ item.lifePercent }}
+ </template>
+ </td>
<td class="num">{{ item.lifeWarn }}</td>
<td :class="item.warnStatus === '棰勮' ? 'warn-cell' : (item.warnStatus === '姝ｅ父' ? 'ok-cell' : '')">
<span v-if="item.warnStatus === '棰勮'" class="warn-badge">璀﹀憡</span>
<span v-else>{{ item.warnStatus }}</span>
</td>
+ <td>
+ {{ item.downTime ? '涓嬫満' : '鍦ㄦ満' }}<!--鍦ㄦ満鐘舵��-->
+ </td>
</tr>
<tr v-if="!toolRecords.length">
- <td colspan="11">鏆傛棤鏁版嵁</td>
+ <td colspan="12">鏆傛棤鏁版嵁</td>
</tr>
</tbody>
</table>
@@ -175,6 +225,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
+ if (this.toolRecords.length > 0) {
+ this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum);
+ }
+ }
+ this.$showMessage('鍒锋柊瀹屾垚');
+ },
// 鑷姩淇濆瓨锛氬惎鍔�
startAutoSave() {
if (!this.autoSaveEnabled) return;
@@ -348,10 +432,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 +485,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;
@@ -623,18 +708,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() {
// 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
@@ -1121,5 +1209,4 @@
margin-right: 16px;
flex: none !important; /* 鍏抽敭锛氬交搴曠姝lex鎷変几 */
}
-
</style>
\ No newline at end of file
--
Gitblit v1.9.3