From 083874dd1224587ae25d3bf87bd0aa02e324a491 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 20 十月 2025 13:35:07 +0800
Subject: [PATCH] 表格修改
---
components/mold.vue | 503 +++++++++++++++++++++++++++++--------------------------
1 files changed, 267 insertions(+), 236 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index da28224..f7d7cc6 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -3,11 +3,8 @@
<!-- 鍒�鍏烽�夋嫨鍖� -->
<view class="top-section-grid">
<view class="form-cell">
- <label class="form-label">閫夋嫨鍒�鍏风紪鍙凤細</label>
- <select v-model="selectedToolNo" class="form-select" :disabled="loadingTools">
- <option value="" disabled>璇烽�夋嫨</option>
- <option v-for="tool in toolList" :key="tool.no" :value="tool.no">{{ tool.no }} | {{ tool.name }}</option>
- </select>
+ <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">
@@ -66,7 +63,7 @@
<tr>
<th style="width:8%">鍒�鍏风紪鍙�</th>
<th style="width:14%">鍒�鍏峰悕绉�</th>
- <th style="width:12%">涓婂垁鏃堕棿 <span class="header-badge">1</span></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>
@@ -116,7 +113,7 @@
return {
machineNo: '',//鏈哄彴缂栫爜
workOrderNo: '',//宸ュ崟鍙�
- activeToolNo: '', // 褰撳墠閫変腑鐨勫垁鍏风紪鍙�
+ activeToolNo: '', // 褰撳墠閫変腑鐨勫垁鍏风紪鍙�
pageIndex: 1,
pageSize: 18,
total: 0,
@@ -132,7 +129,8 @@
loadingTools: false,
loadingForm: false,
submitting: false,
- _searchTimer: null
+ _searchTimer: null,
+ workOrderCurrentCjNum: null // 宸ュ崟褰撳墠鏁伴噰
};
},
computed: {
@@ -182,7 +180,6 @@
this.filteredTools = mapped;
this.toolList = mapped.slice();
- // 淇 total 璧嬪�间紭鍏堢骇锛屼紭鍏堝彇 res.data.total
const totalFromRes = Number(
res.data?.total ?? res.data?.totalCount ?? res.total ?? res.totalCount ?? mapped.length
);
@@ -200,7 +197,6 @@
this.loadingTools = false;
}
},
- //缈婚〉
async prevPage() {
if (this.pageIndex > 1) {
this.pageIndex--;
@@ -214,21 +210,20 @@
}
},
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; // 璁板綍閫変腑
+ this.activeToolNo = tool.no;
},
confirmTool() {
this.showToolDialog = false;
@@ -243,17 +238,16 @@
this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺');
return;
}
- // 浠呭墠绔洿鏂拌〃鏍兼樉绀猴紙濡傞渶鎸佷箙鍖栬璋冪敤鍚庣鎺ュ彛锛�
this.toolRecords = this.toolRecords.map(r => {
if (r.no === this.selectedToolNo) {
return { ...r, useLimit: v };
}
return r;
});
- // 鍚屾 toolList 涓殑妯″瀷锛堝彲鐢ㄦ潵灞曠ず锛�
this.toolList = this.toolList.map(t => t.no === this.selectedToolNo ? { ...t, useLimit: v } : t);
this.$showMessage('浣跨敤涓婇檺宸茶缃紙浠呭墠绔樉绀猴級');
},
+ // 涓婂垁鏃朵紶閫� sdjs = 宸ュ崟 currentCjNum
async handleUpTool() {
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
@@ -262,12 +256,16 @@
const useLimit = Number(this.useLimitInput);
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
+ useLimit,
+ sdjs // 涓婂垁璁℃暟锛堝伐鍗曞綋鍓嶆暟閲囷級
};
try {
this.submitting = true;
@@ -289,6 +287,7 @@
this.submitting = false;
}
},
+ // 涓嬪垁鏃朵紶閫� xdjs = 宸ュ崟 currentCjNum
async handleDownTool() {
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
@@ -297,12 +296,16 @@
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
+ useLimit,
+ xdjs // 涓嬪垁璁℃暟
};
try {
this.submitting = true;
@@ -368,70 +371,67 @@
return Number.isFinite(n) ? n : null;
};
- const formatPercent = n => {
- if (n === null || n === undefined || isNaN(n)) return '';
- // 濡傛灉鏄皬浜庣瓑浜�1鐨勫皬鏁帮紝鎸夋瘮渚嬫斁澶�
- if (n <= 1) return `${(n * 100).toFixed(0)}%`;
- return `${Number(n).toFixed(0)}%`;
+ 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 lifeWarnRaw = getField(t, 'lifE_WARN', 'LIFE_WARN', 'lifeWarn', 'LIFEWARN');
+ 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 lifeWarnRaw = getField(t, 'lifE_WARN', 'LIFE_WARN', 'lifeWarn', 'LIFEWARN');
+ const currentCjNum = getField(t, 'currentCjNum', 'CURRENTCJNUM', 'CurrentCjNum');
- // 浣跨敤娆℃暟鍜屼笂闄�
- const useCount = getField(t, 'usE_COUNT', 'USE_COUNT', 'useCount');
- const useLimit = getField(t, 'usE_LIMIT', 'USE_LIMIT', 'useLimit');
+ 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) + '%';
- }
+ 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);
+ 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);
- // 棰勮瑙勫垯锛氬綋瀵垮懡姣� >= 棰勮鍊兼椂鏍囪 棰勮
- let warnStatus = getField(t, 'status', 'STATUS') || '';
- 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 || '鏈煡';
- }
+ let warnStatus = getField(t, 'status', 'STATUS') || '';
+ 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 || '鏈煡';
+ }
- return {
- id: getField(t, 'id', 'ID') || `${getField(t, 'cutteR_ID') || getField(t, 'CUTTER_ID') || ''}-${upTimeRaw || ''}`,
- no: getField(t, 'cutteR_ID', 'CUTTER_ID', 'cutterId', 'no') || '',
- name: getField(t, 'cutteR_NAME', 'CUTTER_NAME', 'cutterName', 'name') || '',
- upTime: this.formatDateTime(upTimeRaw),
- upCount: getField(t, 'uP_COUNT', 'UP_COUNT', 'upCount') ?? '',
- downTime: this.formatDateTime(downTimeRaw),
- downCount: getField(t, 'dowN_COUNT', 'DOWN_COUNT', 'downCount') ?? '',
- useCount: useCount ?? '',
- useLimit: useLimit ?? '',
- lifePercent: percent,
- lifeWarn: formatPercent(lifeWarnNum),
- warnStatus
- };
- });
+ return {
+ id: getField(t, 'id', 'ID') || `${getField(t, 'cutteR_ID') || getField(t, 'CUTTER_ID') || ''}-${upTimeRaw || ''}`,
+ no: getField(t, 'cutteR_ID', 'CUTTER_ID', 'cutterId', 'no') || '',
+ name: getField(t, 'cutteR_NAME', 'CUTTER_NAME', 'cutterName', 'name') || '',
+ upTime: this.formatDateTime(upTimeRaw),
+ upCount: getField(t, 'uP_COUNT', 'UP_COUNT', 'upCount') ?? '',
+ downTime: this.formatDateTime(downTimeRaw),
+ downCount: getField(t, 'dowN_COUNT', 'DOWN_COUNT', 'downCount') ?? '',
+ useCount: useCount ?? '',
+ useLimit: useLimit ?? '',
+ lifePercent: percent,
+ lifeWarn: formatPercent(lifeWarnNum),
+ warnStatus,
+ currentCjNum
+ };
+ });
this.toolRecords = mapped;
const totalFromRes = Number(
@@ -444,6 +444,30 @@
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) {
@@ -480,6 +504,7 @@
if (this.machineNo && this.workOrderNo) {
this.fetchFormData();
+ this.fetchDefaultToolFromWorkOrder();
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
@@ -488,84 +513,84 @@
</script>
<style scoped>
- .top-section-grid {
- display: flex;
- justify-content: center;
- align-items: flex-end;
- gap: 32px;
- margin-bottom: 2vh;
- }
+ .top-section-grid {
+ display: flex;
+ justify-content: center;
+ align-items: flex-end;
+ gap: 32px;
+ margin-bottom: 2vh;
+ }
- .form-cell {
- display: flex;
- align-items: center;
- }
+ .form-cell {
+ display: flex;
+ align-items: center;
+ }
- .form-label {
- width: 90px;
- font-weight: bold;
- }
+ .form-label {
+ width: 90px;
+ font-weight: bold;
+ }
- .input {
- padding: 1vh;
- font-size: 1.1vw;
- border: 1px solid #ccc;
- width: 10vw;
- margin-right: 8px;
- }
+ .input {
+ padding: 1vh;
+ font-size: 1.1vw;
+ border: 1px solid #ccc;
+ width: 10vw;
+ margin-right: 8px;
+ }
- .form-select {
- width: 12vw;
- padding: 1vh;
- font-size: 1.1vw;
- margin-right: 8px;
- }
+ .form-select {
+ width: 12vw;
+ padding: 1vh;
+ font-size: 1.1vw;
+ margin-right: 8px;
+ }
- .btn-blue {
- background-color: #00A2E9;
- color: white;
- border: none;
- padding: 8px 18px;
- margin-left: 8px;
- border-radius: 5px;
- cursor: pointer;
- }
+ .btn-blue {
+ background-color: #00A2E9;
+ color: white;
+ border: none;
+ padding: 8px 18px;
+ margin-left: 8px;
+ border-radius: 5px;
+ cursor: pointer;
+ }
- .button-row {
- display: flex;
- justify-content: center;
- gap: 32px;
- margin: 2vh 0;
- }
+ .button-row {
+ display: flex;
+ justify-content: center;
+ gap: 32px;
+ margin: 2vh 0;
+ }
- .save-btn, .cancel-btn {
- width: 28%;
- padding: 1.5vh;
- background-color: #00A2E9;
- color: white;
- font-size: 1.2vw;
- border: none;
- text-align: center;
- border-radius: 5px;
- }
+ .save-btn, .cancel-btn {
+ width: 28%;
+ padding: 1.5vh;
+ background-color: #00A2E9;
+ color: white;
+ font-size: 1.2vw;
+ border: none;
+ text-align: center;
+ border-radius: 5px;
+ }
- .cancel-btn {
- background-color: #ccc;
- color: #333;
- }
+ .cancel-btn {
+ background-color: #ccc;
+ color: #333;
+ }
- .dialog-overlay {
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background: rgba(0,0,0,0.3);
- display: flex;
- justify-content: center;
- align-items: center;
- z-index: 1000;
- }
+ .dialog-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0,0,0,0.3);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 1000;
+ }
.dialog {
background: #fff;
@@ -609,114 +634,120 @@
font-weight: bold;
}
- .dialog-actions {
- display: flex;
- justify-content: space-between;
- margin-top: 2vh;
- }
+ .dialog-actions {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 2vh;
+ }
- .table-section {
- margin: 2vh 0;
- overflow-x: auto;
- }
+ /* 琛ㄦ牸鏁翠綋灞呬腑锛屽搴﹂檺鍒讹紝鍐呭灞呬腑 */
+ .table-section {
+ display: flex;
+ justify-content: center;
+ margin: 1vh 0;
+ overflow-x: auto;
+ }
- /* 鏂扮殑琛ㄦ牸鏍峰紡锛岃创杩戞埅鍥鹃鏍� */
- table.styled-table {
- width: 100%;
- border-collapse: separate;
- border-spacing: 0;
- border: 2px solid #bfbfbf;
- background: #fff;
- }
+ table.styled-table {
+ max-width: 1400px; /* 鍘�900px锛屾敼涓�1400px锛岃〃鏍兼洿澶� */
+ width: 90vw; /* 浣跨敤90%瑙嗗彛瀹藉害锛岄�傚簲澶у睆 */
+ margin: 0 auto;
+ border-collapse: separate;
+ border-spacing: 0;
+ border: 2px solid #bfbfbf;
+ background: #fff;
+ }
- 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 thead th {
+ background: #fafafa;
+ border-bottom: 2px solid #bfbfbf;
+ padding: 16px 10px; /* 澧炲ぇ琛ㄥご楂樺害鍜屽乏鍙抽棿璺� */
+ font-weight: bold;
+ font-size: 1.2vw; /* 瀛椾綋鏇村ぇ */
+ text-align: center;
+ }
- table.styled-table tbody td {
- border-bottom: 1px solid #e8e8e8;
- padding: 10px 6px;
- font-size: 0.95vw;
- vertical-align: middle;
- }
+ table.styled-table tbody td {
+ border-bottom: 1px solid #e8e8e8;
+ padding: 14px 10px; /* 澧炲ぇ琛ㄦ牸鍐呭楂樺害鍜屽乏鍙抽棿璺� */
+ font-size: 1.1vw; /* 瀛椾綋鏇村ぇ */
+ vertical-align: middle;
+ text-align: center;
+ }
- .table-section table th:first-child,
- .table-section table td:first-child {
- border-left: 2px solid #bfbfbf;
- }
+ .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;
- }
+ .table-section table th:last-child,
+ .table-section table td:last-child {
+ border-right: 2px solid #bfbfbf;
+ }
- .row-odd {
- background: #fff;
- }
+ .row-odd {
+ background: #fff;
+ }
- .row-odd + tr {
- background: #fafafa;
- }
+ .row-odd + tr {
+ background: #fafafa;
+ }
- .num {
- text-align: right;
- padding-right: 12px;
- font-variant-numeric: tabular-nums;
- }
+ .num {
+ /* 鏁板瓧鍒楀眳涓� */
+ text-align: center;
+ padding-right: 0;
+ font-variant-numeric: tabular-nums;
+ }
- .left {
- text-align: left;
- padding-left: 8px;
- }
+ .left {
+ text-align: left;
+ padding-left: 8px;
+ }
- .warn-cell {
- color: #d93025;
- font-weight: bold;
- }
+ .warn-cell {
+ color: #d93025;
+ font-weight: bold;
+ }
- .ok-cell {
- color: #333;
- }
+ .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;
- }
+ .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;
- }
+ .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 {
- color: red;
- font-weight: bold;
- }
+ .warn {
+ color: red;
+ font-weight: bold;
+ }
- .bottom-section {
- display: flex;
- justify-content: space-around;
- margin-top: 2vh;
- }
+ .bottom-section {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 2vh;
+ }
- .tool-desc {
- margin-top: 2vh;
- }
+ .tool-desc {
+ margin-top: 2vh;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3