From cd718c2363f8a0426d5bf7365c0df146f86b055f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 19 十一月 2025 10:59:59 +0800
Subject: [PATCH] 定时刷新
---
pages/index.vue | 50 ++++++++++++++++++++------------------------------
1 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 1e54aa2..77ea94a 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -553,20 +553,13 @@
return str;
},
- // 鍒�鍏风粦瀹氬垽鏂挬瀛� (浼樺寲鐗�)
- hasBindedCutter() {
- const o = this.isShowTableData[0];
- if (!o) return false;
- return ['outToolId', 'outToolCode', 'outToolName'].some(k => {
- const v = o[k];
- return v !== undefined && v !== null && v.toString().trim() !== '';
- });
- },
-
cancel() {
- if (!this.machineNo) return;
+ if (!this.machineNo) {
+ return;
+ }
- if (this.hasBindedCutter()) {
+ // 鐩存帴鐢� flag 鍒ゆ柇
+ if (this.hasBindedCutterFlag) {
uni.showToast({
title: '褰撳墠宸ュ崟宸茬粦瀹氬垁鍏凤紝涓嶈兘娓呯┖閲嶉��',
icon: 'error',
@@ -577,6 +570,7 @@
let editDate = this.formatDate(new Date());
this.selectedIndexs = [];
+
this.$post({
url: "/MesOrderSelect/Remove",
data: {
@@ -652,25 +646,21 @@
machineNo: this.machineNo,
}
}).then(res => {
- let list = res.data.tbBillList || [];
- // 褰掍竴鍖栧垁鍏峰瓧娈�
- this.isShowTableData = list.map(row => {
- return {
- ...row,
- outToolId: row.outToolId ?? row.out_tool_id ?? row.outToolID ?? row.toolId ?? row.ToolId,
- outToolCode: row.outToolCode ?? row.out_tool_code ?? row.toolCode ?? row.ToolCode,
- outToolName: row.outToolName ?? row.out_tool_name ?? row.toolName ?? row.ToolName,
- };
- });
- if (this.isShowTableData.length > 0) {
- console.log("宸ュ崟棣栨潯瀹屾暣鏁版嵁:", JSON.stringify(this.isShowTableData[0]));
- console.log("鍒�鍏峰瓧娈�:",
- this.isShowTableData[0].outToolId,
- this.isShowTableData[0].outToolCode,
- this.isShowTableData[0].outToolName
- );
+ this.isShowTableData = res.data.tbBillList;
+
+ // 鍙垽鏂涓�鏉★紙鍙厑璁镐竴鏉″伐鍗曪級
+ const order = this.isShowTableData[0];
+ let hasBindedCutter = false;
+ if (order) {
+ hasBindedCutter =
+ (order.outToolId && order.outToolId.toString().trim() !== '') ||
+ (order.outToolCode && order.outToolCode.trim() !== '') ||
+ (order.outToolName && order.outToolName.trim() !== '');
}
- if (this.isShowTableData.length === 1) {
+ // 瀛樺偍鍒� data 鍙橀噺
+ this.hasBindedCutterFlag = hasBindedCutter;
+
+ if (this.isShowTableData.length == 1) {
uni.setStorageSync('daa001', this.isShowTableData[0].daa001);
uni.setStorageSync('id', this.isShowTableData[0].id);
}
--
Gitblit v1.9.3