From ec4ede1c562b899312bd18a8e5520e7f4e8b732f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 11:15:01 +0800
Subject: [PATCH] 界面优化
---
components/mold.vue | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 2dec576..05708e8 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -287,7 +287,7 @@
this.submitting = false;
}
},
- // 涓嬪垁鏃朵紶閫� xdjs = 褰撳墠 downCount
+ // 涓嬪垁鏃朵紶閫� xdjs = 宸ュ崟 currentCjNum
async handleDownTool() {
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
@@ -296,8 +296,8 @@
const useLimit = Number(this.useLimitInput);
if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
- const currentTool = this.toolRecords.find(r => r.no === this.selectedToolNo);
- const xdjs = currentTool && currentTool.downCount != null ? Number(currentTool.downCount) : null;
+ // 涓嬪垁璁℃暟鍚屾牱鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ const xdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
const payload = {
workOrderNo: this.workOrderNo,
@@ -377,14 +377,11 @@
return `${Number(n).toFixed(0)}%`;
};
- // 鑾峰彇宸ュ崟 currentCjNum
- this.workOrderCurrentCjNum = res.data?.currentCjNum ?? null;
-
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 currentCjNum = getField(t, 'currentCjNum', 'CURRENTCJNUM', 'CurrentCjNum');
const useCount = getField(t, 'usE_COUNT', 'USE_COUNT', 'useCount');
const useLimit = getField(t, 'usE_LIMIT', 'USE_LIMIT', 'useLimit');
@@ -449,29 +446,30 @@
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;
- }
- },
+ // 鑷姩甯﹀嚭宸ュ崟鍒�鍏蜂俊鎭紝骞惰幏鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ 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 '';
try {
--
Gitblit v1.9.3