From 38032dc27d6449f030e41794f2676f01684db39a Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 09:52:47 +0800
Subject: [PATCH] 界面优化
---
components/WorkOrder.vue | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/components/WorkOrder.vue b/components/WorkOrder.vue
index 8059ee9..31481e8 100644
--- a/components/WorkOrder.vue
+++ b/components/WorkOrder.vue
@@ -6,6 +6,7 @@
flex-wrap: nowrap;
align-content: flex-start;
justify-content: flex-start;">
+ <!--涓荤晫闈�-->
<!-- 涓婇儴锛氬伐鍗曢�夋嫨鍜屾満鍙颁俊鎭� -->
<view class="top-order" style=" display:inline-block;">
<view class="form-row4">
@@ -27,8 +28,8 @@
<input class="inp" type="text" v-model="order.daa008" disabled="true" />
</view>
<view class="form-item">
- <label>寮�宸ユ暟閲�:</label><!--寮�宸ユ暟閲囷細寮�宸ユ椂鐨勭疮璁＄敓浜ф暟???-->
- <input class="inp" type="text" v-model="order.daa004" disabled="true" />
+ <label>寮�宸ユ暟閲�:</label><!--寮�宸ユ暟閲�-->
+ <input class="inp" type="text" v-model="order.startCjNum" disabled="true" /><!-- 淇敼涓� startCjNum -->
</view>
</view>
<view class="form-row3">
@@ -47,8 +48,8 @@
<input class="inp" type="text" v-model="order.cutterModel" disabled="true" />
</view>
<view class="form-item">
- <label>褰撳墠鏁伴噰:</label><!--褰撳墠鏁伴噰锛氬綋鍓嶆椂闂寸殑绱鐢熶骇鏁�???-->
- <input class="inp" type="text" v-model="order.daa004" disabled="true" />
+ <label>褰撳墠鏁伴噰:</label><!--褰撳墠鏁伴噰-->
+ <input class="inp" type="text" v-model="order.currentCjNum" disabled="true" /><!-- 淇敼涓� currentCjNum -->
</view>
</view>
<view class="form-row3">
@@ -58,7 +59,7 @@
</view>
<view class="form-item">
<label>浜у搧瑙勬牸:</label>
- <input class="inp" type="text" v-model="order.daa004" disabled="true" />
+ <input class="inp" type="text" v-model="order.daa004" disabled="true" /><!-- 淇濈暀鍘熺粦瀹氫笌娉ㄩ噴锛屾湭鏀� -->
</view>
<view class="form-item">
<label>鎶ュ伐鏁伴噺:</label>
@@ -81,7 +82,7 @@
</view>
</view>
- <!-- 涓儴锛氬搧璐ㄦ楠� -->
+ <!-- 涓儴锛氳繍琛岀姸鎬� -->
<view class="section card">
<view class="form-row">
<view class="form-item">
@@ -99,11 +100,11 @@
</view>
<view class="form-row">
<view class="form-item">
- <label>鐢熶骇鏃堕棿寮�濮�:</label>
+ <label>鐢熶骇寮�濮嬫椂闂�:</label>
<input class="inp" type="text" v-model="startTime" disabled="true" />
</view>
<view class="form-item">
- <label>鐢熶骇鏃堕棿缁撴潫:</label>
+ <label>鐢熶骇缁撴潫鏃堕棿:</label>
<input class="inp" type="text" v-model="endTime" disabled="true" />
</view>
<view class="form-item">
@@ -113,7 +114,7 @@
</view>
</view>
- <!-- 涓嬮儴锛氳繍琛岀姸鎬� -->
+ <!-- 涓嬮儴锛氬搧璐ㄦ楠� -->
<view class="section card">
<view class="form-row">
<view class="form-item">
@@ -265,7 +266,6 @@
this.productionDuration = (differenceInMilliseconds / 60000).toFixed(2);
}
-
// this.$post({
// url: "/MesOrderSta/Binding",
// data: {
@@ -307,7 +307,6 @@
// this.machineNo = uni.getStorageSync('machineNo');
// }
// }
-
if (!this.orderId && !this.orderNo) {
return;
@@ -359,14 +358,20 @@
todayOutput: 0,
todayRunTime: '',
todayFaultNum: 0,
- cutterId, //鍒�鍏蜂唬鐮�
- cutterName, //鍒�鍏峰悕绉�
- cutterModel, //鍒�鍏疯鏍�
+ cutterId, //鍒�鍏蜂唬鐮�
+ cutterName, //鍒�鍏峰悕绉�
+ cutterModel, //鍒�鍏疯鏍�
jdl: '',
+ startCjNum: 0, // 鏂板鍏滃簳瀛楁 淇濈暀鍏跺畠娉ㄩ噴
+ currentCjNum: 0 // 鏂板鍏滃簳瀛楁
};
return;
}
this.order = res.data.tbBillList;
+ // 鍏煎鍚庣澶у皬鍐欙紙濡傛灉鍚庣杩斿洖 StartCjNum/CurrentCjNum锛�
+ this.order.startCjNum = this.order.startCjNum ?? this.order.StartCjNum ?? 0; // 涓嶅垹闄ゅ師鏈夋敞閲婅
+ this.order.currentCjNum = this.order.currentCjNum ?? this.order.CurrentCjNum ?? 0; // 涓嶅垹闄ゅ師鏈夋敞閲婅
+
uni.setStorageSync('engineeringNo', this.order.engineeringNo);
this.orderStatus = this.order.daa018;
this.collectedAmount = this.order.todayOutput;
@@ -382,7 +387,7 @@
this.utilizationRate = this.order.jdl + '%';
// this.startTime = this.order.workStartDate;
// this.endTime = this.order.workEndDate;
- let title = this.machineNo + '鍙锋満鍙� 宸ュ崟鍙�' + this.order.daa001 + ',宸查噰闆�' + this.collectedAmount;
+ let title = this.machineNo + '鍙锋満鍙� 宸ュ崟鍙�' + this.order.daa001 + ',褰撳墠鏁伴噰' + this.order.currentCjNum; // 鏍囬涓娇鐢� currentCjNum
this.setTitle(title);
})
},
--
Gitblit v1.9.3