From d6c4e109f4f1ce9e0562c1c9f4703dc697210eab Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 25 十二月 2025 10:28:56 +0800
Subject: [PATCH] 新增：自动处理调机送检界面的按钮逻辑
---
components/mold.vue | 541 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 537 insertions(+), 4 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 6f3e30b..174ab9c 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -46,9 +46,75 @@
</view> <!-- 杩欓噷闂悎 top-section-grid -->
<!-- 鎿嶄綔鎸夐挳 - 绉诲嚭 top-section-grid -->
<view class="button-row">
- <button class="save-btn" @click="handleUpTool" :disabled="submitting || loadingForm">涓婂垁鎻愪氦(=璋冩満寮�濮�)</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 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>
<!-- 鍒�鍏风洰褰曞脊绐� -->
@@ -81,8 +147,8 @@
</view>
</view>
- <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
- <view class="table-section">
+ <!-- 闅愯棌鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
+ <view v-if="false" class="table-section">
<table class="styled-table">
<thead>
<tr>
@@ -208,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: {
@@ -660,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 || '';
@@ -674,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) {
@@ -702,12 +801,177 @@
} 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 currentCjNum = this.order?.currentCjNum || 0;
+
+ // 璋冪敤鎶ヨ瘯浜ф暟鎺ュ彛(浣跨敤鎶ュ伐鐣岄潰鐨勬帴鍙�)
+ const payload = {
+ orderNo: this.workOrderNo,
+ orderId: this.orderId, // 闇�瑕佷粠宸ュ崟鏁版嵁涓幏鍙�
+ bf: badQty, // bf浼犻�掍笉鑹搧鏁�
+ staffNo: staffNo,
+ initCjNum: currentCjNum - badQty - okQty, // initCjNum = currentCjNum - bf - 鑹搧鏁�
+ currentCjNum: currentCjNum,
+ 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();
+
+ // 鏂板锛氳嚜鍔ㄥ鐞嗚皟鏈洪�佹鐣岄潰鐨勬寜閽�昏緫
+ await this.autoHandleMachineInspection();
+ } catch (err) {
+ console.error('璋冩満鎶ュ伐閿欒:', err);
+ this.$showMessage('璋冩満鎶ュ伐澶辫触锛岃妫�鏌ョ綉缁�');
+ } finally {
+ this.submitting = false;
+ }
+ },
+
+ // 鏂板锛氳嚜鍔ㄥ鐞嗚皟鏈洪�佹鐣岄潰鐨勬寜閽�昏緫
+ async autoHandleMachineInspection() {
+ try {
+ // 1. 浣跨敤 FindByOrderNo 鑾峰彇璋冩満閫佹鐣岄潰鐨勪笁涓椂闂�
+ const statusRes = await this.$post({
+ url: '/MesOrderSta/FindByOrderNo',
+ data: {
+ orderId: this.orderId,
+ orderNo: this.workOrderNo
+ }
+ });
+
+ if (!statusRes || !statusRes.data || !statusRes.data.tbBillList) {
+ console.error('鑾峰彇宸ュ崟鐘舵�佸け璐�');
+ return;
+ }
+
+ const statusForm = statusRes.data.tbBillList;
+ const maStartTime = statusForm.maStartTime;
+ const maShoutTime = statusForm.maShoutTime;
+ const maEndTime = statusForm.maEndTime;
+
+ // 2. 鍑嗗闇�瑕佹洿鏂扮殑鏃堕棿鏁版嵁
+ let needSave = false;
+ let updateData = {
+ id: statusForm.id,
+ orderId: this.orderId,
+ machineNo: this.machineNo,
+ flag: -1
+ };
+
+ // 3. 浠庝笂鍒颁笅鏍规嵁鏄剧ず妗嗛噷鏄惁鏈夋椂闂翠緷娆¤缃�
+ // 濡傛灉璋冩満寮�濮嬫椂闂翠负绌猴紝璁剧疆璋冩満寮�濮嬫椂闂�
+ if (!maStartTime) {
+ updateData.maStartTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
+ updateData.flag = -1; // 璋冩満寮�濮嬬殑flag=-1
+ needSave = true;
+ } else {
+ updateData.maStartTime = maStartTime;
+ }
+
+ // 濡傛灉閫佹鍛煎彨鏃堕棿涓虹┖锛岃缃�佹鍛煎彨鏃堕棿
+ if (!maShoutTime) {
+ updateData.maShoutTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
+ updateData.flag = 1; // 棣栨閫佹鍛煎彨鐨刦lag=1
+ needSave = true;
+ } else {
+ updateData.maShoutTime = maShoutTime;
+ }
+
+ // 璋冩満瀹屾垚鏃堕棿淇濇寔涓嶅彉
+ updateData.maEndTime = maEndTime || '';
+
+ // 4. 濡傛灉鏈夐渶瑕佹洿鏂扮殑鏃堕棿锛岃皟鐢ㄤ繚瀛樻帴鍙�
+ if (needSave) {
+ const saveRes = await this.$post({
+ url: '/MesOrderSta/ChangeMachineTime',
+ data: updateData
+ });
+
+ if (saveRes && saveRes.data && saveRes.data.tbBillList) {
+ console.log('璋冩満閫佹鐣岄潰鏃堕棿鑷姩鏇存柊鎴愬姛');
+ } else {
+ console.error('璋冩満閫佹鐣岄潰鏃堕棿鑷姩鏇存柊澶辫触');
+ }
+ }
+ } catch (err) {
+ console.error('鑷姩澶勭悊璋冩満閫佹鐣岄潰澶辫触:', err);
+ // 涓嶄腑鏂富娴佺▼锛屽彧璁板綍閿欒
+ }
+ },
+
+ // 鏂板锛氳幏鍙栬皟鏈哄笀鍌呭垪琛�
+ 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') || '';
+
+ // 鏂板锛氳幏鍙栬皟鏈哄笀鍌呭垪琛�
+ this.fetchTiaojiStaff();
if (this.machineNo && this.workOrderNo) {
this.fetchFormData().then(async () => {
@@ -1217,4 +1481,273 @@
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