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 | 265 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 172 insertions(+), 93 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 0da01db..30b2d1a 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -8,16 +8,14 @@
<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-use-limit" type="number" v-model="useLimitInput" placeholder="姣忔涓嬪垁鍚庢墜濉笂闄�" :disabled="!selectedToolNo || loadingForm" />
- </view>
- <view class="form-cell">
- <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>
@@ -36,15 +34,19 @@
<label class="form-label">瑙勬牸鍨嬪彿锛�</label>
<input class="input small-font input-tool-model" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
</view>
- <!-- 鏂板鐨勫垁鍏风洰褰曟寜閽� -->
- <view class="form-cell">
+ <!-- 鍒�鍏风洰褰曟寜閽彸绉� -->
+ <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>
@@ -104,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>
@@ -177,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;
@@ -350,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;
@@ -403,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;
@@ -636,7 +675,7 @@
}
// 鍚姩鑷姩淇濆瓨瀹氭椂鍣�
- this.startAutoSave();
+ //this.startAutoSave();
},
beforeDestroy() {
// 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
@@ -650,24 +689,23 @@
display: flex;
flex-direction: column;
justify-content: center;
- align-items: center;
+ align-items: flex-start;
gap: 12px;
margin-bottom: 2vh;
- width: 99vw; /* 鍘�95vw锛屾敼涓�99vw */
- max-width: 1920px; /* 鍘�1600px锛屾敼涓�1920px */
+ width: 99vw;
+ max-width: 1920px;
margin-left: auto;
margin-right: auto;
padding: 12px;
background: #f8f9fa;
border-radius: 8px;
border: 1px solid #e9ecef;
- font-size: 32px;
}
- /* 琛ㄥ崟琛屾牱寮忎紭鍖� */
.form-row {
display: flex;
- justify-content: space-between;
+ flex-direction: row;
+ justify-content: flex-start;
align-items: center;
width: 100%;
margin-bottom: 12px;
@@ -680,26 +718,39 @@
.form-cell {
display: flex;
align-items: center;
- flex-basis: 0;
- flex-grow: 1;
- max-width: 33.33%; /* 涓夌瓑鍒� */
min-width: 0;
- margin: 0 8px;
+ margin-right: 0;
}
+ .form-cell:nth-child(1) {
+ flex: 0 0 28%;
+ min-width: 180px;
+ }
+
+ .form-cell:nth-child(2) {
+ flex: 0 0 32%;
+ min-width: 180px;
+ justify-content: flex-start;
+ }
+
+ .form-cell:nth-child(3) {
+ flex: 0 0 auto;
+ min-width: 0;
+ max-width: 220px; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鎾戝紑 */
+ justify-content: flex-end;
+ }
+
.form-label {
- width: 120px;
+ width: auto;
font-weight: bold;
- font-size: 32px !important; /* 鍘�18/22px锛岃皟澶� */
color: #333;
white-space: nowrap;
- margin-right: 12px;
+ margin-right: 4px;
flex-shrink: 0;
}
.input {
padding: 14px 20px;
- font-size: 30px !important; /* 鍘�16/20px锛岃皟澶� */
border: 1px solid #dcdfe6;
flex: 1;
margin-right: 0;
@@ -711,7 +762,7 @@
}
.input.small-font {
- font-size: 28px !important; /* 鍘�15/19px锛岃皟澶� */
+ /* 涓嶈缃瓧浣撳ぇ灏� */
}
.input:disabled {
@@ -720,19 +771,41 @@
cursor: not-allowed;
}
- .input, .input-with-unit {
- width: 100%;
- box-sizing: border-box;
+ .input-with-unit {
+ display: flex;
+ align-items: center;
+ gap: 0;
}
- .btn-blue {
+ .input-with-unit .input {
+ width: 60px !important;
+ min-width: 0 !important;
+ margin-right: 2px !important;
+ text-align: center;
+ padding-left: 2px;
+ padding-right: 2px;
+ }
+
+ .input-with-unit .input {
+ margin-right: 4px !important;
+ width: 60px !important;
+ min-width: 0 !important;
+ text-align: center;
+ }
+
+ .unit-text {
+ margin-left: 0 !important;
+ padding-left: 0 !important;
+ font-size: 22px !important;
+ }
+
+ .btn-blue, .btn-blue.large-btn {
background-color: #1890ff;
color: white;
border: none;
padding: 14px 32px;
border-radius: 4px;
cursor: pointer;
- font-size: 32px !important; /* 鍘�16/22px锛岃皟澶� */
font-weight: 500;
white-space: nowrap;
height: 70px !important;
@@ -740,7 +813,20 @@
transition: all 0.3s;
flex-shrink: 0;
min-width: 140px;
+ margin-left: 24px;
}
+
+ .btn-blue.large-btn {
+ padding: 0 60px;
+ min-width: 180px;
+ height: 72px !important;
+ margin-left: 0 !important;
+ font-size: 1.3em;
+ box-shadow: 0 2px 8px rgba(24,144,255,0.08);
+ line-height: 72px; /* 鍨傜洿灞呬腑 */
+ display: inline-block; /* 淇濊瘉line-height鐢熸晥 */
+ vertical-align: middle;
+ }
.btn-blue:hover {
background-color: #40a9ff;
@@ -768,7 +854,6 @@
padding: 1.5vh;
background-color: #00A2E9;
color: white;
- font-size: 1.8vw; /* 鍘�1.2vw锛岃皟澶� */
border: none;
text-align: center;
border-radius: 6px;
@@ -856,7 +941,6 @@
cursor: pointer;
color: #333;
text-align: left;
- font-size: 22px; /* 鍘�13/18px锛岃皟澶� */
min-height: 50px;
transition: background 0.15s, color 0.15s;
overflow: hidden;
@@ -897,7 +981,6 @@
.dialog-actions .btn-blue {
padding: 10px 24px;
- font-size: 28px !important; /* 鍘�16/22px锛岃皟澶� */
min-width: 120px;
}
@@ -907,24 +990,23 @@
border: none;
padding: 10px 24px;
border-radius: 4px;
- font-size: 28px !important; /* 鍘�16/22px锛岃皟澶� */
font-weight: 500;
cursor: not-allowed;
box-shadow: none;
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;
@@ -940,14 +1022,12 @@
border-bottom: 2px solid #bfbfbf;
padding: 16px 10px;
font-weight: bold;
- font-size: 1.6vw; /* 鍘�1.2vw锛岃皟澶� */
text-align: center;
}
table.styled-table tbody td {
border-bottom: 1px solid #e8e8e8;
padding: 14px 10px;
- font-size: 1.4vw; /* 鍘�1.1vw锛岃皟澶� */
vertical-align: middle;
text-align: center;
}
@@ -995,26 +1075,6 @@
padding: 2px 6px;
border-radius: 3px;
font-weight: bold;
- font-size: 1.4vw; /* 鍘�0.9/1.2vw锛岃皟澶� */
- }
-
- /* 甯﹀崟浣嶇殑杈撳叆妗嗘牱寮� */
- .input-with-unit {
- display: flex;
- align-items: center;
- flex: 1;
- }
-
- .input-with-unit .input {
- flex: 1;
- margin-right: 8px;
- }
-
- .unit-text {
- color: #666;
- font-size: 28px !important; /* 鍘�14/18px锛岃皟澶� */
- white-space: nowrap;
- width: 28px;
}
/* 鍝嶅簲寮忚皟鏁� */
@@ -1025,52 +1085,39 @@
.form-label {
width: 90px;
- font-size: 22px !important; /* 鍘�16/18px锛岃皟澶� */
}
.input {
- font-size: 20px !important; /* 鍘�14/17px锛岃皟澶� */
padding: 10px 14px;
}
.btn-blue {
padding: 10px 18px;
- font-size: 22px !important; /* 鍘�14/18px锛岃皟澶� */
}
}
- /* 鏂板澶ф寜閽牱寮� */
- .btn-blue.large-btn {
- padding: 14px 32px;
- font-size: 32px !important; /* 鍘�16/22px锛岃皟澶� */
- height: 70px !important;
- min-width: 140px;
- }
-
- /* 璋冩暣琛ㄥ崟鍗曞厓鏍煎竷灞�浠ラ�傚簲鎸夐挳 */
- .form-row .form-cell:last-child {
- justify-content: center;
- flex: 0 0 auto;
- min-width: 140px;
- }
-
- /* 鏂板锛氳鈥滆缃娇鐢ㄤ笂闄愨�濃�滃鍛芥瘮棰勮鍊尖�濊緭鍏ユ鍙樼獎 */
.input-life-warn {
- width: 120px !important;
+ width: 48px !important; /* 绋嶅井鏀惧锛岄伩鍏嶅瓧浣撴孩鍑� */
min-width: 0 !important;
- margin-right: 8px;
+ margin-right: 4px;
+ padding-left: 2px;
+ padding-right: 2px;
+ font-size: 22px !important;
+ text-align: center;
+ box-sizing: border-box;
}
- .input-use-limit {
- width: 100px !important;
- min-width: 0 !important;
- margin-right: 16px;
- color: #1890ff !important;
- border-color: #1890ff !important;
+ .input,
+ .input.small-font,
+ .input-use-limit,
+ .input-tool-model,
+ .input-tool-name,
+ .input-life-warn {
+ font-size: 22px !important;
}
.input-tool-model {
- width: 100px !important;
+ width: 320px !important; /* 鍘熶负200px锛岀幇鍔犻暱 */
min-width: 0 !important;
margin-right: 16px;
}
@@ -1084,4 +1131,36 @@
.highlight-label {
color: #1890ff !important;
}
+
+ .tool-dir-cell {
+ flex: 0 0 auto !important;
+ justify-content: flex-start !important;
+ display: flex !important;
+ align-items: center;
+ margin-left: 16px; /* 涓庤鏍煎瀷鍙疯緭鍏ユ鎷夊紑璺濈 */
+ }
+
+ .form-cell-flex {
+ display: flex;
+ align-items: center;
+ flex: 0 0 60%;
+ min-width: 320px;
+ }
+
+ .form-cell-flex .form-label {
+ margin-right: 4px;
+ width: auto;
+ }
+
+ .form-cell-flex .input-use-limit {
+ margin-right: 12px;
+ }
+
+ .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