优化

pages/login/login.scss

@@ -4,6 +4,7 @@
 	background: url('../../static/u5.png') no-repeat top center ;
 	background-size: 140%;
 	box-sizing: border-box;
+	overflow: hidden;
 }
 
 .setting{
@@ -16,12 +17,27 @@
 	// height: 100%;
 	  
 }
+
+.login_logo{
+   margin-top: 280rpx;
+   text-align: center;
+	image{
+		    width: 280rpx;
+		   	 height: 280rpx;
+	}
+
+
+	
+}
+
 .login-title{
 	position: absolute;
 	bottom: 40%;
 	width: 100%;
 	text-align: center;
 }
+
+
 .login-title label{
 	display: block;
 	color: #fff;

pages/login/login.vue

@@ -1,10 +1,15 @@
 <template>
 	<view class="content">
 		<uni-icons class="setting" type="gear" @click="handleServerSettings" size="50" color="#fff"></uni-icons>
+	  <view class="login_logo">
+	
+		  	<image  :src="logo || 'https://img.picgo.net/2024/04/18/login_logo45cb6a5eb95c8c1c.png'"></image>
+	  </view>
 		<view class="login-title">
+			
 			<label>智慧工厂信息化系统</label>
 
-			<text>{{ gstitle}}</text>
+			<text>{{ companyName}}</text>
 
 
 		</view>
@@ -71,7 +76,8 @@
 				isMemo: isMemo(),
 				loginDisabled: false,
 				
-				gstitle: null,
+				companyName: null,
+				 logo: null,
 			};
 		},
 		onLoad() {
@@ -97,7 +103,8 @@
 
 			getUsName() {
 				usName().then(res => {
-					this.gstitle = res
+					this.companyName = res.companyName
+					this.logo = res.logo
 				})
 			},
 			setServerStatus(val) {

pages/pda/sample/components/sampleBom.vue

@@ -264,11 +264,36 @@
 			save() {
 				this.show = false
 				if (this.selectType) {
-					this.item.sampleList.push({
-						selectType: this.selectType,
-						num: null,
-						warehouseId: null
-					})
+					 
+					 if(this.selectType == 1) {
+						 
+						 let isFals =  this.item.sampleList.some(m => m.selectType == 1)
+						 if(isFals) {
+						 	uni.showToast({
+						 		icon: 'none',
+						 		title: '已经存在回用类型'
+						 	})
+						 	return false
+						 } else {
+							 this.item.sampleList.push({
+							 	selectType: this.selectType,
+							 	num: null,
+							 	warehouseId: null
+							 }) 
+						 }
+						 
+						 
+					 } else {
+						this.item.sampleList.push({
+							selectType: this.selectType,
+							num: null,
+							warehouseId: null
+						}) 
+					 }
+					
+			
+					
+			
 				} else {
 					uni.showToast({
 						icon: 'none',