宇信报告生成游梁无游梁修改，计量数据录入导出修改

src/dashoo.cn/backend/api/business/Limsreportyyaqf/LimsreportyyaqfService.go

@@ -537,8 +537,8 @@ func (s *LimsReportYyaqfService) DocDataToExcel(entrustMainEntity limsdataentry.
 			DetectBasis = dataentrymainlist.DetectBasis
 		}
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "C6", DetectBasis)                 //依据标准
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "B31", dataentrymainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "G31", dataentrymainlist.JHBy)     //校核人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "B31", dataentrymainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "G31", dataentrymainlist.JHBy)     //校核人签名
 		//插入检测人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(sheet2+sheetadd), "B31", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true,"positioning": "oneCell "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/Limsreportzuhq/LimsreportzuhqService.go

@@ -407,8 +407,8 @@ func (s *LimsreportzuhqService) DocDataToExcel(entrustMainEntity limsdataentry.D
 		}
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "C6", DetectBasis) //依据标准
 		//插入检测人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "B31", dataentrymainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "I31", dataentrymainlist.JHBy)     //校核人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "B31", dataentrymainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "I31", dataentrymainlist.JHBy)     //校核人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(sheet2+sheetadd), "B31", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true, "positioning": "absolute "}`)
 		if pictureerr != nil {
 			fmt.Println(pictureerr)

src/dashoo.cn/backend/api/business/limsreportalercarbon/limsreportalercarbonSessionService.go

@@ -61,7 +61,7 @@ func (s *limsreportalercarbonSessionService) GetEntityByOrderbyWhereMain(tbldata
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.*,b.* from 
+	sql = ` select a.Id DataEntryId, a.TaskId TaskBalanceId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/limsreportalerfhgas/limsreportalerfhgasSessionService.go

@@ -61,7 +61,7 @@ func (s *LimsReportAlerFHSessionService) GetEntityByOrderbyWhereMain(tbldataentr
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.*,b.* from 
+	sql = ` select a.Id DataEntryId, a.TaskId TaskBalanceId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/limsreportalerkrgas/limsreportalerkrgasSessionService.go

@@ -61,7 +61,7 @@ func (s *LimsReportAlerKRSessionService) GetEntityByOrderbyWhereMain(tbldataentr
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.*,b.* from 
+	sql = ` select a.Id DataEntryId, a.TaskId TaskBalanceId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/limsreportanal1carbonredgas/limsreportanal1carbonredgasSessionService.go

@@ -61,7 +61,7 @@ func (s *LimsReportAlCarbon1SessionService) GetEntityByOrderbyWhereMain(tbldatae
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.*,b.* from 
+	sql = ` select a.Id DataEntryId, a.TaskId TaskBalanceId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/limsreportanal2carbonredgas/limsreportanal2carbonredgasSessionService.go

@@ -61,7 +61,7 @@ func (s *LimsReportAlCarbon2SessionService) GetEntityByOrderbyWhereMain(tbldatae
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.*,b.* from 
+	sql = ` select a.Id DataEntryId, a.TaskId TaskBalanceId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/limsreportbeampumpingunits/limsreportbeampumpingunitsService.go

@@ -221,12 +221,12 @@ func (s *LimsReportBeamPumpingUnitsService) DataToExcelReport(
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "K11",reportList[i].FaceCheck1 )//外观一结果
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "K12",reportList[i].FaceCheck2 )//外观二结果
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "K13",reportList[i].RDCResult)//密封性结果
-		LongSwingSplict := strings.Split(reportList[i].LongSwing, "/")
-		TransSwingSplict := strings.Split(reportList[i].TransSwing, "/")
-		LongSwing1, _ := strconv.ParseFloat(LongSwingSplict[0], 64)
-		LongSwing2, _ := strconv.ParseFloat(LongSwingSplict[1], 64)
-		TransSwing1, _ := strconv.ParseFloat(TransSwingSplict[0], 64)
-		TransSwing2, _ := strconv.ParseFloat(TransSwingSplict[1], 64)
+		//LongSwingSplict := strings.Split(reportList[i].LongSwing, "/")
+		//TransSwingSplict := strings.Split(reportList[i].TransSwing, "/")
+		LongSwing1, _ := strconv.ParseFloat(reportList[i].LongSwing, 64)
+		LongSwing2, _ := strconv.ParseFloat(strconv.Itoa(reportList[i].LSBaseNum), 64)
+		TransSwing1, _ := strconv.ParseFloat(reportList[i].TransSwing, 64)
+		TransSwing2, _ := strconv.ParseFloat(strconv.Itoa(reportList[i].TSBaseNum), 64)
 		LongSwing := LongSwing2 - LongSwing1
 		TransSwing := TransSwing2 - TransSwing1
 		down, _ := strconv.ParseFloat(reportList[i].DownX, 64)
@@ -495,8 +495,8 @@ func (s *LimsReportBeamPumpingUnitsService) DocDataToExcel(entrustMainEntity lim
 	}
 
 	for i := 0; i < (len(dataentrylist)); i++ {
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B26", dataentrymainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "N26", dataentrymainlist.JHBy) //校核人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B26", dataentrymainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "N26", dataentrymainlist.JHBy) //校核人签名
 		//插入检测人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(i+sheetIdx), "B26", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreportben/limsreportbenSessionService.go

@@ -61,7 +61,7 @@ func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry,
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.Id DataEntryId, b.Id Id, a.*,b.* from 
+	sql = ` select a.Id DataEntryId, a.TaskId TaskBalanceId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/limsreportdetHSgas/limsreportdetHSgasSessionService.go

@@ -62,7 +62,7 @@ func (s *LimsReportDetHsSessionService) GetEntityByOrderbyWhereMain(tbldataentry
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.*,b.* from 
+	sql = ` select a.Id DataEntryId, a.TaskId TaskBalanceId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/limsreportdetelectoxygen/limsreportdetelectoxygenSessionService.go

@@ -61,7 +61,7 @@ func (s *LimsReportOxygenSessionService) GetEntityByOrderbyWhereMain(tbldataentr
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.*,b.* from 
+	sql = ` select a.Id DataEntryId, a.TaskId TaskBalanceId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/limsreportelecground/limsreportelecgroundService.go

@@ -796,8 +796,8 @@ func (s *LimsReportElecGroundService) DocDataToExcel(entrustMainEntity limsdatae
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "E2", "第"+strconv.Itoa(page)+"页")
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "B3", entrustMainEntity.CustomerName)
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "F33", time.Now().Format("2006年01月02日"))
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "B33", dataentrymainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "D33", dataentrymainlist.JHBy)     //校核人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "B33", dataentrymainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "D33", dataentrymainlist.JHBy)     //校核人签名
 		//插入检测人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(sheet1), "B33", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreportequipotent/limsreportequipotentService.go

@@ -591,8 +591,8 @@ func (s *LimsReportEquipotentService) DocDataToExcel(entrustMainEntity limsdatae
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "F2", "第 "+strconv.Itoa(i+1)+" 页")       //第 页
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "B3", entrustMainEntity.CustomerName)    //委托单位
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "G30", time.Now().Format("2006年01月02日")) //日期
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "B30", dataentrymainlist.CreateBy)       //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "D30", dataentrymainlist.JHBy)           //校核人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "B30", dataentrymainlist.CreateBy)       //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "D30", dataentrymainlist.JHBy)           //校核人签名
 		//插入检测人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(SHEETIDX+i), "B30", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreporthuxf/limsreporthuxfService.go

@@ -585,8 +585,8 @@ func (s *LimsReportHuxfService) DocDataToExcel(entrustMainEntity limsdataentry.D
 			DetectBasis = dataentrymainlist.DetectBasis
 		}
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "D6", DetectBasis)                 //依据标准
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "C25", dataentrymainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "K25", dataentrymainlist.JHBy)     //校核人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "C25", dataentrymainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "K25", dataentrymainlist.JHBy)     //校核人签名
 		//插入主检人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(sheet2+sheetadd), "C25", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": false, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreportkqpm/LimsreportkqpmService.go

@@ -330,8 +330,8 @@ func (s *LimsReportkqpmService) DocDataToExcel(entrustMainEntity limsdataentry.D
 			DetectBasis = dataentrymainlist.DetectBasis
 		}
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "C6", DetectBasis)                 //依据标准
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "B32", dataentrymainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "H32", dataentrymainlist.JHBy)     //校核人签名
+		//xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "B32", dataentrymainlist.CreateBy) //主检人签名
+		//xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet2+sheetadd), "H32", dataentrymainlist.JHBy)     //校核人签名
 		//插入检测人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(sheet2+sheetadd), "B32", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreportldbh/LimsreportldbhService.go

@@ -1028,8 +1028,8 @@ func (s *LimsReportldbhService) DocDataToExcel(entrustMainEntity limsdataentry.D
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdex+sheet1), "K2", "第"+strconv.Itoa(page)+"页")
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdex+sheet1), "B4", entrustMainEntity.CustomerName)
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdex+sheet1), "K53", time.Now().Format("2006年01月02日"))
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "B53", dataentrymainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "F53", dataentrymainlist.JHBy)     //校核人签名
+		//xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "B53", dataentrymainlist.CreateBy) //主检人签名
+		//xlsx.SetCellValue("Sheet"+strconv.Itoa(sheet1), "F53", dataentrymainlist.JHBy)     //校核人签名
 		//插入检测人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(sheetIdex+sheet1), "B53", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreportlp/limsreportlpService.go

@@ -606,8 +606,8 @@ func (s *LimsReportLpService) DocDataToExcel(entrustMainEntity limsdataentry.Dat
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "G2", "第 "+strconv.Itoa(i+1)+" 页")       //第 页
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "B3", entrustMainEntity.CustomerName)    //委托单位
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "I32", time.Now().Format("2006年01月02日")) //日期
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "B32", dataentrymainlist.CreateBy)       //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "E32", dataentrymainlist.JHBy)           //校核人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "B32", dataentrymainlist.CreateBy)       //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(SHEETIDX+i), "E32", dataentrymainlist.JHBy)           //校核人签名
 		//插入检测人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(SHEETIDX+i), "B32", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreportnobeampumpingunits/limsreportnobeampumpingunitsService.go

@@ -222,12 +222,12 @@ func (s *LimsReportNoBeamPumpingUnitsService) DataToExcelReport(
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "K11",reportList[i].FaceCheck1 )//外观一结果
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "K12",reportList[i].FaceCheck2 )//外观二结果
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "K13",reportList[i].RDCResult )//密封性结果
-		LongSwingSplict := strings.Split(reportList[i].LongSwing, "/")
-		TransSwingSplict := strings.Split(reportList[i].TransSwing, "/")
-		LongSwing1, _ := strconv.ParseFloat(LongSwingSplict[0], 64)
-		LongSwing2, _ := strconv.ParseFloat(LongSwingSplict[1], 64)
-		TransSwing1, _ := strconv.ParseFloat(TransSwingSplict[0], 64)
-		TransSwing2, _ := strconv.ParseFloat(TransSwingSplict[1], 64)
+		//LongSwingSplict := strings.Split(reportList[i].LongSwing, "/")
+		//TransSwingSplict := strings.Split(reportList[i].TransSwing, "/")
+		LongSwing1, _ := strconv.ParseFloat(reportList[i].LongSwing, 64)
+		LongSwing2, _ := strconv.ParseFloat(strconv.Itoa(reportList[i].LSBaseNum), 64)
+		TransSwing1, _ := strconv.ParseFloat(reportList[i].TransSwing, 64)
+		TransSwing2, _ := strconv.ParseFloat(strconv.Itoa(reportList[i].TSBaseNum), 64)
 		LongSwing := LongSwing2 - LongSwing1
 		TransSwing := TransSwing2 - TransSwing1
 		down, _ := strconv.ParseFloat(reportList[i].DownX, 64)
@@ -499,8 +499,8 @@ func (s *LimsReportNoBeamPumpingUnitsService) DocDataToExcel(entrustMainEntity l
 
 	for i := 0; i < (len(dataentrylist)); i++ {
 
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C26", dataentrymainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "L26", dataentrymainlist.JHBy) //校核人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C26", dataentrymainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "L26", dataentrymainlist.JHBy) //校核人签名
 		//插入检测人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(i+sheetIdx), "C26", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": true, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -1536,6 +1536,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		datamap := StructToMapDemo(mainmodel)
 		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
 		for i := 0; i< len(cervaluelist); i++{
+			datamap["StanDevice"+ utils.ToStr(i)] = cervaluelist[i].StanDevice
 			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
@@ -1652,11 +1653,12 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		datamap := StructToMapDemo(mainmodel)
 		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
 		for i := 0; i< len(cervaluelist); i++{
+			datamap["StanDevice"+ utils.ToStr(i)] = cervaluelist[i].StanDevice
 			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
 			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
 			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
-			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
 		}
 		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
 		for i, d := range alertdeviationlist {
@@ -1706,7 +1708,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow: 1,
 			NeedDelRow: 2,
 			ReverseRow: 0,
-			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
 			Merge: []string{},
 			ColsNum: 8,
 		}
@@ -1757,11 +1759,12 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		datamap := StructToMapDemo(mainmodel)
 		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
 		for i := 0; i< len(cervaluelist); i++{
+			datamap["StanDevice"+ utils.ToStr(i)] = cervaluelist[i].StanDevice
 			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
 			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
 			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
-			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
 		}
 		var alertvalinterfaceSlice []interface{} = make([]interface{}, len(alertvaluelist))
 		for i, d := range alertvaluelist {
@@ -1824,7 +1827,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow: 1,
 			NeedDelRow: 2,
 			ReverseRow: 0,
-			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
 			Merge: []string{},
 			ColsNum: 10,
 		}
@@ -1875,11 +1878,12 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		datamap := StructToMapDemo(mainmodel)
 		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
 		for i := 0; i< len(cervaluelist); i++{
+			datamap["StanDevice"+ utils.ToStr(i)] = cervaluelist[i].StanDevice
 			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
 			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
 			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
-			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
 		}
 		var alertvalinterfaceSlice []interface{} = make([]interface{}, len(alertvaluelist))
 		for i, d := range alertvaluelist {
@@ -1942,7 +1946,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow: 1,
 			NeedDelRow: 2,
 			ReverseRow: 0,
-			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
 			Merge: []string{},
 			ColsNum: 10,
 		}
@@ -1993,11 +1997,12 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		datamap := StructToMapDemo(mainmodel)
 		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
 		for i := 0; i< len(cervaluelist); i++{
+			datamap["StanDevice"+ utils.ToStr(i)] = cervaluelist[i].StanDevice
 			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
 			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
 			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
-			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
 		}
 		var alertotherinterfaceSlice []interface{} = make([]interface{}, len(alertotherlist))
 		for i, d := range alertotherlist {
@@ -2060,7 +2065,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow: 1,
 			NeedDelRow: 2,
 			ReverseRow: 0,
-			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
 			Merge: []string{},
 			ColsNum: 8,
 		}
@@ -2111,11 +2116,12 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		datamap := StructToMapDemo(mainmodel)
 		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
 		for i := 0; i< len(cervaluelist); i++{
+			datamap["StanDevice"+ utils.ToStr(i)] = cervaluelist[i].StanDevice
 			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
 			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
 			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
-			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
 		}
 		var alertotherinterfaceSlice []interface{} = make([]interface{}, len(alertotherlist))
 		for i, d := range alertotherlist {
@@ -2178,7 +2184,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow: 1,
 			NeedDelRow: 2,
 			ReverseRow: 0,
-			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
 			Merge: []string{},
 			ColsNum: 8,
 		}
@@ -2227,11 +2233,12 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		datamap := StructToMapDemo(mainmodel)
 		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
 		for i := 0; i< len(cervaluelist); i++{
+			datamap["StanDevice"+ utils.ToStr(i)] = cervaluelist[i].StanDevice
 			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
 			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
 			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
-			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
 		}
 		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
 		for i, d := range alertdeviationlist {
@@ -2281,7 +2288,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow: 1,
 			NeedDelRow: 2,
 			ReverseRow: 0,
-			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
 			Merge: []string{},
 			ColsNum: 8,
 		}
@@ -2332,11 +2339,12 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		datamap := StructToMapDemo(mainmodel)
 		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
 		for i := 0; i< len(cervaluelist); i++{
+			datamap["StanDevice"+ utils.ToStr(i)] = cervaluelist[i].StanDevice
 			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
 			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
 			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
 			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
-			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
 		}
 		var alertvalinterfaceSlice []interface{} = make([]interface{}, len(alertvaluelist))
 		for i, d := range alertvaluelist {
@@ -2399,7 +2407,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow: 1,
 			NeedDelRow: 2,
 			ReverseRow: 0,
-			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
 			Merge: []string{},
 			ColsNum: 10,
 		}
@@ -2598,6 +2606,8 @@ func (this *LimsDataEntryController) GetUserListByJHRole() {
 		users = svc.GetUserByRole("10000181", this.User.AccCode)
 	case "100000169":
 		users = svc.GetUserByRole("10000195", this.User.AccCode)
+	case "100000168":
+		users = svc.GetUserByRole("10000201", this.User.AccCode)
 	}
 
 
@@ -2633,6 +2643,10 @@ func (this *LimsDataEntryController) CheckSubmit() {
 			processInstanceId = svcActiviti.StartProcess(workflow.TJZ_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
 		case "100000151":
 			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
+		case "100000168":
+			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
+		case "100000169":
+			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
 		}
 		if processInstanceId == "" {
 			errinfo.Message = "工作流异常，请联系管理员！"
@@ -2723,6 +2737,62 @@ func (this *LimsDataEntryController) CheckSubmit() {
 					this.ServeJSON()
 					return
 				}
+			case "100000168":
+				users = svc.GetUserByRole("10000202", this.User.AccCode)
+				for _, tmpUser := range users {
+					userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+				}
+				userIds = strings.Trim(userIds, ",")
+				receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
+				if receiveVal == "true" {
+					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+					err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+					if err == nil {
+						errinfo.Message = "校核提交成功！"
+						errinfo.Code = 0
+						this.Data["json"] = &errinfo
+						this.ServeJSON()
+					} else {
+						errinfo.Message = "校核提交发生错误,请检查后重新提交！"
+						errinfo.Code = -1
+						this.Data["json"] = &errinfo
+						this.ServeJSON()
+					}
+				} else {
+					errinfo.Message = "工作流异常，请联系管理员！"
+					errinfo.Code = -1
+					this.Data["json"] = &errinfo
+					this.ServeJSON()
+					return
+				}
+			case "100000169":
+				users = svc.GetUserByRole("10000196", this.User.AccCode)
+				for _, tmpUser := range users {
+					userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+				}
+				userIds = strings.Trim(userIds, ",")
+				receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
+				if receiveVal == "true" {
+					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+					err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+					if err == nil {
+						errinfo.Message = "校核提交成功！"
+						errinfo.Code = 0
+						this.Data["json"] = &errinfo
+						this.ServeJSON()
+					} else {
+						errinfo.Message = "校核提交发生错误,请检查后重新提交！"
+						errinfo.Code = -1
+						this.Data["json"] = &errinfo
+						this.ServeJSON()
+					}
+				} else {
+					errinfo.Message = "工作流异常，请联系管理员！"
+					errinfo.Code = -1
+					this.Data["json"] = &errinfo
+					this.ServeJSON()
+					return
+				}
 			}
 
 		} else {
@@ -2750,6 +2820,10 @@ func (this *LimsDataEntryController) CheckSubmit() {
 					receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
 				case "100000151":
 					receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
+				case "100000168":
+					receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
+				case "100000169":
+					receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
 				}
 				fmt.Println(receiveVal)
 				var errinfo ErrorInfo

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalercarbon.go

@@ -107,7 +107,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 		"ModifiedBy",
 		"ModifiedUserId",
 	}
-	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel, dataentrycols, "Id = "+ utils.ToStr(model.BenMainform.DataEntryId))
 	//if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
 	//	_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
 	//}

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalerfhgas.go

@@ -110,7 +110,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 		"ModifiedBy",
 		"ModifiedUserId",
 	}
-	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel, dataentrycols, "Id = "+ utils.ToStr(model.BenMainform.DataEntryId))
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalerkrgas.go

@@ -110,7 +110,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 		"ModifiedBy",
 		"ModifiedUserId",
 	}
-	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel, dataentrycols, "Id = "+ utils.ToStr(model.BenMainform.DataEntryId))
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportanal1carbonredgas.go

@@ -122,7 +122,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 		"ModifiedBy",
 		"ModifiedUserId",
 	}
-	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel, dataentrycols, "Id = "+ utils.ToStr(model.BenMainform.DataEntryId))
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportanal2carbonredgas.go

@@ -111,7 +111,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 		"ModifiedBy",
 		"ModifiedUserId",
 	}
-	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel, dataentrycols, "Id = "+ utils.ToStr(model.BenMainform.DataEntryId))
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportdetHSgas.go

@@ -110,7 +110,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 		"ModifiedBy",
 		"ModifiedUserId",
 	}
-	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel, dataentrycols, "Id = "+ utils.ToStr(model.BenMainform.DataEntryId))
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportdetelectoxygen.go

@@ -110,7 +110,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 		"ModifiedBy",
 		"ModifiedUserId",
 	}
-	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel, dataentrycols, "Id = "+ utils.ToStr(model.BenMainform.DataEntryId))
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck

src/dashoo.cn/frontend_web/src/pages/lims/createreport/allreport.vue

@@ -47,7 +47,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby"
         @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" :span-method="objectSpanMethod">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-        <el-table-column label="操作" width="230" align="center" fixed>
+        <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">
             <el-popover v-if="scope.row.TaskId != ''" placement="top" trigger="click" style="margin-left:10px">
               <el-alert title="" description="请选择报告查看方式" type="success" :closable="false">

src/dashoo.cn/frontend_web/src/pages/lims/createreport/docviewframe.vue

@@ -49,7 +49,7 @@
     methods: {
       // 返回
       backFunc(){
-        this.$router.go(-1)
+        this.$router.go(-2)
         // let _this = this
         // _this.$router.push({
         //   path: '/lims/createreport',

src/dashoo.cn/frontend_web/src/pages/lims/createreport/index.vue

@@ -47,7 +47,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby"
         @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" :span-method="objectSpanMethod">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-        <el-table-column label="操作" width="230" align="center" fixed>
+        <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">
             <el-popover v-if="scope.row.TaskId != ''" placement="top" trigger="click" style="margin-left:10px">
               <el-alert title="" description="请选择报告查看方式" type="success" :closable="false">

src/dashoo.cn/frontend_web/src/pages/lims/createreport/reporttodo.vue

@@ -47,7 +47,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby"
         @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" :span-method="objectSpanMethod">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-        <el-table-column label="操作" width="230" align="center" fixed>
+        <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">
             <!-- <router-link :to="'/lims/tasksentrust/'+scope.row.EId+'/operation'">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
@@ -85,6 +85,7 @@
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('ViewDocPdf', scope.row)">PDF查看</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('OpenExcel', scope.row)" v-if="scope.row.TaskId != ''" divided>打开Excel</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('DownLoadExcel', scope.row)" v-if="scope.row.TaskId != ''">下载Excel</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('DownloadTool', scope.row)" divided>下载工具</el-dropdown-item>
@@ -92,9 +93,9 @@
                   divided>删除报告</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            <el-button slot="reference" style="margin-left :10px;" type="primary" size="mini" plain title="查看报告" @click="ViewDocPdf(scope.row)">
+            <!-- <el-button slot="reference" style="margin-left :10px;" type="primary" size="mini" plain title="查看报告" @click="ViewDocPdf(scope.row)">
               查看
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
         <el-table-column prop="ReportCode" sortable min-width="110" label="报告编号" align="center" show-overflow-tooltip></el-table-column>
@@ -443,7 +444,9 @@
       MoreCmdClick(cmd) {
         if (cmd.Command === 'History') {
           this.gethistoryvalue(cmd.row)
-        } else if (cmd.Command === 'OpenExcel') {
+        } else if (cmd.Command === 'ViewDocPdf') {
+          this.ViewDocPdf(cmd.row)
+        }else if (cmd.Command === 'OpenExcel') {
           this.docdownload(cmd.row)
         } else if (cmd.Command === 'DownLoadExcel') {
           this.datadownload(cmd.row)

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/alltask.vue

@@ -48,7 +48,7 @@
       </div>
       <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName" @sort-change="orderby" @selection-change="handleSelectionChange">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-        <el-table-column label="操作" width="230" align="center" fixed>
+        <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">
             <el-button slot="reference" type="primary" size="mini" plain title="原始数据录入" @click="OpenOrignDataInput(scope.row)">
               打开
@@ -62,15 +62,16 @@
                 <!--<el-dropdown-item :command="GetCommand('JiaoHe', scope.row)" v-if="scope.row.CheckStatus == 1">数据校核</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('ShenHe', scope.row)" v-if="scope.row.CheckStatus == 2">数据审核</el-dropdown-item>-->
                 <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('ViewDocPdf', scope.row)">PDF查看</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('OpenExcel', scope.row)" v-if="scope.row.TaskId != ''" divided>打开Excel</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('DownLoadExcel', scope.row)" v-if="scope.row.TaskId != ''">下载Excel</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('DownloadTool', scope.row)" divided>下载工具</el-dropdown-item>
                 <!--<el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.CheckStatus != 0" divided>删除数据</el-dropdown-item>-->
               </el-dropdown-menu>
             </el-dropdown>
-            <el-button slot="reference" style="margin-left :10px;" type="primary" size="mini" plain title="查看文档" @click="ViewDocPdf(scope.row)">
+            <!-- <el-button slot="reference" style="margin-left :10px;" type="primary" size="mini" plain title="查看文档" @click="ViewDocPdf(scope.row)">
               查看
-            </el-button>
+            </el-button> -->
             <!-- <el-button v-if="scope.row.CheckStatus != 0" style="margin-left:8px" icon="el-icon-search" type="text"
               title="预览" size="small" @click="review(scope.row)">
             </el-button> -->
@@ -506,7 +507,10 @@
         } else if(cmd.Command == 'History') {
           this.getvalues(cmd.row)
 
-        } else if(cmd.Command == 'OpenExcel') {
+        } else if(cmd.Command == 'ViewDocPdf') {
+          this.ViewDocPdf(cmd.row)
+
+        }else if(cmd.Command == 'OpenExcel') {
           this.docdownload(cmd.row)
 
         } else if(cmd.Command == 'DownLoadExcel') {

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/docviewframe.vue

@@ -53,7 +53,7 @@
     methods: {
       // 返回
       backFunc(){
-        this.$router.go(-1)
+        this.$router.go(-2)
         // window.history.go(-1)
         // let _this = this
         // _this.$router.push({

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/index.vue

@@ -46,7 +46,7 @@
       <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName"
         @sort-change="orderby" @selection-change="handleSelectionChange">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-        <el-table-column label="操作" width="230" align="center" fixed>
+        <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">
             <!-- <el-button v-if="scope.row.DataEntryStatus != 0" style="margin-left:8px" icon="el-icon-search" type="text"
               title="预览" size="small" @click="review(scope.row)">
@@ -66,6 +66,7 @@
                 <!--<el-dropdown-item :command="GetCommand('JiaoHe', scope.row)" v-if="scope.row.CheckStatus == 1">数据校核</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('ShenHe', scope.row)" v-if="scope.row.CheckStatus == 2">数据审核</el-dropdown-item>-->
                 <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('ViewDocPdf', scope.row)">PDF查看</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('OpenExcel', scope.row)" v-if="scope.row.TaskId != ''" divided>打开Excel</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('DownLoadExcel', scope.row)" v-if="scope.row.TaskId != ''">下载Excel</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('ShowReport', scope.row)" divided>查看报告</el-dropdown-item>
@@ -74,9 +75,9 @@
                   divided>删除数据</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            <el-button slot="reference" style="margin-left :10px;" type="primary" size="mini" plain title="查看文档" @click="ViewDocPdf(scope.row)">
+            <!-- <el-button slot="reference" style="margin-left :10px;" type="primary" size="mini" plain title="查看文档" @click="ViewDocPdf(scope.row)">
               查看
-            </el-button>
+            </el-button> -->
             <!--<el-button slot="reference" type="primary" size="mini" plain @click="getvalues(scope.row)">查看</el-button>-->
             <!-- <el-button slot="reference" v-if="scope.row.TaskId != ''" type="primary" plain size="mini" title="导出"  @click="docdownload(scope.row)">
              导出
@@ -517,7 +518,9 @@
           this.shenHeFunc(cmd.row)
         } else if (cmd.Command == 'History') {
           this.getvalues(cmd.row)
-        } else if (cmd.Command == 'OpenExcel') {
+        } else if(cmd.Command == 'ViewDocPdf') {
+          this.ViewDocPdf(cmd.row)
+        }else if (cmd.Command == 'OpenExcel') {
           this.docdownload(cmd.row)
         } else if (cmd.Command == 'DownLoadExcel') {
           this.datadownload(cmd.row)

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/tacktodo.vue

@@ -42,7 +42,7 @@
       </div>
       <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName"
         @sort-change="orderby" @selection-change="handleSelectionChange">
-        <el-table-column label="操作" width="230" align="center" fixed>
+        <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">
             <el-button slot="reference" type="primary" size="mini" plain title="原始数据录入" v-if="scope.row.CheckStatus != 1 && scope.row.CheckStatus != 2"
               @click="OpenOrignDataInput(scope.row)">
@@ -64,6 +64,7 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="GetCommand('Open', scope.row)" v-if="scope.row.CheckStatus == 1 || scope.row.CheckStatus == 2">数据打开</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('ViewDocPdf', scope.row)">PDF查看</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('OpenExcel', scope.row)" v-if="scope.row.TaskId != ''" divided>打开Excel</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('DownLoadExcel', scope.row)" v-if="scope.row.TaskId != ''">下载Excel</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('DownloadTool', scope.row)" divided>下载工具</el-dropdown-item>
@@ -71,9 +72,9 @@
                   divided>删除数据</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            <el-button slot="reference" style="margin-left :10px;" type="primary" size="mini" plain title="查看文档" @click="ViewDocPdf(scope.row)">
+            <!-- <el-button slot="reference" style="margin-left :10px;" type="primary" size="mini" plain title="查看文档" @click="ViewDocPdf(scope.row)">
               查看
-            </el-button>
+            </el-button> -->
             <!--<el-button slot="reference" type="primary" plain size="mini" title="校核" v-if="scope.row.CheckStatus == 1"  @click="jiaoheshowdialog(scope.row)">
              校核
             </el-button>
@@ -519,7 +520,9 @@
           this.shenHeFunc(cmd.row)
         } else if (cmd.Command === 'History') {
           this.getvalues(cmd.row)
-        } else if (cmd.Command === 'OpenExcel') {
+        } else if(cmd.Command == 'ViewDocPdf') {
+          this.ViewDocPdf(cmd.row)
+        }else if (cmd.Command === 'OpenExcel') {
           this.docdownload(cmd.row)
         } else if (cmd.Command === 'DownLoadExcel') {
           this.datadownload(cmd.row)

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorbendetect/_opera/operation.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
@@ -18,12 +20,21 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true">
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定日期:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -45,7 +56,8 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true">
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -139,8 +151,8 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="有效期至:">
-            <el-date-picker style="width: 100%" v-model="formCertificateData.EffectDate" type="date" format="yyyy 年 MM 月 dd 日"
-              placeholder="请选择">
+            <el-date-picker style="width: 100%" v-model="formCertificateData.EffectDate" type="date"
+              format="yyyy 年 MM 月 dd 日" placeholder="请选择">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -195,23 +207,27 @@
         <el-table-column align="center" label="实测报警值（%LEL）">
           <el-table-column align="center" label="" prop="Value1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="" prop="Value2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="" prop="Value3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column prop="ActionValue" align="center" label="报警动作值（%LEL）" min-width="90">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ActionValue" style="width: 160px" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.ActionValue" style="width: 160px" size="mini">
+            </el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -224,7 +240,8 @@
       <el-table :data="deviationData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="仪器示值（%LEL）" min-width="180">
@@ -248,13 +265,15 @@
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="Deviation" label="示值误差（%FS）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -267,28 +286,33 @@
       <el-table :data="responseTimeData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6  mol/mol)" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="时间" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Deviation" label="响应时间">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
         </el-table-column>
@@ -302,7 +326,8 @@
       <el-table :data="RepeatData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="150">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="仪器示值（%LEL）" min-width="180">
@@ -344,13 +369,15 @@
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="RepeatValue" label="重复性（%）" width="150">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -365,47 +392,56 @@
         </el-table-column>
         <el-table-column prop="value0" align="center" label="0">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value1" align="center" label="1h   （10min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value2" align="center" label="2h   （20min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value3" align="center" label="3h   （30min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value4" align="center" label="4h   （40min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value5" align="center" label="5h   （50min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.Value5" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value6" align="center" label="6h   （60min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.Value6" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ZeroValue" label="零点漂移（%FS）" width="135">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ShowValue" label="量程漂移（%FS）" width="135">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.01" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -417,6 +453,28 @@
         </div>
       </template>
     </el-card>
+    <el-dialog title="提交校核" :visible.sync="ProoFreadShow" top="5vh">
+      <el-form :model="shenhesubmitForm" label-width="130px" ref="shenhesubmitForm">
+        <el-row>
+          <el-form-item label="校核人" prop="AuthorUser">
+            <el-select ref="consigneeselect" v-model="shenhesubmitForm.AuditorUserId" placeholder="请选择校核人"
+              style="width: 100%;">
+              <el-option v-for="item in acceptUsers" :key="item.id" :label="item.realname" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="说明">
+            <el-input type="textarea" v-model="shenhesubmitForm.AuditorRemark" placeholder="请输入说明"></el-input>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="ProoFreadShow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="makesure()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -435,9 +493,18 @@
 
     data() {
       return {
+        ProoFreadShow: false,
+        acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -669,6 +736,7 @@
       this.sign = this.$route.query.sign
       //this.serviceId = this.$route.params.opera;
       this.initDatas();
+      this.getUsersByRole()
       //this.getDictOptions();
       // console.log(this.serviceId);
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -677,7 +745,7 @@
       // } else {
       //   this.formData.Id = 0;
       // }
-      console.log("--------",)
+      console.log("--------", )
     },
     methods: {
       initDatas() {
@@ -685,6 +753,9 @@
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+              this.formData.CheckDate = new Date();
+            }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
                 this.alerValData[i] = res.data.alvalitem[i];
@@ -742,6 +813,20 @@
           });
         }
       },
+      // 获取校核人列表
+      getUsersByRole() {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       discountHeaderStyle1({
         row,
         column,
@@ -817,6 +902,58 @@
           row.AvgValue = '0'
         }
       },
+      setProoFreadShow() {
+          this.ProoFreadShow = true
+      },
+      // 提交校核
+      makesure() {
+        this.$confirm('确定提交校核！', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+            // this.addRunRecord()
+          })
+          .catch(() => {})
+      },
+      // 添加运行记录
+      addRunRecord() {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      checkstatus() {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
+
+              })
+              this.DataStatus = 1
+              this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       //保存信息
       saveEntity() {
         console.log("------this.formData.Id----", this.formData.Id)
@@ -849,7 +986,7 @@
             }
           }
         }
-        this.deviationData.AvgValue = this.deviationData.AvgValue+""
+        this.deviationData.AvgValue = this.deviationData.AvgValue + ""
         this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.alerValData.ActionValue = parseInt(this.alerValData.ActionValue)
         // this.alerValData.Value1 = parseInt(this.alerValData.Value1)

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorcarbondetect/_opera/operation.vue

@@ -12,6 +12,8 @@
         </span>
         <span style="float: right;">
           <!-- <el-button type="primary" size="mini" @click="saveEntity">保存</el-button> -->
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
@@ -27,6 +29,13 @@
               <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定日期:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="环境温度:">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%"></el-input>
@@ -397,9 +406,18 @@
 
     data() {
       return {
+        ProoFreadShow: false,
+        acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -626,10 +644,14 @@
     },
     methods: {
       initDatas() {
+         console.log("------re3s------", this.formData)
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+              this.formData.CheckDate = new Date();
+            }
             if (res.data.deviitem != null) {
               for (var i = 0; i < res.data.deviitem.length; i++) {
                 this.deviationData[i].Id = res.data.deviitem[i].Id;
@@ -753,7 +775,58 @@
           row.AvgValue = '0'
         }
       },
+      setProoFreadShow() {
+          this.ProoFreadShow = true
+      },
+      // 提交校核
+      makesure() {
+        this.$confirm('确定提交校核！', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+            // this.addRunRecord()
+          })
+          .catch(() => {})
+      },
+      // 添加运行记录
+      addRunRecord() {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      checkstatus() {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
 
+              })
+              this.DataStatus = 1
+              this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       //保存信息
       saveEntity() {
         console.log("------this.formData.Id----", this.formData.Id)

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorfhgasdetect/_opera/operation.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
@@ -26,6 +28,13 @@
               <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定日期:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="环境温度:">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%"></el-input>
@@ -428,9 +437,18 @@
 
     data() {
       return {
+        ProoFreadShow: false,
+        acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -661,6 +679,9 @@
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+              this.formData.CheckDate = new Date();
+            }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
                 this.alerValData[i] = res.data.alvalitem[i];
@@ -793,6 +814,58 @@
           row.AvgValue = '0'
         }
       },
+      setProoFreadShow() {
+          this.ProoFreadShow = true
+      },
+      // 提交校核
+      makesure() {
+        this.$confirm('确定提交校核！', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+            // this.addRunRecord()
+          })
+          .catch(() => {})
+      },
+      // 添加运行记录
+      addRunRecord() {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      checkstatus() {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
+
+              })
+              this.DataStatus = 1
+              this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
 
       //保存信息
       saveEntity() {

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorkrgasdetect/_opera/operation.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
@@ -26,6 +28,13 @@
               <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定日期:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="环境温度:">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%"></el-input>
@@ -420,9 +429,18 @@
 
     data() {
       return {
+        ProoFreadShow: false,
+        acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -653,6 +671,9 @@
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+              this.formData.CheckDate = new Date();
+            }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
                 this.alerValData[i] = res.data.alvalitem[i];
@@ -785,6 +806,58 @@
           row.AvgValue = '0'
         }
       },
+      setProoFreadShow() {
+          this.ProoFreadShow = true
+      },
+      // 提交校核
+      makesure() {
+        this.$confirm('确定提交校核！', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+            // this.addRunRecord()
+          })
+          .catch(() => {})
+      },
+      // 添加运行记录
+      addRunRecord() {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      checkstatus() {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
+
+              })
+              this.DataStatus = 1
+              this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
 
       //保存信息
       saveEntity() {

src/dashoo.cn/frontend_web/src/pages/lims/reportanalyzer1carbonredgas/_opera/operation.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
@@ -26,6 +28,13 @@
               <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定日期:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="环境温度:">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%"></el-input>
@@ -406,9 +415,18 @@
 
   data() {
       return {
+        ProoFreadShow: false,
+        acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -587,7 +605,7 @@
         //漂移
         ShiftData: [{
           ValueType: '零点示值',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
@@ -598,7 +616,7 @@
           ShowValue: ''
         }, {
           ValueType: '量程示值',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
@@ -611,14 +629,14 @@
         //干扰误差
         ReportAlerOtherData:[{
           ValueType: '非被测分组',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
           OtherValue: ''
         },{
           ValueType: '水蒸气',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
@@ -653,8 +671,11 @@
       initDatas() {
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log("------res------", res.data)
+            console.log("------resco------", res.data)
             this.formData = res.data.mainitem;
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+              this.formData.CheckDate = new Date();
+            }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
                 this.alerValData[i] = res.data.alvalitem[i];
@@ -684,7 +705,14 @@
             }
             if (res.data.repeatitem != null) {
               for (var i = 0; i < res.data.repeatitem.length; i++) {
-                this.RepeatData[i] = res.data.repeatitem[i];
+                this.deviationData[i].RepeatValue = res.data.deviitem[i].RepeatValue;
+                this.RepeatData[i].AvgValue = res.data.repeatitem[i].AvgValue + "";
+                this.deviationData[i].Value1 = res.data.deviitem[i].Value1;
+                this.deviationData[i].Value2 = res.data.deviitem[i].Value2;
+                this.deviationData[i].Value3 = res.data.deviitem[i].Value3;
+                this.deviationData[i].Value4 = res.data.deviitem[i].Value4;
+                this.deviationData[i].Value5 = res.data.deviitem[i].Value5;
+                this.deviationData[i].Value6 = res.data.deviitem[i].Value6;
               }
             }
             if (res.data.shiftitem != null) {
@@ -792,7 +820,58 @@
           row.AvgValue = '0'
         }
       },
+      setProoFreadShow() {
+          this.ProoFreadShow = true
+      },
+      // 提交校核
+      makesure() {
+        this.$confirm('确定提交校核！', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+            // this.addRunRecord()
+          })
+          .catch(() => {})
+      },
+      // 添加运行记录
+      addRunRecord() {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      checkstatus() {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
 
+              })
+              this.DataStatus = 1
+              this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       //保存信息
       saveEntity() {
         console.log("------this.formData.Id----", this.formData.Id)
@@ -815,8 +894,6 @@
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].StanDevice = this.formData.StanDevice
         }
-        this.deviationData.AvgValue = this.deviationData.AvgValue+""
-        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.deviationData.GasValue = parseInt(this.deviationData.GasValue)
         // this.deviationData.Deviation = parseInt(this.deviationData.Deviation)
         // this.responseTimeData.GasValue = parseInt(this.responseTimeData.GasValue)
@@ -847,7 +924,7 @@
           ResponTimeArrayList: this.responseTimeData, //添加响应时间数据
           RepeatArrayList: this.RepeatData, //添加重复性数据
           ShiftArrayList: this.ShiftData, //添加漂移数据
-          ReportAlerOtherData: this.ReportAlerOtherData,//干扰误差
+          AlertOtherList: this.ReportAlerOtherData,//干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
         console.log("---------allform", allform)
@@ -907,9 +984,10 @@
           ResponTimeArrayList: this.responseTimeData, //添加响应时间数据
           RepeatArrayList: this.RepeatData, //添加重复性数据
           ShiftArrayList: this.ShiftData, //添加漂移数据
-          ReportAlerOtherData: this.ReportAlerOtherData,//干扰误差
+          AlertOtherList: this.ReportAlerOtherData,//干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
+        console.log("---------allform", allform)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

src/dashoo.cn/frontend_web/src/pages/lims/reportanalyzer2carbonredgas/_opera/operation.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
          <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
@@ -26,6 +28,13 @@
               <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定日期:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="环境温度:">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%"></el-input>
@@ -309,7 +318,7 @@
       <el-table :data="ShiftData" border style="width: 100%">
         <el-table-column align="center" prop="ValueType" label="时间">
         </el-table-column>
-         <el-table-column prop="value0" align="center" label="0">
+         <el-table-column prop="Value0" align="center" label="0">
           <template slot-scope="scope">
             <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
           </template>
@@ -319,17 +328,17 @@
             <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="value2" align="center" label="4h   （30min）" min-width="90">
+        <el-table-column prop="Value2" align="center" label="4h   （30min）" min-width="90">
        <template slot-scope="scope">
             <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="value3" align="center" label="6h   （45min）" min-width="90">
+        <el-table-column prop="Value3" align="center" label="6h   （45min）" min-width="90">
          <template slot-scope="scope">
             <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="value4" align="center" label="8h   （60min）" min-width="90">
+        <el-table-column prop="Value4" align="center" label="8h   （60min）" min-width="90">
         <template slot-scope="scope">
             <el-input type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
           </template>
@@ -354,7 +363,7 @@
       <el-table :data="ReportAlerOtherData" border style="width: 100%">
         <el-table-column align="center" prop="ValueType" label="项  目">
         </el-table-column>
-        <el-table-column prop="value0" align="center" label="C0">
+        <el-table-column prop="Value0" align="center" label="C0">
            <template slot-scope="scope">
             <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
           </template>
@@ -406,9 +415,18 @@
 
    data() {
       return {
+        ProoFreadShow: false,
+        acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -547,13 +565,6 @@
           Deviation: ''
         }],
         //响应时间
-        responseTimeForm: {
-          GasValue: '',
-          Value1: '',
-          Value2: '',
-          Value3: '',
-          Deviation: ''
-        },
         responseTimeData: [{
           GasValue: '',
           Value1: '',
@@ -562,17 +573,6 @@
           Deviation: ''
         }],
         //重复性
-        RepeatForm: {
-          GasValue: '',
-          Value1: '',
-          Value2: '',
-          Value3: '',
-          Value4: '',
-          Value5: '',
-          Value6: '',
-          AvgValue: '',
-          RepeatValue: ''
-        },
         RepeatData: [{
           GasValue: '',
           Value1: '',
@@ -587,7 +587,7 @@
         //漂移
         ShiftData: [{
           ValueType: '零点示值',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
@@ -598,7 +598,7 @@
           ShowValue: ''
         }, {
           ValueType: '量程示值',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
@@ -611,14 +611,14 @@
         //干扰误差
         ReportAlerOtherData:[{
           ValueType: '非被测分组',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
           OtherValue: ''
         },{
           ValueType: '水蒸气',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
@@ -649,8 +649,11 @@
       initDatas() {
        if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log("------res------", res.data)
+            console.log("------resco2------", res.data)
             this.formData = res.data.mainitem;
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+              this.formData.CheckDate = new Date();
+            }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
                 this.alerValData[i] = res.data.alvalitem[i];
@@ -788,6 +791,58 @@
           row.AvgValue = '0'
         }
       },
+      setProoFreadShow() {
+          this.ProoFreadShow = true
+      },
+      // 提交校核
+      makesure() {
+        this.$confirm('确定提交校核！', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+            // this.addRunRecord()
+          })
+          .catch(() => {})
+      },
+      // 添加运行记录
+      addRunRecord() {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      checkstatus() {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
+
+              })
+              this.DataStatus = 1
+              this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
 
       //保存信息
       saveEntity() {
@@ -811,8 +866,6 @@
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].StanDevice = this.formData.StanDevice
         }
-        this.deviationData.AvgValue = this.deviationData.AvgValue+""
-        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.deviationData.GasValue = parseInt(this.deviationData.GasValue)
         // this.deviationData.Deviation = parseInt(this.deviationData.Deviation)
         // this.responseTimeData.GasValue = parseInt(this.responseTimeData.GasValue)
@@ -843,7 +896,7 @@
           ResponTimeArrayList: this.responseTimeData, //添加响应时间数据
           RepeatArrayList: this.RepeatData, //添加重复性数据
           ShiftArrayList: this.ShiftData, //添加漂移数据
-          ReportAlerOtherData: this.ReportAlerOtherData,//干扰误差
+          AlertOtherList: this.ReportAlerOtherData,//干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
         console.log("---------allform", allform)
@@ -903,7 +956,7 @@
           ResponTimeArrayList: this.responseTimeData, //添加响应时间数据
           RepeatArrayList: this.RepeatData, //添加重复性数据
           ShiftArrayList: this.ShiftData, //添加漂移数据
-          ReportAlerOtherData: this.ReportAlerOtherData,//干扰误差
+          AlertOtherList: this.ReportAlerOtherData,//干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {

src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorHSgas/_opera/operation.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
@@ -432,9 +434,18 @@
 
     data() {
       return {
+        ProoFreadShow: false,
+        acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -645,6 +656,7 @@
       this.formData.DataEntryId = this.queryParams.DataEntryId
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
+      console.log("--this.$route.query.tbid--",this.formData.TaskBalanceId)
       this.initDatas();
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -659,6 +671,10 @@
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             this.formData = res.data.mainitem;
+            console.log("----this.formData----",this.formData)
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+              this.formData.CheckDate = new Date();
+            }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
                 this.alerValData[i] = res.data.alvalitem[i];
@@ -787,6 +803,58 @@
           row.AvgValue = '0'
         }
       },
+      setProoFreadShow() {
+          this.ProoFreadShow = true
+      },
+      // 提交校核
+      makesure() {
+        this.$confirm('确定提交校核！', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+            // this.addRunRecord()
+          })
+          .catch(() => {})
+      },
+      // 添加运行记录
+      addRunRecord() {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      checkstatus() {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
+
+              })
+              this.DataStatus = 1
+              this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
 
       //保存信息
       saveEntity() {

src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorelectoxygen/_opera/operation.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
@@ -26,6 +28,13 @@
               <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定日期:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="环境温度:">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%"></el-input>
@@ -365,9 +374,18 @@
 
     data() {
       return {
+        ProoFreadShow: false,
+        acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -598,6 +616,9 @@
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+              this.formData.CheckDate = new Date();
+            }
             if (res.data.deviitem != null) {
               for (var i = 0; i < res.data.deviitem.length; i++) {
                 this.deviationData[i].Id = res.data.deviitem[i].Id;
@@ -709,6 +730,58 @@
           row.AvgValue = '0'
         }
       },
+      setProoFreadShow() {
+          this.ProoFreadShow = true
+      },
+      // 提交校核
+      makesure() {
+        this.$confirm('确定提交校核！', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+            // this.addRunRecord()
+          })
+          .catch(() => {})
+      },
+      // 添加运行记录
+      addRunRecord() {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      checkstatus() {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
+
+              })
+              this.DataStatus = 1
+              this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
 
       //保存信息
       saveEntity() {