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

wtt

2025-11-10 f04e5eb9331d896d383d855ccb2d232923cf37de

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

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.0.9",
    "versionCode" : 209,
    "versionName" : "2.0.12",
    "versionCode" : 212,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/MJGL/shangmudan/table.vue

@@ -476,6 +476,7 @@
            width: 450rpx;
            border-radius: 22rpx;
            border: 1px solid #acacac;
            position: relative;
        }

        .righton {

 pages/MJGL/xiamodan/table.vue

@@ -407,6 +407,7 @@
            width: 450rpx;
            border-radius: 22rpx;
            border: 1px solid #acacac;
            position: relative;
        }

        .righton {

 pages/zhuangxiangdan/form.vue

@@ -24,7 +24,7 @@
                <view class="right-icon">
                    <uni-icons class="right-icon" :class="[disableBarCode ? 'disabled':'']" type="scan"
                        style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
                        @click="toScanCode" :disabled="disableBarCode"></uni-icons>
                        @click="toScanCode2" :disabled="disableBarCode"></uni-icons>
                </view>
            </view>
            <view class="form-item">
@@ -45,7 +45,7 @@
            <view class="bill-info">
                <view class="form-item">
                    <view class="title">源单类型:</view>
                    <view class="right" v-show="showHMainSourceBillType">
                    <view class="right" v-show="showHMainSourceBillType" style='position: relative;'>
                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillTypeIndex"
                            @change="HMainSourceBillTypeChange">
                            <input name="HMainSourceBillType" disabled :value="HMainSourceBillType"
@@ -145,6 +145,7 @@
        <!-- 弹窗组件 -->
        <BillListPopupVue ref="billList" :HBillType="HBillType" :HSourceBillType="hform.HMainSourceBillType || 3710"
            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
			
    </view>
</template>
<script>
@@ -360,7 +361,7 @@
                })
            },

            // 扫描产品码
            // 扫描产品码s
            toScanCode2() {
                MpaasScan.scanCode((scanCode) => {
                    this.HBarCode = scanCode
@@ -896,7 +897,9 @@
            //this.HBarCodePackFocusRefresh()
            uni.$on('BillSelectComplete', (e) => {
                console.log("接收到的源单: ", e.HBillNo)
                this.getSourceBarCodeData(e.HBillNo)
                // 获取源单状态
                this.getSourceBarCodeControl(e.HBillNo)
                //this.getSourceBarCodeData(e.HBillNo)
                this.$refs.billList.exit()
            })
        },