From ec4ede1c562b899312bd18a8e5520e7f4e8b732f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 11:15:01 +0800
Subject: [PATCH] 界面优化
---
components/mold.vue | 509 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 337 insertions(+), 172 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index b322b5b..05708e8 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -3,16 +3,13 @@
<!-- 鍒�鍏烽�夋嫨鍖� -->
<view class="top-section-grid">
<view class="form-cell">
- <label class="form-label">閫夋嫨鍒�鍏风紪鍙凤細</label>
- <select v-model="selectedToolNo" class="form-select">
- <option v-for="tool in toolList" :key="tool.no" :value="tool.no">{{ tool.no }} | {{ tool.name }}</option>
- </select>
- <button class="btn-blue" @click="showToolDialog = true">鍒�鍏风洰褰�</button>
+ <label class="form-label">鍒�鍏风紪鍙凤細</label>
+ <input class="input" v-model="selectedToolNo" placeholder="璇烽�氳繃鍒�鍏风洰褰曢�夋嫨" disabled />
+ <button class="btn-blue" @click="openToolDialog" :disabled="loadingTools">鍒�鍏风洰褰�</button>
</view>
<view class="form-cell">
<label class="form-label">璁剧疆浣跨敤涓婇檺锛�</label>
- <input class="input" type="number" v-model="useLimitInput" placeholder="姣忔鎹㈠垁鍚庢墜濉�" :disabled="!selectedToolNo" />
- <button class="btn-blue" @click="setUseLimit" :disabled="!selectedToolNo || !useLimitInput">淇濆瓨涓婇檺</button>
+ <input class="input" type="number" v-model="useLimitInput" placeholder="姣忔鎹㈠垁鍚庢墜濉�" :disabled="!selectedToolNo || loadingForm" />
</view>
<view class="form-cell">
<label class="form-label">鍒�鍏峰悕绉帮細</label>
@@ -24,32 +21,36 @@
<!-- 鎿嶄綔鎸夐挳 -->
<view class="button-row">
- <button class="save-btn" @click="handleUpTool">涓婂垁鎻愪氦</button>
- <button class="save-btn" @click="handleDownTool">涓嬪垁鎻愪氦</button>
- <button class="cancel-btn" @click="cancel">鍙栨秷</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>
<!-- 鍒�鍏风洰褰曞脊绐� -->
<view v-if="showToolDialog" class="dialog-overlay">
<view class="dialog">
<view class="form-group">
- <input v-model="searchKey" placeholder="杈撳叆鍒�鍏风紪鐮併�佸悕绉版ā绯婃悳绱�" class="input" />
- <button class="btn-blue" @click="searchTool">鎼滅储</button>
+ <input v-model="searchKey" placeholder="杈撳叆鍒�鍏风紪鐮併�佸悕绉版ā绯婃悳绱�" class="input" @input="onSearchKeyInput" />
+ <button class="btn-blue" @click="searchTool" :disabled="loadingTools">鎼滅储</button>
</view>
<view class="tool-list">
- <button v-for="tool in filteredTools" :key="tool.no" class="tool-btn" @click="selectTool(tool)">
+ <button v-for="tool in filteredTools"
+ :key="tool.no"
+ class="tool-btn"
+ :class="{ active: activeToolNo === tool.no }"
+ @click="selectTool(tool)">
{{ tool.no }} | {{ tool.name }}
</button>
</view>
<view class="dialog-actions">
<div style="display: flex; align-items: center;">
- <button class="btn-blue" @click="prevPage" :disabled="pageIndex === 1">涓婁竴椤�</button>
+ <button class="btn-blue" @click="prevPage" :disabled="pageIndex === 1 || loadingTools">涓婁竴椤�</button>
<span style="margin: 0 12px;">绗瑊{ pageIndex }}椤� / 鍏眥{ totalPages }}椤�</span>
- <button class="btn-blue" @click="nextPage" :disabled="pageIndex === totalPages">涓嬩竴椤�</button>
+ <button class="btn-blue" @click="nextPage" :disabled="pageIndex === totalPages || loadingTools">涓嬩竴椤�</button>
</div>
<div>
<button class="btn-blue" @click="confirmTool">纭畾</button>
- <button class="btn-disabled" @click="showToolDialog = false">鍙栨秷</button>
+ <button class="btn-disabled" @click="closeToolDialog">鍙栨秷</button>
</div>
</view>
</view>
@@ -57,35 +58,41 @@
<!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
<view class="table-section">
- <table>
+ <table class="styled-table">
<thead>
<tr>
- <th>鍒�鍏风紪鍙�</th>
- <th>鍒�鍏峰悕绉�</th>
- <th>涓婂垁鏃堕棿</th>
- <th>涓婂垁璁℃暟</th>
- <th>涓嬪垁鏃堕棿</th>
- <th>涓嬪垁璁℃暟</th>
- <th>浣跨敤娆℃暟</th>
- <th>浣跨敤涓婇檺</th>
- <th>瀵垮懡姣�%</th>
- <th>瀵垮懡姣旈璀﹀��</th>
- <th>棰勮鐘舵��</th>
+ <th style="width:8%">鍒�鍏风紪鍙�</th>
+ <th style="width:14%">鍒�鍏峰悕绉�</th>
+ <th style="width:12%">涓婂垁鏃堕棿 <span class="header-badge">1</span></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>
</tr>
</thead>
<tbody>
- <tr v-for="item in toolRecords" :key="item.id">
+ <tr v-for="(item, idx) in toolRecords" :key="item.id" :class="{'row-odd': idx % 2 === 0}">
<td>{{ item.no }}</td>
- <td>{{ item.name }}</td>
+ <td class="left">{{ item.name }}</td>
<td>{{ item.upTime }}</td>
- <td>{{ item.upCount }}</td>
+ <td class="num">{{ item.upCount != null ? item.upCount : '' }}</td>
<td>{{ item.downTime }}</td>
- <td>{{ item.downCount }}</td>
- <td>{{ item.useCount }}</td>
- <td>{{ item.useLimit }}</td>
- <td>{{ item.lifePercent }}</td>
- <td>{{ item.lifeWarn }}</td>
- <td :class="item.warnStatus === '璀﹀憡' ? 'warn' : ''">{{ item.warnStatus }}</td>
+ <td class="num">{{ item.downCount != null ? item.downCount : '' }}</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>
+ <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>
+ </tr>
+ <tr v-if="!toolRecords.length">
+ <td colspan="11">鏆傛棤鏁版嵁</td>
</tr>
</tbody>
</table>
@@ -106,6 +113,7 @@
return {
machineNo: '',//鏈哄彴缂栫爜
workOrderNo: '',//宸ュ崟鍙�
+ activeToolNo: '', // 褰撳墠閫変腑鐨勫垁鍏风紪鍙�
pageIndex: 1,
pageSize: 18,
total: 0,
@@ -117,16 +125,30 @@
searchKey: '',
filteredTools: [],
useLimitInput: '',
- toolRecords: []
+ toolRecords: [],
+ loadingTools: false,
+ loadingForm: false,
+ submitting: false,
+ _searchTimer: null,
+ workOrderCurrentCjNum: null // 宸ュ崟褰撳墠鏁伴噰
};
},
computed: {
totalPages() {
- return Math.ceil(this.total / this.pageSize) || 1;
+ return Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
}
},
methods: {
+ openToolDialog() {
+ this.showToolDialog = true;
+ this.pageIndex = 1;
+ this.fetchTools(this.searchKey);
+ },
+ closeToolDialog() {
+ this.showToolDialog = false;
+ },
async fetchTools(searchKey) {
+ this.loadingTools = true;
try {
const res = await this.$post({
url: '/MesCutterLedger/QueryTools',
@@ -139,7 +161,6 @@
});
if (res.status === 0) {
- // 鍏煎涓嶅悓杩斿洖缁撴瀯锛氱洿鎺ユ暟缁� / { tbBillList, total } / { data: [...] }
const payload = Array.isArray(res.data) ? res.data
: (res.data && res.data.tbBillList) ? res.data.tbBillList
: (res.data && res.data.data) ? res.data.data
@@ -156,16 +177,15 @@
model: getField(t, 'cutterModel', 'CUTTER_MODEL', 'cutteR_MODEL', 'model')
}));
- // 濉厖寮圭獥鍒楄〃鍜屼笅鎷夊垪琛紙妯℃澘涓笅鎷変娇鐢� toolList锛�
this.filteredTools = mapped;
this.toolList = mapped.slice();
- // 澶勭悊 total锛氬綋鍚庣 totalCount 涓� 0 鏃讹紝鍥為��鍒板祵濂� total 鎴栨槧灏勬暟缁勯暱搴�
- const totalFromRes = Number(res.totalCount);
- if (Number.isFinite(totalFromRes) && totalFromRes > 0) {
- this.total = totalFromRes;
- } else {
- this.total = Number(res.data?.total ?? res.data?.totalCount ?? res.total ?? mapped.length) || 0;
+ const totalFromRes = Number(
+ res.data?.total ?? res.data?.totalCount ?? res.total ?? res.totalCount ?? mapped.length
+ );
+ this.total = Number.isFinite(totalFromRes) ? totalFromRes : mapped.length;
+ if (this.pageIndex > this.totalPages) {
+ this.pageIndex = this.totalPages;
}
} else {
this.$showMessage(res.message || '鏌ヨ澶辫触');
@@ -173,9 +193,10 @@
} catch (err) {
console.error('fetchTools 閿欒锛�', err);
this.$showMessage('鏌ヨ鍒�鍏峰け璐ワ紝璇锋鏌ョ綉缁滄垨鎺ュ彛');
+ } finally {
+ this.loadingTools = false;
}
},
- //缈婚〉
async prevPage() {
if (this.pageIndex > 1) {
this.pageIndex--;
@@ -188,134 +209,151 @@
await this.fetchTools(this.searchKey);
}
},
+ onSearchKeyInput() {
+ clearTimeout(this._searchTimer);
+ this._searchTimer = setTimeout(() => {
+ this.searchTool();
+ }, 300);
+ },
async searchTool() {
- this.pageIndex = 1; // 鎼滅储鏃堕噸缃埌绗竴椤�
+ this.pageIndex = 1;
await this.fetchTools(this.searchKey);
},
selectTool(tool) {
this.selectedToolNo = tool.no;
this.toolName = tool.name;
this.toolModel = tool.model;
+ this.activeToolNo = tool.no;
},
confirmTool() {
this.showToolDialog = false;
},
- async handleUpTool() {
- if (!this.workOrderNo) {
- this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�');
- return;
- }
- if (!this.machineNo) {
- this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�');
- return;
- }
+ async setUseLimit() {
if (!this.selectedToolNo) {
- this.$showMessage('鍒�鍏风紪鍙蜂笉鑳戒负绌�');
+ this.$showMessage('璇烽�夋嫨鍒�鍏峰悗鍐嶈缃笂闄�');
return;
}
- if (!this.useLimitInput) {
- this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖');
- return;
- }
- const useLimit = Number(this.useLimitInput);
- if (isNaN(useLimit) || useLimit <= 0) {
+ const v = Number(this.useLimitInput);
+ if (isNaN(v) || v <= 0) {
this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺');
return;
}
- const payload = {
- workOrderNo: this.workOrderNo, // 宸ュ崟鍙�
- machineNo: this.machineNo, // 鏈哄彴缂栧彿
- toolNo: this.selectedToolNo, // 鍒�鍏风紪鍙�
- type: '涓婂垁', // 涓婂垁
- useLimit: this.useLimitInput ? Number(this.useLimitInput) : null // 浣跨敤涓婇檺
- };
- const res = await this.$post({
- url: '/MesCutterLedger/SubmitToolAction',
- data: JSON.stringify(payload),
- headers: { 'Content-Type': 'application/json' }
+ this.toolRecords = this.toolRecords.map(r => {
+ if (r.no === this.selectedToolNo) {
+ return { ...r, useLimit: v };
+ }
+ return r;
});
- if (res.status === 0) {
- this.$showMessage('涓婂垁鎻愪氦鎴愬姛');
- // 鎴愬姛鍚庡埛鏂板垪琛�
- await this.fetchFormData();
- } else {
- this.$showMessage(res.message || '涓婂垁鎻愪氦澶辫触');
- }
+ this.toolList = this.toolList.map(t => t.no === this.selectedToolNo ? { ...t, useLimit: v } : t);
+ this.$showMessage('浣跨敤涓婇檺宸茶缃紙浠呭墠绔樉绀猴級');
},
- async handleDownTool() {
- if (!this.workOrderNo) {
- this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�');
- return;
- }
- if (!this.machineNo) {
- this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�');
- return;
- }
- if (!this.selectedToolNo) {
- this.$showMessage('鍒�鍏风紪鍙蜂笉鑳戒负绌�');
- return;
- }
- if (!this.useLimitInput) {
- this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖');
- return;
- }
+ // 涓婂垁鏃朵紶閫� sdjs = 宸ュ崟 currentCjNum
+ async handleUpTool() {
+ if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
+ if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
+ if (!this.selectedToolNo) { 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;
+
const payload = {
workOrderNo: this.workOrderNo,
machineNo: this.machineNo,
toolNo: this.selectedToolNo,
- type: '涓嬪垁', // 涓嬪垁
- useLimit: this.useLimitInput ? Number(this.useLimitInput) : null
+ type: '涓婂垁',
+ useLimit,
+ sdjs // 涓婂垁璁℃暟锛堝伐鍗曞綋鍓嶆暟閲囷級
};
- const res = await this.$post({
- url: '/MesCutterLedger/SubmitToolAction',
- data: JSON.stringify(payload),
- headers: { 'Content-Type': 'application/json' }
- });
- if (res.status === 0) {
- this.$showMessage('涓嬪垁鎻愪氦鎴愬姛');
- // 鎴愬姛鍚庡埛鏂板垪琛�
- await this.fetchFormData();
- } else {
- this.$showMessage(res.message || '涓嬪垁鎻愪氦澶辫触');
+ try {
+ this.submitting = true;
+ const res = await this.$post({
+ url: '/MesCutterLedger/SubmitToolAction',
+ data: JSON.stringify(payload),
+ headers: { 'Content-Type': 'application/json' }
+ });
+ if (res.status === 0) {
+ this.$showMessage('涓婂垁鎻愪氦鎴愬姛');
+ await this.fetchFormData();
+ } else {
+ this.$showMessage(res.message || '涓婂垁鎻愪氦澶辫触');
+ }
+ } catch (err) {
+ console.error(err);
+ this.$showMessage('涓婂垁鎻愪氦澶辫触锛岃妫�鏌ョ綉缁�');
+ } finally {
+ this.submitting = false;
+ }
+ },
+ // 涓嬪垁鏃朵紶閫� xdjs = 宸ュ崟 currentCjNum
+ async handleDownTool() {
+ if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
+ if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
+ if (!this.selectedToolNo) { this.$showMessage('鍒�鍏风紪鍙蜂笉鑳戒负绌�'); return; }
+ if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
+ const useLimit = Number(this.useLimitInput);
+ if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+
+ // 涓嬪垁璁℃暟鍚屾牱鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ const xdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
+
+ const payload = {
+ workOrderNo: this.workOrderNo,
+ machineNo: this.machineNo,
+ toolNo: this.selectedToolNo,
+ type: '涓嬪垁',
+ useLimit,
+ xdjs // 涓嬪垁璁℃暟
+ };
+ try {
+ this.submitting = true;
+ const res = await this.$post({
+ url: '/MesCutterLedger/SubmitToolAction',
+ data: JSON.stringify(payload),
+ headers: { 'Content-Type': 'application/json' }
+ });
+ if (res.status === 0) {
+ this.$showMessage('涓嬪垁鎻愪氦鎴愬姛');
+ await this.fetchFormData();
+ } else {
+ this.$showMessage(res.message || '涓嬪垁鎻愪氦澶辫触');
+ }
+ } catch (err) {
+ console.error(err);
+ this.$showMessage('涓嬪垁鎻愪氦澶辫触锛岃妫�鏌ョ綉缁�');
+ } finally {
+ this.submitting = false;
}
},
cancel() {
this.selectedToolNo = '';
this.toolName = '';
this.toolModel = '';
+ this.useLimitInput = '';
},
async fetchFormData() {
- // 閲嶅啓锛氬寮哄吋瀹规�с�佺粺涓�瀛楁鏄犲皠銆佹牸寮忓寲鏃堕棿鍜岀櫨鍒嗘瘮锛岃绠楅璀︾姸鎬�
if (!this.workOrderNo || !this.machineNo) {
console.warn('宸ュ崟鍙锋垨鏈哄彴鍙蜂负绌猴紝璺宠繃鑾峰彇琛ㄥ崟鏁版嵁');
return;
}
-
+ this.loadingForm = true;
const payload = {
workOrderNo: this.workOrderNo.trim(),
machineNo: this.machineNo.trim()
};
-
try {
- console.log('璇锋眰鍙傛暟:', payload);
-
const res = await this.$post({
url: '/MesCutterLedger/GetFormData',
data: JSON.stringify(payload),
headers: { 'Content-Type': 'application/json' }
});
-
if (res.status !== 0) {
this.$showMessage(res.message || '鑾峰彇琛ㄥ崟鏁版嵁澶辫触');
+ this.toolRecords = [];
return;
}
-
- // 鍏煎澶氱杩斿洖缁撴瀯锛屽彇鍒版暟缁�
const list = Array.isArray(res.data) ? res.data
: (res.data && res.data.tbBillList) ? res.data.tbBillList
: (res.data && res.data.data) ? res.data.data
@@ -333,24 +371,49 @@
return Number.isFinite(n) ? n : null;
};
- const formatPercent = n => (n === null || n === undefined || isNaN(n)) ? '' : `${Number(n).toFixed(2)}%`;
+ const formatPercent = n => {
+ if (n === null || n === undefined || isNaN(n)) return '';
+ if (n <= 1) return `${(n * 100).toFixed(0)}%`;
+ return `${Number(n).toFixed(0)}%`;
+ };
const mapped = (list || []).map(t => {
const upTimeRaw = getField(t, 'uP_TIME', 'UP_TIME', 'uPTime', 'UPTIME', 'UpTime');
const downTimeRaw = getField(t, 'dowN_TIME', 'DOWN_TIME', 'downTime', 'DOWNTIME');
- const lifePercentRaw = getField(t, 'lifE_PERCENT', 'LIFE_PERCENT', 'lifePercent', 'LIFEPERCENT');
const lifeWarnRaw = getField(t, 'lifE_WARN', 'LIFE_WARN', 'lifeWarn', 'LIFEWARN');
+ const currentCjNum = getField(t, 'currentCjNum', 'CURRENTCJNUM', 'CurrentCjNum');
- const lifePercentNum = parseNumber(lifePercentRaw);
+ const useCount = getField(t, 'usE_COUNT', 'USE_COUNT', 'useCount');
+ const useLimit = getField(t, 'usE_LIMIT', 'USE_LIMIT', 'useLimit');
+
+ let percent = '';
+ if (
+ useCount != null && useLimit != null &&
+ !isNaN(useCount) && !isNaN(useLimit) &&
+ Number(useLimit) > 0
+ ) {
+ percent = ((Number(useCount) / Number(useLimit)) * 100).toFixed(0) + '%';
+ }
+
+ const parseNumber = v => {
+ if (v === null || v === undefined || v === '') return null;
+ const s = String(v).replace(/[,锛�%]/g, '').trim();
+ const n = parseFloat(s);
+ return Number.isFinite(n) ? n : null;
+ };
+ const formatPercent = n => {
+ if (n === null || n === undefined || isNaN(n)) return '';
+ if (n <= 1) return `${(n * 100).toFixed(0)}%`;
+ return `${Number(n).toFixed(0)}%`;
+ };
const lifeWarnNum = parseNumber(lifeWarnRaw);
- // 棰勮瑙勫垯锛氬綋瀵垮懡姣� >= 棰勮鍊兼椂鏍囪 璀﹀憡锛堟牴鎹浘鐗囩ず渚嬶細90.01% vs 90% 涓� 璀﹀憡锛�
let warnStatus = getField(t, 'status', 'STATUS') || '';
- if (lifeWarnNum !== null && lifePercentNum !== null) {
- warnStatus = (lifePercentNum >= lifeWarnNum) ? '璀﹀憡' : '姝ｅ父';
+ if (lifeWarnNum !== null && useCount != null && useLimit != null && !isNaN(useCount) && !isNaN(useLimit) && Number(useLimit) > 0) {
+ const percentNum = Number(useCount) / Number(useLimit);
+ warnStatus = (percentNum >= lifeWarnNum) ? '棰勮' : '姝ｅ父';
} else {
- // 濡傛灉鍚庣鐩存帴鎻愪緵鐘舵�佸瓧娈碉紝鍒欎繚鐣欙紝鍚﹀垯榛樿绌�
- warnStatus = warnStatus || '';
+ warnStatus = warnStatus || '鏈煡';
}
return {
@@ -361,34 +424,55 @@
upCount: getField(t, 'uP_COUNT', 'UP_COUNT', 'upCount') ?? '',
downTime: this.formatDateTime(downTimeRaw),
downCount: getField(t, 'dowN_COUNT', 'DOWN_COUNT', 'downCount') ?? '',
- useCount: getField(t, 'usE_COUNT', 'USE_COUNT', 'useCount') ?? '',
- useLimit: getField(t, 'usE_LIMIT', 'USE_LIMIT', 'useLimit') ?? '',
- lifePercent: formatPercent(lifePercentNum),
- lifeWarn: lifeWarnNum !== null ? `${Number(lifeWarnNum).toFixed(0)}%` : (lifeWarnRaw ? String(lifeWarnRaw) : ''),
- warnStatus
+ useCount: useCount ?? '',
+ useLimit: useLimit ?? '',
+ lifePercent: percent,
+ lifeWarn: formatPercent(lifeWarnNum),
+ warnStatus,
+ currentCjNum
};
});
this.toolRecords = mapped;
-
- // 鏇存柊 total锛氫紭鍏堜娇鐢ㄥ悗绔� totalCount锛屽惁鍒欎娇鐢ㄨ繑鍥炴暟缁勯暱搴�
- const totalFromRes = Number(res.totalCount);
- if (Number.isFinite(totalFromRes) && totalFromRes > 0) {
- this.total = totalFromRes;
- } else {
- this.total = Number(res.data?.total ?? res.data?.totalCount ?? this.toolRecords.length) || 0;
- }
+ const totalFromRes = Number(
+ res.data?.total ?? res.data?.totalCount ?? res.total ?? res.totalCount ?? mapped.length
+ );
+ this.total = Number.isFinite(totalFromRes) ? totalFromRes : mapped.length;
} catch (error) {
console.error('鑾峰彇琛ㄥ崟鏁版嵁閿欒:', error);
this.$showMessage('鑾峰彇鏁版嵁澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
+ this.toolRecords = [];
+ } finally {
+ this.loadingForm = false;
+ }
+ },
+ // 鑷姩甯﹀嚭宸ュ崟鍒�鍏蜂俊鎭紝骞惰幏鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ async fetchDefaultToolFromWorkOrder() {
+ if (!this.machineNo) return;
+ 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) && res.data.tbBillList.length > 0) {
+ const order = res.data.tbBillList[0];
+ this.selectedToolNo = order.cutterId || order.cutteR_ID || '';
+ this.toolName = order.cutterName || order.cutteR_NAME || '';
+ this.toolModel = order.cutterModel || order.cutteR_MODEL || '';
+ // 鍏抽敭锛氳幏鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ this.workOrderCurrentCjNum = order.CurrentCjNum ?? order.currentCjNum ?? null;
+ } else {
+ this.workOrderCurrentCjNum = null;
+ }
+ } catch (e) {
+ console.warn('鑷姩甯﹀嚭宸ュ崟鍒�鍏峰け璐�', e);
+ this.workOrderCurrentCjNum = null;
}
},
formatDateTime(dateTimeStr) {
if (!dateTimeStr) return '';
- // 鏀寔澶氱鍚庣鏃堕棿鏍煎紡锛欼SO / 鏃堕棿鎴� / 鑷畾涔夊瓧绗︿覆
- // 浼樺厛灏濊瘯瑙ｆ瀽涓� Date锛屽け璐ュ垯杩斿洖鍘熷瀛楃涓茬殑鍙鐗囨
try {
- // 濡傛灉鏄椂闂存埑锛堢鎴栨绉掞級
const s = String(dateTimeStr).trim();
if (/^\d{10}$/.test(s)) {
const d = new Date(Number(s) * 1000);
@@ -402,7 +486,6 @@
if (!isNaN(date.getTime())) {
return `${date.getMonth() + 1}-${date.getDate()} ${date.getHours()}:${String(date.getMinutes()).padStart(2, '0')}`;
}
- // 鍥為��锛氭埅鍙栧埌鏃ユ湡鍜屾椂闂撮儴鍒嗭紙甯歌鏍煎紡锛�
const match = String(dateTimeStr).match(/(\d{1,4}[-\/]\d{1,2}[-\/]\d{1,2}).*?(\d{1,2}:\d{2})/);
if (match) return `${match[1].replace(/-/g, '/').replace(/^\d{4}\//, (m) => m)} ${match[2]}`;
return String(dateTimeStr);
@@ -410,25 +493,18 @@
return String(dateTimeStr);
}
}
- //// 娣诲姞杈呭姪鏂规硶
- //formatDateTime(dateTimeStr) {
- // if (!dateTimeStr) return '';
- // // 鏍规嵁鍚庣杩斿洖鐨勬椂闂存牸寮忚繘琛岃皟鏁�
- // const date = new Date(dateTimeStr);
- // return `${date.getMonth() + 1}-${date.getDate()} ${date.getHours()}:${date.getMinutes().toString().padStart(2, '0')}`;
- //}
},
mounted() {
this.fetchTools('');
this.machineNo = uni.getStorageSync('machineNo') || '';
this.workOrderNo = uni.getStorageSync('daa001') || '';
- // 娣诲姞璋冭瘯淇℃伅
console.log('鏈哄彴鍙�:', this.machineNo);
console.log('宸ュ崟鍙�:', this.workOrderNo);
if (this.machineNo && this.workOrderNo) {
this.fetchFormData();
+ this.fetchDefaultToolFromWorkOrder();
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
@@ -518,9 +594,16 @@
.dialog {
background: #fff;
- padding: 2vh 2vw;
- border-radius: 8px;
- width: 60vw;
+ padding: 3vh 3vw; /* 澧炲ぇ鍐呰竟璺� */
+ border-radius: 12px; /* 绋嶅井鍦嗘鼎涓�鐐� */
+ width: 100vw; /* 鍘�60vw锛屾敼涓�100vw鏇村 */
+ max-width: 1200px; /* 闄愬埗鏈�澶у搴︼紝闃叉瓒呭睆 */
+ min-height: 60vh; /* 澧炲姞鏈�灏忛珮搴� */
+ box-sizing: border-box;
+ }
+
+ .form-group .input {
+ width: 24vw; /* 杈撳叆妗嗘洿瀹� */
}
.tool-list {
@@ -532,15 +615,24 @@
}
.tool-btn {
- margin: 5px 10px 5px 0;
+ flex: 0 0 32%;
+ box-sizing: border-box;
+ margin: 5px 1% 5px 0;
padding: 8px 16px;
- background: #f5f5f5;
+ background: #e0e0e0;
border: 1px solid #ccc;
border-radius: 4px;
cursor: pointer;
- background: #e0e0e0;
- color: #888;
+ color: #333;
+ text-align: left;
+ transition: background 0.15s, color 0.15s;
}
+
+ .tool-btn.active {
+ background: #00A2E9;
+ color: #fff;
+ font-weight: bold;
+ }
.dialog-actions {
display: flex;
@@ -553,16 +645,89 @@
overflow-x: auto;
}
- table {
+ /* 鏂扮殑琛ㄦ牸鏍峰紡锛岃创杩戞埅鍥鹃鏍� */
+ table.styled-table {
width: 100%;
- border-collapse: collapse;
+ border-collapse: separate;
+ border-spacing: 0;
+ border: 2px solid #bfbfbf;
+ background: #fff;
}
- th, td {
- border: 1px solid #ccc;
- padding: 8px 4px;
- text-align: center;
- font-size: 1vw;
+ table.styled-table thead th {
+ background: #fafafa;
+ border-bottom: 2px solid #bfbfbf;
+ padding: 10px 6px;
+ font-weight: bold;
+ font-size: 1vw;
+ text-align: center;
+ }
+
+ table.styled-table tbody td {
+ border-bottom: 1px solid #e8e8e8;
+ padding: 10px 6px;
+ font-size: 0.95vw;
+ vertical-align: middle;
+ }
+
+ .table-section table th:first-child,
+ .table-section table td:first-child {
+ border-left: 2px solid #bfbfbf;
+ }
+
+ .table-section table th:last-child,
+ .table-section table td:last-child {
+ border-right: 2px solid #bfbfbf;
+ }
+
+ .row-odd {
+ background: #fff;
+ }
+
+ .row-odd + tr {
+ background: #fafafa;
+ }
+
+ .num {
+ text-align: right;
+ padding-right: 12px;
+ font-variant-numeric: tabular-nums;
+ }
+
+ .left {
+ text-align: left;
+ padding-left: 8px;
+ }
+
+ .warn-cell {
+ color: #d93025;
+ font-weight: bold;
+ }
+
+ .ok-cell {
+ color: #333;
+ }
+
+ .warn-badge {
+ display: inline-block;
+ background: #ff4d4f;
+ color: #fff;
+ padding: 2px 6px;
+ border-radius: 3px;
+ font-weight: bold;
+ font-size: 0.9vw;
+ }
+
+ .header-badge {
+ display: inline-block;
+ background: #fff7e6;
+ color: #8a6d00;
+ border: 1px solid #ffe58f;
+ padding: 1px 6px;
+ border-radius: 3px;
+ margin-left: 6px;
+ font-size: 0.8vw;
+ vertical-align: middle;
}
.warn {
--
Gitblit v1.9.3