数据录入模板计量修改

src/dashoo.cn/backend/api/business/codecsequence/codecsequenceService.go

@@ -357,10 +357,66 @@ func (s *CodecSequenceService)GetDetailPressureGaugTestSequence(accCode string)
 	return seqStr
 }
 
-//ben
+//苯气检测报警器检定记录
 func (s *CodecSequenceService)GetDetailBenSequence(accCode string) string{
 	seqName := "BenAlertorTest"
 	sequence := s.GetSequenceByName(accCode, seqName)
 	seqStr := "J计QW7.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
 	return seqStr
+}
+
+//一氧化碳检测报警器检定记录
+func (s *CodecSequenceService)GetDetailCarbonSequence(accCode string) string{
+	seqName := "CarbonAlertorTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J计QW4.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+//复合气体检测报警器检定记录
+func (s *CodecSequenceService)GetDetailFHSequence(accCode string) string{
+	seqName := "FHAlertorTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J计QW8.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+//可燃气体检测报警器检定记录
+func (s *CodecSequenceService)GetDetailKRSequence(accCode string) string{
+	seqName := "KRAlertorTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J计QW2.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+//一氧化碳红外气体分析器检定记录
+func (s *CodecSequenceService)GetDetailACarbon1Sequence(accCode string) string{
+	seqName := "ACarbon1AlertorTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J计QW5.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+//二氧化碳红外气体分析器检定记录
+func (s *CodecSequenceService)GetDetailACarbon2Sequence(accCode string) string{
+	seqName := "ACarbon2AlertorTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J计QW6.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+//电化学氧测定仪检定记录
+func (s *CodecSequenceService)GetDetailEOSequence(accCode string) string{
+	seqName := "EOAlertorTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J计QW3.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+//硫化氢气体检测仪检定记录
+func (s *CodecSequenceService)GetDetailHSSequence(accCode string) string{
+	seqName := "HSAlertorTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J计QW1.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
 }

src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -196,9 +196,30 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 	case limsdoctemplate.DAYT_PRESSUREGAUGETEST_DETAIL:
 		//压力表检定
 		seqStr = codecSvc.GetDetailPressureGaugTestSequence(AccCode)
-	case limsdoctemplate.DAYT_BEN_DETAIL:
-		//ben
-		seqStr = codecSvc.GetDetailPressureGaugTestSequence(AccCode)
+	case limsdoctemplate.DAYT_REPORTALERTORBENDETECT_DETAIL:
+		//苯气检测报警器检定记录
+		seqStr = codecSvc.GetDetailBenSequence(AccCode)
+	case limsdoctemplate.DAYT_REPORTALERTORCARBONDETECT_DETAIL:
+		//一氧化碳检测报警器检定记录
+		seqStr = codecSvc.GetDetailCarbonSequence(AccCode)
+	case limsdoctemplate.DAYT_REPORTALERTORFHGASDETECT_DETAIL:
+		//复合气体检测报警器检定记录
+		seqStr = codecSvc.GetDetailFHSequence(AccCode)
+	case limsdoctemplate.DAYT_REPORTALERTORKRGASDETECT_DETAIL:
+		//可燃气体检测报警器检定记录
+		seqStr = codecSvc.GetDetailKRSequence(AccCode)
+	case limsdoctemplate.DAYT_REPORTANALYZER1CARBONREDGAS_DETAIL:
+		//一氧化碳红外气体分析器检定记录
+		seqStr = codecSvc.GetDetailACarbon1Sequence(AccCode)
+	case limsdoctemplate.DAYT_REPORTANALYZER2CARBONREDGAS_DETAIL:
+		//二氧化碳红外气体分析器检定记录
+		seqStr = codecSvc.GetDetailACarbon2Sequence(AccCode)
+	case limsdoctemplate.DAYT_REPORTDETECTORELECTOXYGEN_DETAIL:
+		//电化学氧测定仪检定记录
+		seqStr = codecSvc.GetDetailEOSequence(AccCode)
+	case limsdoctemplate.DAYT_REPORTDETECTORHSGAS_DETAIL:
+		//硫化氢气体检测仪检定记录
+		seqStr = codecSvc.GetDetailHSSequence(AccCode)
 	}
 	//根据分配人员创建多条数据录入记录
 	ConUserIdList := strings.Split(balancedata.ConUserId, ",")

src/dashoo.cn/backend/api/business/limsdoctemplate/limstemplateenum.go

@@ -101,12 +101,25 @@ const (
 	DAYT_LIMSREPORTMOTOR_DETAIL string = "DAYT.LimsReportMotor.Detail"
 	// 电泵井
 	DAYT_LIMSREPORTELECPUMPWELL_DETAIL string = "DAYT.LimsReportElecPumpWell.Detail"
-	//Ben
-	DAYT_BEN_DETAIL string= "DAYT.Ben.Detail"
-	// 一氧化碳报警器
-	DAYT_CARBON_DETAIL string= "DAYT.Carbon.Detail"
+	//苯气检测报警器检定记录
+	DAYT_REPORTALERTORBENDETECT_DETAIL string= "DAYT.ReportAlertorBenDetect.Detail"
+	// 一氧化碳检测报警器检定记录
+	DAYT_REPORTALERTORCARBONDETECT_DETAIL string= "DAYT.ReportAlertorCarbonDetect.Detail"
+	// 复合气体检测报警器检定记录
+	DAYT_REPORTALERTORFHGASDETECT_DETAIL string= "DAYT.ReportAlertorFHGasDetect.Detail"
+	// 可燃气体检测报警器检定记录
+	DAYT_REPORTALERTORKRGASDETECT_DETAIL string= "DAYT.ReportAlertorKRGasDetect.Detail"
 	//螺杆泵
 	DAYT_LIMSREPORTSCREWPUMP_DETAIL string = "DAYT.LimsReportScrewPump.Detail"
 	// 油田专用变压器
 	DAYT_LIMSREPORTSPECIALFIELD_DETAIL string = "DAYT.LimsReportSpecialField.Detail"
+	// 一氧化碳红外气体分析器检定记录
+	DAYT_REPORTANALYZER1CARBONREDGAS_DETAIL string= "DAYT.ReportAnalyzer1CarbonRedGas.Detail"
+	// 二氧化碳红外气体分析器检定记录
+	DAYT_REPORTANALYZER2CARBONREDGAS_DETAIL string= "DAYT.ReportAnalyzer2CarbonRedGas.Detail"
+	// 电化学氧测定仪检定记录
+	DAYT_REPORTDETECTORELECTOXYGEN_DETAIL string= "DAYT.ReportDetectorElectOxygen.Detail"
+	// 硫化氢气体检测仪检定记录
+	DAYT_REPORTDETECTORHSGAS_DETAIL string= "DAYT.ReportDetectorHSGas.Detail"
+
 )

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

@@ -1444,6 +1444,27 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			DocUrl = ""
 			err = errors.New("")
 		}
+	case limsdoctemplate.DAYT_REPORTALERTORBENDETECT_DETAIL:
+		// 苯气检测报警器检定记录
+		var model limsreportpistonpumpunit.LimsReportPistonPumpUnit
+		svc := limsreportpistonpumpunit.GetLimsReportPistonPumpUnitService(utils.DBE)
+		where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsReportPistonPumpUnitName, where1, &model)
+		datamap := StructToMapDemo(model)
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has = svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
 	}
 	return DocUrl, err
 }

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

@@ -90,12 +90,24 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
-	dataentrymodel.CreateOn = time.Now()
-	dataentrymodel.CreateBy = this.User.Realname
-	dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
-		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	dataentrymodel.ModifiedOn = time.Now()
+	dataentrymodel.ModifiedBy = this.User.Realname
+	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	dataentrycols := []string{
+		"CustomerName",
+		"StandardDesc",
+		"Instrument1",
+		"PositionCheck",
+		"Temperature",
+		"DetectBasis",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
+	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	//if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
+	//	_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	//}
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -271,7 +283,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = dataentrymodel.Id
+		errinfo.Item = almodel.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -373,10 +385,11 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.ModifiedOn = time.Now()
-			cerentity.ModifiedBy = this.User.Realname
-			cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.CertiArrayList[i].Id != 0 {
+				cerentity.ModifiedOn = time.Now()
+				cerentity.ModifiedBy = this.User.Realname
+				cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				cercols := []string{
 					"CerNum",
 					"StandardUnit",
@@ -392,6 +405,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.CreateOn = time.Now()
+					cerentity.CreateBy = this.User.Realname
+					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -406,10 +422,11 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.ModifiedOn = time.Now()
-	cerentity2.ModifiedBy = this.User.Realname
-	cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 	if model.Id != 0 {
+		cerentity2.ModifiedOn = time.Now()
+		cerentity2.ModifiedBy = this.User.Realname
+		cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		cer2cols := []string{
 			"CerNum",
 			"StandardUnit",
@@ -425,6 +442,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	} else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.CreateOn = time.Now()
+			cerentity2.CreateBy = this.User.Realname
+			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -464,10 +484,11 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.DeviationRelative = model.DeviationArrayList[i].DeviationRelative
 			devientity.DeviationAbs = model.DeviationArrayList[i].DeviationAbs
-			devientity.ModifiedOn = time.Now()
-			devientity.ModifiedBy = this.User.Realname
-			devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.DeviationArrayList[i].Id != 0 {
+				devientity.ModifiedOn = time.Now()
+				devientity.ModifiedBy = this.User.Realname
+				devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				devicols := []string{
 					"GasValue",
 					"Value1",
@@ -483,6 +504,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			} else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.DeviationRelative != 0 || devientity.DeviationAbs != 0 {
+					devientity.CreateOn = time.Now()
+					devientity.CreateBy = this.User.Realname
+					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -497,10 +521,11 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 		reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 		reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 		reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-		reponseentity.ModifiedOn = time.Now()
-		reponseentity.ModifiedBy = this.User.Realname
-		reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.ResponTimeArrayList[0].Id != 0 {
+			reponseentity.ModifiedOn = time.Now()
+			reponseentity.ModifiedBy = this.User.Realname
+			reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			responcols := []string{
 				"GasValue",
 				"Value1",
@@ -514,6 +539,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.CreateOn = time.Now()
+				reponseentity.CreateBy = this.User.Realname
+				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -531,10 +559,11 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 		repeatentity.Value6 = model.RepeatArrayList[0].Value6
 		repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 		repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-		repeatentity.ModifiedOn = time.Now()
-		repeatentity.ModifiedBy = this.User.Realname
-		repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.RepeatArrayList[0].Id !=0 {
+			repeatentity.ModifiedOn = time.Now()
+			repeatentity.ModifiedBy = this.User.Realname
+			repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			repeacols := []string{
 				"GasValue",
 				"Value1",
@@ -552,6 +581,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.CreateOn = time.Now()
+				repeatentity.CreateBy = this.User.Realname
+				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -570,10 +602,11 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.ModifiedOn = time.Now()
-			shiftentity.ModifiedBy = this.User.Realname
-			shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.ShiftArrayList[i].Id !=0 {
+				shiftentity.ModifiedOn = time.Now()
+				shiftentity.ModifiedBy = this.User.Realname
+				shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				shiftcols := []string{
 					"ValueType",
 					"Value1",
@@ -591,6 +624,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.CreateOn = time.Now()
+					shiftentity.CreateBy = this.User.Realname
+					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

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

@@ -93,12 +93,21 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
-	dataentrymodel.CreateOn = time.Now()
-	dataentrymodel.CreateBy = this.User.Realname
-	dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
-		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	dataentrymodel.ModifiedOn = time.Now()
+	dataentrymodel.ModifiedBy = this.User.Realname
+	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	dataentrycols := []string{
+		"CustomerName",
+		"StandardDesc",
+		"Instrument1",
+		"PositionCheck",
+		"Temperature",
+		"DetectBasis",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
+	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -274,7 +283,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = dataentrymodel.Id
+		errinfo.Item = almodel.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -378,10 +387,11 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.ModifiedOn = time.Now()
-			cerentity.ModifiedBy = this.User.Realname
-			cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.CertiArrayList[i].Id != 0 {
+				cerentity.ModifiedOn = time.Now()
+				cerentity.ModifiedBy = this.User.Realname
+				cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				cercols := []string{
 					"CerNum",
 					"StandardUnit",
@@ -397,6 +407,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			}else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.CreateOn = time.Now()
+					cerentity.CreateBy = this.User.Realname
+					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -410,10 +423,10 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.ModifiedOn = time.Now()
-	cerentity2.ModifiedBy = this.User.Realname
-	cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 	if model.Id != 0 {
+		cerentity2.ModifiedOn = time.Now()
+		cerentity2.ModifiedBy = this.User.Realname
+		cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		cer2cols := []string{
 			"CerNum",
 			"StandardUnit",
@@ -429,6 +442,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	}else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.CreateOn = time.Now()
+			cerentity2.CreateBy = this.User.Realname
+			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -442,10 +458,11 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 			avalentity.Value2 = model.AlertValArrayList[i].Value2
 			avalentity.Value3 = model.AlertValArrayList[i].Value3
 			avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
-			avalentity.ModifiedOn = time.Now()
-			avalentity.ModifiedBy = this.User.Realname
-			avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.AlertValArrayList[i].Id != 0 {
+				avalentity.ModifiedOn = time.Now()
+				avalentity.ModifiedBy = this.User.Realname
+				avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				alvalcols := []string{
 					"AlertFunction",
 					"Value1",
@@ -459,6 +476,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity, alvalcols, alwhere)
 			}else {
 				if avalentity.AlertFunction != "" || avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.ActionValue != 0 {
+					avalentity.CreateOn = time.Now()
+					avalentity.CreateBy = this.User.Realname
+					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity)
 				}
 			}
@@ -475,10 +495,11 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 			devientity.Value3 = model.DeviationArrayList[i].Value3
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
-			devientity.ModifiedOn = time.Now()
-			devientity.ModifiedBy = this.User.Realname
-			devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.DeviationArrayList[i].Id != 0 {
+				devientity.ModifiedOn = time.Now()
+				devientity.ModifiedBy = this.User.Realname
+				devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				devicols := []string{
 					"GasValue",
 					"Value1",
@@ -493,6 +514,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.CreateOn = time.Now()
+					devientity.CreateBy = this.User.Realname
+					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -507,10 +531,11 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 		reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 		reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 		reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-		reponseentity.ModifiedOn = time.Now()
-		reponseentity.ModifiedBy = this.User.Realname
-		reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.ResponTimeArrayList[0].Id !=0 {
+			reponseentity.ModifiedOn = time.Now()
+			reponseentity.ModifiedBy = this.User.Realname
+			reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			responcols := []string{
 				"GasValue",
 				"Value1",
@@ -524,6 +549,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.CreateOn = time.Now()
+				reponseentity.CreateBy = this.User.Realname
+				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -541,10 +569,11 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 		repeatentity.Value6 = model.RepeatArrayList[0].Value6
 		repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 		repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-		repeatentity.ModifiedOn = time.Now()
-		repeatentity.ModifiedBy = this.User.Realname
-		repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.RepeatArrayList[0].Id !=0 {
+			repeatentity.ModifiedOn = time.Now()
+			repeatentity.ModifiedBy = this.User.Realname
+			repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			repeacols := []string{
 				"GasValue",
 				"Value1",
@@ -562,6 +591,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.CreateOn = time.Now()
+				repeatentity.CreateBy = this.User.Realname
+				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -581,10 +613,11 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.ModifiedOn = time.Now()
-			shiftentity.ModifiedBy = this.User.Realname
-			shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.ShiftArrayList[i].Id !=0 {
+				shiftentity.ModifiedOn = time.Now()
+				shiftentity.ModifiedBy = this.User.Realname
+				shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				shiftcols := []string{
 					"ValueType",
 					"Value1",
@@ -602,6 +635,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.CreateOn = time.Now()
+					shiftentity.CreateBy = this.User.Realname
+					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

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

@@ -93,12 +93,21 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
-	dataentrymodel.CreateOn = time.Now()
-	dataentrymodel.CreateBy = this.User.Realname
-	dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
-		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	dataentrymodel.ModifiedOn = time.Now()
+	dataentrymodel.ModifiedBy = this.User.Realname
+	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	dataentrycols := []string{
+		"CustomerName",
+		"StandardDesc",
+		"Instrument1",
+		"PositionCheck",
+		"Temperature",
+		"DetectBasis",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
+	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -274,7 +283,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = dataentrymodel.Id
+		errinfo.Item = almodel.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -376,10 +385,11 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.ModifiedOn = time.Now()
-			cerentity.ModifiedBy = this.User.Realname
-			cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.CertiArrayList[i].Id != 0 {
+				cerentity.ModifiedOn = time.Now()
+				cerentity.ModifiedBy = this.User.Realname
+				cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				cercols := []string{
 					"CerNum",
 					"StandardUnit",
@@ -395,6 +405,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.CreateOn = time.Now()
+					cerentity.CreateBy = this.User.Realname
+					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -409,10 +422,11 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.ModifiedOn = time.Now()
-	cerentity2.ModifiedBy = this.User.Realname
-	cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 	if model.Id != 0 {
+		cerentity2.ModifiedOn = time.Now()
+		cerentity2.ModifiedBy = this.User.Realname
+		cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		cer2cols := []string{
 			"CerNum",
 			"StandardUnit",
@@ -428,6 +442,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	}else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.CreateOn = time.Now()
+			cerentity2.CreateBy = this.User.Realname
+			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -442,10 +459,11 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 				avalentity.Value2 = model.AlertValArrayList[i].Value2
 				avalentity.Value3 = model.AlertValArrayList[i].Value3
 				avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
-				avalentity.ModifiedOn = time.Now()
-				avalentity.ModifiedBy = this.User.Realname
-				avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 				if model.AlertValArrayList[i].Id != 0 {
+					avalentity.ModifiedOn = time.Now()
+					avalentity.ModifiedBy = this.User.Realname
+					avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 					alvalcols := []string{
 						"AlertFunction",
 						"Value1",
@@ -459,6 +477,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 					err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity, alvalcols, alwhere)
 				}else {
 					if avalentity.AlertFunction != "" || avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.ActionValue != 0 {
+						avalentity.CreateOn = time.Now()
+						avalentity.CreateBy = this.User.Realname
+						avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 						_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity)
 					}
 				}
@@ -477,10 +498,11 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 			devientity.Value3 = model.DeviationArrayList[i].Value3
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
-			devientity.ModifiedOn = time.Now()
-			devientity.ModifiedBy = this.User.Realname
-			devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.AlertValArrayList[i].Id != 0 {
+				devientity.ModifiedOn = time.Now()
+				devientity.ModifiedBy = this.User.Realname
+				devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				devicols := []string{
 					"GasValue",
 					"Value1",
@@ -495,6 +517,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.CreateOn = time.Now()
+					devientity.CreateBy = this.User.Realname
+					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -509,10 +534,11 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 		reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 		reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 		reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-		reponseentity.ModifiedOn = time.Now()
-		reponseentity.ModifiedBy = this.User.Realname
-		reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.ResponTimeArrayList[0].Id != 0 {
+			reponseentity.ModifiedOn = time.Now()
+			reponseentity.ModifiedBy = this.User.Realname
+			reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			responcols := []string{
 				"GasValue",
 				"Value1",
@@ -526,6 +552,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		}else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.CreateOn = time.Now()
+				reponseentity.CreateBy = this.User.Realname
+				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -543,10 +572,11 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 		repeatentity.Value6 = model.RepeatArrayList[0].Value6
 		repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 		repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-		repeatentity.ModifiedOn = time.Now()
-		repeatentity.ModifiedBy = this.User.Realname
-		repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.RepeatArrayList[0].Id != 0 {
+			repeatentity.ModifiedOn = time.Now()
+			repeatentity.ModifiedBy = this.User.Realname
+			repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			repeacols := []string{
 				"GasValue",
 				"Value1",
@@ -564,6 +594,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.CreateOn = time.Now()
+				repeatentity.CreateBy = this.User.Realname
+				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -582,10 +615,11 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.ModifiedOn = time.Now()
-			shiftentity.ModifiedBy = this.User.Realname
-			shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.ShiftArrayList[i].Id !=0 {
+				shiftentity.ModifiedOn = time.Now()
+				shiftentity.ModifiedBy = this.User.Realname
+				shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				shiftcols := []string{
 					"ValueType",
 					"Value1",
@@ -603,6 +637,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.CreateOn = time.Now()
+					shiftentity.CreateBy = this.User.Realname
+					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

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

@@ -105,12 +105,21 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
-	dataentrymodel.CreateOn = time.Now()
-	dataentrymodel.CreateBy = this.User.Realname
-	dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
-		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	dataentrymodel.ModifiedOn = time.Now()
+	dataentrymodel.ModifiedBy = this.User.Realname
+	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	dataentrycols := []string{
+		"CustomerName",
+		"StandardDesc",
+		"Instrument1",
+		"PositionCheck",
+		"Temperature",
+		"DetectBasis",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
+	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -285,7 +294,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = dataentrymodel.Id
+		errinfo.Item = almodel.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -387,10 +396,11 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.ModifiedOn = time.Now()
-			cerentity.ModifiedBy = this.User.Realname
-			cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.CertiArrayList[i].Id != 0 {
+				cerentity.ModifiedOn = time.Now()
+				cerentity.ModifiedBy = this.User.Realname
+				cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				cercols := []string{
 					"CerNum",
 					"StandardUnit",
@@ -406,6 +416,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.CreateOn = time.Now()
+					cerentity.CreateBy = this.User.Realname
+					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -420,10 +433,11 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.ModifiedOn = time.Now()
-	cerentity2.ModifiedBy = this.User.Realname
-	cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 	if model.Id != 0 {
+		cerentity2.ModifiedOn = time.Now()
+		cerentity2.ModifiedBy = this.User.Realname
+		cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		cer2cols := []string{
 			"CerNum",
 			"StandardUnit",
@@ -439,6 +453,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	} else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.CreateOn = time.Now()
+			cerentity2.CreateBy = this.User.Realname
+			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -453,10 +470,11 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 			avalentity.Value2 = model.AlertOtherList[i].Value2
 			avalentity.Value3 = model.AlertOtherList[i].Value3
 			avalentity.OtherValue = model.AlertOtherList[i].OtherValue
-			avalentity.ModifiedOn = time.Now()
-			avalentity.ModifiedBy = this.User.Realname
-			avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.AlertOtherList[i].Id != 0 {
+				avalentity.ModifiedOn = time.Now()
+				avalentity.ModifiedBy = this.User.Realname
+				avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				alvalcols := []string{
 					"ValueType",
 					"Value0",
@@ -471,6 +489,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorOtherName, &avalentity, alvalcols, alwhere)
 			} else {
 				if avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.OtherValue != 0 {
+					avalentity.CreateOn = time.Now()
+					avalentity.CreateBy = this.User.Realname
+					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorOtherName, &avalentity)
 				}
 			}
@@ -487,10 +508,11 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 			devientity.Value3 = model.DeviationArrayList[i].Value3
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
-			devientity.ModifiedOn = time.Now()
-			devientity.ModifiedBy = this.User.Realname
-			devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.DeviationArrayList[i].Id != 0 {
+				devientity.ModifiedOn = time.Now()
+				devientity.ModifiedBy = this.User.Realname
+				devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				devicols := []string{
 					"GasValue",
 					"Value1",
@@ -505,6 +527,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.CreateOn = time.Now()
+					devientity.CreateBy = this.User.Realname
+					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -518,10 +543,11 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 		reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 		reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 		reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-		reponseentity.ModifiedOn = time.Now()
-		reponseentity.ModifiedBy = this.User.Realname
-		reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.ResponTimeArrayList[0].Id != 0 {
+			reponseentity.ModifiedOn = time.Now()
+			reponseentity.ModifiedBy = this.User.Realname
+			reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			responcols := []string{
 				"GasValue",
 				"Value1",
@@ -535,6 +561,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		}else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.CreateOn = time.Now()
+				reponseentity.CreateBy = this.User.Realname
+				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -552,10 +581,11 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 		repeatentity.Value6 = model.RepeatArrayList[0].Value6
 		repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 		repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-		repeatentity.ModifiedOn = time.Now()
-		repeatentity.ModifiedBy = this.User.Realname
-		repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.RepeatArrayList[0].Id != 0 {
+			repeatentity.ModifiedOn = time.Now()
+			repeatentity.ModifiedBy = this.User.Realname
+			repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			repeacols := []string{
 				"GasValue",
 				"Value1",
@@ -573,6 +603,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.CreateOn = time.Now()
+				repeatentity.CreateBy = this.User.Realname
+				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -591,10 +624,11 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.ModifiedOn = time.Now()
-			shiftentity.ModifiedBy = this.User.Realname
-			shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.ShiftArrayList[i].Id !=0 {
+				shiftentity.ModifiedOn = time.Now()
+				shiftentity.ModifiedBy = this.User.Realname
+				shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				shiftcols := []string{
 					"ValueType",
 					"Value1",
@@ -612,6 +646,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.CreateOn = time.Now()
+					shiftentity.CreateBy = this.User.Realname
+					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

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

@@ -94,12 +94,21 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
-	dataentrymodel.CreateOn = time.Now()
-	dataentrymodel.CreateBy = this.User.Realname
-	dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
-		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	dataentrymodel.ModifiedOn = time.Now()
+	dataentrymodel.ModifiedBy = this.User.Realname
+	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	dataentrycols := []string{
+		"CustomerName",
+		"StandardDesc",
+		"Instrument1",
+		"PositionCheck",
+		"Temperature",
+		"DetectBasis",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
+	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -275,7 +284,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 			//新增
 			errinfo.Message = "添加成功！"
 			errinfo.Code = 0
-			errinfo.Item = dataentrymodel.Id
+			errinfo.Item = almodel.Id
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		} else {
@@ -377,10 +386,11 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.ModifiedOn = time.Now()
-			cerentity.ModifiedBy = this.User.Realname
-			cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.CertiArrayList[i].Id != 0 {
+				cerentity.ModifiedOn = time.Now()
+				cerentity.ModifiedBy = this.User.Realname
+				cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				cercols := []string{
 					"CerNum",
 					"StandardUnit",
@@ -396,6 +406,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.CreateOn = time.Now()
+					cerentity.CreateBy = this.User.Realname
+					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -409,10 +422,11 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.ModifiedOn = time.Now()
-	cerentity2.ModifiedBy = this.User.Realname
-	cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 	if model.Id != 0 {
+		cerentity2.ModifiedOn = time.Now()
+		cerentity2.ModifiedBy = this.User.Realname
+		cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		cer2cols := []string{
 			"CerNum",
 			"StandardUnit",
@@ -428,6 +442,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	}else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.CreateOn = time.Now()
+			cerentity2.CreateBy = this.User.Realname
+			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -442,10 +459,11 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 			avalentity.Value2 = model.AlertOtherList[i].Value2
 			avalentity.Value3 = model.AlertOtherList[i].Value3
 			avalentity.OtherValue = model.AlertOtherList[i].OtherValue
-			avalentity.ModifiedOn = time.Now()
-			avalentity.ModifiedBy = this.User.Realname
-			avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.AlertOtherList[i].Id != 0 {
+				avalentity.ModifiedOn = time.Now()
+				avalentity.ModifiedBy = this.User.Realname
+				avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				alvalcols := []string{
 					"ValueType",
 					"Value0",
@@ -460,6 +478,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorOtherName, &avalentity, alvalcols, alwhere)
 			} else {
 				if avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.OtherValue != 0 {
+					avalentity.CreateOn = time.Now()
+					avalentity.CreateBy = this.User.Realname
+					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorOtherName, &avalentity)
 				}
 			}
@@ -475,10 +496,11 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 			devientity.Value3 = model.DeviationArrayList[i].Value3
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
-			devientity.ModifiedOn = time.Now()
-			devientity.ModifiedBy = this.User.Realname
-			devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.DeviationArrayList[i].Id != 0 {
+				devientity.ModifiedOn = time.Now()
+				devientity.ModifiedBy = this.User.Realname
+				devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				devicols := []string{
 					"GasValue",
 					"Value1",
@@ -493,6 +515,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.CreateOn = time.Now()
+					devientity.CreateBy = this.User.Realname
+					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -507,10 +532,11 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 		reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 		reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 		reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-		reponseentity.ModifiedOn = time.Now()
-		reponseentity.ModifiedBy = this.User.Realname
-		reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.ResponTimeArrayList[0].Id != 0 {
+			reponseentity.ModifiedOn = time.Now()
+			reponseentity.ModifiedBy = this.User.Realname
+			reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			responcols := []string{
 				"GasValue",
 				"Value1",
@@ -524,6 +550,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		}else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.CreateOn = time.Now()
+				reponseentity.CreateBy = this.User.Realname
+				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -541,10 +570,11 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 		repeatentity.Value6 = model.RepeatArrayList[0].Value6
 		repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 		repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-		repeatentity.ModifiedOn = time.Now()
-		repeatentity.ModifiedBy = this.User.Realname
-		repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.RepeatArrayList[0].Id != 0 {
+			repeatentity.ModifiedOn = time.Now()
+			repeatentity.ModifiedBy = this.User.Realname
+			repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			repeacols := []string{
 				"GasValue",
 				"Value1",
@@ -562,6 +592,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.CreateOn = time.Now()
+				repeatentity.CreateBy = this.User.Realname
+				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -581,10 +614,11 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.ModifiedOn = time.Now()
-			shiftentity.ModifiedBy = this.User.Realname
-			shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.ShiftArrayList[i].Id !=0 {
+				shiftentity.ModifiedOn = time.Now()
+				shiftentity.ModifiedBy = this.User.Realname
+				shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				shiftcols := []string{
 					"ValueType",
 					"Value1",
@@ -602,6 +636,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.CreateOn = time.Now()
+					shiftentity.CreateBy = this.User.Realname
+					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

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

@@ -158,12 +158,21 @@ func (this *LimsReportBenController) AddEntity() {
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
-	dataentrymodel.CreateOn = time.Now()
-	dataentrymodel.CreateBy = this.User.Realname
-	dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
-		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	dataentrymodel.ModifiedOn = time.Now()
+	dataentrymodel.ModifiedBy = this.User.Realname
+	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	dataentrycols := []string{
+		"CustomerName",
+		"StandardDesc",
+		"Instrument1",
+		"PositionCheck",
+		"Temperature",
+		"DetectBasis",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
+	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -339,7 +348,7 @@ func (this *LimsReportBenController) AddEntity() {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = dataentrymodel.Id
+		errinfo.Item = almodel.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -442,10 +451,11 @@ func (this *LimsReportBenController) UpdateEntity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.ModifiedOn = time.Now()
-			cerentity.ModifiedBy = this.User.Realname
-			cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.CertiArrayList[i].Id != 0 {
+				cerentity.ModifiedOn = time.Now()
+				cerentity.ModifiedBy = this.User.Realname
+				cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				cercols := []string{
 					"CerNum",
 					"StandardUnit",
@@ -461,6 +471,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.CreateOn = time.Now()
+					cerentity.CreateBy = this.User.Realname
+					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -474,10 +487,11 @@ func (this *LimsReportBenController) UpdateEntity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.ModifiedOn = time.Now()
-	cerentity2.ModifiedBy = this.User.Realname
-	cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 	if model.Id != 0 {
+		cerentity2.ModifiedOn = time.Now()
+		cerentity2.ModifiedBy = this.User.Realname
+		cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		cer2cols := []string{
 			"CerNum",
 			"StandardUnit",
@@ -493,6 +507,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	}else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.CreateOn = time.Now()
+			cerentity2.CreateBy = this.User.Realname
+			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -506,10 +523,11 @@ func (this *LimsReportBenController) UpdateEntity() {
 			avalentity.Value2 = model.AlertValArrayList[i].Value2
 			avalentity.Value3 = model.AlertValArrayList[i].Value3
 			avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
-			avalentity.ModifiedOn = time.Now()
-			avalentity.ModifiedBy = this.User.Realname
-			avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.AlertValArrayList[i].Id != 0 {
+				avalentity.ModifiedOn = time.Now()
+				avalentity.ModifiedBy = this.User.Realname
+				avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				alvalcols := []string{
 					"AlertFunction",
 					"Value1",
@@ -523,6 +541,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity, alvalcols, alwhere)
 			}else {
 				if avalentity.AlertFunction != "" || avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.ActionValue != 0 {
+					avalentity.CreateOn = time.Now()
+					avalentity.CreateBy = this.User.Realname
+					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity)
 				}
 			}
@@ -539,10 +560,11 @@ func (this *LimsReportBenController) UpdateEntity() {
 			devientity.Value3 = model.DeviationArrayList[i].Value3
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
-			devientity.ModifiedOn = time.Now()
-			devientity.ModifiedBy = this.User.Realname
-			devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.DeviationArrayList[i].Id != 0 {
+				devientity.ModifiedOn = time.Now()
+				devientity.ModifiedBy = this.User.Realname
+				devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				devicols := []string{
 					"GasValue",
 					"Value1",
@@ -557,6 +579,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.CreateOn = time.Now()
+					devientity.CreateBy = this.User.Realname
+					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -572,10 +597,11 @@ func (this *LimsReportBenController) UpdateEntity() {
 		reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 		reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 		reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-		reponseentity.ModifiedOn = time.Now()
-		reponseentity.ModifiedBy = this.User.Realname
-		reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.ResponTimeArrayList[0].Id != 0 {
+			reponseentity.ModifiedOn = time.Now()
+			reponseentity.ModifiedBy = this.User.Realname
+			reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			responcols := []string{
 				"GasValue",
 				"Value1",
@@ -589,6 +615,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.CreateOn = time.Now()
+				reponseentity.CreateBy = this.User.Realname
+				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -606,10 +635,11 @@ func (this *LimsReportBenController) UpdateEntity() {
 		repeatentity.Value6 = model.RepeatArrayList[0].Value6
 		repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 		repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-		repeatentity.ModifiedOn = time.Now()
-		repeatentity.ModifiedBy = this.User.Realname
-		repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.RepeatArrayList[0].Id != 0 {
+			repeatentity.ModifiedOn = time.Now()
+			repeatentity.ModifiedBy = this.User.Realname
+			repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			repeacols := []string{
 				"GasValue",
 				"Value1",
@@ -627,6 +657,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		} else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.CreateOn = time.Now()
+				repeatentity.CreateBy = this.User.Realname
+				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -646,10 +679,11 @@ func (this *LimsReportBenController) UpdateEntity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.ModifiedOn = time.Now()
-			shiftentity.ModifiedBy = this.User.Realname
-			shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.ShiftArrayList[i].Id !=0 {
+				shiftentity.ModifiedOn = time.Now()
+				shiftentity.ModifiedBy = this.User.Realname
+				shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				shiftcols := []string{
 					"ValueType",
 					"Value1",
@@ -667,6 +701,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.CreateOn = time.Now()
+					shiftentity.CreateBy = this.User.Realname
+					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

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

@@ -93,12 +93,21 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
-	dataentrymodel.CreateOn = time.Now()
-	dataentrymodel.CreateBy = this.User.Realname
-	dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
-		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	dataentrymodel.ModifiedOn = time.Now()
+	dataentrymodel.ModifiedBy = this.User.Realname
+	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	dataentrycols := []string{
+		"CustomerName",
+		"StandardDesc",
+		"Instrument1",
+		"PositionCheck",
+		"Temperature",
+		"DetectBasis",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
+	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -123,7 +132,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorName, &almodel)
 	}
 	//证书表
-	if model.CertiArrayList != nil{
+	if model.CertiArrayList != nil {
 		for i := 0; i < len(model.CertiArrayList); i++ {
 			var cerentity limsreportalertor.LimsReportAlertorCertificate
 			cerentity.CerNum = model.CertiArrayList[i].CerNum
@@ -277,7 +286,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = dataentrymodel.Id
+		errinfo.Item = almodel.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -379,10 +388,10 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.ModifiedOn = time.Now()
-			cerentity.ModifiedBy = this.User.Realname
-			cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			if model.CertiArrayList[i].Id != 0 {
+				cerentity.ModifiedOn = time.Now()
+				cerentity.ModifiedBy = this.User.Realname
+				cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				cercols := []string{
 					"CerNum",
 					"StandardUnit",
@@ -396,8 +405,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 					"ModifiedUserId",
 				}
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
-			}else {
+			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.CreateOn = time.Now()
+					cerentity.CreateBy = this.User.Realname
+					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -412,10 +424,10 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.ModifiedOn = time.Now()
-	cerentity2.ModifiedBy = this.User.Realname
-	cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 	if model.Id != 0 {
+		cerentity2.ModifiedOn = time.Now()
+		cerentity2.ModifiedBy = this.User.Realname
+		cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		cer2cols := []string{
 			"CerNum",
 			"StandardUnit",
@@ -429,8 +441,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 			"ModifiedUserId",
 		}
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
-	}else {
+	} else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.CreateOn = time.Now()
+			cerentity2.CreateBy = this.User.Realname
+			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -445,10 +460,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 			avalentity.Value3 = model.AlertValArrayList[i].Value3
 			avalentity.MaxValue = model.AlertValArrayList[i].MaxValue
 			avalentity.AllowValue = model.AlertValArrayList[i].AllowValue
-			avalentity.ModifiedOn = time.Now()
-			avalentity.ModifiedBy = this.User.Realname
-			avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.AlertValArrayList[i].Id != 0 {
+				avalentity.ModifiedOn = time.Now()
+				avalentity.ModifiedBy = this.User.Realname
+				avalentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				alvalcols := []string{
 					"SureValue",
 					"Value1",
@@ -461,8 +477,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 					"ModifiedUserId",
 				}
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity, alvalcols, alwhere)
-			}else {
-				if avalentity.SureValue != 0 || avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.MaxValue != 0 || avalentity.AllowValue != 0{
+			} else {
+				if avalentity.SureValue != 0 || avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.MaxValue != 0 || avalentity.AllowValue != 0 {
+					avalentity.CreateOn = time.Now()
+					avalentity.CreateBy = this.User.Realname
+					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity)
 				}
 			}
@@ -479,10 +498,10 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 			devientity.Value3 = model.DeviationArrayList[i].Value3
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
-			devientity.ModifiedOn = time.Now()
-			devientity.ModifiedBy = this.User.Realname
-			devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			if model.DeviationArrayList[i].Id != 0 {
+				devientity.ModifiedOn = time.Now()
+				devientity.ModifiedBy = this.User.Realname
+				devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				devicols := []string{
 					"GasValue",
 					"Value1",
@@ -497,6 +516,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			} else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.CreateOn = time.Now()
+					devientity.CreateBy = this.User.Realname
+					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -511,10 +533,10 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 		reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 		reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 		reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-		reponseentity.ModifiedOn = time.Now()
-		reponseentity.ModifiedBy = this.User.Realname
-		reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		if model.ResponTimeArrayList[0].Id != 0 {
+			reponseentity.ModifiedOn = time.Now()
+			reponseentity.ModifiedBy = this.User.Realname
+			reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			responcols := []string{
 				"GasValue",
 				"Value1",
@@ -526,8 +548,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 				"ModifiedUserId",
 			}
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
-		}else {
+		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.CreateOn = time.Now()
+				reponseentity.CreateBy = this.User.Realname
+				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -545,10 +570,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 		repeatentity.Value6 = model.RepeatArrayList[0].Value6
 		repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 		repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-		repeatentity.ModifiedOn = time.Now()
-		repeatentity.ModifiedBy = this.User.Realname
-		repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.RepeatArrayList[0].Id != 0 {
+			repeatentity.ModifiedOn = time.Now()
+			repeatentity.ModifiedBy = this.User.Realname
+			repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			repeacols := []string{
 				"GasValue",
 				"Value1",
@@ -564,8 +590,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 				"ModifiedUserId",
 			}
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
-		}else {
+		} else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.CreateOn = time.Now()
+				repeatentity.CreateBy = this.User.Realname
+				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -584,10 +613,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.ModifiedOn = time.Now()
-			shiftentity.ModifiedBy = this.User.Realname
-			shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-			if model.ShiftArrayList[i].Id !=0 {
+
+			if model.ShiftArrayList[i].Id != 0 {
+				shiftentity.ModifiedOn = time.Now()
+				shiftentity.ModifiedBy = this.User.Realname
+				shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				shiftcols := []string{
 					"ValueType",
 					"Value1",
@@ -603,8 +633,11 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 					"ModifiedUserId",
 				}
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
-			}else {
+			} else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.CreateOn = time.Now()
+					shiftentity.CreateBy = this.User.Realname
+					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

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

@@ -93,12 +93,21 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
-	dataentrymodel.CreateOn = time.Now()
-	dataentrymodel.CreateBy = this.User.Realname
-	dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	if dataentrymodel.Instrument1 != "" || dataentrymodel.DetectBasis != "" || dataentrymodel.CustomerName != "" || dataentrymodel.Temperature != "" || dataentrymodel.StandardDesc != "" {
-		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+	dataentrymodel.ModifiedOn = time.Now()
+	dataentrymodel.ModifiedBy = this.User.Realname
+	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	dataentrycols := []string{
+		"CustomerName",
+		"StandardDesc",
+		"Instrument1",
+		"PositionCheck",
+		"Temperature",
+		"DetectBasis",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
+	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -275,7 +284,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = dataentrymodel.Id
+		errinfo.Item = almodel.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -377,10 +386,11 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.ModifiedOn = time.Now()
-			cerentity.ModifiedBy = this.User.Realname
-			cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.CertiArrayList[i].Id != 0 {
+				cerentity.ModifiedOn = time.Now()
+				cerentity.ModifiedBy = this.User.Realname
+				cerentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				cercols := []string{
 					"CerNum",
 					"StandardUnit",
@@ -396,6 +406,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.CreateOn = time.Now()
+					cerentity.CreateBy = this.User.Realname
+					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -410,10 +423,11 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.ModifiedOn = time.Now()
-	cerentity2.ModifiedBy = this.User.Realname
-	cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 	if model.Id != 0 {
+		cerentity2.ModifiedOn = time.Now()
+		cerentity2.ModifiedBy = this.User.Realname
+		cerentity2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		cer2cols := []string{
 			"CerNum",
 			"StandardUnit",
@@ -429,6 +443,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	} else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.CreateOn = time.Now()
+			cerentity2.CreateBy = this.User.Realname
+			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -467,10 +484,11 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 			devientity.Value3 = model.DeviationArrayList[i].Value3
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
-			devientity.ModifiedOn = time.Now()
-			devientity.ModifiedBy = this.User.Realname
-			devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.DeviationArrayList[i].Id != 0 {
+				devientity.ModifiedOn = time.Now()
+				devientity.ModifiedBy = this.User.Realname
+				devientity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				devicols := []string{
 					"GasValue",
 					"Value1",
@@ -485,6 +503,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			} else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.DeviationRelative != 0 || devientity.DeviationAbs != 0 {
+					devientity.CreateOn = time.Now()
+					devientity.CreateBy = this.User.Realname
+					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -499,10 +520,11 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 		reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 		reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 		reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-		reponseentity.ModifiedOn = time.Now()
-		reponseentity.ModifiedBy = this.User.Realname
-		reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.ResponTimeArrayList[0].Id != 0 {
+			reponseentity.ModifiedOn = time.Now()
+			reponseentity.ModifiedBy = this.User.Realname
+			reponseentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			responcols := []string{
 				"GasValue",
 				"Value1",
@@ -516,6 +538,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.CreateOn = time.Now()
+				reponseentity.CreateBy = this.User.Realname
+				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -533,10 +558,11 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 		repeatentity.Value6 = model.RepeatArrayList[0].Value6
 		repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 		repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-		repeatentity.ModifiedOn = time.Now()
-		repeatentity.ModifiedBy = this.User.Realname
-		repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 		if model.RepeatArrayList[0].Id != 0 {
+			repeatentity.ModifiedOn = time.Now()
+			repeatentity.ModifiedBy = this.User.Realname
+			repeatentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 			repeacols := []string{
 				"GasValue",
 				"Value1",
@@ -554,6 +580,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		} else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.CreateOn = time.Now()
+				repeatentity.CreateBy = this.User.Realname
+				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -572,10 +601,11 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.ModifiedOn = time.Now()
-			shiftentity.ModifiedBy = this.User.Realname
-			shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
 			if model.ShiftArrayList[i].Id != 0 {
+				shiftentity.ModifiedOn = time.Now()
+				shiftentity.ModifiedBy = this.User.Realname
+				shiftentity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 				shiftcols := []string{
 					"ValueType",
 					"Value1",
@@ -593,6 +623,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			} else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.CreateOn = time.Now()
+					shiftentity.CreateBy = this.User.Realname
+					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

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

@@ -46,7 +46,8 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName" @sort-change="orderby" @selection-change="handleSelectionChange">
+      <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="180" align="center" fixed>
           <template slot-scope="scope">
@@ -124,7 +125,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center"
+          show-overflow-tooltip></el-table-column>
         <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"
           show-overflow-tooltip></el-table-column>
         <el-table-column prop="TestDetail" sortable min-width="100" label="检测明细项" align="center" show-overflow-tooltip></el-table-column>
@@ -143,30 +145,24 @@
         </el-table-column> -->
         <el-table-column sortable min-width="110" align="center" prop="CheckStatus" label="审核状态">
           <template slot-scope="scope">
-             <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="校核通过"
-             type="success">
-             </el-alert>
-             <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="审核通过"
-             type="success">
-             </el-alert>
-             <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="未校核"
-             type="info">
-             </el-alert>
-              <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待校核"
-              type="warning">
-               </el-alert>
-                <el-alert v-if="scope.row.CheckStatus=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过"
-              type="error">
-               </el-alert>
-               <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false"  style="background:rgba(255,255,255,0.2)"
-               title="校核未通过"
-               type="error">
-                </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="校核通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="未校核" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待校核" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="校核未通过" type="error">
+            </el-alert>
           </template>
         </el-table-column>
         <el-table-column prop="Remark" sortable label="备注" align="center" show-overflow-tooltip></el-table-column>
@@ -263,8 +259,7 @@
       <el-form :model="dataentryForm" label-width="160px" ref="dataentryForm">
         <el-alert title="" description="请先访问网址 【weed1.labsop.cn:9390/3,0b86ca7a6f80】" type="warning" :closable="false">
         </el-alert>
-        <el-alert title="" description="解压到后,以管理员身份运行一下，即安装成功 " type="warning"
-          :closable="false">
+        <el-alert title="" description="解压到后,以管理员身份运行一下，即安装成功 " type="warning" :closable="false">
         </el-alert>
         <br />
         <el-alert title="文件保存修改注意！" description="请编辑完毕点击保存修改，不然您的修改将无效！" type="success" :closable="false">
@@ -343,7 +338,7 @@
         addsheetshow: false,
         dialogbuttonvisble: true,
         dialogTableVisible: false,
-        tooldownloaddialog:false,
+        tooldownloaddialog: false,
         CheckStatus: 0,
         EntryId: '',
         key: '',
@@ -474,7 +469,6 @@
         row,
         rowIndex
       }) {
-        console.log("-------wwwww",row)
         if (row.Recheck === 1) {
           return 'warning-row';
         }
@@ -492,27 +486,27 @@
       },
       //
       MoreCmdClick(cmd) {
-        if(cmd.Command == 'Open') {
+        if (cmd.Command == 'Open') {
           this.OpenOrignDataInput(cmd.row)
 
-        } else if(cmd.Command == 'JiaoHe') {
+        } else if (cmd.Command == 'JiaoHe') {
           this.jiaoheshowdialog(cmd.row)
 
-        } else if(cmd.Command == 'ShenHe') {
+        } else if (cmd.Command == 'ShenHe') {
           this.shenHeFunc(cmd.row)
 
-        } else if(cmd.Command == 'History') {
+        } else if (cmd.Command == 'History') {
           this.getvalues(cmd.row)
 
-        } else if(cmd.Command == 'OpenExcel') {
+        } else if (cmd.Command == 'OpenExcel') {
           this.docdownload(cmd.row)
 
-        } else if(cmd.Command == 'DownLoadExcel') {
+        } else if (cmd.Command == 'DownLoadExcel') {
           this.datadownload(cmd.row)
 
-        } else if(cmd.Command == 'Delete') {
+        } else if (cmd.Command == 'Delete') {
           this.deldataentry(cmd.row)
-        }else if(cmd.Command == 'DownloadTool') {
+        } else if (cmd.Command == 'DownloadTool') {
           this.tooldownload()
         }
 
@@ -526,11 +520,11 @@
       handleChange(value) {
         console.log(value);
       },
-       //工具下载
-      tooldownload(){
-          let url = "http://weed1.labsop.cn:9390/2,1080b2997d49"
-          window.open(url);
-          this.tooldownloaddialog = true
+      //工具下载
+      tooldownload() {
+        let url = "http://weed1.labsop.cn:9390/2,1080b2997d49"
+        window.open(url);
+        this.tooldownloaddialog = true
       },
       OpenOrignDataInput(row) {
 
@@ -595,7 +589,7 @@
               let fdocurl = docurl.DocUrl;
               let fname = docurl.DocName;
               console.log("---------docurl", res.data.item.DocUrl)
-              location.href = "http://"+fdocurl
+              location.href = "http://" + fdocurl
             }
           }).catch(err => {
             console.error(err)
@@ -639,6 +633,7 @@
           datastatus: this.CheckStatus,
           sign: '3'
         };
+        console.log("------doc",docTempType)
         switch (docTempType) {
           //漏电保护
           case "DAYT.LeakProtect.Detail":
@@ -717,14 +712,14 @@
               query: queryParams,
             });
             break
-          // 离心泵机组液体输送系统节能监测原始记录
-          case  "DAYT.LiquidTransportation.Detail":
+            // 离心泵机组液体输送系统节能监测原始记录
+          case "DAYT.LiquidTransportation.Detail":
             this.$router.push({
               path: '/lims/reportliquidtransportation/operation',
               query: queryParams
             })
             break
-          // 柱塞泵机组液体输送系统
+            // 柱塞泵机组液体输送系统
           case 'DAYT.ReportPistonPumpUnit.Detail':
             this.$router.push({
               path: '/lims/reportpistonpumpunit/operation',
@@ -759,6 +754,34 @@
               query: queryParams
             })
             break
+            //一氧化碳红外气体分析器检定记录
+          case 'DAYT.ReportAnalyzer1CarbonRedGas.Detail':
+            this.$router.push({
+              path: '/lims/reportanalyzer1carbonredgas/operation',
+              query: queryParams
+            })
+            break
+            //二氧化碳红外气体分析器检定记录
+          case 'DAYT.ReportAnalyzer2CarbonRedGas.Detail':
+            this.$router.push({
+              path: '/lims/reportanalyzer2carbonredgas/operation',
+              query: queryParams
+            })
+            break
+            //电化学氧测定仪检定记录
+          case 'DAYT.ReportDetectorElectOxygen.Detail':
+            this.$router.push({
+              path: '/lims/reportdetectorelectoxygen/operation',
+              query: queryParams
+            })
+            break
+            //硫化氢气体检测仪检定记录
+          case 'DAYT.ReportDetectorHSGas.Detail':
+            this.$router.push({
+              path: '/lims/reportdetectorHSgas/operation',
+              query: queryParams
+            })
+            break
           default:
             this.$message.warning('无模板类型相匹配，请重试');
         }
@@ -1087,4 +1110,5 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
+
 </style>

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

@@ -43,7 +43,8 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName" @sort-change="orderby" @selection-change="handleSelectionChange">
+      <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="180" align="center" fixed>
           <template slot-scope="scope">
@@ -69,7 +70,8 @@
                 <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>
                 <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-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.CheckStatus != 0"
+                  divided>删除数据</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
             <!--<el-button slot="reference" type="primary" size="mini" plain @click="getvalues(scope.row)">查看</el-button>-->
@@ -122,7 +124,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="EntrustNo" sortable min-width="130" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center"
+          show-overflow-tooltip></el-table-column>
         <el-table-column prop="CustomerName" sortable min-width="120" label="委托方名称" align="center"
           show-overflow-tooltip></el-table-column>
         <el-table-column prop="TestDetail" sortable min-width="120" label="检测项目" align="center" show-overflow-tooltip></el-table-column>
@@ -142,29 +145,23 @@
         <el-table-column sortable min-width="130" align="center" prop="CheckStatus" label="审核状态">
           <template slot-scope="scope">
             <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="校核通过"
-             type="success">
-             </el-alert>
-             <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="审核通过"
-             type="success">
-             </el-alert>
-             <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="未校核"
-             type="info">
-             </el-alert>
-              <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待校核"
-              type="warning">
-               </el-alert>
-                <el-alert v-if="scope.row.CheckStatus=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过"
-              type="error">
-               </el-alert>
-               <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false"  style="background:rgba(255,255,255,0.2)"
-               title="校核未通过"
-               type="error">
-                </el-alert>
+              title="校核通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="未校核" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待校核" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="校核未通过" type="error">
+            </el-alert>
           </template>
         </el-table-column>
         <el-table-column prop="Remark" sortable label="备注" align="center" show-overflow-tooltip></el-table-column>
@@ -240,48 +237,44 @@
         <el-button size="mini" type="primary" @click="clicksearch">查 询</el-button>
       </span>
     </el-dialog>
-        <el-dialog title="下载工具" :visible.sync="tooldownloaddialog" top="15vh" width="460px">
+    <el-dialog title="下载工具" :visible.sync="tooldownloaddialog" top="15vh" width="460px">
       <el-form label-width="160px">
-        <el-alert title="" description="工具下载完毕，解压后,以管理员身份运行，即可安装成功 " type="warning"
-          :closable="false">
+        <el-alert title="" description="工具下载完毕，解压后,以管理员身份运行，即可安装成功 " type="warning" :closable="false">
         </el-alert>
       </el-form>
     </el-dialog>
     <el-dialog title="数据录入添加" :visible.sync="adddataentryShow" top="5vh">
-     <el-form :model="adddataentryFrom" label-width="130px" ref="adddataentryFrom">
-             <el-row>
-                 <el-form-item label="委托单号">
-                  <el-input type="text" v-model="adddataentryFrom.EntrustNo" placeholder="请输入委托单号"
-                    style="width: 100%">
-                  </el-input>
-                </el-form-item>
-             </el-row>
-              <el-row>
-                <el-form-item label="检测人">
-                  <el-select ref="selectConUserId" v-model="adddataentryFrom.ConUserId" filterable placeholder="请选择检测人"
-                    style="width: 100%">
-                     <el-option v-for="item in partuserlist" :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="adddataentryFrom.Remark" 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="adddataentryShow = false">取 消</el-button>
-            <el-button type="primary" size="small" @click="makesureaddata()">确 定</el-button>
-          </div>
+      <el-form :model="adddataentryFrom" label-width="130px" ref="adddataentryFrom">
+        <el-row>
+          <el-form-item label="委托单号">
+            <el-input type="text" v-model="adddataentryFrom.EntrustNo" placeholder="请输入委托单号" style="width: 100%">
+            </el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="检测人">
+            <el-select ref="selectConUserId" v-model="adddataentryFrom.ConUserId" filterable placeholder="请选择检测人" style="width: 100%">
+              <el-option v-for="item in partuserlist" :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="adddataentryFrom.Remark" 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="adddataentryShow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="makesureaddata()">确 定</el-button>
+      </div>
     </el-dialog>
     <el-dialog title="数据录入" :visible.sync="dataentryShow" top="15vh" width="460px" :before-close="handleClose">
       <el-form :model="dataentryForm" label-width="160px" ref="dataentryForm">
         <el-alert title="" description="请先访问网址 【weed1.labsop.cn:9390/3,0b86ca7a6f80】" type="warning" :closable="false">
         </el-alert>
-        <el-alert title="" description="解压到后,以管理员身份运行一下，即安装成功 " type="warning"
-          :closable="false">
+        <el-alert title="" description="解压到后,以管理员身份运行一下，即安装成功 " type="warning" :closable="false">
         </el-alert>
         <br />
         <el-alert title="文件保存修改注意！" description="请编辑完毕点击保存修改，不然您的修改将无效！" type="success" :closable="false">
@@ -354,13 +347,13 @@
         },
         auditorShow: false,
         dataentryShow: false,
-        adddataentryShow :false,
+        adddataentryShow: false,
         historylist: [],
         historydialog: false,
         addsheetshow: false,
         dialogbuttonvisble: true,
         dialogTableVisible: false,
-        tooldownloaddialog :false,
+        tooldownloaddialog: false,
         CheckStatus: 0,
         EntryId: '',
         key: '',
@@ -378,7 +371,7 @@
         detailList: [],
         taskbalacelist: [],
         selectSamples: [],
-        partuserlist:[],
+        partuserlist: [],
         docTemplateDictList: [],
         tableColumns2: [],
         dataentryhistorylist: [],
@@ -409,13 +402,13 @@
           SuccessStatus: 1,
           AuditorRemark: ''
         },
-        reportList:[],
+        reportList: [],
         adddataentryFrom: {
           //TestDetail: '',
           EntrustNo: '',
-         // CustomerName: '',
+          // CustomerName: '',
           ConUserId: '',
-          ConUserBy:'',
+          ConUserBy: '',
           Remark: '',
         },
         Column: {
@@ -507,29 +500,29 @@
         return '';
       },
       //添加数据录入记录
-      adddataentry(){
+      adddataentry() {
         this.getpartuserlist()
-        this.adddataentryShow=true
+        this.adddataentryShow = true
       },
       //
       MoreCmdClick(cmd) {
-        if(cmd.Command == 'Open') {
-            this.OpenOrignDataInput(cmd.row)
-        } else if(cmd.Command == 'JiaoHe') {
+        if (cmd.Command == 'Open') {
+          this.OpenOrignDataInput(cmd.row)
+        } else if (cmd.Command == 'JiaoHe') {
           this.jiaoheshowdialog(cmd.row)
-        } else if(cmd.Command == 'ShenHe') {
+        } else if (cmd.Command == 'ShenHe') {
           this.shenHeFunc(cmd.row)
-        } else if(cmd.Command == 'History') {
+        } else if (cmd.Command == 'History') {
           this.getvalues(cmd.row)
-        } else if(cmd.Command == 'OpenExcel') {
+        } else if (cmd.Command == 'OpenExcel') {
           this.docdownload(cmd.row)
-        } else if(cmd.Command == 'DownLoadExcel') {
+        } else if (cmd.Command == 'DownLoadExcel') {
           this.datadownload(cmd.row)
-        } else if(cmd.Command == 'Delete') {
+        } else if (cmd.Command == 'Delete') {
           this.deldataentry(cmd.row)
-        } else if(cmd.Command == 'DownloadTool') {
+        } else if (cmd.Command == 'DownloadTool') {
           this.tooldownload()
-        }else if(cmd.Command == 'ShowReport') {
+        } else if (cmd.Command == 'ShowReport') {
           this.showreport(cmd.row)
         }
       },
@@ -540,35 +533,35 @@
         return cmd
       },
       //工具下载
-      tooldownload(){
-          let url = "http://weed1.labsop.cn:9390/2,1080b2997d49"
-          window.open(url);
-          this.tooldownloaddialog = true
+      tooldownload() {
+        let url = "http://weed1.labsop.cn:9390/2,1080b2997d49"
+        window.open(url);
+        this.tooldownloaddialog = true
       },
       //查看报告
-      showreport(val){
+      showreport(val) {
         this.reportList = val
         reportApi.dataCreateReport(this.reportList, this.$axios).then(res => {
           // response
           if (res.data.code === 0) {
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
+            // this.$message({
+            //   type: 'success',
+            //   message: res.data.message
+            // })
             let docurl = res.data.item.ReportUrl
-            this.changepage(val,docurl)
-            }else {
-              this.$message({
+            this.changepage(val, docurl)
+          } else {
+            this.$message({
               type: 'warning',
               message: res.data.message
-              })
-            }
+            })
+          }
         }).catch(err => {
           console.error(err)
         })
       },
       // 审核页面跳转
-      changepage (row, DocAddress) {
+      changepage(row, DocAddress) {
         let _this = this
         let queryParams = {
           key: row.EId,
@@ -581,7 +574,7 @@
         })
       },
       //数据录入添加确认按钮
-      makesureaddata(){
+      makesureaddata() {
         this.adddataentryFrom.ConUserBy = this.$refs.selectConUserId.selectedLabel + ''
         api.adddataentry(this.adddataentryFrom, this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -618,29 +611,29 @@
             console.error(err)
           })
       },
-      deldataentry(val){
-         this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+      deldataentry(val) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-        api.dataentrydelect(val.Id, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-            this.initdata2()
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
-          }
-        }).catch(err => {
-          // handle error
-          console.error(err)
-        })
+          api.dataentrydelect(val.Id, this.$axios).then(res => {
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+              this.initdata2()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          }).catch(err => {
+            // handle error
+            console.error(err)
+          })
         }).catch(err => {
           // handle error
           console.error(err)
@@ -713,7 +706,7 @@
               let furl = docurl.DocAddress;
               let fdocurl = docurl.DocUrl;
               let fname = docurl.DocName;
-              location.href = "http://"+ fdocurl
+              location.href = "http://" + fdocurl
             }
           }).catch(err => {
             console.error(err)
@@ -833,7 +826,62 @@
               query: queryParams,
             });
             break;
-
+            //苯气检测报警器检定记录
+          case 'DAYT.ReportAlertorBenDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorbendetect/operation',
+              query: queryParams
+            })
+            break
+            //一氧化碳检测报警器检定记录
+          case 'DAYT.ReportAlertorCarbonDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorcarbondetect/operation',
+              query: queryParams
+            })
+            break
+            //复合气体检测报警器检定记录
+          case 'DAYT.ReportAlertorFHGasDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorfhgasdetect/operation',
+              query: queryParams
+            })
+            break
+            //可燃气体检测报警器检定记录
+          case 'DAYT.ReportAlertorKRGasDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorkrgasdetect/operation',
+              query: queryParams
+            })
+            break
+            //一氧化碳红外气体分析器检定记录
+          case 'DAYT.ReportAnalyzer1CarbonRedGas.Detail':
+            this.$router.push({
+              path: '/lims/reportanalyzer1carbonredgas/operation',
+              query: queryParams
+            })
+            break
+            //二氧化碳红外气体分析器检定记录
+          case 'DAYT.ReportAnalyzer2CarbonRedGas.Detail':
+            this.$router.push({
+              path: '/lims/reportanalyzer2carbonredgas/operation',
+              query: queryParams
+            })
+            break
+            //电化学氧测定仪检定记录
+          case 'DAYT.ReportDetectorElectOxygen.Detail':
+            this.$router.push({
+              path: '/lims/reportdetectorelectoxygen/operation',
+              query: queryParams
+            })
+            break
+            //硫化氢气体检测仪检定记录
+          case 'DAYT.ReportDetectorHCGas.Detail':
+            this.$router.push({
+              path: '/lims/reportdetectorHCgas/operation',
+              query: queryParams
+            })
+            break
           default:
             this.$message.warning('无模板类型相匹配，请重试');
         }
@@ -1216,4 +1264,5 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
+
 </style>

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

@@ -40,16 +40,20 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName" @sort-change="orderby" @selection-change="handleSelectionChange">
+      <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName"
+        @sort-change="orderby" @selection-change="handleSelectionChange">
         <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)">
+            <el-button slot="reference" type="primary" size="mini" plain title="原始数据录入" v-if="scope.row.CheckStatus != 1 && scope.row.CheckStatus != 2"
+              @click="OpenOrignDataInput(scope.row)">
               打开
             </el-button>
-            <el-button slot="reference" type="primary" plain size="mini" title="数据校核" v-if="scope.row.CheckStatus == 1"  @click="jiaoheshowdialog(scope.row)">
+            <el-button slot="reference" type="primary" plain size="mini" title="数据校核" v-if="scope.row.CheckStatus == 1"
+              @click="jiaoheshowdialog(scope.row)">
               校核
             </el-button>
-            <el-button slot="reference" type="primary" plain size="mini" title="数据审核" v-if="scope.row.CheckStatus == 2"  @click="shenHeFunc(scope.row)">
+            <el-button slot="reference" type="primary" plain size="mini" title="数据审核" v-if="scope.row.CheckStatus == 2"
+              @click="shenHeFunc(scope.row)">
               审核
             </el-button>
             &nbsp;
@@ -63,7 +67,8 @@
                 <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-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.CheckStatus != 0"
+                  divided>删除数据</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
             <!--<el-button slot="reference" type="primary" plain size="mini" title="校核" v-if="scope.row.CheckStatus == 1"  @click="jiaoheshowdialog(scope.row)">
@@ -89,7 +94,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center"
+          show-overflow-tooltip></el-table-column>
         <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"
           show-overflow-tooltip></el-table-column>
         <el-table-column prop="TestDetail" sortable min-width="100" label="检测明细项" align="center" show-overflow-tooltip></el-table-column>
@@ -101,30 +107,24 @@
         </el-table-column>
         <el-table-column sortable min-width="110" align="center" prop="CheckStatus" label="审核状态">
           <template slot-scope="scope">
-             <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="校核通过"
-             type="success">
-             </el-alert>
-             <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="审核通过"
-             type="success">
-             </el-alert>
-             <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="未校核"
-             type="info">
-             </el-alert>
-              <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待校核"
-              type="warning">
-               </el-alert>
-                <el-alert v-if="scope.row.CheckStatus=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过"
-              type="error">
-               </el-alert>
-               <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false"  style="background:rgba(255,255,255,0.2)"
-               title="校核未通过"
-               type="error">
-                </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="校核通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="未校核" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待校核" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="校核未通过" type="error">
+            </el-alert>
             <!-- <el-tag v-show="scope.row.CheckStatus=='0'" type="info" style="background:#FFFFFF" >未校核</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='1'" type="warning" >待校核</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='2'" type="success" style="background:#FFFFFF">校核通过</el-tag>
@@ -227,8 +227,7 @@
       <el-form :model="dataentryForm" label-width="160px" ref="dataentryForm">
         <el-alert title="" description="请先访问网址 【weed1.labsop.cn:9390/3,0b86ca7a6f80】" type="warning" :closable="false">
         </el-alert>
-        <el-alert title="" description="解压到后,以管理员身份运行一下，即安装成功 " type="warning"
-          :closable="false">
+        <el-alert title="" description="解压到后,以管理员身份运行一下，即安装成功 " type="warning" :closable="false">
         </el-alert>
         <br />
         <el-alert title="文件保存修改注意！" description="请编辑完毕点击保存修改，不然您的修改将无效！" type="success" :closable="false">
@@ -268,15 +267,13 @@
       <el-form :model="adddataentryFrom" label-width="130px" ref="adddataentryFrom">
         <el-row>
           <el-form-item label="委托单号">
-            <el-input type="text" v-model="adddataentryFrom.EntrustNo" placeholder="请输入委托单号"
-                      style="width: 100%">
+            <el-input type="text" v-model="adddataentryFrom.EntrustNo" placeholder="请输入委托单号" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item label="检测人">
-            <el-select ref="selectConUserId" v-model="adddataentryFrom.ConUserId" filterable placeholder="请选择检测人"
-                       style="width: 100%">
+            <el-select ref="selectConUserId" v-model="adddataentryFrom.ConUserId" filterable placeholder="请选择检测人" style="width: 100%">
               <el-option v-for="item in partuserlist" :key="item.Id" :label="item.Realname" :value="item.Id">
               </el-option>
             </el-select>
@@ -314,7 +311,7 @@
         authUser: 'authUser'
       })
     },
-    data () {
+    data() {
       return {
         // dialogdataentryhistoryVisible: false,
         adddataentryShow: false,
@@ -389,8 +386,7 @@
           Order: '',
           Prop: ''
         },
-        tableColumns: [
-          {
+        tableColumns: [{
             prop: 'DocType',
             label: '文档名称',
             width: 100,
@@ -415,7 +411,7 @@
         }
       }
     },
-    created () {
+    created() {
       // this.initData()
       this.getDictList()
       this.getDetaillist() // 检测明细项下拉
@@ -423,12 +419,12 @@
     },
     methods: {
       // 添加数据录入记录
-      adddataentry () {
+      adddataentry() {
         this.getpartuserlist()
         this.adddataentryShow = true
       },
       // 检测人列表
-      getpartuserlist () {
+      getpartuserlist() {
         let _this = this
         _this.$axios.get('limsbalance/partuserlist', {})
           .then(res => {
@@ -445,7 +441,7 @@
           })
       },
       // 数据录入添加确认按钮
-      makesureaddata () {
+      makesureaddata() {
         this.adddataentryFrom.ConUserBy = this.$refs.selectConUserId.selectedLabel + ''
         console.log('-----dataentryfrom---', this.adddataentryFrom)
         api.adddataentry(this.adddataentryFrom, this.$axios).then(res => {
@@ -466,7 +462,7 @@
           console.error(err)
         })
       },
-      initdata2 () {
+      initdata2() {
         let _this = this
         let BalanceTime = []
         if (!_this.BalanceTime) {
@@ -490,8 +486,8 @@
         Object.assign(params, this.searchform)
         // request
         _this.$axios.get('/limsdataentry/todolist?BalanceTime=' + BalanceTime.join(','), {
-          params
-        })
+            params
+          })
           .then(res => {
             _this.taskbalacelist = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -511,7 +507,7 @@
         }
         return '';
       },
-      MoreCmdClick (cmd) {
+      MoreCmdClick(cmd) {
         if (cmd.Command === 'Open') {
           this.OpenOrignDataInput(cmd.row)
         } else if (cmd.Command === 'JiaoHe') {
@@ -530,24 +526,24 @@
           this.tooldownload()
         }
       },
-      GetCommand (cmdType, row) {
+      GetCommand(cmdType, row) {
         let cmd = {}
         cmd.Command = cmdType
         cmd.row = row
         return cmd
       },
       // 工具下载
-      tooldownload () {
+      tooldownload() {
         let url = 'http://weed1.labsop.cn:9390/2,1080b2997d49'
         window.open(url)
         this.tooldownloaddialog = true
       },
       // 审核
-      shenHeFunc (row) {
+      shenHeFunc(row) {
         this.dataentrytoexcel(row)
       },
       // 生成excel数据
-      dataentrytoexcel (row) {
+      dataentrytoexcel(row) {
         api.docexport(row.Id, this.$axios)
           .then(res => {
             // response
@@ -562,7 +558,7 @@
           })
       },
       // 审核页面跳转
-      changepage (row, DocAddress) {
+      changepage(row, DocAddress) {
         let _this = this
         let queryParams = {
           key: row.DocKey,
@@ -574,20 +570,20 @@
           query: queryParams
         })
       },
-      getDictList () {
+      getDictList() {
         docTemplateApi.getDictList(this.$axios).then(res => {
           this.docTemplateDictList = res.data
         })
       },
-      getvalues (val) {
+      getvalues(val) {
         this.entrydetail.business = val.Id
         this.entrydetail.instance = val.DocKey
         this.historyVisible = true
       },
-      handleChange (value) {
+      handleChange(value) {
         console.log(value)
       },
-      OpenOrignDataInput (row) {
+      OpenOrignDataInput(row) {
         this.CheckStatus = row.CheckStatus
         this.eid = row.EId
         this.tbid = row.TaskId
@@ -617,7 +613,7 @@
           }) */
       },
       // 选择页码刷新历史数据
-      refreshdataentrydata () {
+      refreshdataentrydata() {
         const params = {
           _currentPage: this.historycurrentPage,
           _size: this.historysize,
@@ -632,7 +628,7 @@
             console.error(err)
           })
       },
-      datadownload (val) {
+      datadownload(val) {
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
@@ -653,7 +649,7 @@
           })
       },
       // 数据录入导出
-      docdownload (val) {
+      docdownload(val) {
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
@@ -674,7 +670,7 @@
           })
       },
       // 删除数据
-      deldataentry (val) {
+      deldataentry(val) {
         this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -702,7 +698,7 @@
           console.error(err)
         })
       },
-      opendocentry () {
+      opendocentry() {
         let docTempType = ''
         for (let idx in this.docTemplateDictList) {
           if (this.datadocId === this.docTemplateDictList[idx].Id) {
@@ -796,12 +792,68 @@
               query: queryParams
             })
             break
+            //苯气检测报警器检定记录
+          case 'DAYT.ReportAlertorBenDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorbendetect/operation',
+              query: queryParams
+            })
+            break
+            //一氧化碳检测报警器检定记录
+          case 'DAYT.ReportAlertorCarbonDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorcarbondetect/operation',
+              query: queryParams
+            })
+            break
+            //复合气体检测报警器检定记录
+          case 'DAYT.ReportAlertorFHGasDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorfhgasdetect/operation',
+              query: queryParams
+            })
+            break
+            //可燃气体检测报警器检定记录
+          case 'DAYT.ReportAlertorKRGasDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorkrgasdetect/operation',
+              query: queryParams
+            })
+            break
+            //一氧化碳红外气体分析器检定记录
+          case 'DAYT.ReportAnalyzer1CarbonRedGas.Detail':
+            this.$router.push({
+              path: '/lims/reportanalyzer1carbonredgas/operation',
+              query: queryParams
+            })
+            break
+            //二氧化碳红外气体分析器检定记录
+          case 'DAYT.ReportAnalyzer2CarbonRedGas.Detail':
+            this.$router.push({
+              path: '/lims/reportanalyzer2carbonredgas/operation',
+              query: queryParams
+            })
+            break
+            //电化学氧测定仪检定记录
+          case 'DAYT.ReportDetectorElectOxygen.Detail':
+            this.$router.push({
+              path: '/lims/reportdetectorelectoxygen/operation',
+              query: queryParams
+            })
+            break
+            //硫化氢气体检测仪检定记录
+          case 'DAYT.ReportDetectorHCGas.Detail':
+            this.$router.push({
+              path: '/lims/reportdetectorHCgas/operation',
+              query: queryParams
+            })
+            break
 
           default:
             this.$message.warning('无模板类型相匹配，请重试')
         }
       },
-      handleselectentry (val) {
+      handleselectentry(val) {
         let params = {
           eid: this.eid,
           tbid: this.tbid,
@@ -824,7 +876,7 @@
             console.error(err)
           })
       },
-      dataentry (val) {
+      dataentry(val) {
         let _this = this
         _this.key = val.EntrustNo + '' + val.TestDetailId
         // var accCode = this.authUser.Profile.AccCode
@@ -869,11 +921,11 @@
         }
         this.dataentryShow = true
       },
-      review (val) {
+      review(val) {
         let url = 'dataentry/' + val.DocVersion + '/office_history?Address=' + val.DocAddress
         window.open(url)
       },
-      upload () {
+      upload() {
         location.href = 'petrotool://furl=' + this.dataurl + '&fname=' + this.docname + '&doctype=data&id=' + this.dataentryid +
           '&act=up&token=' + localStorage.getItem('token')
         this.$message({
@@ -883,13 +935,13 @@
         this.initdata2()
         this.dataentryShow = false
       },
-      cancel () {
+      cancel() {
         location.href = 'petrotool://furl=' + this.dataurl + '&fname=' + this.docname + '&doctype=data&id=' + this.dataentryid +
           '&act=cancel&token=' + localStorage.getItem('token')
         this.dataentryShow = false
         this.initdata2()
       },
-      dataentry_onlyoffice (val) {
+      dataentry_onlyoffice(val) {
         let _this = this
         _this.key = val.EntrustNo + '' + val.TestDetailId
         var accCode = this.authUser.Profile.AccCode
@@ -929,7 +981,7 @@
             })
         }
       },
-      gethistory (val) {
+      gethistory(val) {
         let _this = this
         _this.historydialog = true
         this.$axios.get('/limsdataentry/historylist/' + val.Id, {})
@@ -941,12 +993,12 @@
             console.error(err)
           })
       },
-      historyview (val) {
+      historyview(val) {
         let historykey = val.DocKey + '' + val.Version
         let url = 'dataentry/' + historykey + '/office_history?Address=' + val.Address
         window.open(url)
       },
-      dataentryview (val) {
+      dataentryview(val) {
         let key = val.DocKey + '' + val.Version
         var accCode = this.authUser.Profile.AccCode
         var userId = this.authUser.Profile.Id
@@ -955,10 +1007,10 @@
           accCode + '&UserId=' + userId + '&RealName=' + realname + '&Edit=false'
         window.open(url)
       },
-      handleSelectionChange (val) {
+      handleSelectionChange(val) {
         this.selectSamples = val
       },
-      handleClose (done) {
+      handleClose(done) {
         this.$confirm('确认关闭？')
           .then(_ => {
             done()
@@ -968,25 +1020,25 @@
           .catch(_ => {})
       },
       // 打开校核弹窗
-      jiaoheshowdialog (val) {
+      jiaoheshowdialog(val) {
         // console.log('------jioahe', val)
         // this.jiaoheForm.DataEntryId = val.Id
         // this.jiaoheshow = true
         this.OpenOrignDataInput(val)
       },
-      makesure () {
+      makesure() {
         this.$confirm('确认校核！', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
           .then(() => {
             this.jiaoheshow = false
             this.checkstatus()
           })
           .catch(() => {})
       },
-      checkstatus () {
+      checkstatus() {
         let params = this.jiaoheForm
         this.$axios.put('/limsdataentry/jiaohe/', params)
           .then(res => {
@@ -1009,12 +1061,12 @@
             console.error(err)
           })
       },
-      openexcel (val) {
+      openexcel(val) {
         let key = val.EntrustNo + '' + val.TestDetailId
         let url = 'dataentry/' + key + '/office'
         window.open(url)
       },
-      searchCommand (command) {
+      searchCommand(command) {
         if (command === 'search') {
           this.dialogVisible = true
         } else if (command === 'clear') {
@@ -1022,7 +1074,7 @@
         }
       },
       // 列表排序功能
-      orderby (column) {
+      orderby(column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -1031,7 +1083,7 @@
         this.Column.Prop = column.prop
         this.initdata2()
       },
-      getDetaillist () {
+      getDetaillist() {
         let _this = this
         _this.$axios.get('/limsbalance/getdetaillist', {})
           .then(res => {
@@ -1042,7 +1094,7 @@
             console.error(err)
           })
       },
-      clearSearch () {
+      clearSearch() {
         this.searchform.EntrustNo = ''
         this.searchform.TestDetailId = ''
         this.searchform.CheckStatus = ''
@@ -1050,29 +1102,29 @@
         // this.searchform.TestDetailId = ''
         this.initdata2()
       },
-      clicksearch () {
+      clicksearch() {
         this.currentPage = 1
         this.initdata2()
       },
-      handleCurrentChange (value) {
+      handleCurrentChange(value) {
         this.currentPage = value
         this.initdata2()
       },
-      handleSizeChange (value) {
+      handleSizeChange(value) {
         this.size = value
         this.currentPage = 1
         this.initdata2()
       },
-      historyhandleCurrentChange (value) {
+      historyhandleCurrentChange(value) {
         this.historycurrentPage = value
         this.refreshdataentrydata()
       },
-      historyhandleSizeChange (value) {
+      historyhandleSizeChange(value) {
         this.historysize = value
         this.historycurrentPage = 1
         this.refreshdataentrydata()
       },
-      jstimehandle (val) {
+      jstimehandle(val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1084,7 +1136,7 @@
           return val.substring(0, 19)
         }
       },
-      formatDateTime (date) {
+      formatDateTime(date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -1095,7 +1147,7 @@
         minute = minute < 10 ? ('0' + minute) : minute
         return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       },
-      getdate () {
+      getdate() {
         let date = new Date()
         var year = date.getFullYear()
         var month = date.getMonth() + 1
@@ -1110,6 +1162,7 @@
       }
     }
   }
+
 </script>
 
 <style lang="scss">
@@ -1117,4 +1170,5 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
+
 </style>

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

@@ -438,6 +438,13 @@
     data() {
       return {
         serviceId: '',
+        DataStatus: '0',
+        sign: '2',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0
+        },
         formData: {
           Id: 0,
           EId: 0,
@@ -654,15 +661,22 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera;
+      this.queryParams.EId = this.$route.query.eid
+      this.queryParams.TaskBalanceId = this.$route.query.tbid
+      this.queryParams.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.sign = this.$route.query.sign
+      //this.serviceId = this.$route.params.opera;
+      this.initDatas();
       //this.getDictOptions();
-      console.log(this.serviceId);
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
-      }
+      // console.log(this.serviceId);
+      // if (this.serviceId != 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
       initDatas() {
@@ -949,7 +963,7 @@
         }
         allform = Object.assign(allform, this.formCertificateData)
         console.log("------updataallform----", allform)
-        api.updateEntity(this.formData.Id, allform, this.$axios).then(res => {
+        api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.initDatas();

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

@@ -394,6 +394,13 @@
     data() {
       return {
         serviceId: '',
+        DataStatus: '0',
+        sign: '2',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0
+        },
         formData: {
           Id: 0,
           EId: 0,
@@ -595,15 +602,21 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera;
+      this.queryParams.EId = this.$route.query.eid
+      this.queryParams.TaskBalanceId = this.$route.query.tbid
+      this.queryParams.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      // this.serviceId = this.$route.params.opera;
+      this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.initDatas();
       //this.getDictOptions();
-      console.log(this.serviceId);
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
-      }
+      // if (this.serviceId != 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
       initDatas() {
@@ -837,7 +850,7 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        api.updateEntity(this.formData.Id, allform, this.$axios).then(res => {
+        api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.initDatas();

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

@@ -425,6 +425,13 @@
     data() {
       return {
         serviceId: '',
+        DataStatus: '0',
+        sign: '2',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0
+        },
         formData: {
           Id: 0,
           EId: 0,
@@ -626,15 +633,21 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera;
+      this.queryParams.EId = this.$route.query.eid
+      this.queryParams.TaskBalanceId = this.$route.query.tbid
+      this.queryParams.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      // this.serviceId = this.$route.params.opera;
+      this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.initDatas();
       //this.getDictOptions();
-      console.log(this.serviceId);
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
-      }
+      // if (this.serviceId != 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
       initDatas() {
@@ -916,7 +929,7 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        api.updateEntity(this.formData.Id, allform, this.$axios).then(res => {
+        api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.initDatas();

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

@@ -417,6 +417,13 @@
     data() {
       return {
         serviceId: '',
+        DataStatus: '0',
+        sign: '2',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0
+        },
         formData: {
           Id: 0,
           EId: 0,
@@ -618,15 +625,21 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera;
+      this.queryParams.EId = this.$route.query.eid
+      this.queryParams.TaskBalanceId = this.$route.query.tbid
+      this.queryParams.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      // this.serviceId = this.$route.params.opera;
+      this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.initDatas();
       //this.getDictOptions();
-      console.log(this.serviceId);
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
-      }
+      // if (this.serviceId != 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
       initDatas() {
@@ -907,7 +920,7 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        api.updateEntity(this.formData.Id, allform, this.$axios).then(res => {
+        api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.initDatas();

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

@@ -403,6 +403,13 @@
   data() {
       return {
         serviceId: '',
+        DataStatus: '0',
+        sign: '2',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0
+        },
         formData: {
           Id: 0,
           EId: 0,
@@ -620,15 +627,21 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera;
+      this.queryParams.EId = this.$route.query.eid
+      this.queryParams.TaskBalanceId = this.$route.query.tbid
+      this.queryParams.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      // this.serviceId = this.$route.params.opera;
+      this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.initDatas();
       //this.getDictOptions();
-      console.log(this.serviceId);
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
-      }
+      // if (this.serviceId != 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
       initDatas() {
@@ -889,7 +902,7 @@
           ReportAlerOtherData: this.ReportAlerOtherData,//干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
-        api.updateEntity(this.formData.Id, allform, this.$axios).then(res => {
+        api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.initDatas();

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

@@ -403,6 +403,13 @@
    data() {
       return {
         serviceId: '',
+        DataStatus: '0',
+        sign: '2',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0
+        },
         formData: {
           Id: 0,
           EId: 0,
@@ -616,15 +623,21 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera;
+      this.queryParams.EId = this.$route.query.eid
+      this.queryParams.TaskBalanceId = this.$route.query.tbid
+      this.queryParams.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      // this.serviceId = this.$route.params.opera;
+      this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.initDatas();
       //this.getDictOptions();
-      console.log(this.serviceId);
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
-      }
+      // if (this.serviceId != 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
       initDatas() {
@@ -885,7 +898,7 @@
           ReportAlerOtherData: this.ReportAlerOtherData,//干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
-        api.updateEntity(this.formData.Id, allform, this.$axios).then(res => {
+        api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.initDatas();

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

@@ -422,6 +422,13 @@
     data() {
       return {
         serviceId: '',
+        DataStatus: '0',
+        sign: '2',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0
+        },
         formData: {
           Id: 0,
           EId: 0,
@@ -618,15 +625,21 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera;
+      this.queryParams.EId = this.$route.query.eid
+      this.queryParams.TaskBalanceId = this.$route.query.tbid
+      this.queryParams.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      // this.serviceId = this.$route.params.opera;
+      this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.initDatas();
       //this.getDictOptions();
-      console.log(this.serviceId);
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
-      }
+      // if (this.serviceId != 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
       initDatas() {
@@ -891,7 +904,7 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        api.updateEntity(this.formData.Id, allform, this.$axios).then(res => {
+        api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.initDatas();

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

@@ -362,6 +362,13 @@
     data() {
       return {
         serviceId: '',
+        DataStatus: '0',
+        sign: '2',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0
+        },
         formData: {
           Id: 0,
           EId: 0,
@@ -563,15 +570,21 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera;
+      this.queryParams.EId = this.$route.query.eid
+      this.queryParams.TaskBalanceId = this.$route.query.tbid
+      this.queryParams.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      // this.serviceId = this.$route.params.opera;
+      this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.initDatas();
       //this.getDictOptions();
-      console.log(this.serviceId);
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
-      }
+      // if (this.serviceId != 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
       initDatas() {
@@ -790,7 +803,7 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        api.updateEntity(this.formData.Id, allform, this.$axios).then(res => {
+        api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.initDatas();