From 38032dc27d6449f030e41794f2676f01684db39a Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 09:52:47 +0800
Subject: [PATCH] 界面优化
---
components/WorkOrder.vue | 246 ++++++++++++++++++++----------------------------
1 files changed, 102 insertions(+), 144 deletions(-)
diff --git a/components/WorkOrder.vue b/components/WorkOrder.vue
index ef12e65..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">
@@ -15,100 +16,56 @@
justify-content: flex-start;
align-items: center;">
<view class="form-item">
- <label>宸ュ崟鍗曞彿:</label>
+ <label>宸ュ崟缂栧彿:</label>
<input class="inp" type="text" v-model="order.daa001" disabled="true" />
</view>
<view class="form-item">
- <label>浜у搧鍚嶇О:</label>
- <!-- <input class="inp" type="text" v-model="order.daa003" disabled="true" />-->
- <superwei-combox :candidates="DAA003List" v-model="order.daa003" @select="onDaa003Change"
- class="inp" style="font-size: 20px;"></superwei-combox>
+ <label>鍒�鍏峰悕绉�:</label>
+ <input class="inp" type="text" v-model="order.cutterName" disabled="true" />
</view>
<view class="form-item">
- <label>鐢熶骇鏂欏彿:</label>
+ <label>宸ュ崟鏁伴噺:</label>
+ <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.startCjNum" disabled="true" /><!-- 淇敼涓� startCjNum -->
+ </view>
+ </view>
+ <view class="form-row3">
+ <view class="form-item">
+ <label>浜у搧鍚嶇О:</label>
+ <!--<input class="inp" type="text" v-model="order.daa003" disabled="true" />-->
+ <superwei-combox :candidates="DAA003List" v-model="order.daa003" @select="onDaa003Change"
+ class="inp" style="font-size: 20px;"></superwei-combox>
+ </view>
+ <view class="form-item">
+ <label>鍒�鍏风紪鍙�:</label><!--鍒�鍏风紪鍙�???-->
+ <input class="inp" type="text" v-model="order.cutterId" disabled="true" />
+ </view>
+ <view class="form-item">
+ <label>鍒�鍏疯鏍�:</label><!--鍒�鍏疯鏍�???-->
+ <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.currentCjNum" disabled="true" /><!-- 淇敼涓� currentCjNum -->
+ </view>
+ </view>
+ <view class="form-row3">
+ <view class="form-item">
+ <label>浜у搧缂栫爜:</label>
<input class="inp" type="text" v-model="order.daa002" disabled="true" />
</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>鎴愬瀷鏈�(s):</label>
- <input class="inp" type="text" v-model="order.moldingCyc" disabled="true" />
+ <label>鎶ュ伐鏁伴噺:</label>
+ <input class="inp" type="text" v-model="order.daa011" disabled="true" />
</view>
</view>
- <view class="form-row3">
- <view class="form-item">
- <label>鍥� 鍙�:</label>
- <input class="inp" type="text" v-model="order.engineeringNo" disabled="true" />
- </view>
- <view class="form-item">
- <label>妯″叿缂栧彿:</label>
- <input class="inp" type="text" v-model="order.moldId" disabled="true" />
- </view>
- <view class="form-item">
- <label>棰� 鑹�:</label>
- <input class="inp" type="text" v-model="order.colorName" disabled="true" />
- </view>
- <view class="form-item">
- <label>鏉� 璐�:</label>
- <input class="inp" type="text" v-model="order.material" disabled="true" />
- </view>
- <view class="form-item">
- <label>鍑虹┐鏁�:</label>
- <input class="inp" type="text" v-model="order.outItemNum" disabled="true" />
- </view>
- </view>
- <view class="form-row3">
- <view class="form-item">
- <label>宸ュ崟鏁伴噺:</label>
- <input class="inp" style="background-color: deepskyblue;" type="text" v-model="order.daa008"
- disabled="true" />
- </view>
- <view class="form-item">
- <label>闈㈡澘鏁伴噺:</label>
- <input class="inp" style="background-color: orange;" type="text" v-model="collectedAmount"
- disabled="true" />
- </view>
- <view class="form-item">
- <label>宸叉姤鏁伴噺:</label>
- <input class="inp" style="background-color: yellow;" type="text" v-model="order.daa011"
- disabled="true" />
- </view>
- <view class="form-item">
- <label>鏈姤妫�鏁�:</label>
- <input class="inp" type="text" style="background-color: seagreen;" v-model="order.wjQty"
- disabled="true" />
- </view>
- <view class="form-item">
- <label>璁惧鐐规:</label>
- <input class="inp" type="text" v-model="order.finalResult"
- disabled="true" />
- </view>
-
- <!-- <view class="form-item">
- <label>涓嶈壇鏁伴噺:</label>
- <input class="inp" style="background-color: crimson;" type="text" v-model="order.blQty"
- disabled="true" />
- </view> -->
- </view>
- <!-- <view class="form-row">
-
- <view class="form-item">
- <label>鏈姤宸ユ暟閲�:</label>
- <input class="inp" type="text" v-model="order.wjQty"
- disabled="true" />
- </view>
- <view class="form-item">
- <label>宸ュ崟鐘舵��:</label>
- <input class="inp" type="text" v-model="order.daa018"
- disabled="true" />
- </view>
- <view class="form-item">
- <label>鏈哄彴缂栧彿:</label>
- <input class="inp" type="text" v-model="order.machineNo"
- disabled="true" />
- </view> -->
</view>
</view>
<view class="form-row1">
@@ -129,34 +86,6 @@
<view class="section card">
<view class="form-row">
<view class="form-item">
- <label>鏈�杩戦妫�鏃堕棿:</label>
- <input class="inp" type="text" v-model="lastInitialCheck" disabled="true" />
- </view>
- <view class="form-item">
- <label>棣栨缁撹:</label>
- <input class="inp" type="text" v-model="initialConclusion" disabled="true" />
- </view>
- </view>
- <view class="form-row">
- <view class="form-item">
- <label>鏈�杩戝贰妫�鏃堕棿:</label>
- <input class="inp" type="text" v-model="lastPatrolCheck" disabled="true" />
- </view>
- <view class="form-item">
- <label>宸℃缁撹:</label>
- <input class="inp" type="text" v-model="patrolConclusion" disabled="true" />
- </view>
- <view class="form-item">
- <label>宸℃娆℃暟:</label>
- <input class="inp" type="number" v-model="patrolCount" disabled="true" />
- </view>
- </view>
- </view>
-
- <!-- 涓嬮儴锛氬搧璐ㄦ楠� -->
- <view class="section card">
- <view class="form-row">
- <view class="form-item">
<label style="color: red;">鏃ュ仠鏈烘鏁�(鏃堕暱瓒�5鍒嗛挓):</label>
<input class="inp" style="width: 40%;" type="number" v-model="todayFaultNum" disabled="true" />
</view>
@@ -171,16 +100,48 @@
</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">
<label>鐢熶骇鏃堕暱(mi):</label>
<input class="inp" type="text" v-model="productionDuration" disabled="true" />
+ </view>
+ </view>
+ </view>
+
+ <!-- 涓嬮儴锛氬搧璐ㄦ楠� -->
+ <view class="section card">
+ <view class="form-row">
+ <view class="form-item">
+ <label>鏈�杩戦妫�鏃堕棿:</label>
+ <input class="inp" type="text" v-model="lastInitialCheck" disabled="true" />
+ </view>
+ <view class="form-item">
+ <label>棣栨缁撹:</label>
+ <input class="inp" type="text" v-model="initialConclusion" disabled="true" />
+ </view>
+ <view class="form-item">
+ <label>宸℃娆℃暟:</label><!--棣栨娆℃暟???-->
+ <input class="inp" type="number" v-model="patrolCount" disabled="true" />
+ </view>
+ </view>
+ <view class="form-row">
+ <view class="form-item">
+ <label>鏈�杩戝贰妫�鏃堕棿:</label>
+ <input class="inp" type="text" v-model="lastPatrolCheck" disabled="true" />
+ </view>
+ <view class="form-item">
+ <label>宸℃缁撹:</label>
+ <input class="inp" type="text" v-model="patrolConclusion" disabled="true" />
+ </view>
+ <view class="form-item">
+ <label>宸℃娆℃暟:</label>
+ <input class="inp" type="number" v-model="patrolCount" disabled="true" />
</view>
</view>
</view>
@@ -220,13 +181,9 @@
};
},
created() {
-
this.fetchData(true);
-
this.sumbit();
-
this.init();
-
},
mounted() {
this.fetchData(false); // Initial fetch
@@ -236,7 +193,6 @@
clearInterval(this.timer); // Clear the timer on component destruction
},
methods: {
-
init() {
this.$post({
url: "/MesOrderSta/init",
@@ -276,25 +232,18 @@
});
},
-
onDaa003Change(event) {
-
let orde = this.lineList[this.DAA003List.indexOf(event)];
-
this.orderId = orde.id;
this.orderNo = orde.daa001;
-
//鍒囨崲涓烘柊鐨刬d
uni.setStorageSync('machine', this.machineNo);
uni.setStorageSync('orderId', this.orderId);
uni.setStorageSync('orderNo', this.orderNo);
-
this.fetchData(false);
-
this.sumbit();
},
sumbit() {
-
this.$post({
url: "/MesOrderSta/FindByOrderNo",
data: {
@@ -303,26 +252,19 @@
}
}).then(res => {
let statusForm = res.data.tbBillList;
-
this.startTime = res.data.tbBillList.startTime;
this.endTime = res.data.tbBillList.endTime;
-
this.productionDuration = "0m";
-
if (this.startTime) {
-
let date1 = new Date(this.startTime);
let date2 = new Date();
if (this.endTime) {
date2 = new Date(this.endTime);
}
-
// 璁＄畻涓や釜鏃ユ湡涔嬮棿鐨勫樊寮傦紙浠ユ绉掍负鍗曚綅锛�
let differenceInMilliseconds = date2 - date1;
-
this.productionDuration = (differenceInMilliseconds / 60000).toFixed(2);
}
-
// this.$post({
// url: "/MesOrderSta/Binding",
@@ -366,15 +308,12 @@
// }
// }
-
if (!this.orderId && !this.orderNo) {
return;
}
-
this.getOrderById();
this.getSJByOrder();
this.getXJByOrder();
-
if (flag) {
this.$post({
url: "/Womdaa/GetWomdaasByShow",
@@ -401,34 +340,54 @@
orderNo: this.orderNo
}
}).then(res => {
-
if (res.data.tbBillList == null) {
this.$showMessage("宸ュ崟涓嶅瓨鍦ㄦ垨鑰呮湭寮�宸ワ紝璇锋鏌�");
+ // 淇濊瘉order涓哄璞★紝閬垮厤妯℃澘鎶ラ敊
+ this.order = {
+ daa001: '',
+ moldId: '',
+ daa008: '',
+ daa004: '',
+ daa003: '',
+ daa002: '',
+ daa005: '',
+ daa011: '',
+ daa018: '',
+ machineNo: '',
+ engineeringNo: '',
+ todayOutput: 0,
+ todayRunTime: '',
+ todayFaultNum: 0,
+ 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;
-
if (!this.order.todayOutput) {
this.collectedAmount = 0;
}
-
this.todayRunTime = this.order.todayRunTime;
if (!this.order.todayRunTime) {
this.todayRunTime = "0";
}
-
//this.productionDuration = (this.order.todayOnlineTime / 3600).toFixed(2) + "h";
this.todayFaultNum = this.order.todayFaultNum;
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);
})
},
@@ -491,9 +450,9 @@
margin-bottom: 20px;
}
- .refresh-btn:hover {
- background-color: #00A2E9;
- }
+ .refresh-btn:hover {
+ background-color: #00A2E9;
+ }
.form-row {
display: flex;
@@ -585,7 +544,6 @@
margin-top: -13px;
line-height: 48px;
align-content: flex-start;
-
}
.form-row3 {
--
Gitblit v1.9.3