From 034093edb928c798057262156a09531718aa0604 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 26 一月 2026 17:03:59 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/EmployeeRecords/EmployeeRecordsBill.vue | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 154 insertions(+), 10 deletions(-)
diff --git a/pages/EmployeeRecords/EmployeeRecordsBill.vue b/pages/EmployeeRecords/EmployeeRecordsBill.vue
index cd8a79f..a962dca 100644
--- a/pages/EmployeeRecords/EmployeeRecordsBill.vue
+++ b/pages/EmployeeRecords/EmployeeRecordsBill.vue
@@ -84,12 +84,47 @@
<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
</view>
<!-- 瑁呯淇℃伅 -->
- <view v-if="tabs == 1">
- <zb-table id="list-table" :checked-highlight="true" :fit="true" :style="{height: `${listTableHeight}px`}"
- :columns="columns" :data="listData" :show-header="true" :border="true" :row-key="row => row.index"
- @toggleRowSelection="handleSelect" @toggleAllSelection="handleSelectAll"
- @rowClick="onTableRowClickHandler" />
- </view>
+ <view v-if="tabs == 1" class="work-order-cards">
+ <view v-for="(item, index) in listData" :key="item.index" class="work-order-card">
+ <view class="card-header">
+ <text class="card-title">宸ュ崟淇℃伅 {{ index + 1 }}</text>
+ <checkbox :checked="item.checked" style="transform:scale(0.8)" color="#3A78FF"
+ @change="onCardCheckChange(item, index)" />
+ </view>
+ <view class="card-content">
+ <view class="card-row">
+ <text class="card-label">娴佽浆鍗″彿锛�</text>
+ <text class="card-value">{{ item['娴佽浆鍗″彿'] || '-' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">鐗╂枡浠ｇ爜锛�</text>
+ <text class="card-value">{{ item['鐗╂枡浠ｇ爜'] || '-' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">鐗╂枡鍚嶇О锛�</text>
+ <text class="card-value">{{ item['鐗╂枡鍚嶇О'] || '-' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">瑙勬牸鍨嬪彿锛�</text>
+ <text class="card-value">{{ item['瑙勬牸鍨嬪彿'] || '-' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">鏁伴噺锛�</text>
+ <text class="card-value">{{ item['鏁伴噺'] || '0' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">鐢熶骇璧勬簮锛�</text>
+ <text class="card-value">{{ item['鐢熶骇璧勬簮'] || '-' }}</text>
+ </view>
+ </view>
+ </view>
+
+ <view v-if="listData.length === 0" class="empty-card">
+ <uni-icons type="info" size="30" color="#999"></uni-icons>
+ <text class="empty-text">鏆傛棤宸ュ崟淇℃伅</text>
+ <text class="empty-tip">璇峰厛鎵弿鏉＄爜鑾峰彇宸ュ崟淇℃伅</text>
+ </view>
+ </view>
<view v-if="tabs == 0" class="machine-info-container">
<view class="form-item" v-if="false">
<view class="title">璁惧ID:</view>
@@ -282,7 +317,8 @@
arrayHProcName: [], //宸ュ簭
HProcNameList: [],
-
+ maskShow:false,
+ printInfo:false,
EnableScanBarCodePack: true,
EnableSubmit: true,
HBarCodePackFocus: false,
@@ -434,6 +470,18 @@
}
},
methods: {
+ onCardCheckChange(item, index) {
+ item.checked = !item.checked;
+ if (item.checked) {
+ this.selectedRows.push(item);
+ } else {
+ const idx = this.selectedRows.findIndex(row => row.index === item.index);
+ if (idx > -1) {
+ this.selectedRows.splice(idx, 1);
+ }
+ }
+ console.log('褰撳墠閫変腑鐨勮:', this.selectedRows);
+ },
onTableRowClickHandler(row, index) {
console.log('row: ', row);
if (!this.listData[index].checked) {
@@ -760,7 +808,6 @@
})
},
GetMeesageByBarCode(HBarCode) {
-
let sBarCode = this.HBarCode
if (!sBarCode) {
return uni.showToast({
@@ -790,6 +837,7 @@
this.hform.HMouldNo = data[0][0].妯″叿缂栫爜
this.hform.HMouldName = data[0][0].妯″叿鍚嶇О
this.hform.HMouldState = data[0][0].妯″叿鐘舵��
+
this.listData = []
let tabledata = data[1][0]
if (data[1].length > 0) {
@@ -802,11 +850,23 @@
}))
}
}
-
-
+ if(data[0][0].妯″叿id===0 && data[0][0].妯″叿缂栫爜===""&& data[0][0].妯″叿鍚嶇О===""&&data[1].length<=0)
+ {
+ CommonUtils.playSound(0)
+ this.listData = []
+
+ this.HBarCodeFocusRefresh()
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ return;
+ }
+
} else {
CommonUtils.playSound(0)
this.listData = []
+
this.HBarCodeFocusRefresh()
uni.showToast({
icon: 'none',
@@ -1493,4 +1553,88 @@
}
}
}
+ .work-order-cards {
+ padding: 30rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+
+ .work-order-card {
+ background: #fff;
+ border-radius: 16rpx;
+ padding: 24rpx;
+ box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
+ border: 1px solid #e8e8e8;
+
+ .card-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding-bottom: 20rpx;
+ border-bottom: 1px solid #f0f0f0;
+ margin-bottom: 20rpx;
+
+ .card-title {
+ font-size: 32rpx;
+ font-weight: bold;
+ color: #333;
+ }
+ }
+
+ .card-content {
+ .card-row {
+ display: flex;
+ align-items: center;
+ padding: 12rpx 0;
+ border-bottom: 1px dashed #f5f5f5;
+
+ &:last-child {
+ border-bottom: none;
+ }
+
+ .card-label {
+ width: 160rpx;
+ font-size: 28rpx;
+ color: #666;
+ flex-shrink: 0;
+ }
+
+ .card-value {
+ flex: 1;
+ font-size: 28rpx;
+ color: #333;
+ word-break: break-all;
+ }
+ }
+ }
+
+ &:hover {
+ box-shadow: 0 4rpx 16rpx rgba(58, 120, 255, 0.15);
+ border-color: #3a78ff;
+ }
+ }
+
+ .empty-card {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 80rpx 30rpx;
+ background: #f8f9fa;
+ border-radius: 16rpx;
+ border: 2rpx dashed #dcdfe6;
+
+ .empty-text {
+ font-size: 30rpx;
+ color: #999;
+ margin-top: 20rpx;
+ margin-bottom: 10rpx;
+ }
+
+ .empty-tip {
+ font-size: 26rpx;
+ color: #ccc;
+ }
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1