From 46f36432517b2e6dbfd3626cb38761881ffae8bd Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 27 一月 2026 09:33:28 +0800
Subject: [PATCH] Merge branches 'Dev' and 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 153 ++++++++++++++++++++++++++++++--------------------
1 files changed, 91 insertions(+), 62 deletions(-)
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index 215a9d3..5a86d62 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -274,7 +274,7 @@
@tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
</view>
<!-- 瀛愯〃鍐呭 -->
- <view class="bill-main-contents">
+ <view class="bill-sub-content">
<!-- 妫�楠岄」鐩� 鍛堢幇 -->
<view v-if="subTabSelected == 1">
<!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
@@ -2265,8 +2265,23 @@
});
}
},
+ // 璁剧疆涓鸿嚜鍔�
+ setAuto() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.unlockOrientation();
+ }
+ },
+ // 璁剧疆涓虹珫灞�
+ setPortrait() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.lockOrientation('portrait');
+ }
+ },
},
async onLoad(e) {
+ this.setAuto();
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
console.log(this.hform.HFirstCheckEmp)
@@ -2281,6 +2296,9 @@
await this.InitHEmp();
await this.loadCache();
},
+ onUnload(){
+ this.setPortrait();
+ }
};
</script>
@@ -2323,62 +2341,68 @@
}
}
- .bill-main-content,
- .bill-sub-content {
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
- display: flex;
- flex-direction: column;
-
- .form-item {
- width: 100%;
- display: flex;
- align-items: center;
- font-size: 26rpx;
- padding: 6rpx 0;
-
- .left {
- width: 208rpx;
-
- text {
- color: red;
- font-weight: bold;
- }
- }
-
- .right {
- // width: 450rpx;
- padding: 8rpx 20rpx;
- font-size: 26rpx;
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
-
- .uni-combox {
- padding: 0;
- height: auto;
-
- .uni-input-placeholder,
- .uni-input-input {
- font-size: 26rpx;
- }
- }
-
- .uni-combox::v-deep input {
- height: inherit;
- font-size: 26rpx;
- }
- }
-
- .disabled {
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
-
- .none-border {
- border: none;
- }
- }
+ .bill-main-content{
+ box-sizing: border-box;
+ padding: 0 30rpx 0 30rpx;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap; /* 瓒呭嚭鑷姩鎹㈣ */
+ /* 鍙�夛細璁剧疆鎹㈣鍚庣殑瀵归綈鏂瑰紡 */
+ align-content: flex-start; /* 澶氳瀵归綈鏂瑰紡 */
+ .form-item {
+ width: 600rpx;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
+ margin-right: 20rpx;
+ .left {
+ width: 208rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ // width: 450rpx;
+ padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+
+ .uni-combox {
+ padding: 0;
+ height: auto;
+
+ .uni-input-placeholder,
+ .uni-input-input {
+ font-size: 26rpx;
+ }
+ }
+
+ .uni-combox::v-deep input {
+ height: inherit;
+ font-size: 26rpx;
+ }
+ }
+ .right-select {
+ //padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+
+ }
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ .none-border {
+ border: none;
+ }
+ }
}
.bottom-btn {
@@ -2456,12 +2480,17 @@
color: #fff;
}
}
-
+ ::v-deep .uni-card {
+ flex: 500rpx;
+ }
.list {
width: 100%;
-
+ display: flex; /* 娣诲姞flex甯冨眬 */
+ flex-wrap: wrap; /* 鍏佽鎹㈣ */
+ gap: 20rpx; /* 璁剧疆鍗＄墖闂磋窛 */
+
.card-detail {
- width: 100%;
+ width: 500rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
@@ -2469,7 +2498,7 @@
line-height: 120%;
padding: 20rpx 10rpx;
gap: 10rpx 0;
-
+
input {
font-size: 26rpx;
}
@@ -2505,7 +2534,7 @@
}
}
}
-
+
.icon-wrapper {
background-color: #3a78ff;
border-radius: 100%;
--
Gitblit v1.9.1