From c5a146f28935019016d0d0fa93b7e8d91a8388e8 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期二, 04 十一月 2025 12:22:38 +0800
Subject: [PATCH] 1111

---
 pages/index.vue |  329 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 168 insertions(+), 161 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index b889857..70a133f 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -12,23 +12,23 @@
 				璋冩満閫佹
 			</view>
 			<view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
-				鎹㈡ā
-			</view>
-			<view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
-				寮�宸ュ畬宸�
+				鍒�鍏风鐞�
 			</view>
 			<view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
-				鎵撶爜鎶ュ伐
+				鐢熶骇鎶ュ伐
 			</view>
+			<!-- <view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
+				寮�宸ュ畬宸�
+			</view> -->
 			<view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
 				e-SOP
 			</view>
 			<view class="tab-item" :class="{ active: currentTab === 6 }" @click="changeTab(6)">
 				宸ヨ壓鍙傛暟
 			</view>
-			<view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
+			<!-- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
 				鎵撳嵃鏈鸿缃�
-			</view>
+			</view> -->
 
 		</view>
 		<view class="font"></view>
@@ -38,23 +38,22 @@
 					<view class="top-right">
 						<button class="refresh-btn" @click="refresh">鍒锋柊</button>
 					</view>
-					<view>
-						<h4>涓�骞呮ā鍏峰悓鏃跺紑宸ュ涓伐鍗曡缃�</h4>
-					</view>
+					<!--<view>
+						<h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
+					</view>-->
 					<view class="section top-section">
 						<view class="form-row">
 							<view>
 								<!-- <label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px">绗竴姝ラ�夋嫨鏈哄彴:</label> -->
 								<!-- <superwei-combox :candidates="machineList" placeholder="璇烽�夋嫨" v-model="machineName"
-									@select="onMachineChange" class="picker"></superwei-combox> -->
+								@select="onMachineChange" class="picker"></superwei-combox> -->
 								<input v-model="machineName" disabled="true" type="text" style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px" />
 							</view>
 						</view>
 
 						<view class="form-row">
 							<view>
-								<label
-									style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px;">绗竴姝ラ�夋嫨宸ュ崟:</label>
+								<label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px;">绗竴姝ラ�夋嫨宸ュ崟:</label>
 								<button class="print-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
 							</view>
 						</view>
@@ -79,7 +78,7 @@
 							</uni-tr>
 							<uni-tr v-for="(item, index) in isShowTableData" :key="index">
 								<uni-td align="center">
-									<input class="form-input" disabled="true" type="text" v-model="item.PROC_NAME" /><!--宸ュ簭-->
+									<input class="form-input" disabled="true" type="text" v-model="item.procName" /><!--宸ュ簭-->
 								</uni-td>
 								<uni-td align="center">
 									<input class="form-input" disabled="true" type="text" v-model="item.daa001" />
@@ -88,10 +87,10 @@
 									<input class="form-input" disabled="true" type="text" v-model="item.daa002" />
 								</uni-td>
 								<uni-td align="center">
-									<input class="form-input" disabled="true" type="text" v-model="item.DAA003" /><!--浜у搧鍚嶇О-->
+									<input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
 								</uni-td>
 								<uni-td align="center">
-									<input class="form-input" disabled="true" type="text" v-model="item.DAA004" /><!--瑙勬牸-->
+									<input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
 								</uni-td>
 								<uni-td align="center">
 									<input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
@@ -109,7 +108,7 @@
 									<input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
 								</uni-td>
 								<uni-td align="center">
-									<input class="form-input" disabled="true" type="text" v-model="item.STAFF_NAME" /><!--鎶ュ伐浜�-->
+									<input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
 								</uni-td>
 								<uni-td>
 									<view class="uni-group">
@@ -127,17 +126,16 @@
 					</view>
 
 					<view>
-						<text style="color: red;">
-							璇存槑:鍒濆鐘舵�佹槸锛屾寜娉ㄥ鏈烘煡鍑烘墍鏈夌殑鏈畬宸ョ殑宸ュ崟銆傜敤閫夋嫨妗嗘爣璇嗘満鍣ㄨ寮�宸ョ殑宸ュ崟.
-							鍙互鍚屾椂寮�宸ュ涓伐鍗曪紝浣嗗繀椤绘ā鍏锋槸涓�濂椼�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
+						<!--<text style="color: red;">
+							璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
 							濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
-						</text>
+						</text>-->
 					</view>
 				</view>
 			</view>
 			<view v-if="currentTab === 0" class="tab-content">
 				<WorkOrder :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo"
-					:deviceNumber="machineName" />
+						   :deviceNumber="machineName" />
 			</view>
 			<view v-if="currentTab === 1" class="tab-content">
 				<!--        &lt;!&ndash; 璋冪敤 WorkOrderStatus 缁勪欢 &ndash;&gt;-->
@@ -168,70 +166,78 @@
 		</scroll-view>
 
 
+		<!-- 寮圭獥涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵�� -->
 		<view v-if="isShow" class="overlay">
 			<view class="popup">
-				<!--绛涢�夊伐鍗曠姸鎬�-->
 				<view class="form-row">
 					<view>
 						<label style="float: left;margin-top: 18px;">閫夋嫨宸ュ崟鐘舵��:</label>
 						<superwei-combox :candidates="engineeringNoMapList" placeholder="璇烽�夋嫨" v-model="engineeringNo"
-							@select="onEngineeringNoChange" class="picker"
-							style="padding: 7px 46px;width: 650px;"></superwei-combox>
+										 @select="onEngineeringNoChange" class="picker"
+										 style="padding: 7px 46px;width: 650px;"></superwei-combox>
 					</view>
 				</view>
-				<view class="section card">
-					<uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
-						@selection-change="selectionChange">
-						<uni-tr>
-							<uni-th align="center" class="th" style="color: #FFFFFF">宸ュ簭</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF">宸ュ崟鍙�</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF">瑙勬牸</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
-							<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
-						</uni-tr>
-						<uni-tr v-for="(item, index) in tableData" :key="index">
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.PROC_NAME" /><!--宸ュ簭-->
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.daa001" />
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.daa002" />
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.DAA003" /><!--浜у搧鍚嶇О-->
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.DAA004" /><!--瑙勬牸-->
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" /><!--鏈敓浜ф暟閲�-->
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
-							</uni-td>
-							<uni-td align="center">
-								<input class="form-input" disabled="true" type="text" v-model="item.STAFF_NAME" /><!--鎶ュ伐浜�-->
-							</uni-td>
-						</uni-tr>
-					</uni-table>
-				</view>
+
+				<div style="height: 400px; overflow: auto;">
+					<table>
+
+						<view class="section card">
+							<uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
+									   @selection-change="selectionChange">
+								<uni-tr>
+									<uni-th align="center" class="th" style="color: #FFFFFF">宸ュ簭</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF">宸ュ崟鍙�</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF">瑙勬牸</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
+								</uni-tr>
+								<uni-tr v-for="(item, index) in tableData" :key="index">
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.procName" /><!--宸ュ簭-->
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa001" />
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa002" />
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" /><!--鏈敓浜ф暟閲�-->
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
+									</uni-td>
+									<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
+									</uni-td>
+								</uni-tr>
+							</uni-table>
+						</view>
+
+					</table>
+				</div>
+
 				<view class="bottom-section">
 					<button class="save-btn" @click="save">淇濆瓨閫夋嫨</button>
 					<button class="cancel-btn" @click="isShow = !isShow">鍙栨秷</button>
@@ -270,6 +276,9 @@
 			return {
                 orderStatus: '', // 榛樿鍏ㄩ儴
 				currentTab: 7,
+
+                productCode: '', // 浜у搧缂栫爜
+                productSpec: '', // 浜у搧瑙勬牸
 
 				machineList: [],
 
@@ -389,7 +398,7 @@
 			getPrintInfo() {
 				var mac = "ac:f4:2c:20:0d:b4";
 				
-				mac = "e8:51:9e:7d:dc:95";
+				mac = "74:24:ca:4f:b7:9b";
 				this.$post({
 					url: "/DevMachine/GetDevMachineByPdaMac",
 					data: {
@@ -409,43 +418,43 @@
 				});
 				
 				
-	// 			if (plus.os.name == "Android") {
-	// 				//鑾峰彇鎵嬫満MAC鍦板潃
-	// 				var Context = plus.android.importClass("android.content.Context");
-	// 				var WifiManager = plus.android.importClass("android.net.wifi.WifiManager");
-	// 				var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
-	// 				var WifiInfo = plus.android.importClass("android.net.wifi.WifiInfo");
-	// 				var wifiInfo = wifiManager.getConnectionInfo();
-	// 				mac = wifiInfo.getMacAddress();
+	 			if (plus.os.name == "Android") {
+	 				//鑾峰彇鎵嬫満MAC鍦板潃
+	 				var Context = plus.android.importClass("android.content.Context");
+	 				var WifiManager = plus.android.importClass("android.net.wifi.WifiManager");
+	 				var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
+	 				var WifiInfo = plus.android.importClass("android.net.wifi.WifiInfo");
+	 				var wifiInfo = wifiManager.getConnectionInfo();
+	 				mac = wifiInfo.getMacAddress();
 					
-	// 				//濡傛灉mac涓衡��02:00:00:00:00:00鈥濓紝鍒欏彲鑳芥槸瀹夊崜6.0浠ヤ笂鐗堟湰锛屽垯浣跨敤鍙︿竴绉嶆柟娉曡幏鍙杕ac鍦板潃
-	// 				if (mac == "02:00:00:00:00:00") {
-	// 					mac = this.getMacNew();
-	// 				}
-	// 				//濡傛灉mac浣跨敤鏂版柟娉曚緷鐒舵槸鈥�02:00:00:00:00:00鈥濆垯涓嶈繘琛屼繚瀛�
-	// 				if (mac == "02:00:00:00:00:00") {
-	// 					return;
-	// 				}
-	// 				uni.setStorageSync('pdaMac', mac);
+	 				//濡傛灉mac涓衡��02:00:00:00:00:00鈥濓紝鍒欏彲鑳芥槸瀹夊崜6.0浠ヤ笂鐗堟湰锛屽垯浣跨敤鍙︿竴绉嶆柟娉曡幏鍙杕ac鍦板潃
+	 				if (mac == "02:00:00:00:00:00") {
+	 					mac = this.getMacNew();
+	 				}
+	 				//濡傛灉mac浣跨敤鏂版柟娉曚緷鐒舵槸鈥�02:00:00:00:00:00鈥濆垯涓嶈繘琛屼繚瀛�
+	 				if (mac == "02:00:00:00:00:00") {
+	 					return;
+	 				}
+	 				uni.setStorageSync('pdaMac', mac);
 
-	// 				this.$post({
-	// 					url: "/DevMachine/GetDevMachineByPdaMac",
-	// 					data: {
-	// 						pdaMac: mac,
-	// 					}
-	// 				}).then(res => {
-	// 					let devMachine = res.data.tbBillList;
-	// 					this.machineNo = devMachine.machineNo;
-	// 					this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙锋敞濉戞満";
+	 				this.$post({
+	 					url: "/DevMachine/GetDevMachineByPdaMac",
+	 					data: {
+	 						pdaMac: mac,
+	 					}
+	 				}).then(res => {
+	 					let devMachine = res.data.tbBillList;
+	 					this.machineNo = devMachine.machineNo;
+	 					this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙烽娇杞満";
 
-	// 					uni.setStorageSync('machineNo', this.machineNo);
-	// 					uni.setStorageSync('printMac', devMachine.printMac);
+	 					uni.setStorageSync('machineNo', this.machineNo);
+	 					uni.setStorageSync('printMac', devMachine.printMac);
  
 
-	// 					this.getWomdaaIsShow();
+	 					this.getWomdaaIsShow();
 
-	// 				});
-	// 			}
+	 				});
+	 			}
 			},
 			save() {
 				let data = this.selectedItems();
@@ -460,14 +469,14 @@
 					return;
 				}
 
-				let firstValue = data[0]["moldId"]; // 鑾峰彇绗竴涓璞$殑鎸囧畾灞炴�у��
+				//let firstValue = data[0]["moldId"]; // 鑾峰彇绗竴涓璞$殑鎸囧畾灞炴�у��
 
-				// 浣跨敤 every 鏂规硶妫�鏌ユ墍鏈夊璞$殑璇ュ睘鎬у�兼槸鍚︿竴鑷�
-				let flag = data.every(item => item["moldId"] === firstValue);
-				if (!flag) {
-					this.$showMessage("閫夊彇鐨�" + data.length + "涓伐鍗曚腑鐨勬ā鍏风紪鍙蜂笉涓�鑷�");
-					return;
-				}
+				//// 浣跨敤 every 鏂规硶妫�鏌ユ墍鏈夊璞$殑璇ュ睘鎬у�兼槸鍚︿竴鑷�
+				//let flag = data.every(item => item["moldId"] === firstValue);
+				//if (!flag) {
+				//	this.$showMessage("閫夊彇鐨�" + data.length + "涓伐鍗曚腑鐨勬ā鍏风紪鍙蜂笉涓�鑷�");
+				//	return;
+				//}
 
 				let orderSelect = [];
 
@@ -492,7 +501,8 @@
 					if (res.data.tbBillList) {
 						this.getWomdaaIsShow();
 						uni.showToast({
-							title: '灏嗘敞濉戞満寮�鍚堟ā鏁版竻0',
+                            title: '淇濆瓨宸ュ崟鎴愬姛',
+							//title: '灏嗘敞濉戞満寮�鍚堟ā鏁版竻0',
 							//灏嗗�艰缃负 success 鎴栬�呯洿鎺ヤ笉鐢ㄥ啓icon杩欎釜鍙傛暟
 							icon: 'success',
 							//鏄剧ず鎸佺画鏃堕棿涓� 5绉�
@@ -560,12 +570,8 @@
 				return `${year}-${month}-${day}`; // 杩斿洖鏍煎紡鍖栧悗鐨勫瓧绗︿覆
 			},
 			selectionChange(e) {
-                // 鍙繚鐣欐渶鍚庝竴涓�変腑鐨勫伐鍗�
-                if (Array.isArray(e.detail.index)) {
-                    this.selectedIndexs = [e.detail.index[e.detail.index.length - 1]];
-                } else {
-                    this.selectedIndexs = [e.detail.index];
-                }
+                // 鍗曢�夌洿鎺ヨ祴鍊�
+                this.selectedIndexs = [e.detail.index];
 			},
 
 			selectedItems() {
@@ -629,29 +635,30 @@
 				});
 			},
 
-			isShowTab() {
+            isShowTab() {
+                if (this.isShowTableData.length > 0) {
+                    uni.showToast({
+                        title: '宸叉湁姝e湪鎿嶄綔鐨勫伐鍗曪紝涓嶈兘鍐嶆閫夋嫨',
+                        icon: 'error',
+                        duration: 2000
+                    });
+                    return;
+                }
 
-				if (this.isShowTableData.length > 0) {
-					uni.showToast({
-						title: '宸叉湁姝e湪鎿嶄綔鐨勫伐鍗曪紝涓嶈兘鍐嶆閫夋嫨',
-						//灏嗗�艰缃负 success 鎴栬�呯洿鎺ヤ笉鐢ㄥ啓icon杩欎釜鍙傛暟
-						icon: 'error',
-						//鏄剧ず鎸佺画鏃堕棿涓� 2绉�
-						duration: 2000
-					});
-
-					return;
-				}
-
-				this.isShow = true;
-
-				this.engineeringNo = null;
-				this.tableData = [];
-                // 绛涢�夊伐鍗曠姸鎬�
-				this.GetWomdaasByEngineeringNo();
-				this.getWomdaa();
-			},
-
+                this.isShow = true;
+                // 榛樿閫変腑鈥滃緟寮�宸モ��
+                this.engineeringNo = '寰呭紑宸�';
+                this.tableData = [];
+                // 涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵��
+                this.engineeringNoMapList = ['寰呭紑宸�', '鏈紑宸�', '寮�宸�', '鏆傚仠', '瀹屽伐'];
+                // 榛樿鏄剧ず鈥滃緟寮�宸モ�濆伐鍗�
+                this.getWomdaaByStatus();
+            },
+            // 涓嬫媺妗嗛�変腑鍚庯紝鎸夌姸鎬佺瓫閫夊伐鍗�
+            onEngineeringNoChange(status) {
+                this.engineeringNo = status;
+                this.getWomdaaByStatus();
+            },
 			getWomdaa() {
 
 				let editDate = this.formatDate(new Date());
@@ -660,31 +667,31 @@
 					url: "/Womdaa/GetWomdaasByMachine",
 					data: {
 						machineNo: this.machineNo,
-						//engineeringNo: this.engineeringNo,
 						editDate: editDate
 					}
 				}).then(res => {
 					this.tableData = res.data.tbBillList;
 				})
 			},
-            // 绛涢�夊伐鍗曠姸鎬�
-			GetWomdaasByEngineeringNo() {
-
-				this.$post({
-					url: "/Womdaa/GetWomdaasByEngineeringNo",
-					data: {
-						machineNo: this.machineNo,
-						orderStatus: ['寰呭紑宸�', '鏈紑宸�', '瀹屽伐', '鏆傚仠'] // 鏂板鐘舵�佺瓫閫夋潯浠�
-					}
-				}).then(res => {
-                    this.engineeringNoList = res.data.tbBillList;
-                    // 鐩存帴鏄犲皠锛屼笉鍒嗙粍
-                    this.engineeringNoMapList = this.engineeringNoList.map(s => s.moldId + ":" + s.moldName + ":" + s.moldModel);
+            // 鎸夊伐鍗曠姸鎬佺瓫閫夊伐鍗�
+            getWomdaaByStatus() {
+                let editDate = this.formatDate(new Date());
+                this.$post({
+                    url: "/Womdaa/GetWomdaasByEngineeringNo",
+                    data: {
+                        machineNo: this.machineNo,
+                        orderStatus: [this.engineeringNo], // 鍙紶閫変腑鐨勭姸鎬�
+                        editDate: editDate
+                    }
+                }).then(res => {
+                    this.tableData = res.data.tbBillList;
                 });
-			},
+            },
 			toDetail(item) {
 				this.orderId = item.id;
 				this.selectedOrder = item.daa001;
+                this.productCode = item.daa002; // 浜у搧缂栫爜
+                this.productSpec = item.daa004; // 浜у搧瑙勬牸
 				this.currentTab = 0;
 			}
 		},

--
Gitblit v1.9.3