From 720cbbe9e5fbf76968355eda83b643e4ec95f03c Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 23 十二月 2025 14:41:22 +0800
Subject: [PATCH] 优化界面
---
pages/index.vue | 720 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 508 insertions(+), 212 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 5b7f455..acfec3d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -8,18 +8,21 @@
<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">
涓荤晫闈�
</view>
+ <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
+ 涓婂垁涓嬪垁
+ </view>
<view class="tab-item" :class="{ active: currentTab === 3 }" @click="changeTab(3)">
璋冩満閫佹
</view>
- <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
- 鍒�鍏风鐞�
+ <view class="tab-item" :class="{ active: currentTab === 10 }" @click="changeTab(10)">
+ 涓婁笅鍒�/棣栨鍗曡褰�
</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 class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
寮�宸ュ畬宸�
- </view> -->
+ </view>
<view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
e-SOP
</view>
@@ -30,34 +33,32 @@
璁惧鐐规
</view>
<!-- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
- 鎵撳嵃鏈鸿缃�
- </view> -->
+ 鎵撳嵃鏈鸿缃�
+ </view> -->
</view>
<view class="font"></view>
<scroll-view class="content">
<view v-if="currentTab === 7" class="tab-content">
<view class="content">
- <view class="top-right">
+ <!--<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> -->
- <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>
+ <view class="form-row align-row">
+ <input v-model="machineName"
+ disabled="true"
+ type="text"
+ class="machine-name-box" />
+ <view class="form-group">
+ <label class="order-label">绗竴姝ラ�夋嫨宸ュ崟:</label>
<button class="print-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
+ </view>
+ <view class="top-right">
+ <button class="refresh-btn" @click="refresh">鍒锋柊</button>
</view>
</view>
</view>
@@ -66,34 +67,34 @@
<view class="section card">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" @selection-change="selectionChange">
<uni-tr>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 140px;">宸ュ簭</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">宸ュ崟鍙�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 220px;">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">瑙勬牸</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">娲惧伐鏁伴噺</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">宸ュ崟鏁伴噺</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">鎶ュ伐浜�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">閫夋嫨</uni-th>
+ <uni-th align="center" class="th" style="width: 100px;">宸ュ簭</uni-th>
+ <uni-th align="center" class="th" style="width: 170px;">宸ュ崟鍙�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">浜у搧缂栫爜</uni-th>
+ <uni-th align="center" class="th" style="width: 190px;">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="width: 190px;">瑙勬牸</uni-th>
+ <uni-th align="center" class="th" style="width: 80px;">宸茬敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="width: 80px;">鏈敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="width: 80px;">娲惧伐鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="width: 80px;">宸ュ崟鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">宸ュ崟鐘舵��</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">鎶ュ伐浜�</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">閫夋嫨</uni-th>
</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.procName" /><!--宸ュ簭-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa001" /><!--宸ュ崟鍙�-->
+ <div class="form-input">{{ item.daa001 }}</div><!--宸ュ崟鍙�-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa002" /><!--浜у搧缂栫爜-->
+ <div class="form-input">{{ item.daa002 }}</div><!--浜у搧缂栫爜-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
+ <div class="form-input">{{ item.daa003 }}</div><!--浜у搧鍚嶇О-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
+ <div class="form-input">{{ item.daa004 }}</div><!--瑙勬牸-->
</uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
@@ -105,7 +106,7 @@
<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" /><!--宸ュ崟鏁伴噺-->
+ <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" /><!--宸ュ崟鐘舵��-->
@@ -116,7 +117,7 @@
<uni-td>
<view class="uni-group">
<button class="select-btn" type="default" @click="toDetail(item)">
- 閫夋嫨
+ 杞埌涓荤晫闈�
</button>
</view>
</uni-td>
@@ -130,9 +131,9 @@
<view>
<!--<text style="color: red;">
- 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
- 濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
- </text>-->
+ 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
+ 濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
+ </text>-->
</view>
</view>
</view>
@@ -151,6 +152,10 @@
<view v-if="currentTab === 3" class="tab-content">
<!-- <!– 璋冪敤 mold 缁勪欢 –>-->
<machine :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
+ </view>
+ <view v-if="currentTab === 10" class="tab-content">
+ <!-- 璋冪敤 moldRecord 缁勪欢 -->
+ <MoldRecord :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
<view v-if="currentTab === 4" class="tab-content">
<!-- 璋冪敤 mold 缁勪欢 -->
@@ -177,48 +182,54 @@
<view v-if="isShow" class="overlay">
<view class="popup">
<view class="form-row">
- <view>
- <label style="float: left;margin-top: 18px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
+ <view style="display: flex; align-items: center;">
+ <label style="float: left;margin-top: 18px;font-size: 22px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
<superwei-combox :candidates="engineeringNoMapList" placeholder="璇烽�夋嫨" v-model="engineeringNo"
@select="onEngineeringNoChange" class="picker"
style="padding: 7px 46px;width: 650px;"></superwei-combox>
+ <span style="margin-left: 20px; color: #ff6600; font-size: 18px;">澶氶�夋椂鍙繚鐣欐渶鍚庝竴鏉″伐鍗�</span>
</view>
</view>
- <div style="height: 400px; overflow: auto;">
+ <div style="height: 450px; overflow: auto;"> <!-- 璋冩暣楂樺害涓�380px锛屼负搴曢儴鎸夐挳鐣欏嚭鏇村绌洪棿 -->
<table>
<view class="section card">
<uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
- @selection-change="selectionChange">
+ class="large-selection-table" @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-th align="center" class="th" style="width: 100px;">宸ュ簭</uni-th>
+ <uni-th align="center" class="th" style="width: 200px;">宸ュ崟鍙�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">浜у搧缂栫爜</uni-th>
+ <uni-th align="center" class="th" style="width: 240px;">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="width: 200px;">瑙勬牸</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">宸茬敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">鏈敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">娲惧伐鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">宸ュ崟鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">宸ュ崟鐘舵��</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">鎶ュ伐浜�</uni-th>
+<!-- <uni-th align="center" class="th" style="width: 126px;">閫夋嫨</uni-th> -->
</uni-tr>
- <uni-tr v-for="(item, index) in tableData" :key="index">
+ <uni-tr v-for="(item, index) in tableData"
+ :key="index"
+ :class="{'row-selected': selectedIndexs.includes(index)}"
+ @click="onRowClick(index)"
+ style="cursor: pointer;">
<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" />
+ <div class="form-input">{{ item.daa001 }}</div>
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa002" />
+ <div class="form-input">{{ item.daa002 }}</div>
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
+ <div class="form-input">{{ item.daa003 }}</div>
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
+ <div class="form-input">{{ item.daa004 }}</div><!--瑙勬牸-->
</uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
@@ -230,13 +241,20 @@
<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" /><!--宸ュ崟鏁伴噺-->
+ <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-td>
+<!-- <view class="uni-group">
+ <button class="select-btn" type="default" @click="toDetail(item)">
+ 杞埌涓荤晫闈�
+ </button>
+ </view> -->
</uni-td>
</uni-tr>
</uni-table>
@@ -266,6 +284,7 @@
import PrintInit from "../components/PrintInit.vue";
import PrintTest from "../components/PrintTest.vue";
import EquipmentInspection from "../components/EquipmentInspection.vue";
+import MoldRecord from "../pages/moldRecord.vue";
export default {
components: {
@@ -279,7 +298,8 @@
PDFShow,
PrintInit,
PrintTest,
- EquipmentInspection
+ EquipmentInspection,
+ MoldRecord
},
data() {
return {
@@ -310,6 +330,10 @@
selectedIndexs: [],
isShow: false,
+
+ // 鑷姩璺宠浆鐩稿叧
+ autoRedirectTimer: null,
+ autoRedirectTime: 5 * 60 * 1000, // 5鍒嗛挓
};
},
created() {
@@ -335,8 +359,39 @@
},
onShow() {
this.refresh();
+ this.resetAutoRedirectTimer();
},
methods: {
+ onRowClick(index) {
+ this.selectedIndexs = [index]; // 鍗曢��
+ // 鎵嬪姩瑙﹀彂 selectionChange 浠ュ悓姝ュ閫夋
+ this.selectionChange({ detail: { index } });
+ // 閲嶇疆鑷姩璺宠浆璁℃椂鍣�
+ this.resetAutoRedirectTimer();
+ },
+
+ // 閲嶇疆鑷姩璺宠浆璁℃椂鍣�
+ resetAutoRedirectTimer() {
+ // 娓呴櫎鐜版湁鐨勫畾鏃跺櫒
+ if (this.autoRedirectTimer) {
+ clearTimeout(this.autoRedirectTimer);
+ this.autoRedirectTimer = null;
+ }
+
+ // 闄や簡涓婚〉(0)銆佸伐鍗曢�夋嫨椤�(7)銆佺敓浜ф姤宸ラ〉(4)涔嬪鐨勯〉闈㈡墠璁剧疆鑷姩璺宠浆
+ if (this.currentTab !== 0 && this.currentTab !== 7 && this.currentTab !== 4) {
+ this.autoRedirectTimer = setTimeout(() => {
+ // 璺宠浆鍥炰富椤�
+ this.currentTab = 0;
+ // 鏄剧ず鎻愮ず淇℃伅
+ uni.showToast({
+ title: '椤甸潰瓒呮椂锛岃嚜鍔ㄨ繑鍥炰富椤�',
+ icon: 'none',
+ duration: 2000
+ });
+ }, this.autoRedirectTime);
+ }
+ },
checkForUpdate() {
this.$post({
url: "/DevMachine/getAppUpgradeInfo",
@@ -407,7 +462,7 @@
getPrintInfo() {
var mac = "";
- mac = "74:24:ca:4f:b7:9b";
+ mac = "74:24:ca:4f:b2:c3";
this.$post({
url: "/DevMachine/GetDevMachineByPdaMac",
data: {
@@ -428,43 +483,43 @@
return;
- 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();
@@ -551,28 +606,38 @@
}
return str;
},
- cancel() {
- if (!this.machineNo) {
- return;
- }
+ cancel() {
+ if (!this.machineNo) {
+ return;
+ }
- let editDate = this.formatDate(new Date());
+ // 鐩存帴鐢� flag 鍒ゆ柇
+ if (this.hasBindedCutterFlag) {
+ uni.showToast({
+ title: '褰撳墠宸ュ崟宸茬粦瀹氬垁鍏凤紝涓嶈兘娓呯┖閲嶉��',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
- this.selectedIndexs = [];
+ let editDate = this.formatDate(new Date());
+ this.selectedIndexs = [];
- this.$post({
- url: "/MesOrderSelect/Remove",
- data: {
- machineNo: this.machineNo,
- editDate: editDate
- },
- }).then(res => {
- if (res.data.tbBillList > 0) {
- this.isShowTableData = [];
- }
- });
- },
+ this.$post({
+ url: "/MesOrderSelect/Remove",
+ data: {
+ machineNo: this.machineNo,
+ editDate: editDate
+ },
+ }).then(res => {
+ if (res.data.tbBillList > 0) {
+ this.isShowTableData = [];
+ }
+ });
+ },
+
formatDate(date) {
let year = date.getFullYear(); // 鑾峰彇骞翠唤
let month = String(date.getMonth() + 1).padStart(2, '0'); // 鑾峰彇鏈堜唤骞惰ˉ闆�
@@ -595,6 +660,8 @@
if (index === 7) {
this.refresh();
}
+ // 閲嶇疆鑷姩璺宠浆璁℃椂鍣�
+ this.resetAutoRedirectTimer();
console.log(index);
},
onMachineChange(event) {
@@ -628,22 +695,33 @@
})
},
//鑾峰彇琛ㄦ牸鐨勬暟鎹簮
- getWomdaaIsShow() {
- this.$post({
- url: "/Womdaa/GetWomdaasByShow",
- data: {
- machineNo: this.machineNo,
- }
- }).then(res => {
- this.isShowTableData = res.data.tbBillList;
+ getWomdaaIsShow() {
+ this.$post({
+ url: "/Womdaa/GetWomdaasByShow",
+ data: {
+ machineNo: this.machineNo,
+ }
+ }).then(res => {
+ this.isShowTableData = res.data.tbBillList;
- if (this.isShowTableData.length == 1) {
- uni.setStorageSync('daa001', this.isShowTableData[0].daa001);
- uni.setStorageSync('id', this.isShowTableData[0].id);
- //this.toDetail(this.isShowTableData[0]);
- }
- });
- },
+ // 鍙垽鏂涓�鏉★紙鍙厑璁镐竴鏉″伐鍗曪級
+ 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() !== '');
+ }
+ // 瀛樺偍鍒� data 鍙橀噺
+ this.hasBindedCutterFlag = hasBindedCutter;
+
+ if (this.isShowTableData.length == 1) {
+ uni.setStorageSync('daa001', this.isShowTableData[0].daa001);
+ uni.setStorageSync('id', this.isShowTableData[0].id);
+ }
+ });
+ },
isShowTab() {
if (this.isShowTableData.length > 0) {
@@ -657,10 +735,14 @@
this.isShow = true;
// 榛樿閫変腑鈥滃緟寮�宸モ��
- this.engineeringNo = '寰呭紑宸�';
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
this.tableData = [];
- // 涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵��
- this.engineeringNoMapList = ['寰呭紑宸�', '鏈紑宸�', '寮�宸�', '鏆傚仠', '瀹屽伐'];
+ // 涓嬫媺妗嗗彧鏄剧ず鍚堝苟鍚庣殑鐘舵�佸拰鍏跺畠鐘舵��
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
// 榛樿鏄剧ず鈥滃緟寮�宸モ�濆伐鍗�
this.getWomdaaByStatus();
},
@@ -686,11 +768,17 @@
// 鎸夊伐鍗曠姸鎬佺瓫閫夊伐鍗�
getWomdaaByStatus() {
let editDate = this.formatDate(new Date());
+ let statusArr = [];
+ if (this.engineeringNo === '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�') {
+ statusArr = ['寰呭紑宸�', '鏈紑宸�', '鏆傚仠'];
+ } else {
+ statusArr = [this.engineeringNo];
+ }
this.$post({
url: "/Womdaa/GetWomdaasByEngineeringNo",
data: {
machineNo: this.machineNo,
- orderStatus: [this.engineeringNo], // 鍙紶閫変腑鐨勭姸鎬�
+ orderStatus: statusArr,
editDate: editDate
}
}).then(res => {
@@ -710,6 +798,26 @@
</script>
<style lang="scss">
+
+ :deep(.checkbox),
+ :deep(.checkbox__inner) {
+ width: 60px !important;
+ height: 60px !important;
+ min-width: 60px !important;
+ min-height: 60px !important;
+ padding: 16px !important;
+ margin-right: 20px !important;
+ }
+
+ .popup .large-selection-table {
+ width: 100% !important;
+ table-layout: auto !important; // 璁╄〃鏍艰嚜鍔ㄥ垎閰嶅搴�
+ }
+
+ .row-selected {
+ background-color: #e0f3ff !important;
+ }
+
.font {
background-color: #666666;
height: 30px;
@@ -788,14 +896,23 @@
}
/* 鍗＄墖鏍峰紡 */
- .card {
- background-color: #fff;
- border-radius: 10px;
- box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
- padding: 16px;
- position: relative;
- margin-bottom: 25px
- }
+ .card {
+ background-color: #fff;
+ border-radius: 10px;
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+ padding: 0; // 鍘婚櫎澶氫綑鍐呰竟璺�
+ position: relative;
+ margin-bottom: 25px;
+ width: 100%; // 濉弧鐖跺鍣�
+ box-sizing: border-box;
+ }
+
+/* //.content {
+ // flex: 1;
+ // padding: 1vh 1vw; // 淇濊瘉鏁翠綋鏈夊乏鍙崇暀鐧�
+ // background-color: white;
+ // font-size: 1.5vw;
+ //}*/
/* 鍗＄墖鏍囬鍦ㄥ乏涓婅 */
.card-header {
@@ -855,7 +972,7 @@
background-color: #00A2E9;
color: white;
border: none;
- font-size: 1.5vw;
+ font-size: 22px;
border-radius: 5px;
}
@@ -868,23 +985,24 @@
background-color: #fff;
color: #007aff;
cursor: pointer;
- font-size: 1.8vw;
- /* Increased font size */
+ font-size: 22px;
+ font-weight: 500;
transition: background-color 0.3s, color 0.3s;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.tab-item.active {
background-color: #007aff;
color: #fff;
- font-weight: bold;
+ font-weight: 600;
+ box-shadow: 0 4px 8px rgba(0, 122, 255, 0.3);
}
.content {
flex: 1;
padding: 1vh 1vw;
background-color: white;
- font-size: 1.5vw;
- /* Increased font size for content */
+ font-size: 16px;
}
.picker {
@@ -892,34 +1010,64 @@
margin-top: 7px;
margin-left: 10px;
text-align: center;
- font-size: 100%;
+ font-size: 32px !important; // 寮哄埗澶у瓧浣擄紝閫傞厤浣庡瘑搴�
+ min-height: 60px; // 璁╅�夋嫨妗嗛珮搴︿篃鍙樺ぇ
+ line-height: 60px;
padding: 5.5px 1px;
- background-color: #007aff; // 杩欓噷鏀逛负钃濊壊
+ background-color: #fff; // 杩欓噷鏀逛负钃濊壊
border: 2px solid #007aff; // 杈规涔熸敼涓鸿摑鑹�
- color: #fff; // 瀛椾綋棰滆壊鏀逛负鐧借壊锛屼繚璇佸彲璇绘��
+ color: #007aff; // 瀛椾綋棰滆壊鏀逛负鐧借壊锛屼繚璇佸彲璇绘��
border-radius: 6px;
transition: background 0.2s;
}
- .th {
- background-color: lightskyblue;
- height: 6vh;
- font-size: 2vw;
- /* Increased font size for table headers */
- }
+ .th {
+ background-color: white;
+ color: black;
+ height: 6vh;
+ font-size: 22px;
+ font-weight: 600;
+ border: 1px solid #555;
+ padding: 6px 8px;
+ text-align: center;
+ white-space: normal;
+ word-break: break-all;
+ }
+
+ /* 涓昏〃鏍艰竟妗嗘牱寮� */
+ uni-table {
+ border: 2px solid #d00 !important;
+ border-collapse: separate !important;
+ border-spacing: 0 !important;
+ }
+
+ .uni-th, .uni-td {
+ border: 1px solid #555 !important;
+ position: relative !important;
+ z-index: 1 !important;
+ }
- .form-input {
- font-size: 1.8vw;
- /* Increased input font size */
- }
+ .form-input {
+ word-break: break-all;
+ white-space: normal;
+ line-height: 1.4;
+ text-align: center;
+ vertical-align: middle;
+ max-width: 180px;
+ overflow-wrap: break-word;
+ font-size: 22px;
+ padding: 6px 8px;
+ background-color: transparent; /* 璁剧疆鑳屾櫙涓洪�忔槑 */
+ }
/* 搴曢儴淇濆瓨鍜屽彇娑堟寜閽� */
- .bottom-section {
- display: flex;
- justify-content: space-around;
- margin-bottom: 2vh;
- padding: 2vh 1vw;
- }
+ .bottom-section {
+ display: flex;
+ justify-content: space-around;
+ margin-bottom: 2vh;
+ padding: 2vh 1vw;
+ margin-top: 20px; // 鍑忓皬椤堕儴杈硅窛锛岀‘淇濇寜閽湪寮圭獥鍐呮纭樉绀�
+ }
.save-btn,
.cancel-btn {
@@ -927,63 +1075,223 @@
padding: 1.5vh;
background-color: #00a2e9;
color: white;
- font-size: 1.8vw;
- /* Increased button font size */
+ font-size: 22px;
+ font-weight: 500;
border: none;
text-align: center;
cursor: pointer;
+ border-radius: 4px;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+ transition: all 0.3s;
+ }
+
+ .cancel-btn {
+ background-color: #00A2E9;
+ color: white;
}
- .overlay {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.5);
- display: flex;
- justify-content: center;
- align-items: center;
- }
+ .overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 2000; // 澧炲姞z-index锛岀‘淇濆脊绐楀湪鍒锋柊鎸夐挳涔嬩笂
+ }
- .popup {
- background-color: #fff;
- padding: 2vh;
- border: 1px solid #ccc;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- width: 90vw;
- height: 70vh;
- font-size: 1.6vw;
- /* Increased font size within popups */
- }
+ .popup {
+ background-color: #fff;
+ padding: 2vh 2vh 8vh 2vh; // 澧炲姞搴曢儴鍐呰竟璺濓紝涓烘寜閽暀鍑虹┖闂�
+ border: 1px solid #ccc;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ width: 90.16vw; // 鍘熸潵鐨�98vw缂╁皬8% (98vw * 0.92)
+ height: 68vh; // 鍘熸潵鐨�85vh缂╁皬20% (85vh * 0.8)
+ font-size: 1.6vw;
+ box-sizing: border-box; // 纭繚鍐呰竟璺濅笉褰卞搷鎬诲昂瀵�
+ }
.print-btn {
float: left;
margin-top: 4px;
margin-left: 10px;
text-align: center;
- font-size: 100%;
- color: black;
+ font-size: 22px;
+ color: white;
+ background-color: #00A2E9;
padding: 0px 90px;
- border: 2px solid #ccc;
+ border: 2px solid #00A2E9;
cursor: pointer;
border-radius: 0.8vw;
}
+ .machine-name-box {
+ border: 2px solid #007aff; /* 钃濊壊杈规 */
+ border-radius: 8px;
+ font-family: fantasy;
+ font-size: 33px;
+ margin-top: 20px;
+ padding: 15px 28px; /* 涓婁笅20px锛屽乏鍙�48px锛屽鍔犲唴杈硅窛 */
+ width: 300px; /* 鏇村锛屼繚璇佸唴瀹瑰畬鏁存樉绀� */
+ height: 70px; /* 澧炲姞楂樺害 */
+ box-sizing: border-box;
+ background: #fff;
+ color: #222;
+ font-weight: bold;
+ text-align: left;
+ display: block;
+ }
+
+/* //v-deep .checkbox {
+ // padding: 10 10px;
+ // width: 26px;
+ // padding-left: 12px;
+ // display: table-cell;
+ // vertical-align: middle;
+ // color: #333;
+ // font-weight: 500;
+ // border-bottom: 1px #ebeef5 solid;
+ // font-size: 14px;
+ //}*/
+
+ .popup .card {
+ margin-bottom: 40px !important; // 鍘熸潵250px锛屾敼涓�40px锛岀┖鐧芥槑鏄惧噺灏�
+ }
+
@media screen and (max-width: 1920px) {
.tab-item {
- font-size: 1.6vw;
+ font-size: 22px;
}
.content {
padding: 1vw;
- font-size: 1.5vw;
+ font-size: 22px;
}
.form-input {
- font-size: 1.6vw;
+ font-size: 22px;
}
}
+
+ .uni-td,
+ td {
+ white-space: normal !important; // 鍏佽鑷姩鎹㈣
+ word-break: break-all !important; // 鍗曡瘝/涓枃閮借兘鏂
+ line-height: 1.4; // 琛岄珮閫傚綋锛屼究浜庡琛屾樉绀�
+ text-align: center; // 灞呬腑鏄剧ず锛堝闇�宸﹀榻愬彲鏀逛负 left锛�
+ vertical-align: middle; // 鍨傜洿灞呬腑
+ max-width: 180px; // 淇濇寔鍗曞厓鏍兼渶澶у搴�
+ overflow-wrap: break-word; // 鍏煎鎬ф洿濂�
+ background-color: transparent; /* 璁剧疆鑳屾櫙涓洪�忔槑 */
+ }
+
+ // 寮圭獥鍐呰〃鏍兼牱寮忎笌鐢熶骇鎶ュ伐椤甸潰鍘嗗彶鎶ュ伐璁板綍琛ㄦ牸涓�鑷�
+ .popup .large-selection-table .uni-th,
+ .popup .large-selection-table .uni-td {
+ padding: 6px 8px;
+ text-align: center;
+ white-space: normal;
+ word-break: break-all;
+ font-size: 22px;
+ background-color: transparent; /* 璁剧疆鑳屾櫙涓洪�忔槑 */
+ border: 1px solid #555 !important;
+ }
+
+ .popup .large-selection-table .uni-th {
+ background-color: white;
+ color: black;
+ font-weight: 600;
+ font-size: 22px;
+ }
+
+ /* 寮圭獥琛ㄦ牸澶栨绾� */
+ .popup .large-selection-table {
+ border: 2px solid #d00 !important;
+ border-collapse: separate !important;
+ border-spacing: 0 !important;
+ }
+
+ .select-btn {
+ width: 150px; // 鍘熸潵鐨�70% (180px * 0.7)
+ height: 75px; // 鍘熸潵鐨�65% (80px * 0.65)
+ font-size: 22px; // 瀛椾綋涔熺暐澶�
+ //font-weight: 200;
+ border-radius: 10px;
+ background-color: #00A2E9;
+ color: white;
+ border: 2px solid #00A2E9;
+ margin: 0 auto;
+ display: block;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+ transition: all 0.3s;
+ }
+
+ .top-section {
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ margin-bottom: 20px;
+ padding: 20px 10px;
+ }
+
+ .form-row.align-row {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ position: relative;
+ width: 100%;
+ }
+
+ .machine-name-box {
+ flex: 1 1 45%;
+ margin-right: 20px;
+ }
+
+ .form-group {
+ display: flex;
+ align-items: center;
+ flex: 1 1 45%;
+ justify-content: flex-start;
+ }
+
+ .order-label {
+ font-family: fantasy;
+ font-size: 22px;
+ margin-top: 20px;
+ margin-right: 10px;
+ float: none;
+ }
+
+ .print-btn {
+ margin-top: 20px;
+ }
+
+ .top-right {
+ position: absolute;
+ top: -30px; // 寰�涓婄Щ
+ right: 0;
+ z-index: 1000;
+ }
+
+/* 鏀惧ぇ琛ㄥご鍜岃〃鏍煎唴瀹瑰瓧浣� */
+ .th,
+ .uni-th,
+ th {
+ font-size: 22px !important;
+ color: black !important;
+ font-weight: 600;
+ letter-spacing: 1px;
+ }
+
+ .popup .large-selection-table .th,
+ .popup .large-selection-table .uni-th,
+ .popup .large-selection-table th {
+ font-size: 22px !important;
+ color: black !important;
+ }
/* 閽堝1280x800鐨勫钩鏉夸娇鐢ㄥ獟浣撴煡璇㈣繘琛岄�傞厤 */
@media screen and (min-width: 1280px) and (max-width: 1920px) {
@@ -993,34 +1301,22 @@
.save-btn,
.cancel-btn {
- font-size: 1.6vw;
+ font-size: 16px;
}
.inp {
width: 85%;
- font-size: 20px;
+ font-size: 16px;
}
.status-block p {
- font-size: 20px;
+ font-size: 16px;
}
.uni-tr,
.uni-td {
- font-size: 20px;
+ font-size: 22px;
}
}
-
- .select-btn {
- width: 180px; // 鏇村
- height: 80px; // 鏇撮珮
- font-size: 1.8vw; // 瀛椾綋涔熺暐澶�
- border-radius: 10px;
- background-color: #f5f5f5;
- color: #007aff;
- border: 2px solid #007aff;
- margin: 0 auto;
- display: block;
- }
</style>
--
Gitblit v1.9.3