From 46cc7a29dc1f9b3dffee5cdcb9b7f9dfdac3b16d Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 05 九月 2025 20:44:14 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/qitaruku_v2/table.vue |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pages/qitaruku_v2/table.vue b/pages/qitaruku_v2/table.vue
index e630fda..e5b5e67 100644
--- a/pages/qitaruku_v2/table.vue
+++ b/pages/qitaruku_v2/table.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="tabs">
 			<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
-			<view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view>
 		</view>
 		
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
@@ -66,6 +66,9 @@
 		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
 			<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
 				<view class="card-detail">
+					<view class="detail" v-if="item.鐘舵��">
+						<text>鐘舵�侊細</text>{{item.鐘舵�亇}
+					</view>
 					<view class="detail" v-if="item.鍒跺崟浜�">
 						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
 					</view>
@@ -90,6 +93,9 @@
 				</view>
 		
 				<view class="more">
+                    <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+                        <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+                    </view>
 					<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
 						<uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
 					</view>
@@ -100,12 +106,14 @@
 		<view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
 		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
 		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
-	</view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
 </template>
 
 <script>
 	import { getUserInfo } from "@/utils/auth.js";
-	export default {
+	import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    export default {
 	    data() {
 	        return {
 				userInfo:getUserInfo(),
@@ -128,6 +136,7 @@
 				page:1,
 	        }
 	    },
+        components: {BarCodePopupVue},
 		onShow() {
 			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
 			this.CheckModRight()
@@ -147,6 +156,11 @@
 			}, 1000);
 		},
 	    methods: {
+            async qrCodeDisplay(item) {
+               this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+               await this.$nextTick()
+               this.$refs.barcodePopup.open()
+            },
 			CheckModRight(){
 				uni.request({
 				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',

--
Gitblit v1.9.1