From 423c1948a631cff298e6348cc55626f5149c111a Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 26 二月 2026 13:10:19 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index fad9bf8..e2a006c 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -256,7 +256,7 @@
<view >
<view>{{ item.涓嶈壇鍘熷洜浠ｇ爜 }}</view>
<view>{{ item.涓嶈壇鍘熷洜鍚嶇О }}</view>
- <view>姹囨姤鎬绘暟:{{ item.num }}</view>
+ <view style="color:brown;">姹囨姤鎬绘暟:{{ item.num }}</view>
</view>
</view>
</view>
@@ -737,7 +737,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 绂佺敤鏍囪 = '' order by 閮ㄩ棬浠ｇ爜`,
+ sWhere: ` and 绂佺敤鏍囪 = '' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
@@ -1045,9 +1045,24 @@
goBack() {
uni.navigateBack();
},
+ // 璁剧疆涓鸿嚜鍔�
+ 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;
if (this.operationType == 1) {
@@ -1061,13 +1076,16 @@
await this.InitHGroup();
await this.loadCache();
},
+ onUnload(){
+ this.setPortrait();
+ }
};
</script>
<style lang="scss" scoped>
input {
width: inherit;
- font-size: 26rpx;
+ font-size: 30rpx;
}
.uni-input {
@@ -1090,7 +1108,7 @@
view {
width: auto;
- font-size: 26rpx;
+ font-size: 30rpx;
color: #555;
text-align: center;
padding: 16rpx 0;
@@ -1113,10 +1131,10 @@
/* 鍙�夛細璁剧疆鎹㈣鍚庣殑瀵归綈鏂瑰紡 */
align-content: flex-start; /* 澶氳瀵归綈鏂瑰紡 */
.form-item {
- width: 600rpx;
+ width: 650rpx;
display: flex;
align-items: center;
- font-size: 26rpx;
+ font-size: 30rpx;
padding: 6rpx 0;
margin-right: 20rpx;
.left {
@@ -1131,7 +1149,7 @@
.right {
// width: 450rpx;
padding: 8rpx 20rpx;
- font-size: 26rpx;
+ font-size: 30rpx;
flex: 1;
border-radius: 22rpx;
border: 1px solid #acacac;
@@ -1142,18 +1160,18 @@
.uni-input-placeholder,
.uni-input-input {
- font-size: 26rpx;
+ font-size: 30rpx;
}
}
.uni-combox::v-deep input {
height: inherit;
- font-size: 26rpx;
+ font-size: 30rpx;
}
}
.right-select {
//padding: 8rpx 20rpx;
- font-size: 26rpx;
+ font-size: 30rpx;
flex: 1;
}
@@ -1225,7 +1243,7 @@
width: 180rpx;
height: 66rpx;
line-height: 66rpx;
- font-size: 26rpx;
+ font-size: 30rpx;
}
.btn-a {
@@ -1257,19 +1275,19 @@
gap: 10rpx 0;
input {
- font-size: 26rpx;
+ font-size: 30rpx;
}
.detail {
// width: 50%;
box-sizing: border-box;
- font-size: 26rpx;
+ font-size: 30rpx;
color: #555;
padding-right: 20rpx;
-
+
text {
color: #999;
- font-size: 26rpx;
+ font-size: 30rpx;
}
}
@@ -1377,18 +1395,20 @@
.reason-item-flex {
/* 鏂瑰潡鍩虹鏍峰紡 */
- background-color: #f5f5f5;
+ background-color: #55ffff;
border-radius: 8px;
padding: 12px 16px;
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
transition: all 0.3s ease;
-
+ border-width: 2px; /* 杈规瀹藉害 */
+ border-style: solid; /* 杈规鏍峰紡 */
+ border-color: #333; /* 杈规棰滆壊 */
/* 鏂囧瓧鏍峰紡 */
- font-size: 14px;
+ font-size: 30rpx;
color: #333;
text-align: center;
- width: 300rpx;
+ width: 350rpx;
/* 纭繚鍐呭涓嶆崲琛屾椂灞呬腑 */
display: flex;
@@ -1400,6 +1420,7 @@
0% {
transform: scale(1);
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+ border-color: #0000ff; /* 杈规棰滆壊 */
}
50% {
transform: scale(0.95);
--
Gitblit v1.9.1