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/shengchanbuliao/form.vue |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pages/shengchanbuliao/form.vue b/pages/shengchanbuliao/form.vue
index 849d1a3..13f377c 100644
--- a/pages/shengchanbuliao/form.vue
+++ b/pages/shengchanbuliao/form.vue
@@ -103,6 +103,9 @@
                     <view class="righton">
                         <input name="HBillNo" disabled v-model="hform.HBillNo" />
                     </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="qrCodeDisplay"></uni-icons>
+                    </view>
                 </view>
                 <view class="form-item">
                     <view class="title">鍗曟嵁ID:</view>
@@ -174,6 +177,9 @@
                             <view class="detail" v-if="item.杈呭姪灞炴��">
                                 <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
                             </view>
+							<view class="detail" v-if="item.娆惧彿">
+								<text>娆惧彿锛�</text>{{item.娆惧彿}}
+							</view>
                         </view>
                     </uni-card>
                 </view>
@@ -278,6 +284,7 @@
         </view>
         <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
             :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
     </view>
 </template>
 <script>
@@ -286,6 +293,7 @@
         getUserInfo
     } from "@/utils/auth.js";
     import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
     import { getUserStockRelation } from '../../utils/userRelationManager';
 	export default {
         data() {
@@ -375,7 +383,7 @@
             }
         },
         components: {
-            BillListPopupVue
+            BillListPopupVue, BarCodePopupVue
         },
         onLoad(e) {
             console.log(e, this.userInfo)
@@ -406,6 +414,18 @@
             uni.$off('BillSelectComplete')
         },
         methods: {
+            async qrCodeDisplay() {
+                try {
+                    this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
+                    await this.$nextTick()
+                    this.$refs.barcodePopup.open()
+                }catch(err) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err
+                    })
+                }
+            },
 			async getRelationStore() {
 				let {
 					data,
@@ -1361,9 +1381,9 @@
                                                 })
                                             } else if (res.cancel) {
                                                 console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                                setTimeout(() => {
-                                                    uni.navigateBack();
-                                                }, 500)
+                                                // setTimeout(() => {
+                                                //     uni.navigateBack();
+                                                // }, 500)
                                             }
                                         }
                                     });
@@ -1456,7 +1476,8 @@
 
         .title {
             width: 208rpx;
-
+            flex-shrink: 0;
+            
             text {
                 color: red;
                 font-weight: bold;
@@ -1507,6 +1528,7 @@
             display: flex;
             justify-content: center;
             align-items: center;
+            flex-shrink: 0;
 
             .uni-icons {
                 color: #fff !important;

--
Gitblit v1.9.1