From 5d15164521a9343a5ff3860c97f36eae8386d674 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 24 十二月 2025 15:36:53 +0800
Subject: [PATCH] 调试
---
components/mold.vue | 867 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 742 insertions(+), 125 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 98ad38a..ff12f7e 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">
- <label class="form-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>
+ <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" />
+ <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>
@@ -26,17 +24,23 @@
<!-- 绗簩琛岋細鍦ㄦ渶鍚庢坊鍔犲垁鍏风洰褰曟寜閽� -->
<view class="form-row">
+ <!-- 鍒�鍏峰悕绉� -->
<view class="form-cell">
<label class="form-label">鍒�鍏峰悕绉帮細</label>
- <input class="input small-font" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
+ <input class="input small-font input-tool-name" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
</view>
+ <!-- 瑙勬牸鍨嬪彿 -->
<view class="form-cell">
<label class="form-label">瑙勬牸鍨嬪彿锛�</label>
- <input class="input small-font" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
+ <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 -->
@@ -44,7 +48,73 @@
<view class="button-row">
<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>
+ <button class="cancel-btn" @click="cancel" :disabled="submitting || loadingForm">娓呯┖鍒�鍏烽�夋嫨</button>
+ </view>
+
+ <!-- 鏂板锛氳皟鏈烘暟鎹緭鍏ュ尯鍩� -->
+ <view class="tiaoji-section">
+ <view class="tiaoji-row">
+ <!-- 褰撳墠璋冩満甯堝倕 -->
+ <view class="current-user-section">
+ <text>褰撳墠璋冩満甯堝倕锛�</text>
+ <text class="current-user-name">{{ tiaojiStaffDisplay || '鏈�夋嫨' }}</text>
+ <button class="select-user-btn" @click="isTiaojiUserSelectShow = true">閫変汉</button>
+ </view>
+
+ <!-- 璋冩満鑹搧鏁� -->
+ <view class="tiaoji-input-section">
+ <text>璋冩満鑹搧鏁帮細</text>
+ <input v-model="tiaojiOkQty" class="inp tiaoji-input" type="number" placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+
+ <!-- 璋冩満涓嶈壇鍝佹暟 -->
+ <view class="tiaoji-input-section">
+ <text>璋冩満涓嶈壇鍝佹暟锛�</text>
+ <input v-model="tiaojiBadQty" class="inp tiaoji-input" type="number" placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+
+ <!-- 閫佹鍛煎彨鎸夐挳 -->
+ <view class="tiaoji-submit-section">
+ <button class="details-btn" @click="handleInspectionCall">閫佹鍛煎彨</button>
+ </view>
+ </view>
+ </view>
+
+ <!-- 閫夋嫨璋冩満甯堝倕寮圭獥 -->
+ <view v-if="isTiaojiUserSelectShow" class="overlay">
+ <view class="popup user-select-popup">
+ <!-- 鎼滅储鏍� -->
+ <view class="user-search-bar">
+ <input v-model.trim="tiaojiUserSearch"
+ type="text"
+ class="user-search-input"
+ placeholder="杈撳叆宸ュ彿鎴栧鍚嶆悳绱�"
+ @keydown.enter.prevent />
+ <button v-if="tiaojiUserSearch" class="user-search-clear" @click="tiaojiUserSearch=''">娓呯┖</button>
+ <view class="user-search-info">
+ 鍖归厤锛歿{ filteredTiaojiUsers.length }} / {{ tiaojiUsers.length }}
+ </view>
+ </view>
+ <view class="user-list-scroll">
+ <template v-if="filteredTiaojiUsers.length">
+ <view class="user-list-grid">
+ <button v-for="(u, index) in filteredTiaojiUsers"
+ :key="index"
+ :class="['user-list-btn', {'selected': u===tiaojiStaffNo}]"
+ @click="selectTiaojiUser(u)">
+ <span class="user-code">{{ u.split(':')[0] }}</span>
+ <span class="user-name">{{ u.split(':')[1] }}</span>
+ </button>
+ </view>
+ </template>
+ <view v-else class="no-user-result">
+ 鏈壘鍒板尮閰嶄汉鍛�
+ </view>
+ </view>
+ <view class="user-popup-footer">
+ <button class="clean-btn wide-btn" @click="isTiaojiUserSelectShow = false">鍏抽棴</button>
+ </view>
+ </view>
</view>
<!-- 鍒�鍏风洰褰曞脊绐� -->
@@ -77,22 +147,23 @@
</view>
</view>
- <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
- <view class="table-section">
+ <!-- 闅愯棌鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
+ <view v-if="false" class="table-section">
<table class="styled-table">
<thead>
<tr>
- <th style="width:8%">鍒�鍏风紪鍙�</th>
- <th style="width:14%">鍒�鍏峰悕绉�</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>
- <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>
+ <th style="width:7%">鍒�鍏风紪鍙�</th>
+ <th style="width:12%">鍒�鍏峰悕绉�</th>
+ <th style="width:10%">涓婂垁鏃堕棿</th>
+ <th class="num" style="width:7%">涓婂垁璁℃暟</th>
+ <th style="width:10%">涓嬪垁鏃堕棿</th>
+ <th class="num" style="width:7%">涓嬪垁璁℃暟</th>
+ <th class="num" style="width:7%">浣跨敤娆℃暟</th>
+ <th class="num" style="width:7%">浣跨敤涓婇檺</th>
+ <th class="num" style="width:7%">瀵垮懡姣�%</th>
+ <th class="num" style="width:7%">瀵垮懡姣旈璀﹀��</th>
+ <th style="width:7%">棰勮鐘舵��</th>
+ <th style="width:7%">鍒�鍏峰湪鏈虹姸鎬�</th>
</tr>
</thead>
<tbody>
@@ -102,18 +173,63 @@
<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.useCount != null ? item.useCount : '' }}</td>
+ <!-- 鍙湁绗竴琛屾樉绀� currentCjNum锛屽叾瀹冭鏄剧ず downCount -->
+ <td class="num">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛岋細涓嬫満鏃朵笉瀹炴椂鏄剧ず currentCjNum锛屾樉绀� downCount -->
+ <template v-if="!item.downTime">
+ {{ item.currentCjNum != null ? item.currentCjNum : '' }}
+ </template>
+ <template v-else>
+ {{ item.downCount != null ? item.downCount : '' }}
+ </template>
+ </template>
+ <template v-else>
+ {{ item.downCount != null ? item.downCount : '' }}
+ </template>
+ </td>
+ <!--浣跨敤娆℃暟-->
+ <td class="num">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛屽疄鏃惰绠椾娇鐢ㄦ鏁帮紝鑻ヤ负涓嬫満鍒欎笉瀹炴椂鏄剧ず -->
+ <template v-if="!item.downTime">
+ {{item.currentCjNum != null && item.upCount != null ? (Number(item.currentCjNum) - Number(item.upCount)) : (item.useCount != null ? item.useCount : '') }}
+ </template>
+ <template v-else>
+ {{ item.useCount != null ? item.useCount : '' }}
+ </template>
+ </template>
+ <template v-else>
+ {{ item.useCount != null ? item.useCount : '' }}
+ </template>
+ </td>
<td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td>
- <td class="num">{{ item.lifePercent }}</td>
+ <!--瀵垮懡姣�%-->
+ <td class="num">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛屽疄鏃惰绠楀鍛芥瘮%锛岃嫢涓轰笅鏈哄垯涓嶅疄鏃舵樉绀� -->
+ <template v-if="!item.downTime">
+ {{item.currentCjNum != null && item.upCount != null && item.useLimit != null && Number(item.useLimit) > 0 ? Math.round((Number(item.currentCjNum) - Number(item.upCount)) / Number(item.useLimit) * 100) + '%' : (item.lifePercent != null ? item.lifePercent : '') }}
+ </template>
+ <template v-else>
+ {{ item.lifePercent != null ? item.lifePercent : '' }}
+ </template>
+ </template>
+ <template v-else>
+ {{ item.lifePercent }}
+ </template>
+ </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>
+ <td>
+ {{ item.downTime ? '涓嬫満' : '鍦ㄦ満' }}<!--鍦ㄦ満鐘舵��-->
+ </td>
</tr>
<tr v-if="!toolRecords.length">
- <td colspan="11">鏆傛棤鏁版嵁</td>
+ <td colspan="12">鏆傛棤鏁版嵁</td>
</tr>
</tbody>
</table>
@@ -158,12 +274,36 @@
isDirty: false, // 琛ㄥ崟鏄惁鏈夋湭淇濆瓨鍙樻洿
autoSaveIntervalMs: 5 * 60 * 1000, // 榛樿 5 鍒嗛挓
autoSaveEnabled: true,
- autoSaveActionName: 'handleUpTool' // 鑷姩瑙﹀彂鐨勬柟娉曞悕锛屽彲鏀逛负鑷畾涔変繚瀛樻柟娉�
+ autoSaveActionName: 'handleUpTool', // 鑷姩瑙﹀彂鐨勬柟娉曞悕锛屽彲鏀逛负鑷畾涔変繚瀛樻柟娉�
+
+ // 鏂板锛氳皟鏈虹浉鍏冲瓧娈�
+ isTiaojiUserSelectShow: false, // 璋冩満甯堝倕閫夋嫨寮圭獥
+ tiaojiStaffNo: '', // 褰撳墠閫変腑鐨勮皟鏈哄笀鍌�(鏍煎紡: 宸ュ彿:濮撳悕)
+ tiaojiOkQty: '', // 璋冩満鑹搧鏁�
+ tiaojiBadQty: '', // 璋冩満涓嶈壇鍝佹暟
+ tiaojiUsers: [], // 璋冩満甯堝倕鍒楄〃
+ tiaojiUserSearch: '', // 鎼滅储鍏抽敭璇�
+
+ // 鏂板锛氭姤璇曚骇鏁版墍闇�瀛楁
+ orderId: null, // 宸ュ崟ID
+ order: {} // 宸ュ崟鏁版嵁
};
},
computed: {
totalPages() {
return Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
+ },
+ // 鏂板锛氳皟鏈哄笀鍌呮樉绀哄悕绉�
+ tiaojiStaffDisplay() {
+ if (!this.tiaojiStaffNo) return '';
+ const segs = this.tiaojiStaffNo.split(':');
+ return segs.length > 1 ? `${segs[0]} ${segs[1]}` : this.tiaojiStaffNo;
+ },
+ // 鏂板锛氳繃婊ゅ悗鐨勮皟鏈哄笀鍌呭垪琛�
+ filteredTiaojiUsers() {
+ if (!this.tiaojiUserSearch) return this.tiaojiUsers;
+ const kw = this.tiaojiUserSearch.trim().toLowerCase();
+ return this.tiaojiUsers.filter(u => u.toLowerCase().includes(kw));
}
},
watch: {
@@ -175,6 +315,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
+ if (this.toolRecords.length > 0) {
+ this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum);
+ }
+ }
+ this.$showMessage('鍒锋柊瀹屾垚');
+ },
// 鑷姩淇濆瓨锛氬惎鍔�
startAutoSave() {
if (!this.autoSaveEnabled) return;
@@ -348,10 +522,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;
@@ -401,9 +575,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;
@@ -575,6 +750,11 @@
});
if (res.status === 0 && Array.isArray(res.data?.tbBillList) && res.data.tbBillList.length > 0) {
const order = res.data.tbBillList[0];
+
+ // 鏂板锛氫繚瀛樺伐鍗曟暟鎹紝鐢ㄤ簬鎶ヨ瘯浜ф暟
+ this.order = order;
+ this.orderId = order.id || order.ID || order.orderId || null;
+
this.selectedToolNo = order.cutterId || order.cutteR_ID || '';
this.toolName = order.cutterName || order.cutteR_NAME || '';
this.toolModel = order.cutterModel || order.cutteR_MODEL || '';
@@ -589,10 +769,14 @@
}
} else {
this.workOrderCurrentCjNum = null;
+ this.order = {};
+ this.orderId = null;
}
} catch (e) {
console.warn('鑷姩甯﹀嚭宸ュ崟鍒�鍏峰け璐�', e);
this.workOrderCurrentCjNum = null;
+ this.order = {};
+ this.orderId = null;
}
},
formatDateTime(dateTimeStr) {
@@ -617,24 +801,117 @@
} catch {
return String(dateTimeStr);
}
+ },
+
+ // 鏂板锛氶�夋嫨璋冩満甯堝倕
+ selectTiaojiUser(u) {
+ this.tiaojiStaffNo = u;
+ this.isTiaojiUserSelectShow = false;
+ this.tiaojiUserSearch = '';
+ },
+
+ // 鏂板锛氶�佹鍛煎彨 + 鎶ヨ瘯浜ф暟
+ async handleInspectionCall() {
+ // 楠岃瘉蹇呭～椤�
+ if (!this.tiaojiStaffNo) {
+ this.$showMessage('璇烽�夋嫨璋冩満甯堝倕');
+ return;
+ }
+
+ const okQty = Number(this.tiaojiOkQty);
+ const badQty = Number(this.tiaojiBadQty);
+
+ if (isNaN(okQty) || okQty < 0) {
+ this.$showMessage('璇疯緭鍏ユ湁鏁堢殑璋冩満鑹搧鏁�');
+ return;
+ }
+
+ if (isNaN(badQty) || badQty < 0) {
+ this.$showMessage('璇疯緭鍏ユ湁鏁堢殑璋冩満涓嶈壇鍝佹暟');
+ return;
+ }
+
+ const staffNo = this.tiaojiStaffNo.split(':')[0];
+ const totalQty = okQty + badQty; // 璇曚骇鎬绘暟 = 鑹搧鏁� + 涓嶈壇鍝佹暟
+
+ // 璋冪敤鎶ヨ瘯浜ф暟鎺ュ彛(浣跨敤鎶ュ伐鐣岄潰鐨勬帴鍙�)
+ const payload = {
+ orderNo: this.workOrderNo,
+ orderId: this.orderId, // 闇�瑕佷粠宸ュ崟鏁版嵁涓幏鍙�
+ bf: totalQty, // 璇曚骇鎬绘暟
+ staffNo: staffNo,
+ initCjNum: this.order?.initCjNum || 0,
+ currentCjNum: this.order?.currentCjNum || 0,
+ type: 'tiaoji', // 鏍囪瘑涓鸿皟鏈烘姤宸�
+ tiaojiOkQty: okQty, // 鏂板:鑹搧鏁�
+ tiaojiBadQty: badQty // 鏂板:涓嶈壇鍝佹暟
+ };
+
+ try {
+ this.submitting = true;
+ // 璋冪敤鎶ュ伐鐣岄潰鐨勬姤璇曚骇鏁版帴鍙�
+ const res = await this.$post({
+ url: '/MesInvItemBarcodes/AddBFToBarcodes',
+ data: payload
+ });
+
+ if (res.status == 1) {
+ this.$showMessage(res.message);
+ return;
+ }
+
+ this.$showMessage('璋冩満鎶ュ伐鎴愬姛');
+ // 娓呯┖杈撳叆
+ this.tiaojiOkQty = '';
+ this.tiaojiBadQty = '';
+ // 鍒锋柊鏁版嵁
+ await this.fetchFormData();
+ await this.fetchDefaultToolFromWorkOrder();
+ } catch (err) {
+ console.error('璋冩満鎶ュ伐閿欒:', err);
+ this.$showMessage('璋冩満鎶ュ伐澶辫触锛岃妫�鏌ョ綉缁�');
+ } finally {
+ this.submitting = false;
+ }
+ },
+
+ // 鏂板锛氳幏鍙栬皟鏈哄笀鍌呭垪琛�
+ async fetchTiaojiStaff() {
+ try {
+ const res = await this.$post({
+ url: '/MesStaff/GetAllXS0101BYtj' // 涓庢姤宸ョ晫闈娇鐢ㄧ浉鍚屾帴鍙�
+ });
+ if (res.status === 0 && res.data && res.data.tbBillList) {
+ const staff = res.data.tbBillList;
+ this.tiaojiUsers = staff.map(s => s.staffNo + ':' + s.staffName);
+ }
+ } catch (err) {
+ console.error('鑾峰彇璋冩満甯堝倕鍒楄〃澶辫触:', err);
+ }
}
},
mounted() {
this.fetchTools('');
this.machineNo = uni.getStorageSync('machineNo') || '';
this.workOrderNo = uni.getStorageSync('daa001') || '';
- // 鍘婚櫎榛樿棰勮鍊� (90% -> 0.9)
- //this.lifeWarnInput = '90';
+
+ // 鏂板锛氳幏鍙栬皟鏈哄笀鍌呭垪琛�
+ this.fetchTiaojiStaff();
if (this.machineNo && this.workOrderNo) {
- this.fetchFormData();
- this.fetchDefaultToolFromWorkOrder();
+ this.fetchFormData().then(async () => {
+ await this.fetchDefaultToolFromWorkOrder();
+ // 杩涘叆椤甸潰鏃惰祴鍊肩涓�琛� currentCjNum
+ if (this.toolRecords.length > 0) {
+ this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum);
+ }
+ });
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
// 鍚姩鑷姩淇濆瓨瀹氭椂鍣�
- this.startAutoSave();
+ //this.startAutoSave();
},
beforeDestroy() {
// 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
@@ -644,32 +921,30 @@
</script>
<style scoped>
- /* 浼樺寲椤堕儴琛ㄥ崟鍖哄煙鏍峰紡 */
.top-section-grid {
display: flex;
flex-direction: column;
justify-content: center;
- align-items: center;
+ align-items: flex-start;
gap: 12px;
margin-bottom: 2vh;
- width: 95vw;
- max-width: 1600px;
+ width: 99vw;
+ max-width: 1920px;
margin-left: auto;
margin-right: auto;
padding: 12px;
background: #f8f9fa;
border-radius: 8px;
border: 1px solid #e9ecef;
- font-size: 22px; /* 鏁翠綋璋冨ぇ琛ㄥ崟鍖哄瓧浣� */
}
- /* 琛ㄥ崟琛屾牱寮忎紭鍖� */
.form-row {
display: flex;
- justify-content: space-between;
+ flex-direction: row;
+ justify-content: flex-start;
align-items: center;
width: 100%;
- margin-bottom: 8px;
+ margin-bottom: 12px;
}
.form-row:last-child {
@@ -679,36 +954,53 @@
.form-cell {
display: flex;
align-items: center;
- flex: 1;
- margin: 0 8px;
- min-height: 44px;
+ min-width: 0;
+ 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: 100px;
- font-weight: bold;
- font-size: 22px; /* 鍘�18px锛岃皟澶� */
+ width: auto;
+ font-weight: 500;
color: #333;
white-space: nowrap;
- margin-right: 8px;
+ margin-right: 4px;
flex-shrink: 0;
+ font-size: 22px;
}
.input {
- padding: 8px 12px;
- font-size: 20px; /* 鍘�16px锛岃皟澶� */
+ padding: 14px 20px;
border: 1px solid #dcdfe6;
flex: 1;
margin-right: 0;
border-radius: 4px;
background: #fff;
min-width: 0;
- height: 36px;
+ height: 56px !important;
box-sizing: border-box;
+ font-size: 22px;
}
.input.small-font {
- font-size: 19px; /* 鍘�15px锛岃皟澶� */
+ /* 涓嶈缃瓧浣撳ぇ灏� */
}
.input:disabled {
@@ -717,21 +1009,62 @@
cursor: not-allowed;
}
- .btn-blue {
+ .input-with-unit {
+ display: flex;
+ align-items: center;
+ gap: 0;
+ }
+
+ .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: 8px 16px;
+ padding: 14px 32px;
border-radius: 4px;
cursor: pointer;
- font-size: 22px; /* 鍘�16px锛岃皟澶� */
font-weight: 500;
white-space: nowrap;
- height: 60px;
+ height: 70px !important;
box-sizing: border-box;
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;
@@ -759,15 +1092,17 @@
padding: 1.5vh;
background-color: #00A2E9;
color: white;
- font-size: 1.6vw; /* 鍘�1.2vw锛岃皟澶� */
border: none;
text-align: center;
- border-radius: 6px;
- transition: background 0.2s;
+ border-radius: 4px;
+ transition: all 0.3s;
+ font-size: 22px;
+ font-weight: 500;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.cancel-btn {
- background-color: #eee;
+ background-color: #f5f5f5;
color: #333;
}
@@ -847,7 +1182,6 @@
cursor: pointer;
color: #333;
text-align: left;
- font-size: 18px; /* 鍘�13px锛岃皟澶� */
min-height: 50px;
transition: background 0.15s, color 0.15s;
overflow: hidden;
@@ -888,8 +1222,8 @@
.dialog-actions .btn-blue {
padding: 10px 24px;
- font-size: 22px; /* 鍘�16px锛岃皟澶� */
- min-width: 100px;
+ min-width: 120px;
+ font-size: 22px;
}
.btn-disabled {
@@ -898,24 +1232,23 @@
border: none;
padding: 10px 24px;
border-radius: 4px;
- font-size: 22px; /* 鍘�16px锛岃皟澶� */
font-weight: 500;
cursor: not-allowed;
box-shadow: none;
- min-width: 100px;
+ 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;
@@ -931,16 +1264,16 @@
border-bottom: 2px solid #bfbfbf;
padding: 16px 10px;
font-weight: bold;
- font-size: 1.6vw; /* 鍘�1.2vw锛岃皟澶� */
text-align: center;
+ font-size: 22px;
}
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;
+ font-size: 22px;
}
.table-section table th:first-child, .table-section table td:first-child {
@@ -986,26 +1319,6 @@
padding: 2px 6px;
border-radius: 3px;
font-weight: bold;
- font-size: 1.2vw; /* 鍘�0.9vw锛岃皟澶� */
- }
-
- /* 甯﹀崟浣嶇殑杈撳叆妗嗘牱寮� */
- .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: 18px; /* 鍘�14px锛岃皟澶� */
- white-space: nowrap;
- width: 20px;
}
/* 鍝嶅簲寮忚皟鏁� */
@@ -1016,46 +1329,350 @@
.form-label {
width: 90px;
- font-size: 18px; /* 鍘�16px锛岃皟澶� */
}
.input {
- font-size: 17px; /* 鍘�14px锛岃皟澶� */
- padding: 6px 10px;
+ padding: 10px 14px;
}
.btn-blue {
- padding: 6px 12px;
- font-size: 18px; /* 鍘�14px锛岃皟澶� */
+ padding: 10px 18px;
}
}
- /* 鏂板澶ф寜閽牱寮� */
- .btn-blue.large-btn {
- padding: 8px 24px;
- font-size: 22px; /* 鍘�16px锛岃皟澶� */
- height: 60px;
- min-width: 100px;
- }
-
- /* 璋冩暣琛ㄥ崟鍗曞厓鏍煎竷灞�浠ラ�傚簲鎸夐挳 */
- .form-row .form-cell:last-child {
- justify-content: center;
- flex: 0 0 auto;
- min-width: 120px;
- }
-
- /* 鏂板锛氳鈥滆缃娇鐢ㄤ笂闄愨�濃�滃鍛芥瘮棰勮鍊尖�濊緭鍏ユ鍙樼獎 */
- .input-use-limit {
- width: 110px !important;
- min-width: 0 !important;
- margin-right: 10px;
- }
-
.input-life-warn {
- width: 110px !important;
+ width: 48px !important; /* 绋嶅井鏀惧锛岄伩鍏嶅瓧浣撴孩鍑� */
min-width: 0 !important;
margin-right: 4px;
+ padding-left: 2px;
+ padding-right: 2px;
+ font-size: 22px !important;
+ text-align: center;
+ box-sizing: border-box;
}
+ .input,
+ .input.small-font,
+ .input-use-limit,
+ .input-tool-model,
+ .input-tool-name,
+ .input-life-warn {
+ font-size: 22px !important;
+ }
+
+ .input-tool-model {
+ width: 320px !important; /* 鍘熶负200px锛岀幇鍔犻暱 */
+ min-width: 0 !important;
+ margin-right: 16px;
+ }
+
+ .input-tool-name {
+ width: 120px !important;
+ min-width: 0 !important;
+ margin-right: 16px;
+ }
+
+ .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鎷変几 */
+ }
+
+ /* 鏂板锛氳皟鏈哄尯鍩熸牱寮� */
+ .tiaoji-section {
+ width: 100%;
+ margin: 2vh 0;
+ padding: 20px;
+ background: #f8f9fa;
+ border-radius: 8px;
+ border: 1px solid #e9ecef;
+ }
+
+ .tiaoji-row {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ gap: 20px;
+ }
+
+ /* 褰撳墠璋冩満甯堝倕鍖哄煙 - 涓庢姤宸ョ晫闈繚鎸佷竴鑷� */
+ .current-user-section {
+ display: flex;
+ align-items: center;
+ font-size: 22px;
+ border: 1.5px solid #f00;
+ border-radius: 10px;
+ padding: 14px 22px;
+ background: #fff;
+ gap: 14px;
+ flex: 0 0 auto;
+ }
+
+ .current-user-name {
+ font-weight: bold;
+ font-size: 22px;
+ }
+
+ /* 閫変汉鎸夐挳 - 钃濊壊涓婚锛屼笌鎶ュ伐鐣岄潰淇濇寔涓�鑷� */
+ .select-user-btn {
+ background: #00a2e9;
+ color: #fff;
+ border: none;
+ padding: 12px 22px;
+ border-radius: 12px;
+ font-size: 22px;
+ cursor: pointer;
+ transition: background 0.15s;
+ height: 66px;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .select-user-btn:hover {
+ background: #008ac2;
+ }
+
+ /* 璋冩満鏁伴噺杈撳叆鍖哄煙 */
+ .tiaoji-input-section {
+ display: flex;
+ align-items: center;
+ gap: 14px;
+ font-size: 22px;
+ }
+
+ .tiaoji-input {
+ width: 200px;
+ max-width: 100%;
+ height: 66px;
+ border: 2px solid #808080;
+ font-size: 28px;
+ text-align: center;
+ border-radius: 8px;
+ box-sizing: border-box;
+ }
+
+ /* 閫佹鍛煎彨鎸夐挳 - 涓庢姤宸ョ晫闈㈢殑纭鎻愪氦鎸夐挳淇濇寔涓�鑷� */
+ .details-btn {
+ padding: 12px 34px;
+ background: #00a2e9;
+ color: #fff;
+ font-size: 32px;
+ border: none;
+ cursor: pointer;
+ border-radius: 12px;
+ height: 66px;
+ min-width: 180px;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ line-height: 1.1;
+ box-sizing: border-box;
+ transition: background 0.15s;
+ }
+
+ .details-btn:hover {
+ background: #008ac2;
+ }
+
+ .details-btn:disabled {
+ opacity: 0.6;
+ cursor: not-allowed;
+ background: #bae7ff;
+ }
+
+ .tiaoji-submit-section {
+ display: flex;
+ align-items: center;
+ }
+
+ /* 閫変汉寮圭獥鏍峰紡 - 涓庢姤宸ョ晫闈繚鎸佷竴鑷� */
+ .overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(0,0,0,.45);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 1000;
+ }
+
+ .user-select-popup {
+ background: #fff;
+ width: 1600px;
+ max-width: 99vw;
+ min-width: 1000px;
+ height: auto;
+ min-height: 520px;
+ padding: 0;
+ display: flex;
+ flex-direction: column;
+ font-size: 32px;
+ border-radius: 12px;
+ box-shadow: 0 8px 32px rgba(0,0,0,0.12);
+ z-index: 1001;
+ }
+
+ .user-search-bar {
+ display: flex;
+ align-items: center;
+ gap: 18px;
+ padding: 24px 64px 0 64px;
+ background: #fff;
+ flex-wrap: wrap;
+ }
+
+ .user-search-input {
+ flex: 1 1 260px;
+ padding: 16px 20px;
+ font-size: 28px;
+ border: 1px solid #bbb;
+ border-radius: 8px;
+ outline: none;
+ height: 54px;
+ }
+
+ .user-search-input:focus {
+ border-color: #007aff;
+ box-shadow: 0 0 0 2px rgba(0,122,255,.15);
+ }
+
+ .user-search-clear {
+ padding: 12px 28px;
+ background: #ff9f43;
+ color: #fff;
+ border: none;
+ border-radius: 8px;
+ font-size: 24px;
+ cursor: pointer;
+ }
+
+ .user-search-clear:hover {
+ background: #ff8920;
+ }
+
+ .user-search-info {
+ font-size: 22px;
+ color: #555;
+ }
+
+ .user-list-scroll {
+ flex: 1 1 auto;
+ overflow-y: auto;
+ padding: 32px 64px 0 64px;
+ }
+
+ .user-list-grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fill,minmax(200px,1fr));
+ gap: 22px 22px;
+ }
+
+ .user-list-btn {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ gap: 2px;
+ padding: 10px 10px;
+ height: 100px;
+ font-size: 30px;
+ background: #00a2e9;
+ color: #fff;
+ border: none;
+ border-radius: 8px;
+ cursor: pointer;
+ box-sizing: border-box;
+ word-break: break-word;
+ }
+
+ .user-list-btn .user-code {
+ font-weight: 700;
+ font-size: 36px;
+ line-height: 1.1;
+ }
+
+ .user-list-btn .user-name {
+ font-size: 32px;
+ line-height: 1.1;
+ }
+
+ .user-list-btn.selected {
+ background: #0072c9;
+ box-shadow: 0 0 0 3px rgba(255,255,255,.6) inset;
+ }
+
+ .user-list-btn:hover {
+ background: #008ed0;
+ }
+
+ .no-user-result {
+ padding: 40px 0;
+ text-align: center;
+ font-size: 28px;
+ color: #666;
+ }
+
+ .user-popup-footer {
+ flex-shrink: 0;
+ padding: 24px 64px 32px 64px;
+ background: #fff;
+ text-align: center;
+ }
+
+ .clean-btn {
+ width: 24%;
+ padding: 10px 0;
+ color: #fff;
+ font-size: 20px;
+ border: none;
+ text-align: center;
+ cursor: pointer;
+ border-radius: 0.6vw;
+ background: #007aff;
+ }
+
+ .clean-btn.wide-btn {
+ width: 30%;
+ font-size: 22px;
+ padding: 12px 0;
+ }
+
+ .clean-btn:hover {
+ background: #0062c9;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3