From f04e5eb9331d896d383d855ccb2d232923cf37de Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 10 十一月 2025 16:11:57 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
manifest.json | 4 ++--
pages/MJGL/xiamodan/table.vue | 1 +
pages/MJGL/shangmudan/table.vue | 1 +
pages/zhuangxiangdan/form.vue | 11 +++++++----
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/manifest.json b/manifest.json
index 46f764f..53123f8 100644
--- a/manifest.json
+++ b/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" : {
diff --git a/pages/MJGL/shangmudan/table.vue b/pages/MJGL/shangmudan/table.vue
index 6997398..d90c952 100644
--- a/pages/MJGL/shangmudan/table.vue
+++ b/pages/MJGL/shangmudan/table.vue
@@ -476,6 +476,7 @@
width: 450rpx;
border-radius: 22rpx;
border: 1px solid #acacac;
+ position: relative;
}
.righton {
diff --git a/pages/MJGL/xiamodan/table.vue b/pages/MJGL/xiamodan/table.vue
index a3a8cc6..1d17ddb 100644
--- a/pages/MJGL/xiamodan/table.vue
+++ b/pages/MJGL/xiamodan/table.vue
@@ -407,6 +407,7 @@
width: 450rpx;
border-radius: 22rpx;
border: 1px solid #acacac;
+ position: relative;
}
.righton {
diff --git a/pages/zhuangxiangdan/form.vue b/pages/zhuangxiangdan/form.vue
index 7513d27..101667e 100644
--- a/pages/zhuangxiangdan/form.vue
+++ b/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 @@
})
},
- // 鎵弿浜у搧鐮�
+ // 鎵弿浜у搧鐮乻
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()
})
},
--
Gitblit v1.9.1