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

src/pages/fg/receiptByPlan.vue

@@ -273,30 +273,43 @@ import { nextTick } from 'vue';
 					console.log(JSON.stringify(params))
 
 					let list = []
-					var planData = await planReceiptSubmit(params)
-					if (planData.data) {
-
-						planData.data.forEach(item => {
-							list.push({
-								itemCode: item.itemCode, // 物品代码
-								itemName: item.itemName, // 物品名称
-								packName: item.packName, // 包装名称
-								packageCode: item.toPackingNumber, // 包装号
-								batch: item.toBatch, //批次
-								parentNumber: item.parentNumber, //父包装号
-								itemType: item.itemType, //物料类型
-								asnNumber: item.asnNumber, //ASN
-								supplierCode: item.supplierCode, // 供应商
-								qty: item.qty, // 数量
-								printTimes: getCurrDateTime(), // 打印时间
-								productionLineCode: item.productionLineCode, //生产线
-								barcodeString: item.barcodeString, // 标签信息
-								barcodeBase64: '',
-								requestNumber: item.requestNumber
+					try{
+						var planData = await planReceiptSubmit(params)
+						console.log('planData',planData)
+						if (planData.data) {
+						
+							planData.data.forEach(item => {
+								list.push({
+									itemCode: item.itemCode, // 物品代码
+									itemName: item.itemName, // 物品名称
+									packName: item.packName, // 包装名称
+									packageCode: item.toPackingNumber, // 包装号
+									batch: item.toBatch, //批次
+									parentNumber: item.parentNumber, //父包装号
+									itemType: item.itemType, //物料类型
+									asnNumber: item.asnNumber, //ASN
+									supplierCode: item.supplierCode, // 供应商
+									qty: item.qty, // 数量
+									printTimes: getCurrDateTime(), // 打印时间
+									productionLineCode: item.productionLineCode, //生产线
+									barcodeString: item.barcodeString, // 标签信息
+									barcodeBase64: '',
+									requestNumber: item.requestNumber
+								})
 							})
-						})
-					} else {
-						throw new Error("提交失败")
+						} else {
+							throw new Error("提交失败")
+						}
+					}catch(error){
+						console.log('异常',error)
+						if(error.indexOf('请返回开工阶段')>-1){
+							uni.hideLoading()
+							this.showErrorMessage('计划已完成')
+							this.clearData()
+							this.openFg();
+							return
+						}
+						
 					}
 
 					//装配收货记录 生成后 创建 制品上架申请

src/pages/login/index.vue

@@ -157,18 +157,21 @@
 			}
 
 		},
-		onLoad() {
-			getCaptchaImage().then(res => {
-				if (res) {
-					var code = res.data.img;
-					let base64 = 'data:image/jpeg;base64,' + code
-					// console.log("图标", base64)
-					this.imageSrc = base64.replace(/[\r\n]/g, "")
-					this.uuid = res.data.uuid
-				}
-			}).catch(error => {
-				this.showErrorMessage(error);
-			})
+		onLoad() {
+			if(this.needCode){
+				getCaptchaImage().then(res => {
+					if (res) {
+						var code = res.data.img;
+						let base64 = 'data:image/jpeg;base64,' + code
+						// console.log("图标", base64)
+						this.imageSrc = base64.replace(/[\r\n]/g, "")
+						this.uuid = res.data.uuid
+					}
+				}).catch(error => {
+					this.showErrorMessage(error);
+				})
+			}
+			
 			this.getAppVersion()
 		},
 		methods: {