From 11939aa712c013aad41c08dece5c979fd821ffcb Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 22 十一月 2025 15:28:46 +0800
Subject: [PATCH] 调试
---
pages/index.vue | 537 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 313 insertions(+), 224 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 9b752f8..b8eded8 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,130 +1,122 @@
-锘�<template>
+<template>
- <view class="page-container">
- <!-- 椤堕儴鎿嶄綔鏉＄粺涓�灞曠ず鏈哄彴淇℃伅涓庡揩鎹锋搷浣� -->
- <view class="top-bar">
- <view class="top-bar__title">娴溠呭殠閹笛嗩攽閹貉冨煑閸�?/view>
- <view class="top-bar__actions inline-gap">
- <view class="device-chip">
- <text class="device-chip__label">瑜版挸澧犻張鍝勫酱</text>
- <text class="device-chip__value">{{ machineName || '閺堫亞绮︾��? }}</text>
- </view>
- <button class="btn btn--secondary" @click="refresh">閸掗攱鏌�</button>
- </view>
- </view>
- <!-- 妯悜鏍囩瀵艰埅锛屼繚鎸佸悇涓氬姟椤垫牱寮忎竴鑷� -->
- <view class="tab-strip">
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 7 }" @click="changeTab(7)">
+ <view>
+ <view class="tab-bar">
+ <view class="tab-item" :class="{ active: currentTab === 7 }" @click="changeTab(7)">
宸ュ崟閫夋嫨
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 0 }" @click="changeTab(0)">
+ <view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">
涓荤晫闈�
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 3 }" @click="changeTab(3)">
+ <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-strip__item" :class="{ 'tab-strip__item--active': currentTab === 2 }" @click="changeTab(2)">
- 鍒�鍏风鐞�
- </view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 4 }" @click="changeTab(4)">
+ <view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
鐢熶骇鎶ュ伐
</view>
- <!-- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 1 }" @click="changeTab(1)">
+ <view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
寮�宸ュ畬宸�
- </view> -->
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 5 }" @click="changeTab(5)">
+ </view>
+ <view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
e-SOP
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 6 }" @click="changeTab(6)">
+ <view class="tab-item" :class="{ active: currentTab === 6 }" @click="changeTab(6)">
宸ヨ壓鍙傛暟
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 9 }" @click="changeTab(9)">
+ <view class="tab-item" :class="{ active: currentTab === 9 }" @click="changeTab(9)">
璁惧鐐规
</view>
- <!-- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 8 }" @click="changeTab(8)">
- 鎵撳嵃鏈鸿缃�
- </view> -->
+ <!-- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
+ 鎵撳嵃鏈鸿缃�
+ </view> -->
</view>
<view class="font"></view>
- <scroll-view class="page-scroll" scroll-y="true">
- <view v-if="currentTab === 7" class="tab-content content-panel">
+ <scroll-view class="content">
+ <view v-if="currentTab === 7" class="tab-content">
<view class="content">
- <!--<view>
+ <view class="top-right">
+ <button class="refresh-btn" @click="refresh">鍒锋柊</button>
+ </view>
+ <view>
<h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
- </view>-->
+ </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" />
+ <input v-model="machineName"
+ disabled="true"
+ type="text"
+ class="machine-name-box" />
</view>
</view>
<view class="form-row">
<view>
<label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px;">绗竴姝ラ�夋嫨宸ュ崟:</label>
- <button class="btn btn--primary choose-order-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
+ <button class="print-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
</view>
</view>
</view>
<!-- <!– 涓儴锛氳繍琛岀姸鎬�-->
<view class="section card">
- <uni-table class="table" border stripe emptyText="鏆傛棤鏇村鏁版嵁" @selection-change="selectionChange">
- <uni-tr class="table__head">
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">宸ュ簭</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">宸ュ崟鍙�/uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">瑙勬牸</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">閫夋嫨</uni-th>
+ <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-tr>
- <uni-tr class="table__row" v-for="(item, index) in isShowTableData" :key="index">
- <uni-td align="center" class="table__cell">
+ <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" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa001" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa001" /><!--宸ュ崟鍙�-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa002" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa002" /><!--浜у搧缂栫爜-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa003" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa004" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa011" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" />
+ <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" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa018" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.staffName" />
+ <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 type="default" @click="toDetail(item)">
+ <button class="select-btn" type="default" @click="toDetail(item)">
閫夋嫨
</button>
</view>
@@ -139,50 +131,59 @@
<view>
<!--<text style="color: red;">
- 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
- 濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
- </text>-->
+ 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
+ 濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
+ </text>-->
</view>
</view>
</view>
- <view v-if="currentTab === 0" class="tab-content content-panel">
+ <view v-if="currentTab === 0" class="tab-content">
<WorkOrder :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo"
:deviceNumber="machineName" />
</view>
- <view v-if="currentTab === 1" class="tab-content content-panel">
+ <view v-if="currentTab === 1" class="tab-content">
+ <!-- <!– 璋冪敤 WorkOrderStatus 缁勪欢 –>-->
<WorkOrderStatus :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 2" class="tab-content content-panel">
+ <view v-if="currentTab === 2" class="tab-content">
+ <!-- <!– 璋冪敤 mold 缁勪欢 –>-->
<mold :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 3" class="tab-content content-panel">
+ <view v-if="currentTab === 3" class="tab-content">
+ <!-- <!– 璋冪敤 mold 缁勪欢 –>-->
<machine :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 4" class="tab-content content-panel">
+ <view v-if="currentTab === 4" class="tab-content">
+ <!-- 璋冪敤 mold 缁勪欢 -->
<WorkOrderPrint :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 8" class="tab-content content-panel">
+ <view v-if="currentTab === 8" class="tab-content">
+ <!-- 璋冪敤 mold 缁勪欢 -->
<PrintInit :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 5" class="tab-content content-panel">
+ <view v-if="currentTab === 5" class="tab-content">
<PDFShow :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 6" class="tab-content content-panel">
+ <view v-if="currentTab === 6" class="tab-content">
<Technology :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 9" class="tab-content content-panel">
+ <view v-if="currentTab === 9" class="tab-content">
+ <!-- 璁惧鐐规瑙嗗浘 -->
<EquipmentInspection :machineNo="machineNo" />
</view>
</scroll-view>
+
+ <!-- 寮圭獥涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵�� -->
<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;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</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>
@@ -191,53 +192,58 @@
<view class="section card">
<uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
- @selection-change="selectionChange">
- <uni-tr class="table__head">
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">宸ュ簭</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">宸ュ崟鍙�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">瑙勬牸</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
+ class="large-selection-table" @selection-change="selectionChange">
+ <uni-tr>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">宸ュ簭</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: 260px;">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">瑙勬牸</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸茬敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">鏈敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">娲惧伐鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸ュ崟鏁伴噺</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 class="table__row" v-for="(item, index) in tableData" :key="index">
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.procName" />
+ <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" class="table__cell">
+ <uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa001" />
</uni-td>
- <uni-td align="center" class="table__cell">
+ <uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa002" />
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa003" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa004" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa011" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" />
+ <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" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa018" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.staffName" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
</uni-td>
</uni-tr>
</uni-table>
@@ -256,7 +262,7 @@
</template>
<script>
-import WorkOrderStatus from '../components/WorkOrderStatus.vue';
+import WorkOrderStatus from '../components/WorkOrderStatus.vue'; // 纭繚璺緞姝ｇ‘
import UniTable from "../uni_modules/uni-table/components/uni-table/uni-table.vue";
import Mold from "../components/mold.vue";
import Machine from "../components/machine.vue";
@@ -338,6 +344,9 @@
this.refresh();
},
methods: {
+ onRowClick(index) {
+ this.selectedIndexs = [index]; // 鍗曢��
+ },
checkForUpdate() {
this.$post({
url: "/DevMachine/getAppUpgradeInfo",
@@ -406,7 +415,7 @@
this.getWomdaaIsShow();
},
getPrintInfo() {
- var mac = "ac:f4:2c:20:0d:b4";
+ var mac = "";
mac = "74:24:ca:4f:b7:9b";
this.$post({
@@ -426,6 +435,7 @@
this.getWomdaaIsShow();
});
+ return;
if (plus.os.name == "Android") {
@@ -551,28 +561,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'); // 鑾峰彇鏈堜唤骞惰ˉ闆�
@@ -628,22 +648,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 +688,14 @@
this.isShow = true;
// 榛樿閫変腑鈥滃緟寮�宸モ��
- this.engineeringNo = '寰呭紑宸�';
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
this.tableData = [];
- // 涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵��
- this.engineeringNoMapList = ['寰呭紑宸�', '鏈紑宸�', '寮�宸�', '鏆傚仠', '瀹屽伐'];
+ // 涓嬫媺妗嗗彧鏄剧ず鍚堝苟鍚庣殑鐘舵�佸拰鍏跺畠鐘舵��
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
// 榛樿鏄剧ず鈥滃緟寮�宸モ�濆伐鍗�
this.getWomdaaByStatus();
},
@@ -686,11 +721,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 +751,19 @@
</script>
<style lang="scss">
+
+ :deep(.checkbox),
+ :deep(.checkbox__inner) {
+ padding: 10px !important;
+ width: 44px !important;
+ min-width: 44px !important;
+ box-sizing: border-box;
+ }
+
+ .row-selected {
+ background-color: #e0f3ff !important;
+ }
+
.font {
background-color: #666666;
height: 30px;
@@ -834,67 +888,49 @@
flex-direction: column;
}
- /* 椤堕儴鏈哄彴淇℃伅鑳跺泭 */
- .device-chip {
+ .tab-bar {
display: flex;
- flex-direction: column;
- justify-content: center;
- min-width: 180px;
- padding: 8px 16px;
- border-radius: 12px;
- background: rgba(30, 58, 95, 0.12);
- border: 1px solid rgba(30, 58, 95, 0.35);
- color: #1e3a5f;
+ justify-content: space-around;
+ background-color: #f5f5f5;
+ padding: 1vh;
+ padding-top: 30px;
+ border-bottom: 1px solid #ccc;
}
- .device-chip__label {
- font-size: 12px;
- letter-spacing: 0.08em;
- color: rgba(27, 36, 51, 0.65);
+ .top-right {
+ position: absolute;
+ top: 10px;
+ right: 50px;
+ z-index: 1000;
}
- .device-chip__value {
- font-size: 18px;
- font-weight: 600;
+ .refresh-btn {
+ padding: 10px;
+ background-color: #00A2E9;
+ color: white;
+ border: none;
+ font-size: 1.5vw;
+ border-radius: 5px;
}
- /* 椤堕儴瀵艰埅鏍囩 */
- .tab-strip {
- display: flex;
- flex-wrap: wrap;
- gap: 16px;
- margin: 24px 0;
- padding: 16px;
- background: rgba(255, 255, 255, 0.9);
- border-radius: 16px;
- border: 1px solid rgba(30, 58, 95, 0.12);
- box-shadow: 0 20px 50px rgba(15, 34, 58, 0.12);
- }
-
- .tab-strip__item {
+ .tab-item {
flex: 1;
- min-width: 140px;
text-align: center;
- padding: 16px 12px;
- border-radius: 12px;
- background: rgba(30, 58, 95, 0.05);
- color: #1e3a5f;
+ margin-right: 0.5vw;
+ padding: 1vh;
+ border-radius: 0.5vw;
+ background-color: #fff;
+ color: #007aff;
cursor: pointer;
- font-size: 18px;
- font-weight: 600;
- letter-spacing: 0.04em;
- transition: all 0.2s ease;
+ font-size: 1.8vw;
+ /* Increased font size */
+ transition: background-color 0.3s, color 0.3s;
}
- .tab-strip__item:hover {
- background: rgba(27, 127, 233, 0.1);
- box-shadow: inset 0 0 0 1px rgba(27, 127, 233, 0.4);
- }
-
- .tab-strip__item--active {
- background: linear-gradient(135deg, #1e3a5f 0%, #0f223a 100%);
+ .tab-item.active {
+ background-color: #007aff;
color: #fff;
- box-shadow: 0 12px 35px rgba(15, 34, 58, 0.35);
+ font-weight: bold;
}
.content {
@@ -905,16 +941,21 @@
/* Increased font size for content */
}
- .picker {
- float: left;
- margin-top: 7px;
- margin-left: 10px;
- text-align: center;
- font-size: 100%;
- padding: 5.5px 1px;
- background-color: #f8f8f8;
- border: 2px solid #ccc;
- }
+ .picker {
+ float: left;
+ margin-top: 7px;
+ margin-left: 10px;
+ text-align: center;
+ font-size: 32px !important; // 寮哄埗澶у瓧浣擄紝閫傞厤浣庡瘑搴�
+ min-height: 60px; // 璁╅�夋嫨妗嗛珮搴︿篃鍙樺ぇ
+ line-height: 60px;
+ padding: 5.5px 1px;
+ background-color: #fff; // 杩欓噷鏀逛负钃濊壊
+ border: 2px solid #007aff; // 杈规涔熸敼涓鸿摑鑹�
+ color: #007aff; // 瀛椾綋棰滆壊鏀逛负鐧借壊锛屼繚璇佸彲璇绘��
+ border-radius: 6px;
+ transition: background 0.2s;
+ }
.th {
background-color: lightskyblue;
@@ -972,12 +1013,39 @@
/* Increased font size within popups */
}
- .choose-order-btn {
- margin-left: 12px;
+ .print-btn {
+ float: left;
+ margin-top: 4px;
+ margin-left: 10px;
+ text-align: center;
+ font-size: 100%;
+ color: black;
+ padding: 0px 90px;
+ border: 2px solid #ccc;
+ cursor: pointer;
+ border-radius: 0.8vw;
}
+ .machine-name-box {
+ border: 2px solid #e53935; /* 绾㈣壊杈规 */
+ border-radius: 8px;
+ font-family: fantasy;
+ font-size: 33px;
+ margin-top: 20px;
+ padding: 15px 48px; /* 涓婁笅20px锛屽乏鍙�48px锛屽鍔犲唴杈硅窛 */
+ width: 500px; /* 鏇村锛屼繚璇佸唴瀹瑰畬鏁存樉绀� */
+ height: 70px; /* 澧炲姞楂樺害 */
+ box-sizing: border-box;
+ background: #fff;
+ color: #222;
+ font-weight: bold;
+ text-align: left;
+ display: block;
+ }
+
+
@media screen and (max-width: 1920px) {
- .tab-strip__item {
+ .tab-item {
font-size: 1.6vw;
}
@@ -990,6 +1058,14 @@
font-size: 1.6vw;
}
}
+
+ .uni-td, .uni-th, td, th {
+ word-break: break-all;
+ white-space: normal;
+ /* 鍙�夛細璁剧疆鏈�澶у搴︼紝闃叉鎾戠牬琛ㄦ牸 */
+ max-width: 180px;
+ overflow-wrap: break-word;
+ }
/* 閽堝1280x800鐨勫钩鏉夸娇鐢ㄥ獟浣撴煡璇㈣繘琛岄�傞厤 */
@media screen and (min-width: 1280px) and (max-width: 1920px) {
@@ -1016,4 +1092,17 @@
font-size: 20px;
}
}
+
+ .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