Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

zrg

2025-09-05 46cc7a29dc1f9b3dffee5cdcb9b7f9dfdac3b16d

 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;