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 | 142 +++++++++++++++++++++++++---------------------
1 files changed, 77 insertions(+), 65 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index f13e061..30b2d1a 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -1,47 +1,52 @@
<template>
<view class="page">
<!-- 鍒�鍏烽�夋嫨鍖� -->
- <view class="top-section-grid optimized-grid">
- <!-- 绗竴琛� -->
- <view class="form-row optimized-row">
+ <view class="top-section-grid">
+ <!-- 绗竴琛岋細绉婚櫎鍒�鍏风洰褰曟寜閽� -->
+ <view class="form-row">
<view class="form-cell">
<label class="form-label">鍒�鍏风紪鍙凤細</label>
<input class="input small-font" v-model="selectedToolNo" placeholder="璇烽�氳繃鍒�鍏风洰褰曢�夋嫨" disabled />
</view>
- <view class="form-cell">
+ <view class="form-cell form-cell-flex">
<label class="form-label highlight-label">浣跨敤涓婇檺锛�</label>
- <input class="input small-font input-tool-model" type="number" v-model="useLimitInput" placeholder="姣忔涓嬪垁鍚庢墜濉笂闄�" :disabled="!selectedToolNo || loadingForm" />
- </view>
- <view class="form-cell form-cell-life">
- <label class="form-label">瀵垮懡姣旈璀﹀�硷細</label>
+ <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="濡�0.9鎴�90"
+ placeholder="濡�90"
:disabled="!selectedToolNo || loadingForm" />
<span class="unit-text">%</span>
</view>
</view>
</view>
- <!-- 绗簩琛� -->
- <view class="form-row optimized-row">
+
+ <!-- 绗簩琛岋細鍦ㄦ渶鍚庢坊鍔犲垁鍏风洰褰曟寜閽� -->
+ <view class="form-row">
+ <!-- 鍒�鍏峰悕绉� -->
<view class="form-cell">
<label class="form-label">鍒�鍏峰悕绉帮細</label>
<input class="input small-font input-tool-name" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
</view>
+ <!-- 瑙勬牸鍨嬪彿 -->
<view class="form-cell">
<label class="form-label">瑙勬牸鍨嬪彿锛�</label>
<input class="input small-font input-tool-model" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
</view>
- <view class="form-cell tool-dir-cell optimized-tool-dir">
+ <!-- 鍒�鍏风洰褰曟寜閽彸绉� -->
+ <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 -->
+ </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>
@@ -101,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>
@@ -174,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;
@@ -347,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;
@@ -400,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;
@@ -633,7 +675,7 @@
}
// 鍚姩鑷姩淇濆瓨瀹氭椂鍣�
- this.startAutoSave();
+ //this.startAutoSave();
},
beforeDestroy() {
// 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
@@ -674,9 +716,10 @@
}
.form-cell {
- flex: 0 0 32%;
- min-width: 180px;
- justify-content: flex-start;
+ display: flex;
+ align-items: center;
+ min-width: 0;
+ margin-right: 0;
}
.form-cell:nth-child(1) {
@@ -953,17 +996,17 @@
min-width: 120px;
}
- /* 琛ㄦ牸鏍峰紡 */
.table-section {
display: flex;
justify-content: center;
margin: 1vh 0;
overflow-x: auto;
+ width: 100%; /* 纭繚琛ㄦ牸瀹瑰櫒鍗犳弧瀹藉害 */
}
table.styled-table {
- max-width: 1600px;
- width: 95vw;
+ max-width: 1800px; /* 浠�1600px澧炲姞鍒�1800px */
+ width: 98vw; /* 浠�95vw澧炲姞鍒�98vw */
margin: 0 auto;
border-collapse: separate;
border-spacing: 0;
@@ -1073,16 +1116,8 @@
font-size: 22px !important;
}
-/* .input-use-limit {
- width: 100px !important;
- min-width: 0 !important;
- margin-right: 16px;
- color: #1890ff !important;
- border-color: #1890ff !important;
- }*/
-
.input-tool-model {
- width: 200px !important;
+ width: 320px !important; /* 鍘熶负200px锛岀幇鍔犻暱 */
min-width: 0 !important;
margin-right: 16px;
}
@@ -1121,34 +1156,11 @@
margin-right: 12px;
}
- /* 鏂板鎴栦紭鍖栫殑鏍峰紡 */
- .optimized-grid {
- gap: 8px;
- padding: 8px 24px 8px 24px;
- min-width: 900px;
- }
-
- .optimized-row {
- margin-bottom: 6px;
- align-items: flex-end;
- }
-
- .form-cell-life {
- display: flex;
- align-items: flex-end;
- }
-
- .optimized-tool-dir {
- justify-content: flex-end !important;
- margin-left: 0 !important;
- padding-left: 12px;
- }
-
- @media (max-width: 1200px) {
- .optimized-grid {
- min-width: 0;
- padding: 8px 4vw;
- }
+ .input-use-limit {
+ width: 450px !important;
+ min-width: 0 !important;
+ margin-right: 16px;
+ flex: none !important; /* 鍏抽敭锛氬交搴曠姝lex鎷変几 */
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3