Merge branch 'hella_online_20240919' into master_hella

src/pages/count/job/countLightDetail.vue

@@ -478,10 +478,10 @@
 			commit() {
 				this.calcAllCount()
 				this.calcScanCount()
-				if(!this.scanCount){
-					this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交');
-					return
-				}
+				// if(!this.scanCount){
+				// 	this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交');
+				// 	return
+				// }
 				if (this.scanCount == this.allCount) {
 					this.submitJob();
 				} else if (this.scanCount < this.allCount) {
@@ -528,11 +528,13 @@
 				console.log("提交参数", JSON.stringify(params));
 				countJobSubmit(params).then(res => {
 					uni.hideLoading()
-					if (res.data) {
-						this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data)
-					} else {
-						this.showErrorMessage("提交失败[" + res.msg + "]")
-					}
+					const str =res.data || ''
+					this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + str)
+					// if (res.data) {
+					// 	this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data)
+					// } else {
+					// 	this.showErrorMessage("提交失败[" + res.msg + "]")
+					// }
 				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error)