Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

src/api/request2.js

@@ -19,7 +19,7 @@ export function getCaptchaImage(params) {
  */
 export function login(username, password, code, uuid, tenantName) {
 	return request({
-		url: baseApi + '/system/auth/login',
+		url: baseApi + '/system/auth/loginNoCode',
 		headers: {
 			isToken: false
 		},

src/pages/index/index.vue

@@ -388,7 +388,7 @@
 					console.log("包装规格获取失败", res)
 				})
 				
-				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
+				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
 
 				getSwitchByCode(switchCode).then(res=>{
 					uni.setStorageSync("switch", res.data)

src/pages/login/index.vue

@@ -65,13 +65,13 @@
 						</view>
 
 					</view>
-					<view style="display: flex;flex-direction: row;">
+					<view style="display: flex;flex-direction: row;" v-if="needCode">
 						<!-- <view class="uni-input">
 							<input class="" placeholder="请输入验证码"
 							v-model="code"
 								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
 						</view> -->
-						<view class="uni-input-wrapper">
+						<view class="uni-input-wrapper" >
 							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;"
 								placeholder="请输入验证码" type="number" v-model="code" />
 						</view>
@@ -119,7 +119,8 @@
 				imageSrc: "",
 				code: "",
 				uuid: "",
-				version: ""
+				version: "",
+				needCode:false
 			}
 		},
 		// computed: mapState(['forcedLogin', 'hasLogin']),
@@ -185,13 +186,15 @@
 						icon: 'none',
 						mask: true
 					})
-				} else if (this.code === '') {
+				} 
+				else if (this.needCode&&this.code === '') {
 					uni.showToast({
 						title: '验证码不能为空',
 						icon: 'none',
 						mask: true
 					})
-				} else {
+				} 
+				else {
 					// console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg)
 					let logininfo = {
 						username: "",

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -86,6 +86,7 @@
 		goHome,
 		navigateBack,
 		getPackingNumberAndBatch,
+		getSwitchInfoByCode
 	} from '@/common/basic.js';
 
 	import {
@@ -340,12 +341,15 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
+				var valiDate = getSwitchInfoByCode("semiProductReceipCommitValidate")
 				//校验库位、
+				if(valiDate){
 					if (!this.checkLocation()) {
 						return
 					}
-
-
+				}else{
+					this.toLocationCode = this.jobToLocationCode
+				}
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					if (this.checkCount()) {