From 99eb0c882e5d9575219ac82b37bdca3c7737973f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 10:12:19 +0800
Subject: [PATCH] 逻辑修改
---
components/mold.vue | 230 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 132 insertions(+), 98 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 80af0d7..2ba016d 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -113,7 +113,7 @@
return {
machineNo: '',//鏈哄彴缂栫爜
workOrderNo: '',//宸ュ崟鍙�
- activeToolNo: '', // 褰撳墠閫変腑鐨勫垁鍏风紪鍙�
+ activeToolNo: '', // 褰撳墠閫変腑鐨勫垁鍏风紪鍙�
pageIndex: 1,
pageSize: 18,
total: 0,
@@ -225,7 +225,7 @@
this.selectedToolNo = tool.no;
this.toolName = tool.name;
this.toolModel = tool.model;
- this.activeToolNo = tool.no; // 璁板綍閫変腑
+ this.activeToolNo = tool.no; // 璁板綍閫変腑
},
confirmTool() {
this.showToolDialog = false;
@@ -251,6 +251,7 @@
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; }
@@ -259,12 +260,17 @@
const useLimit = Number(this.useLimitInput);
if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ // 鏌ユ壘褰撳墠鍒�鍏风殑 currentCjNum
+ const currentTool = this.toolRecords.find(r => r.no === this.selectedToolNo);
+ const sdjs = currentTool && currentTool.currentCjNum != null ? Number(currentTool.currentCjNum) : null;
+
const payload = {
workOrderNo: this.workOrderNo,
machineNo: this.machineNo,
toolNo: this.selectedToolNo,
type: '涓婂垁',
- useLimit
+ useLimit,
+ sdjs // 涓婂垁璁℃暟锛堝綋鍓嶆暟閲囷級
};
try {
this.submitting = true;
@@ -286,6 +292,7 @@
this.submitting = false;
}
},
+ // 涓嬪垁鏃朵紶閫� xdjs = 褰撳墠 downCount
async handleDownTool() {
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
@@ -294,12 +301,17 @@
const useLimit = Number(this.useLimitInput);
if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ // 鏌ユ壘褰撳墠鍒�鍏风殑 downCount
+ const currentTool = this.toolRecords.find(r => r.no === this.selectedToolNo);
+ const xdjs = currentTool && currentTool.downCount != null ? Number(currentTool.downCount) : null;
+
const payload = {
workOrderNo: this.workOrderNo,
machineNo: this.machineNo,
toolNo: this.selectedToolNo,
type: '涓嬪垁',
- useLimit
+ useLimit,
+ xdjs // 涓嬪垁璁℃暟
};
try {
this.submitting = true;
@@ -365,70 +377,72 @@
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 '';
+ // 濡傛灉鏄皬浜庣瓑浜�1鐨勫皬鏁帮紝鎸夋瘮渚嬫斁澶�
+ 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(
@@ -441,6 +455,25 @@
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 tool = res.data.tbBillList[0];
+ this.selectedToolNo = tool.cutterId || tool.cutteR_ID || '';
+ this.toolName = tool.cutterName || tool.cutteR_NAME || '';
+ this.toolModel = tool.cutterModel || tool.cutteR_MODEL || '';
+ }
+ } catch (e) {
+ console.warn('鑷姩甯﹀嚭宸ュ崟鍒�鍏峰け璐�', e);
}
},
formatDateTime(dateTimeStr) {
@@ -477,6 +510,7 @@
if (this.machineNo && this.workOrderNo) {
this.fetchFormData();
+ this.fetchDefaultToolFromWorkOrder(); // 鑷姩甯﹀嚭宸ュ崟鍒�鍏�
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
@@ -564,47 +598,47 @@
z-index: 1000;
}
- .dialog {
- background: #fff;
- padding: 3vh 3vw; /* 澧炲ぇ鍐呰竟璺� */
- border-radius: 12px; /* 绋嶅井鍦嗘鼎涓�鐐� */
- width: 100vw; /* 鍘�60vw锛屾敼涓�100vw鏇村 */
- max-width: 1200px; /* 闄愬埗鏈�澶у搴︼紝闃叉瓒呭睆 */
- min-height: 60vh; /* 澧炲姞鏈�灏忛珮搴� */
- box-sizing: border-box;
- }
+ .dialog {
+ background: #fff;
+ 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; /* 杈撳叆妗嗘洿瀹� */
- }
+ .form-group .input {
+ width: 24vw; /* 杈撳叆妗嗘洿瀹� */
+ }
- .tool-list {
- display: flex;
- flex-wrap: wrap;
- margin: 1vh 0;
- max-height: 40vh;
- overflow-y: auto;
- }
+ .tool-list {
+ display: flex;
+ flex-wrap: wrap;
+ margin: 1vh 0;
+ max-height: 40vh;
+ overflow-y: auto;
+ }
- .tool-btn {
- flex: 0 0 32%;
- box-sizing: border-box;
- margin: 5px 1% 5px 0;
- padding: 8px 16px;
- background: #e0e0e0;
- border: 1px solid #ccc;
- border-radius: 4px;
- cursor: pointer;
- color: #333;
- text-align: left;
- transition: background 0.15s, color 0.15s;
- }
+ .tool-btn {
+ flex: 0 0 32%;
+ box-sizing: border-box;
+ margin: 5px 1% 5px 0;
+ padding: 8px 16px;
+ background: #e0e0e0;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ cursor: pointer;
+ color: #333;
+ text-align: left;
+ transition: background 0.15s, color 0.15s;
+ }
- .tool-btn.active {
- background: #00A2E9;
- color: #fff;
- font-weight: bold;
- }
+ .tool-btn.active {
+ background: #00A2E9;
+ color: #fff;
+ font-weight: bold;
+ }
.dialog-actions {
display: flex;
--
Gitblit v1.9.3