宇信審批流程修改，任務分配負責人只拉主檢人

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -61,6 +61,8 @@ const (
 	//JN_DATA_KEY string = "jn_data_apply"
 	// 数据录入校核
 	DATAJIAOHE string = "DATAJIAOHE"
+	// 数据录入预审批
+	DATAPREAUDIT string = "DATAPREAUDIT"
 	// 数据录入审批
 	DATAAUDIT string = "DATAAUDIT"
 	// 报告签发

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

@@ -180,7 +180,16 @@ func (this *LimsBalanceController) GetUserList() {
 		var userrolelist []userRole.Base_RoleList
 		userrolelist = svcuser.GetUserByRole("10000188", this.User.AccCode)
 		var userIds string
-
+		for _, tmpUser := range userrolelist {
+			userIds += strconv.FormatInt(tmpUser.Id,10) + ","
+		}
+		userIds = strings.Trim(userIds, ",")
+		where = where + " and Id in (" + userIds + ")"
+	}else {
+		svcuser := limsdataentry.GetLimsDataEntryService(utils.DBE)
+		var userrolelist []userRole.Base_RoleList
+		userrolelist = svcuser.GetUserByRole("10000180", this.User.AccCode)
+		var userIds string
 		for _, tmpUser := range userrolelist {
 			userIds += strconv.FormatInt(tmpUser.Id,10) + ","
 		}

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

@@ -1660,7 +1660,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
 		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
 		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
-		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id),"")
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id), "")
 		fmt.Println(mainmodel)
 		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
 		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
@@ -2204,9 +2204,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			ColsNum:    8,
 		}
 
-
-
-		datamap["TableComment"] = []string{"Deviationa", "Responsea", "Repeata", "Shifta","AlertValb", "Deviationb", "Responseb", "Repeatb", "Shiftb","AlertValc", "Deviationc", "Responsec", "Repeatc", "Shiftc","Deviationd", "Responsed", "Repeatd", "Shiftd"}
+		datamap["TableComment"] = []string{"Deviationa", "Responsea", "Repeata", "Shifta", "AlertValb", "Deviationb", "Responseb", "Repeatb", "Shiftb", "AlertValc", "Deviationc", "Responsec", "Repeatc", "Shiftc", "Deviationd", "Responsed", "Repeatd", "Shiftd"}
 
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var template limsdoctemplate.LimsDocTemplate
@@ -2900,7 +2898,6 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportOilPipeUltrasonicName, where1, "Id desc", &tabledata)
 		datamap := StructToMapDemo(dataentrylist)
 
-
 		var interfaceSlice []interface{} = make([]interface{}, len(tabledata))
 		for i, d := range tabledata {
 			interfaceSlice[i] = d
@@ -2910,9 +2907,9 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow:   10,
 			NeedDelRow: 7,
 			ReverseRow: 0,
-			Cols: []string{"SampleNum", "DefectLoc", "Depth", "Length", "Heigth", "Remark"},
-			Merge:   []string{"1,2","4,5"},
-			ColsNum: 8,
+			Cols:       []string{"SampleNum", "DefectLoc", "Depth", "Length", "Heigth", "Remark"},
+			Merge:      []string{"1,2", "4,5"},
+			ColsNum:    8,
 		}
 		datamap["TableComment"] = []string{"TableData"}
 
@@ -3123,8 +3120,8 @@ func (this *LimsDataEntryController) CheckSubmit() {
 	var errinfo ErrorInfo
 	currentTime := time.Now().Format("060102150405") //当前时间
 	//获得有审核权限的人员
-	var users []userRole.Base_RoleList
-	var userIds string
+	//var users []userRole.Base_RoleList
+	//var userIds string
 	var dataentrymodel limsdataentry.LimsDateEntry
 	svc.GetEntityByWhere(this.User.AccCode+LimsDateEntryName, "Id = '"+utils.ToStr(dataother.DataEntryId)+"'", &dataentrymodel)
 	var RoleSet auditsetting.Base_OilAuditSetting
@@ -3148,102 +3145,102 @@ func (this *LimsDataEntryController) CheckSubmit() {
 		svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, dataentrymodel.Id, &dataentryentity, []string{"DocKey"})
 	} else {
 		//当校核人是自己的时候，直接校核通过进入审核流程
-		if strconv.Itoa(dataother.AuditorUserId) == this.User.Id {
+		//if strconv.Itoa(dataother.AuditorUserId) == this.User.Id {
+		//	where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
+		//	svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, where, &list)
+		//	var entityempty limsdataentry.LimsDateEntry
+		//	var balanceempty limsdataentry.LimsTaskBalance
+		//	var balancecols []string = []string{"DataEntryStatus"}
+		//	var cols []string = []string{"DocVersion", "CheckStatus", "SubmitOn", "SubmitUserId", "SubmitBy", "CheckSubmitRemark", "JHOn", "JHUserId", "JHBy", "JHRemark"}
+		//	entityempty.DocVersion = "v" + currentTime
+		//	entityempty.CheckStatus = 2
+		//	balanceempty.DataEntryStatus = 2
+		//	entityempty.SubmitOn = time.Now()
+		//	entityempty.SubmitUserId, _ = utils.StrTo(this.User.Id).Int()
+		//	entityempty.SubmitBy = this.User.Realname
+		//	entityempty.CheckSubmitRemark = dataother.AuditorRemark
+		//	entityempty.JHOn = time.Now()
+		//	entityempty.JHUserId, _ = utils.StrTo(this.User.Id).Int()
+		//	entityempty.JHBy = this.User.Realname
+		//	entityempty.JHRemark = dataother.AuditorRemark
+		//	//提交校核工作流
+		//	svcActiviti := workflow.GetActivitiService(utils.DBE)
+		//	var receiveVal string
+		//	var auditWorkflow auditsetting.Base_OilAuditSetting
+		//	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+		//	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &auditWorkflow)
+		//	users = svc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
+		//	for _, tmpUser := range users {
+		//		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		//	}
+		//	userIds = strings.Trim(userIds, ",")
+		//	receiveVal = svcActiviti.TaskComplete(auditWorkflow.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "校核提交成功！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "校核提交发生错误,请检查后重新提交！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//
+		//} else {
+		if dataother.SuccessStatus == 1 {
 			where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
 			svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, where, &list)
 			var entityempty limsdataentry.LimsDateEntry
 			var balanceempty limsdataentry.LimsTaskBalance
 			var balancecols []string = []string{"DataEntryStatus"}
-			var cols []string = []string{"DocVersion", "CheckStatus", "SubmitOn", "SubmitUserId", "SubmitBy", "CheckSubmitRemark", "JHOn", "JHUserId", "JHBy", "JHRemark"}
+			var cols []string = []string{"DocVersion", "CheckStatus", "SubmitOn", "SubmitUserId", "SubmitBy", "CheckSubmitRemark"}
 			entityempty.DocVersion = "v" + currentTime
-			entityempty.CheckStatus = 2
-			balanceempty.DataEntryStatus = 2
+			entityempty.CheckStatus = dataother.SuccessStatus
+			balanceempty.DataEntryStatus = dataother.SuccessStatus
 			entityempty.SubmitOn = time.Now()
 			entityempty.SubmitUserId, _ = utils.StrTo(this.User.Id).Int()
 			entityempty.SubmitBy = this.User.Realname
 			entityempty.CheckSubmitRemark = dataother.AuditorRemark
-			entityempty.JHOn = time.Now()
-			entityempty.JHUserId, _ = utils.StrTo(this.User.Id).Int()
-			entityempty.JHBy = this.User.Realname
-			entityempty.JHRemark = dataother.AuditorRemark
+			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+			err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
 			//提交校核工作流
 			svcActiviti := workflow.GetActivitiService(utils.DBE)
 			var receiveVal string
-			var auditWorkflow auditsetting.Base_OilAuditSetting
-			rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-			rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &auditWorkflow)
-			users = svc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
-			userIds = strings.Trim(userIds, ",")
-			receiveVal = svcActiviti.TaskComplete(auditWorkflow.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "校核提交成功！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核提交发生错误,请检查后重新提交！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
+			receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
+
+			fmt.Println(receiveVal)
+			var errinfo ErrorInfo
+			if err == nil {
+				errinfo.Message = "校核提交成功！"
+				errinfo.Code = 0
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
-			}
-
-		} else {
-			if dataother.SuccessStatus == 1 {
-				where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
-				svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, where, &list)
-				var entityempty limsdataentry.LimsDateEntry
-				var balanceempty limsdataentry.LimsTaskBalance
-				var balancecols []string = []string{"DataEntryStatus"}
-				var cols []string = []string{"DocVersion", "CheckStatus", "SubmitOn", "SubmitUserId", "SubmitBy", "CheckSubmitRemark"}
-				entityempty.DocVersion = "v" + currentTime
-				entityempty.CheckStatus = dataother.SuccessStatus
-				balanceempty.DataEntryStatus = dataother.SuccessStatus
-				entityempty.SubmitOn = time.Now()
-				entityempty.SubmitUserId, _ = utils.StrTo(this.User.Id).Int()
-				entityempty.SubmitBy = this.User.Realname
-				entityempty.CheckSubmitRemark = dataother.AuditorRemark
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				//提交校核工作流
-				svcActiviti := workflow.GetActivitiService(utils.DBE)
-				var receiveVal string
-				receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
-
-				fmt.Println(receiveVal)
-				var errinfo ErrorInfo
-				if err == nil {
-					errinfo.Message = "校核提交成功！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核提交发生错误,请检查后重新提交！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
 			} else {
-				var errinfo ErrorInfo
-				errinfo.Message = "审核提交发生错误,请检查后重新提交！"
+				errinfo.Message = "校核提交发生错误,请检查后重新提交！"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
 			}
+		} else {
+			var errinfo ErrorInfo
+			errinfo.Message = "审核提交发生错误,请检查后重新提交！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
 		}
+		//}
 	}
 }
 
@@ -3262,7 +3259,7 @@ func (this *LimsDataEntryController) JiaoHe() {
 	var userIds string
 	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &RoleSet)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAPREAUDIT, &RoleSet)
 	//审核状态判断进行的操作
 	if dataother.SuccessStatus == 2 {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
@@ -3358,19 +3355,37 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 	var dataother limsdataentry.JHModel
 	json.Unmarshal(jsonblob, &dataother)
 	var list []limsdataentry.LimsDateEntry
+	var users []userRole.Base_RoleList
+	var userIds string
 	currentTime := time.Now().Format("060102150405") //当前时间
 	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &RoleSet)
-	//审核状态判断进行的操作
-	if dataother.SuccessStatus == 4 {
+	var workflowauditcode string
+	if dataother.SuccessStatus == 4 || dataother.SuccessStatus == 5 {
+		workflowauditcode = workflow.DATAAUDIT
+	} else if dataother.SuccessStatus == 6 || dataother.SuccessStatus == 7 {
+		workflowauditcode = workflow.DATAAUDIT
+	}
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflowauditcode, &RoleSet)
+	//审核状态判断进行的操作 4:预审通过待审批 5：预审未通过 6：审批通过 7：审批未通过
+	if dataother.SuccessStatus == 4 || dataother.SuccessStatus == 6 {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
 		svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, where, &list)
 		var entityempty limsdataentry.LimsDateEntry
 		var balanceempty limsdataentry.LimsTaskBalance
 		var errinfo ErrorInfo
 		var balancecols []string = []string{"DataEntryStatus"}
-		var cols []string = []string{"DocVersion", "CheckStatus", "CheckOn", "CheckUserId", "CheckBy", "CheckRemark"}
+		var cols []string
+		if dataother.SuccessStatus == 6 {
+			cols = []string{"DocVersion", "CheckStatus", "CheckOn", "CheckUserId", "CheckBy", "CheckRemark", "CheckSign"}
+		} else {
+			users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
+			for _, tmpUser := range users {
+				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+			}
+			userIds = strings.Trim(userIds, ",")
+			cols = []string{"DocVersion", "CheckStatus"}
+		}
 		entityempty.DocVersion = "v" + currentTime
 		entityempty.CheckStatus = dataother.SuccessStatus
 		balanceempty.DataEntryStatus = dataother.SuccessStatus
@@ -3381,7 +3396,7 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
 		if receiveVal == "true" {
 			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
 			err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
@@ -3403,101 +3418,7 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 			this.ServeJSON()
 			return
 		}
-		//switch this.User.DepartmentId {
-		//case "100000150":
-		//	receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
-		//	if receiveVal == "true" {
-		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-		//		if err == nil {
-		//			errinfo.Message = "审核通过！"
-		//			errinfo.Code = 0
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "审核发生错误！"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
-		//	} else {
-		//		errinfo.Message = "工作流异常，请联系管理员！"
-		//		errinfo.Code = -1
-		//		this.Data["json"] = &errinfo
-		//		this.ServeJSON()
-		//		return
-		//	}
-		//case "100000151":
-		//	receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
-		//	if receiveVal == "true" {
-		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-		//		if err == nil {
-		//			errinfo.Message = "审核通过！"
-		//			errinfo.Code = 0
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "审核发生错误！"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
-		//	} else {
-		//		errinfo.Message = "工作流异常，请联系管理员！"
-		//		errinfo.Code = -1
-		//		this.Data["json"] = &errinfo
-		//		this.ServeJSON()
-		//		return
-		//	}
-		//case "100000168":
-		//	receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
-		//	if receiveVal == "true" {
-		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-		//		if err == nil {
-		//			errinfo.Message = "审核通过！"
-		//			errinfo.Code = 0
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "审核发生错误！"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
-		//	} else {
-		//		errinfo.Message = "工作流异常，请联系管理员！"
-		//		errinfo.Code = -1
-		//		this.Data["json"] = &errinfo
-		//		this.ServeJSON()
-		//		return
-		//	}
-		//case "100000169":
-		//	receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
-		//	if receiveVal == "true" {
-		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-		//		if err == nil {
-		//			errinfo.Message = "审核通过！"
-		//			errinfo.Code = 0
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "审核发生错误！"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
-		//	} else {
-		//		errinfo.Message = "工作流异常，请联系管理员！"
-		//		errinfo.Code = -1
-		//		this.Data["json"] = &errinfo
-		//		this.ServeJSON()
-		//		return
-		//	}
-		//}
-	} else {
+	} else if dataother.SuccessStatus == 5 || dataother.SuccessStatus == 7 {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
 		svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, where, &list)
 		var entityempty limsdataentry.LimsDateEntry
@@ -3511,8 +3432,12 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 		entityempty.CheckRemark = dataother.AuditorRemark
 		entityempty.CheckSign = this.User.Description
 		var balancecols []string = []string{"DataEntryStatus"}
-		var cols []string = []string{"CheckStatus", "CheckOn", "CheckUserId", "CheckBy", "CheckRemark", "CheckSign"}
-
+		var cols []string
+		if dataother.SuccessStatus == 7 {
+			cols = []string{"CheckStatus", "CheckOn", "CheckUserId", "CheckBy", "CheckRemark"}
+		} else {
+			cols = []string{"CheckStatus"}
+		}
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
@@ -3538,100 +3463,6 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 			this.ServeJSON()
 			return
 		}
-		//switch this.User.DepartmentId {
-		//case "100000150":
-		//	receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-		//	if receiveVal == "true" {
-		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-		//		if err == nil {
-		//			errinfo.Message = "未通过审核！"
-		//			errinfo.Code = 0
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "审核错误！"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
-		//	} else {
-		//		errinfo.Message = "工作流异常，请联系管理员！"
-		//		errinfo.Code = -1
-		//		this.Data["json"] = &errinfo
-		//		this.ServeJSON()
-		//		return
-		//	}
-		//case "100000151":
-		//	receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-		//	if receiveVal == "true" {
-		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-		//		if err == nil {
-		//			errinfo.Message = "未通过审核！"
-		//			errinfo.Code = 0
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "审核错误！"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
-		//	} else {
-		//		errinfo.Message = "工作流异常，请联系管理员！"
-		//		errinfo.Code = -1
-		//		this.Data["json"] = &errinfo
-		//		this.ServeJSON()
-		//		return
-		//	}
-		//case "100000168":
-		//	receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-		//	if receiveVal == "true" {
-		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-		//		if err == nil {
-		//			errinfo.Message = "未通过审核！"
-		//			errinfo.Code = 0
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "审核错误！"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
-		//	} else {
-		//		errinfo.Message = "工作流异常，请联系管理员！"
-		//		errinfo.Code = -1
-		//		this.Data["json"] = &errinfo
-		//		this.ServeJSON()
-		//		return
-		//	}
-		//case "100000169":
-		//	receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-		//	if receiveVal == "true" {
-		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-		//		if err == nil {
-		//			errinfo.Message = "未通过审核！"
-		//			errinfo.Code = 0
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "审核错误！"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
-		//	} else {
-		//		errinfo.Message = "工作流异常，请联系管理员！"
-		//		errinfo.Code = -1
-		//		this.Data["json"] = &errinfo
-		//		this.ServeJSON()
-		//		return
-		//	}
-		//}
 	}
 }
 
@@ -4916,7 +4747,7 @@ func (this *LimsDataEntryController) AddDataEntryFile() {
 	var model limsdataentry.LimsDateEntryAttach
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &model)
-	model.DateEntryId,_ = strconv.Atoi(DataEntryId)
+	model.DateEntryId, _ = strconv.Atoi(DataEntryId)
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()

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

@@ -148,29 +148,29 @@
         <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>
+              title="待预审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待审批" type="warning">
+            </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=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审批通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='7'" :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>
@@ -312,33 +312,33 @@
 <script>
   import {
     mapGetters
-  } from 'vuex';
-  // import DataEntryHistoryDialog from '../../../../components/lims/dataentryhistorydialog'
-  import historytaskdialog from '../../../components/lims/historytaskdialog'
-  import docTemplateApi from '@/api/lims/docTemplate';
-  import api from '@/api/lims/dataEntry';
-  export default {
+  } from 'vuex'
+// import DataEntryHistoryDialog from '../../../../components/lims/dataentryhistorydialog'
+import historytaskdialog from '../../../components/lims/historytaskdialog'
+  import docTemplateApi from '@/api/lims/docTemplate'
+import api from '@/api/lims/dataEntry'
+export default {
     // components: {
     // DataEntryHistoryDialog
     // },
     components: {
-      historytaskdialog,
+      historytaskdialog
     },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
-      }),
+      })
     },
     name: 'dataentry',
-    data() {
+    data () {
       return {
-        //dialogdataentryhistoryVisible: false,
+        // dialogdataentryhistoryVisible: false,
         dialogVisible: false,
         historyVisible: false,
         entrydetail: {
           process: '',
           business: '',
-          instance: '',
+          instance: ''
         },
         auditorShow: false,
         dataentryShow: false,
@@ -347,7 +347,7 @@
         addsheetshow: false,
         dialogbuttonvisble: true,
         dialogTableVisible: false,
-        tooldownloaddialog:false,
+        tooldownloaddialog: false,
         CheckStatus: 0,
         EntryId: '',
         key: '',
@@ -379,16 +379,16 @@
           TestDetailId: '',
           department: '',
           departmentId: '',
-          conUserId: '', //负责人
+          conUserId: '', // 负责人
           DataDocId: '',
           DataDoc: '',
           conUserBy: '',
-          CheckStatus: '',
+          CheckStatus: ''
         },
         dataentryForm: {
           message: '',
           sheetnum: 1,
-          addsheetshow: false,
+          addsheetshow: false
         },
         shenheForm: {
           SuccessStatus: 1,
@@ -415,29 +415,29 @@
           // },
 
           {
-            prop: "DocType",
+            prop: 'DocType',
             label: '文档名称',
             width: 100,
             sort: true
           },
 
           {
-            prop: "CreatedTime",
+            prop: 'CreatedTime',
             label: '生成时间',
             width: 100,
             sort: true
-          },
+          }
         ]
       }
     },
-    created() {
-      //this.initData()
-      this.getDictList();
-      this.getDetaillist(); //检测明细项下拉
-      this.initdata2();
-    },
+    created () {
+      // this.initData()
+      this.getDictList()
+      this.getDetaillist() // 检测明细项下拉
+      this.initdata2()
+  },
     methods: {
-      initdata2() {
+      initdata2 () {
         let _this = this
         let BalanceTime = []
         if (!_this.BalanceTime) {
@@ -461,11 +461,11 @@
         Object.assign(params, this.searchform)
         // request
         _this.$axios.get('/limsdataentry/alllist?BalanceTime=' + BalanceTime.join(','), {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.taskbalacelist = res.data.items
-            console.log("------task---", _this.taskbalacelist)
+            console.log('------task---', _this.taskbalacelist)
             _this.currentItemCount = res.data.currentItemCount
           })
           .catch(err => {
@@ -473,73 +473,64 @@
             console.error(err)
           })
       },
-      //table背景
-      tableRowClassName({
+      // table背景
+      tableRowClassName ({
         row,
         rowIndex
       }) {
         if (row.Recheck === 1) {
-          return 'warning-row';
+          return 'warning-row'
         }
-        return '';
+        return ''
       },
-      getDictList() {
+      getDictList () {
         docTemplateApi.getDictList(this.$axios).then(res => {
-          this.docTemplateDictList = res.data;
-        });
+          this.docTemplateDictList = res.data
+        })
       },
-      getvalues(val) {
+      getvalues (val) {
         this.entrydetail.business = val.Id
         this.entrydetail.instance = val.DocKey
         this.historyVisible = true
       },
       //
-      MoreCmdClick(cmd) {
-        if(cmd.Command == 'Open') {
+      MoreCmdClick (cmd) {
+        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 == 'ViewDocPdf') {
+        } else if (cmd.Command == 'ViewDocPdf') {
           this.ViewDocPdf(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()
         }
-
       },
-      GetCommand(cmdType, row) {
+      GetCommand (cmdType, row) {
         let cmd = {}
         cmd.Command = cmdType
         cmd.row = row
         return cmd
       },
-      handleChange(value) {
-        console.log(value);
+      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) {
-
+      OpenOrignDataInput (row) {
         this.CheckStatus = row.CheckStatus
         this.eid = row.EId
         this.tbid = row.TaskId
@@ -548,7 +539,7 @@
         this.datadoc = row.DataDoc
 
         this.opendocentry()
-        /**const params = {
+        /** const params = {
           _currentPage: this.historycurrentPage,
           _size: this.historysize,
           datadocId: this.datadocId
@@ -566,10 +557,10 @@
             }
           }).catch(err => {
             console.error(err)
-          })*/
+          }) */
       },
-      ViewDocPdf(row) {
-        console.log("--------row---",row)
+      ViewDocPdf (row) {
+        console.log('--------row---', row)
         api.docexport(row.Id, this.$axios)
           .then(res => {
             // response
@@ -584,22 +575,22 @@
           })
       },
       // 查看文档pdf
-      changepdfpage(row, DocAddress) {
+      changepdfpage (row, DocAddress) {
         let _this = this
         let queryParams = {
           key: row.DocKey,
           docurl: DocAddress,
           dataentryId: row.Id,
-          docname : row.DocName
+          docname: row.DocName
         }
-        console.log("---queryParams-----",queryParams)
+        console.log('---queryParams-----', queryParams)
         _this.$router.push({
           path: '/lims/dataentry/docviewframe',
           query: queryParams
         })
       },
-      //选择页码刷新历史数据
-      refreshdataentrydata() {
+      // 选择页码刷新历史数据
+      refreshdataentrydata () {
         const params = {
           _currentPage: this.historycurrentPage,
           _size: this.historysize,
@@ -614,12 +605,12 @@
             console.error(err)
           })
       },
-      datadownload(val) {
-        console.log("--------val0----", val)
+      datadownload (val) {
+        console.log('--------val0----', val)
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
-            console.log("-----reponse=---", res.date)
+            console.log('-----reponse=---', res.date)
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
@@ -627,23 +618,23 @@
               })
               let docurl = res.data.item
               this.dataentryid = docurl.DataEntryId
-              let furl = docurl.DocAddress;
-              let fdocurl = docurl.DocUrl;
-              let fname = docurl.DocName;
-              console.log("---------docurl", res.data.item.DocUrl)
-              location.href = "http://"+fdocurl
+              let furl = docurl.DocAddress
+              let fdocurl = docurl.DocUrl
+              let fname = docurl.DocName
+              console.log('---------docurl', res.data.item.DocUrl)
+              location.href = 'http://' + fdocurl
             }
           }).catch(err => {
             console.error(err)
           })
       },
-      //数据录入导出
-      docdownload(val) {
-        console.log("--------val0----", val)
+      // 数据录入导出
+      docdownload (val) {
+        console.log('--------val0----', val)
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
-            console.log("-----reponse=---", res.date)
+            console.log('-----reponse=---', res.date)
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
@@ -651,21 +642,21 @@
               })
               let docurl = res.data.item
               this.dataentryid = docurl.DataEntryId
-              let furl = docurl.DocAddress;
-              let fname = docurl.DocName;
-              console.log("---------docurl", res.data.item.DocUrl)
-              location.href = "petrotool://furl=" + furl + "&fname=" + fname + "&doctype=data&id=" + this.dataentryid +
-                "&act=edit";
-            }
+              let furl = docurl.DocAddress
+              let fname = docurl.DocName
+              console.log('---------docurl', res.data.item.DocUrl)
+              location.href = 'petrotool://furl=' + furl + '&fname=' + fname + '&doctype=data&id=' + this.dataentryid +
+                '&act=edit'
+          }
           }).catch(err => {
             console.error(err)
           })
       },
-      opendocentry() {
-        let docTempType = '';
+      opendocentry () {
+        let docTempType = ''
         for (let idx in this.docTemplateDictList) {
           if (this.datadocId == this.docTemplateDictList[idx].Id) {
-            docTempType = this.docTemplateDictList[idx].TemplateCode;
+            docTempType = this.docTemplateDictList[idx].TemplateCode
           }
         }
         let queryParams = {
@@ -674,87 +665,87 @@
           deid: this.DataEntryId,
           datastatus: this.CheckStatus,
           sign: '3'
-        };
+        }
         switch (docTempType) {
-          //漏电保护
-          case "DAYT.LeakProtect.Detail":
+          // 漏电保护
+          case 'DAYT.LeakProtect.Detail':
             this.$router.push({
               path: '/lims/reportleakprotect/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //空气泡沫
-          case "DAYT.Airfoamgenerator.Detail":
+              query: queryParams
+            })
+            break
+          // 空气泡沫
+        case 'DAYT.Airfoamgenerator.Detail':
             this.$router.push({
               path: '/lims/reportairfoamgenerator/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //呼吸阀
-          case "DAYT.AtmosValve.Detail":
+              query: queryParams
+            })
+            break
+          // 呼吸阀
+        case 'DAYT.AtmosValve.Detail':
             this.$router.push({
               path: '/lims/reportatmosvalve/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //液压安全阀
-          case "DAYT.HydraulicSafe.Detail":
+              query: queryParams
+            })
+            break
+          // 液压安全阀
+        case 'DAYT.HydraulicSafe.Detail':
             this.$router.push({
               path: '/lims/reporthydraulicsafe/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //电气接地
-          case "DAYT.ElecGround.Detail":
+              query: queryParams
+            })
+            break
+          // 电气接地
+        case 'DAYT.ElecGround.Detail':
             this.$router.push({
               path: '/lims/reportelecground/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //防雷装置等电位
-          case "DAYT.Equipotent.Detail":
+              query: queryParams
+            })
+            break
+          // 防雷装置等电位
+        case 'DAYT.Equipotent.Detail':
             this.$router.push({
               path: '/lims/reportequipotent/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //防雷装置
-          case "DAYT.LightProtect.Detail":
+              query: queryParams
+            })
+            break
+          // 防雷装置
+        case 'DAYT.LightProtect.Detail':
             this.$router.push({
               path: '/lims/reportlightprotect/datareview',
-              query: queryParams,
-            });
-            break;
-            //电流表
-          case "DAYT.Ammeter.Detail":
+              query: queryParams
+            })
+            break
+          // 电流表
+        case 'DAYT.Ammeter.Detail':
             this.$router.push({
               path: '/lims/reportammeter/subdata/dataopera',
-              query: queryParams,
-            });
-            break;
-            //阻火器
-          case "DAYT.BackFire.Detail":
+              query: queryParams
+            })
+            break
+          // 阻火器
+        case 'DAYT.BackFire.Detail':
             this.$router.push({
               path: '/lims/reportzuhq/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //游梁式抽油机
-          case "DAYT.BeamPumpingUnits.Detail":
+              query: queryParams
+            })
+            break
+          // 游梁式抽油机
+        case 'DAYT.BeamPumpingUnits.Detail':
             this.$router.push({
               path: '/lims/reportbeampumpingUnits/subdata/dataopera',
-              query: queryParams,
-            });
-            break;
-            //无游梁式抽油机
-          case "DAYT.NoBeamPumpingUnits.Detail":
+              query: queryParams
+            })
+            break
+          // 无游梁式抽油机
+        case 'DAYT.NoBeamPumpingUnits.Detail':
             this.$router.push({
               path: '/lims/reportnobeampumpingUnits/subdata/dataopera',
-              query: queryParams,
-            });
+              query: queryParams
+            })
             break
           // 离心泵机组液体输送系统节能监测原始记录
-          case  "DAYT.LiquidTransportation.Detail":
+          case 'DAYT.LiquidTransportation.Detail':
             this.$router.push({
               path: '/lims/reportliquidtransportation/operation',
               query: queryParams
@@ -802,56 +793,56 @@
               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.ReportDetectorHSGas.Detail':
             this.$router.push({
               path: '/lims/reportdetectorHSgas/operation',
@@ -887,17 +878,17 @@
             })
             break
           default:
-            this.$message.warning('无模板类型相匹配，请重试');
+            this.$message.warning('无模板类型相匹配，请重试')
         }
       },
-      handleselectentry(val) {
-        console.log("------val--", val)
+      handleselectentry (val) {
+        console.log('------val--', val)
         let params = {
           eid: this.eid,
           tbid: this.tbid,
           deid: this.DataEntryId,
           datadocId: this.datadocId
-        };
+        }
         api.dataEntryhistory(params, val.Id, this.$axios)
           .then(res => {
             if (res.data.code === 0) {
@@ -914,7 +905,7 @@
             console.error(err)
           })
       },
-      dataentry(val) {
+      dataentry (val) {
         let _this = this
         _this.key = val.EntrustNo + '' + val.TestDetailId
         var accCode = this.authUser.Profile.AccCode
@@ -924,27 +915,27 @@
         if (val.CheckStatus != 0) {
           this.dialogbuttonvisble = false
         }
-        if (val.DataDocId == "") {
+        if (val.DataDocId == '') {
           this.$message({
             type: 'warning',
-            message: "无模板！"
+            message: '无模板！'
           })
         } else {
-          //先将初始数据录入记录写入excel
+          // 先将初始数据录入记录写入excel
           _this.$axios.post('/limsdataentry/datatoexcel/' + _this.key, val)
             .then(res => {
               // response
               if (res.data.code === 0) {
-                this.dataentryForm.message = "请编辑完毕点击保存修改，不然您的修改将无效！"
+                this.dataentryForm.message = '请编辑完毕点击保存修改，不然您的修改将无效！'
                 let docurl = res.data.item
                 this.dataurl = docurl.DocAddress
                 this.docname = docurl.DocName
                 this.dataentryid = docurl.DataEntryId
-                let furl = docurl.DocAddress;
-                let fname = docurl.DocName;
-                location.href = "petrotool://furl=" + furl + "&fname=" + fname + "&doctype=data&id=" + this.dataentryid +
-                  "&act=edit";
-                this.initdata2()
+                let furl = docurl.DocAddress
+                let fname = docurl.DocName
+                location.href = 'petrotool://furl=' + furl + '&fname=' + fname + '&doctype=data&id=' + this.dataentryid +
+                  '&act=edit'
+              this.initdata2()
               } else {
                 _this.$message({
                   type: 'warning',
@@ -959,53 +950,53 @@
         }
         this.dataentryShow = true
       },
-      review(val) {
+      review (val) {
         let url = 'dataentry/' + val.DocVersion + '/office_history?Address=' + val.DocAddress
-        window.open(url);
+        window.open(url)
       },
-      upload() {
-        location.href = "petrotool://furl=" + this.dataurl + "&fname=" + this.docname + "&doctype=data&id=" + this.dataentryid +
-          "&act=up&token=" + localStorage.getItem('token');
+      upload () {
+        location.href = 'petrotool://furl=' + this.dataurl + '&fname=' + this.docname + '&doctype=data&id=' + this.dataentryid +
+          '&act=up&token=' + localStorage.getItem('token')
         this.$message({
           type: 'success',
-          message: "修改已保存",
+          message: '修改已保存'
         })
         this.initdata2()
         this.dataentryShow = false
       },
-      cancel() {
-        location.href = "petrotool://furl=" + this.dataurl + "&fname=" + this.docname + "&doctype=data&id=" + this.dataentryid +
-          "&act=cancel&token=" + localStorage.getItem('token');
+      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
         var userId = this.authUser.Profile.Id
         var realname = this.authUser.Profile.Realname
-        if (val.DataDocId == "") {
+        if (val.DataDocId == '') {
           this.$message({
             type: 'warning',
-            message: "还没有模板！"
+            message: '还没有模板！'
           })
         } else {
-          //先将初始数据录入记录写入excel
+          // 先将初始数据录入记录写入excel
           _this.$axios.post('/limsdataentry/datatoexcel/' + _this.key, val)
             .then(res => {
               // response
               if (res.data.code === 0) {
                 _this.$message({
                   type: 'success',
-                  message: res.data.message,
+                  message: res.data.message
                 })
                 let docurl = res.data.item
                 let key = docurl.DocKey
                 let url = 'dataentry/' + key + '/office?DocId=' + val.DataDocId + '&DocType=' + val.DataDoc +
                   '&AccCode=' + accCode + '&UserId=' + userId + '&RealName=' + realname + '&Edit=true&Address=' +
                   docurl.DocAddress
-                window.open(url);
+                window.open(url)
               } else {
                 _this.$message({
                   type: 'warning',
@@ -1019,7 +1010,7 @@
             })
         }
       },
-      gethistory(val) {
+      gethistory (val) {
         let _this = this
         _this.historydialog = true
         this.$axios.get('/limsdataentry/historylist/' + val.Id, {})
@@ -1031,71 +1022,71 @@
             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);
+        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
         var realname = this.authUser.Profile.Realname
         let url = 'dataentry/' + key + '/office?DocId=' + val.DataDocId + '&DocType=' + val.DataDoc + '&AccCode=' +
           accCode + '&UserId=' + userId + '&RealName=' + realname + '&Edit=false'
-        window.open(url);
+        window.open(url)
       },
-      handleSelectionChange(val) {
+      handleSelectionChange (val) {
         this.selectSamples = val
       },
-      handleClose(done) {
+      handleClose (done) {
         this.$confirm('确认关闭？')
           .then(_ => {
-            done();
+            done()
             this.initdata2()
             this.dialogbuttonvisble = true
           })
-          .catch(_ => {});
+          .catch(_ => {})
       },
       // 打开审核弹窗
-      auditorshow() {
+      auditorshow () {
         this.auditorShow = true
       },
-      makesure() {
-        this.$confirm("确定审核通过！", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      makesure () {
+        this.$confirm('确定审核通过！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             this.auditorShow = false
             this.checkstatus()
           })
           .catch(() => {})
       },
-      check(val) {
+      check (val) {
         this.auditorShow = true
       },
-      checkstatus() {
+      checkstatus () {
         let params = this.shenheForm
         params = Object.assign(params, {
           ApplyList: this.selectSamples
         })
-        //this.$axios.put('/limsdataentry/signature', params)
+        // this.$axios.put('/limsdataentry/signature', params)
         this.$axios.put('/limsdataentry/checkstatus/', params)
           .then(res => {
             // response
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
 
               })
               this.initdata2()
             } else {
               this.$message({
                 type: 'warning',
-                message: "审核错误，请先确定您已经录入内容并且录入的内容已经保存"
+                message: '审核错误，请先确定您已经录入内容并且录入的内容已经保存'
               })
             }
           })
@@ -1104,20 +1095,20 @@
             console.error(err)
           })
       },
-      openexcel(val) {
+      openexcel (val) {
         let key = val.EntrustNo + '' + val.TestDetailId
         let url = 'dataentry/' + key + '/office'
-        window.open(url);
+        window.open(url)
       },
-      searchCommand(command) {
+      searchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -1126,8 +1117,8 @@
         this.Column.Prop = column.prop
         this.initdata2()
       },
-      getDetaillist() {
-        let _this = this;
+      getDetaillist () {
+        let _this = this
         _this.$axios.get('/limsbalance/getdetaillist', {})
           .then(res => {
             _this.detailList = res.data.items
@@ -1137,38 +1128,38 @@
             console.error(err)
           })
       },
-      clearSearch() {
+      clearSearch () {
         this.searchform.EntrustNo = ''
         this.searchform.TestDetailId = ''
         this.searchform.CheckStatus = ''
         this.BalanceTime = []
-        //this.searchform.TestDetailId = ''
+        // 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
-        console.log("-----page---", value)
+        console.log('-----page---', 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') {
@@ -1180,33 +1171,32 @@
           return val.substring(0, 19)
         }
       },
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        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
         var strDate = date.getDate()
         if (month >= 1 && month <= 9) {
-          month = "0" + month;
+          month = '0' + month
         }
         if (strDate >= 0 && strDate <= 9) {
-          strDate = "0" + strDate;
+          strDate = '0' + strDate
         }
-        this.currentdate = year + "" + month + "" + strDate
-      },
+        this.currentdate = year + '' + month + '' + strDate
+      }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -149,10 +149,10 @@
         <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">
+              title="待预审" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核通过" type="success">
+              title="待审批" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待录入" type="info">
@@ -161,11 +161,17 @@
               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">
+              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=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审批通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='7'" :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>
@@ -322,16 +328,16 @@
 <script>
   import {
     mapGetters
-  } from 'vuex';
-  //import DataEntryHistoryDialog from '../../../../components/lims/dataentryhistorydialog'
-  import historytaskdialog from '../../../components/lims/historytaskdialog'
-  import docTemplateApi from '@/api/lims/docTemplate';
-  import api from '@/api/lims/dataEntry';
-  import reportApi from '@/api/lims/createReport'
+  } from 'vuex'
+// import DataEntryHistoryDialog from '../../../../components/lims/dataentryhistorydialog'
+import historytaskdialog from '../../../components/lims/historytaskdialog'
+  import docTemplateApi from '@/api/lims/docTemplate'
+import api from '@/api/lims/dataEntry'
+import reportApi from '@/api/lims/createReport'
   export default {
     components: {
       // DataEntryHistoryDialog
-      historytaskdialog,
+      historytaskdialog
     },
     computed: {
       ...mapGetters({
@@ -339,15 +345,15 @@
       })
     },
     name: 'dataentry',
-    data() {
+    data () {
       return {
-        //dialogdataentryhistoryVisible: false,
+        // dialogdataentryhistoryVisible: false,
         historyVisible: false,
         dialogVisible: false,
         entrydetail: {
           process: '',
           business: '',
-          instance: '',
+          instance: ''
         },
         auditorShow: false,
         dataentryShow: false,
@@ -391,16 +397,16 @@
           TestDetailId: '',
           department: '',
           departmentId: '',
-          conUserId: '', //负责人
+          conUserId: '', // 负责人
           DataDocId: '',
           DataDoc: '',
           conUserBy: '',
-          CheckStatus: '',
+          CheckStatus: ''
         },
         dataentryForm: {
           message: '',
           sheetnum: 1,
-          addsheetshow: false,
+          addsheetshow: false
         },
         shenheForm: {
           SuccessStatus: 1,
@@ -408,12 +414,12 @@
         },
         reportList: [],
         adddataentryFrom: {
-          //TestDetail: '',
+          // TestDetail: '',
           EntrustNo: '',
           // CustomerName: '',
           ConUserId: '',
           ConUserBy: '',
-          Remark: '',
+          Remark: ''
         },
         Column: {
           Order: '',
@@ -436,29 +442,29 @@
           // },
 
           {
-            prop: "DocType",
+            prop: 'DocType',
             label: '文档名称',
             width: 100,
             sort: true
           },
 
           {
-            prop: "CreatedTime",
+            prop: 'CreatedTime',
             label: '生成时间',
             width: 100,
             sort: true
-          },
-        ],
+          }
+        ]
       }
     },
-    created() {
-      this.initdata2();
-      this.getDictList();
-      this.getDetaillist(); //检测明细项下拉
+    created () {
+      this.initdata2()
+      this.getDictList()
+      this.getDetaillist() // 检测明细项下拉
       this.getShowPermissions()
     },
     methods: {
-      initdata2() {
+      initdata2 () {
         let _this = this
         let BalanceTime = []
         if (!_this.BalanceTime) {
@@ -482,8 +488,8 @@
         Object.assign(params, this.searchform)
         // request
         _this.$axios.get('/limsdataentry/list?BalanceTime=' + BalanceTime.join(','), {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.taskbalacelist = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -493,23 +499,23 @@
             console.error(err)
           })
       },
-      //table背景
-      tableRowClassName({
+      // table背景
+      tableRowClassName ({
         row,
         rowIndex
       }) {
         if (row.Recheck == 1) {
-          return 'warning-row';
+          return 'warning-row'
         }
-        return '';
+        return ''
       },
-      //添加数据录入记录
-      adddataentry() {
+      // 添加数据录入记录
+      adddataentry () {
         this.getpartuserlist()
         this.adddataentryShow = true
       },
       //
-      MoreCmdClick(cmd) {
+      MoreCmdClick (cmd) {
         if (cmd.Command == 'Open') {
           this.OpenOrignDataInput(cmd.row)
         } else if (cmd.Command == 'JiaoHe') {
@@ -518,9 +524,9 @@
           this.shenHeFunc(cmd.row)
         } else if (cmd.Command == 'History') {
           this.getvalues(cmd.row)
-        } else if(cmd.Command == 'ViewDocPdf') {
+        } else if (cmd.Command == 'ViewDocPdf') {
           this.ViewDocPdf(cmd.row)
-        }else if (cmd.Command == 'OpenExcel') {
+        } else if (cmd.Command == 'OpenExcel') {
           this.docdownload(cmd.row)
         } else if (cmd.Command == 'DownLoadExcel') {
           this.datadownload(cmd.row)
@@ -532,20 +538,20 @@
           this.showreport(cmd.row)
         }
       },
-      GetCommand(cmdType, row) {
+      GetCommand (cmdType, row) {
         let cmd = {}
         cmd.Command = cmdType
         cmd.row = row
         return cmd
       },
-      //工具下载
-      tooldownload() {
-        let url = "http://weed1.labsop.cn:9390/2,1080b2997d49"
-        window.open(url);
+      // 工具下载
+      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
@@ -567,21 +573,21 @@
         })
       },
       // 审核页面跳转
-      changepage(row, DocAddress) {
+      changepage (row, DocAddress) {
         let _this = this
         let queryParams = {
           key: row.EId,
           docurl: DocAddress,
           dataentryId: row.Id,
-          docname : row.DocName
+          docname: row.DocName
         }
         _this.$router.push({
           path: '/lims/dataentry/showreportframe',
           query: queryParams
         })
       },
-      //数据录入添加确认按钮
-      makesureaddata() {
+      // 数据录入添加确认按钮
+      makesureaddata () {
         this.adddataentryFrom.ConUserBy = this.$refs.selectConUserId.selectedLabel + ''
         api.adddataentry(this.adddataentryFrom, this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -601,24 +607,24 @@
           console.error(err)
         })
       },
-      //检测人列表
-      getpartuserlist() {
+      // 检测人列表
+      getpartuserlist () {
         let _this = this
         _this.$axios.get('limsbalance/partuserlist', {})
           .then(res => {
             // response
             _this.partuserlist = res.data.items
-            /*_this.partuserlist.unshift({
+            /* _this.partuserlist.unshift({
               'Id': _this.authUser.Profile.Id,
               'Realname': _this.authUser.Profile.Realname
-            })*/
+            }) */
           })
           .catch(err => {
             // handle error
             console.error(err)
           })
       },
-      deldataentry(val) {
+      deldataentry (val) {
         this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -646,15 +652,15 @@
           console.error(err)
         })
       },
-      getDictList() {
+      getDictList () {
         docTemplateApi.getDictList(this.$axios).then(res => {
-          this.docTemplateDictList = res.data;
-        });
+          this.docTemplateDictList = res.data
+        })
       },
-      handleChange(value) {
-        console.log(value);
+      handleChange (value) {
+        console.log(value)
       },
-      OpenOrignDataInput(row) {
+      OpenOrignDataInput (row) {
         this.CheckStatus = row.CheckStatus
         this.eid = row.EId
         this.tbid = row.TaskId
@@ -663,7 +669,7 @@
         this.datadoc = row.DataDoc
         this.opendocentry()
 
-        /**const params = {
+        /** const params = {
           _currentPage: this.historycurrentPage,
           _size: this.historysize,
           datadocId: this.datadocId
@@ -681,9 +687,9 @@
             }
           }).catch(err => {
             console.error(err)
-          })*/
+          }) */
       },
-       ViewDocPdf(row) {
+      ViewDocPdf (row) {
         api.docexport(row.Id, this.$axios)
           .then(res => {
             // response
@@ -698,21 +704,21 @@
           })
       },
       // 查看文档pdf
-      changepdfpage(row, DocAddress) {
+      changepdfpage (row, DocAddress) {
         let _this = this
         let queryParams = {
           key: row.DocKey,
           docurl: DocAddress,
           dataentryId: row.Id,
-          docname : row.DocName
+          docname: row.DocName
         }
         _this.$router.push({
           path: '/lims/dataentry/docviewframe',
           query: queryParams
         })
       },
-      //选择页码刷新历史数据
-      refreshdataentrydata() {
+      // 选择页码刷新历史数据
+      refreshdataentrydata () {
         const params = {
           _currentPage: this.historycurrentPage,
           _size: this.historysize,
@@ -727,7 +733,7 @@
             console.error(err)
           })
       },
-      datadownload(val) {
+      datadownload (val) {
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
@@ -738,17 +744,17 @@
               })
               let docurl = res.data.item
               this.dataentryid = docurl.DataEntryId
-              let furl = docurl.DocAddress;
-              let fdocurl = docurl.DocUrl;
-              let fname = docurl.DocName;
-              location.href = "http://" + fdocurl
+              let furl = docurl.DocAddress
+              let fdocurl = docurl.DocUrl
+              let fname = docurl.DocName
+              location.href = 'http://' + fdocurl
             }
           }).catch(err => {
             console.error(err)
           })
       },
-      //数据录入导出
-      docdownload(val) {
+      // 数据录入导出
+      docdownload (val) {
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
@@ -759,20 +765,20 @@
               })
               let docurl = res.data.item
               this.dataentryid = docurl.DataEntryId
-              let furl = docurl.DocAddress;
-              let fname = docurl.DocName;
-              location.href = "petrotool://furl=" + furl + "&fname=" + fname + "&doctype=data&id=" + this.dataentryid +
-                "&act=edit";
-            }
+              let furl = docurl.DocAddress
+              let fname = docurl.DocName
+              location.href = 'petrotool://furl=' + furl + '&fname=' + fname + '&doctype=data&id=' + this.dataentryid +
+                '&act=edit'
+          }
           }).catch(err => {
             console.error(err)
           })
       },
-      opendocentry() {
-        let docTempType = '';
+      opendocentry () {
+        let docTempType = ''
         for (let idx in this.docTemplateDictList) {
           if (this.datadocId == this.docTemplateDictList[idx].Id) {
-            docTempType = this.docTemplateDictList[idx].TemplateCode;
+            docTempType = this.docTemplateDictList[idx].TemplateCode
           }
         }
         let queryParams = {
@@ -782,135 +788,135 @@
           datastatus: this.CheckStatus,
           datadocId: this.datadocId,
           sign: '2'
-        };
+        }
         switch (docTempType) {
-          //漏电保护
-          case "DAYT.LeakProtect.Detail":
+          // 漏电保护
+          case 'DAYT.LeakProtect.Detail':
             this.$router.push({
               path: '/lims/reportleakprotect/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //空气泡沫
-          case "DAYT.Airfoamgenerator.Detail":
+              query: queryParams
+            })
+            break
+          // 空气泡沫
+        case 'DAYT.Airfoamgenerator.Detail':
             this.$router.push({
               path: '/lims/reportairfoamgenerator/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //呼吸阀
-          case "DAYT.AtmosValve.Detail":
+              query: queryParams
+            })
+            break
+          // 呼吸阀
+        case 'DAYT.AtmosValve.Detail':
             this.$router.push({
               path: '/lims/reportatmosvalve/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //液压安全阀
-          case "DAYT.HydraulicSafe.Detail":
+              query: queryParams
+            })
+            break
+          // 液压安全阀
+        case 'DAYT.HydraulicSafe.Detail':
             this.$router.push({
               path: '/lims/reporthydraulicsafe/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //电气接地
-          case "DAYT.ElecGround.Detail":
+              query: queryParams
+            })
+            break
+          // 电气接地
+        case 'DAYT.ElecGround.Detail':
             this.$router.push({
               path: '/lims/reportelecground/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //防雷装置等电位
-          case "DAYT.Equipotent.Detail":
+              query: queryParams
+            })
+            break
+          // 防雷装置等电位
+        case 'DAYT.Equipotent.Detail':
             this.$router.push({
               path: '/lims/reportequipotent/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //防雷装置
-          case "DAYT.LightProtect.Detail":
+              query: queryParams
+            })
+            break
+          // 防雷装置
+        case 'DAYT.LightProtect.Detail':
             this.$router.push({
               path: '/lims/reportlightprotect/datareview',
-              query: queryParams,
-            });
-            break;
-            //电流表
-          case "DAYT.Ammeter.Detail":
+              query: queryParams
+            })
+            break
+          // 电流表
+        case 'DAYT.Ammeter.Detail':
             this.$router.push({
               path: '/lims/reportammeter/subdata/dataopera',
-              query: queryParams,
-            });
-            break;
-            //阻火器
-          case "DAYT.BackFire.Detail":
+              query: queryParams
+            })
+            break
+          // 阻火器
+        case 'DAYT.BackFire.Detail':
             this.$router.push({
               path: '/lims/reportzuhq/subdata/datalist',
-              query: queryParams,
-            });
-            break;
-            //游梁式抽油机
-          case "DAYT.BeamPumpingUnits.Detail":
+              query: queryParams
+            })
+            break
+          // 游梁式抽油机
+        case 'DAYT.BeamPumpingUnits.Detail':
             this.$router.push({
               path: '/lims/reportbeampumpingUnits/subdata/dataopera',
-              query: queryParams,
-            });
-            break;
-            //无游梁式抽油机
-          case "DAYT.NoBeamPumpingUnits.Detail":
+              query: queryParams
+            })
+            break
+          // 无游梁式抽油机
+        case 'DAYT.NoBeamPumpingUnits.Detail':
             this.$router.push({
               path: '/lims/reportnobeampumpingUnits/subdata/dataopera',
-              query: queryParams,
-            });
-            break;
-            //苯气检测报警器检定记录
-          case 'DAYT.ReportAlertorBenDetect.Detail':
+              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.ReportDetectorHSGas.Detail':
             this.$router.push({
               path: '/lims/reportdetectorHSgas/operation',
@@ -995,16 +1001,16 @@
             })
             break
           default:
-            this.$message.warning('无模板类型相匹配，请重试');
+            this.$message.warning('无模板类型相匹配，请重试')
         }
       },
-      handleselectentry(val) {
+      handleselectentry (val) {
         let params = {
           eid: this.eid,
           tbid: this.tbid,
           deid: this.DataEntryId,
           datadocId: this.datadocId
-        };
+        }
         api.dataEntryhistory(params, val.Id, this.$axios)
           .then(res => {
             if (res.data.code === 0) {
@@ -1021,7 +1027,7 @@
             console.error(err)
           })
       },
-      dataentry(val) {
+      dataentry (val) {
         let _this = this
         _this.key = val.EntrustNo + '' + val.TestDetailId
         var accCode = this.authUser.Profile.AccCode
@@ -1031,27 +1037,27 @@
         if (val.CheckStatus != 0) {
           this.dialogbuttonvisble = false
         }
-        if (val.DataDocId == "") {
+        if (val.DataDocId == '') {
           this.$message({
             type: 'warning',
-            message: "无模板！"
+            message: '无模板！'
           })
         } else {
-          //先将初始数据录入记录写入excel
+          // 先将初始数据录入记录写入excel
           _this.$axios.post('/limsdataentry/datatoexcel/' + _this.key, val)
             .then(res => {
               // response
               if (res.data.code === 0) {
-                this.dataentryForm.message = "请编辑完毕点击保存修改，不然您的修改将无效！"
+                this.dataentryForm.message = '请编辑完毕点击保存修改，不然您的修改将无效！'
                 let docurl = res.data.item
                 this.dataurl = docurl.DocAddress
                 this.docname = docurl.DocName
                 this.dataentryid = docurl.DataEntryId
-                let furl = docurl.DocAddress;
-                let fname = docurl.DocName;
-                location.href = "petrotool://furl=" + furl + "&fname=" + fname + "&doctype=data&id=" + this.dataentryid +
-                  "&act=edit";
-                this.initdata2()
+                let furl = docurl.DocAddress
+                let fname = docurl.DocName
+                location.href = 'petrotool://furl=' + furl + '&fname=' + fname + '&doctype=data&id=' + this.dataentryid +
+                  '&act=edit'
+              this.initdata2()
               } else {
                 _this.$message({
                   type: 'warning',
@@ -1066,53 +1072,53 @@
         }
         this.dataentryShow = true
       },
-      review(val) {
+      review (val) {
         let url = 'dataentry/' + val.DocVersion + '/office_history?Address=' + val.DocAddress
-        window.open(url);
+        window.open(url)
       },
-      upload() {
-        location.href = "petrotool://furl=" + this.dataurl + "&fname=" + this.docname + "&doctype=data&id=" + this.dataentryid +
-          "&act=up&token=" + localStorage.getItem('token');
+      upload () {
+        location.href = 'petrotool://furl=' + this.dataurl + '&fname=' + this.docname + '&doctype=data&id=' + this.dataentryid +
+          '&act=up&token=' + localStorage.getItem('token')
         this.$message({
           type: 'success',
-          message: "修改已保存",
+          message: '修改已保存'
         })
         this.initdata2()
         this.dataentryShow = false
       },
-      cancel() {
-        location.href = "petrotool://furl=" + this.dataurl + "&fname=" + this.docname + "&doctype=data&id=" + this.dataentryid +
-          "&act=cancel&token=" + localStorage.getItem('token');
+      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
         var userId = this.authUser.Profile.Id
         var realname = this.authUser.Profile.Realname
-        if (val.DataDocId == "") {
+        if (val.DataDocId == '') {
           this.$message({
             type: 'warning',
-            message: "还没有模板！"
+            message: '还没有模板！'
           })
         } else {
-          //先将初始数据录入记录写入excel
+          // 先将初始数据录入记录写入excel
           _this.$axios.post('/limsdataentry/datatoexcel/' + _this.key, val)
             .then(res => {
               // response
               if (res.data.code === 0) {
                 _this.$message({
                   type: 'success',
-                  message: res.data.message,
+                  message: res.data.message
                 })
                 let docurl = res.data.item
                 let key = docurl.DocKey
                 let url = 'dataentry/' + key + '/office?DocId=' + val.DataDocId + '&DocType=' + val.DataDoc +
                   '&AccCode=' + accCode + '&UserId=' + userId + '&RealName=' + realname + '&Edit=true&Address=' +
                   docurl.DocAddress
-                window.open(url);
+                window.open(url)
               } else {
                 _this.$message({
                   type: 'warning',
@@ -1126,7 +1132,7 @@
             })
         }
       },
-      gethistory(val) {
+      gethistory (val) {
         let _this = this
         _this.historydialog = true
         this.$axios.get('/limsdataentry/historylist/' + val.Id, {})
@@ -1138,34 +1144,34 @@
             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);
+        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
         var realname = this.authUser.Profile.Realname
         let url = 'dataentry/' + key + '/office?DocId=' + val.DataDocId + '&DocType=' + val.DataDoc + '&AccCode=' +
           accCode + '&UserId=' + userId + '&RealName=' + realname + '&Edit=false'
-        window.open(url);
+        window.open(url)
       },
-      handleSelectionChange(val) {
+      handleSelectionChange (val) {
         this.selectSamples = val
       },
-      handleClose(done) {
+      handleClose (done) {
         this.$confirm('确认关闭？')
           .then(_ => {
-            done();
+            done()
             this.initdata2()
             this.dialogbuttonvisble = true
           })
-          .catch(_ => {});
+          .catch(_ => {})
       },
       // 打开审核弹窗
-      auditorshow() {
+      auditorshow () {
         if (this.selectSamples.length < 1) {
           this.$message({
             type: 'warning',
@@ -1184,41 +1190,41 @@
         }
         this.auditorShow = true
       },
-      makesure() {
-        this.$confirm("确定审核通过！", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      makesure () {
+        this.$confirm('确定审核通过！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             this.auditorShow = false
             this.checkstatus()
           })
           .catch(() => {})
       },
-      check(val) {
+      check (val) {
         this.auditorShow = true
       },
-      checkstatus() {
+      checkstatus () {
         let params = this.shenheForm
         params = Object.assign(params, {
           ApplyList: this.selectSamples
         })
-        //this.$axios.put('/limsdataentry/signature', params)
+        // this.$axios.put('/limsdataentry/signature', params)
         this.$axios.put('/limsdataentry/checkstatus/', params)
           .then(res => {
             // response
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
 
               })
               this.initdata2()
             } else {
               this.$message({
                 type: 'warning',
-                message: "审核错误，请先确定您已经录入内容并且录入的内容已经保存"
+                message: '审核错误，请先确定您已经录入内容并且录入的内容已经保存'
               })
             }
           })
@@ -1227,20 +1233,20 @@
             console.error(err)
           })
       },
-      openexcel(val) {
+      openexcel (val) {
         let key = val.EntrustNo + '' + val.TestDetailId
         let url = 'dataentry/' + key + '/office'
-        window.open(url);
+        window.open(url)
       },
-      searchCommand(command) {
+      searchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -1249,8 +1255,8 @@
         this.Column.Prop = column.prop
         this.initdata2()
       },
-      getDetaillist() {
-        let _this = this;
+      getDetaillist () {
+        let _this = this
         _this.$axios.get('/limsbalance/getdetaillist', {})
           .then(res => {
             _this.detailList = res.data.items
@@ -1260,13 +1266,13 @@
             console.error(err)
           })
       },
-      //获取当前登录人分组
-      getShowPermissions() {
+      // 获取当前登录人分组
+      getShowPermissions () {
         let _this = this
-        if (_this.authUser.Profile.DepartmentId == "100000054") {
+        if (_this.authUser.Profile.DepartmentId == '100000054') {
           _this.$message({
             type: 'warning',
-            message: "无法查看"
+            message: '无法查看'
           })
         } else {
           this.$axios.get('/limsentrust/getshow', {})
@@ -1279,15 +1285,15 @@
             })
         }
       },
-      getvalues(val) {
+      getvalues (val) {
         this.entrydetail.business = val.Id
         this.entrydetail.instance = val.DocKey
         this.historyVisible = true
       },
-      recoverydialogcallback(v) {
-        //this.goback()
+      recoverydialogcallback (v) {
+        // this.goback()
       },
-      goback() {
+      goback () {
         if (this.$route.query.size) {
           this.$router.push({
             name: this.$route.query.pname,
@@ -1300,37 +1306,37 @@
           this.$router.go(-1)
         }
       },
-      clearSearch() {
+      clearSearch () {
         this.searchform.EntrustNo = ''
         this.searchform.TestDetailId = ''
         this.searchform.CheckStatus = ''
         this.BalanceTime = []
-        //this.searchform.TestDetailId = ''
+        // 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') {
@@ -1342,33 +1348,32 @@
           return val.substring(0, 19)
         }
       },
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        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
         var strDate = date.getDate()
         if (month >= 1 && month <= 9) {
-          month = "0" + month;
+          month = '0' + month
         }
         if (strDate >= 0 && strDate <= 9) {
-          strDate = "0" + strDate;
+          strDate = '0' + strDate
         }
-        this.currentdate = year + "" + month + "" + strDate
-      },
+        this.currentdate = year + '' + month + '' + strDate
+      }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -11,7 +11,8 @@
           <i class="icon icon-table2"></i> 审核数据
         </span>
         <span style="float: right;">
-          <el-button type="primary" plain size="mini" title="审核" @click="shehedataentry" v-if="this.buttonshow">审核</el-button>
+          <el-button type="primary" plain size="mini" title="审批" @click="shehedataentry" v-if="this.checkstaus == 4&&buttonshow">审批</el-button>
+          <el-button type="primary" plain size="mini" title="预审" @click="shehedataentry" v-if="this.checkstaus == 2&&buttonshow">预审</el-button>
           <el-button plain size="mini" title="返回" @click="backFunc()">返回</el-button>
         </span>
       </div>
@@ -27,8 +28,8 @@
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审核状态">
           <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="4" >审核通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="5" >审核未通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" >审核通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="0" >审核未通过</el-radio>
           </template>
         </el-form-item>
         <el-form-item label="意见">
@@ -45,81 +46,98 @@
 <script>
   import {
     mapGetters
-  } from 'vuex';
-  export default {
+  } from 'vuex'
+export default {
     name: 'onlyofficesframe',
-    data() {
+    data () {
       return {
         data: {
-          entrustNo: '', //是否审核  0 未审核  1已审核
+          entrustNo: '', // 是否审核  0 未审核  1已审核
           testDetail: '',
           testDetailId: '',
           department: '',
           departmentId: '',
-          conUserId: '', //负责人
-          DocId:'',
-          DocType:'',
+          conUserId: '', // 负责人
+          DocId: '',
+          DocType: '',
           conUserBy: '',
           balanceTime: ''
         },
-        shenheForm:  {
-          SuccessStatus: 4,
+        checkstaus: '',
+        shenheForm: {
+          SuccessStatus: 1,
           AuditorRemark: '',
           DataEntryId: 0
         },
         key: '',
-        buttonshow : true,
+        buttonshow: true,
         edit: true,
         currentdate: '',
         date: '',
-        AccCode:'',
-        UserId:'',
-        dataentryId:'',
-        docurl:'',
-        RealName:'',
+        AccCode: '',
+        UserId: '',
+        dataentryId: '',
+        docurl: '',
+        RealName: '',
         iframeSrc: '',
         dialogMakeSure: false,
         docname: ''
       }
     },
-    created() {
-      this.key = this.$route.query.key+''+Date.parse(new Date())
+    created () {
+      this.key = this.$route.query.key + '' + Date.parse(new Date())
       this.docurl = this.$route.query.docurl
       this.dataentryId = this.$route.query.dataentryId
       this.docname = this.$route.query.docname
-      //this.iframeSrc = "./onlyofficeshow?key=" + this.key + "&docurl=http://" + this.docurl
-      this.iframeSrc = "./pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
-      //this.iframeSrc = "http://" + this.docurl
-      console.log("------ifane===",this.iframeSrc)
-
+      this.checkstaus = this.$route.query.checkstaus
+      // this.iframeSrc = "./onlyofficeshow?key=" + this.key + "&docurl=http://" + this.docurl
+      this.iframeSrc = './pdfshow?key=' + this.key + '&docurl=http://' + this.docurl + '&docname=' + this.docname
+      // this.iframeSrc = "http://" + this.docurl
+      console.log('------ifane===', this.iframeSrc)
     },
     methods: {
       // 返回
-      backFunc(){
+      backFunc () {
         let _this = this
         _this.$router.push({
           path: '/lims/dataentry/tacktodo',
           query: ''
         })
       },
-      shehedataentry(){
-        this.shenheForm.DataEntryId = this.dataentryId
+      shehedataentry () {
+        this.shenheForm.DataEntryId = parseInt(this.dataentryId)
         this.dialogMakeSure = true
       },
-      //审核通过
-      makeSure() {
-         this.$confirm("确认审核！", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      // 审核通过
+      makeSure () {
+        this.$confirm('确认审核！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             this.dialogMakeSure = false
             this.checkstatus()
           })
           .catch(() => {})
       },
-      checkstatus() {
+      checkstatus () {
+        // 预审人
+        if (this.checkstaus == '2') {
+          if (this.shenheForm.SuccessStatus == 1) {
+            this.shenheForm.SuccessStatus = 4
+          } else if (this.shenheForm.SuccessStatus == 0) {
+            this.shenheForm.SuccessStatus = 5
+          }
+        } else if (this.checkstaus == '4') { // 审批人
+          if (this.shenheForm.SuccessStatus == 1) {
+            this.shenheForm.SuccessStatus = 6
+          } else if (this.shenheForm.SuccessStatus == 0) {
+            this.shenheForm.SuccessStatus = 7
+          }
+        } else {
+          return
+        }
         let params = this.shenheForm
         this.$axios.put('/limsdataentry/shenhedataentry/', params)
           .then(res => {
@@ -127,13 +145,13 @@
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.buttonshow = false
             } else {
               this.$message({
                 type: 'warning',
-                message: "审核错误"
+                message: '审核错误'
               })
             }
           })
@@ -141,10 +159,9 @@
             // handle error
             console.error(err)
           })
-      },
+      }
 
     }
 
   }
-
 </script>

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

@@ -52,7 +52,11 @@
               @click="jiaoheshowdialog(scope.row)">
               校核
             </el-button>
-            <el-button slot="reference" type="primary" plain size="mini" title="数据审核" v-if="scope.row.CheckStatus == 2"
+            <el-button slot="reference" type="primary" plain size="mini" title="预审" v-if="scope.row.CheckStatus == 2"
+              @click="preauditdialog(scope.row)">
+              预审
+            </el-button>
+            <el-button slot="reference" type="primary" plain size="mini" title="数据审核" v-if="scope.row.CheckStatus == 4"
               @click="shenHeFunc(scope.row)">
               审核
             </el-button>
@@ -112,10 +116,10 @@
         <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">
+              title="待预审" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核通过" type="success">
+              title="待审批" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待录入" type="info">
@@ -124,11 +128,17 @@
               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">
+              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=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审批通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.CheckStatus=='7'" :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>
@@ -315,7 +325,7 @@
         authUser: 'authUser'
       })
     },
-    data() {
+    data () {
       return {
         // dialogdataentryhistoryVisible: false,
         adddataentryShow: false,
@@ -391,18 +401,18 @@
           Prop: ''
         },
         tableColumns: [{
-            prop: 'DocType',
-            label: '文档名称',
-            width: 100,
-            sort: true
-          },
+          prop: 'DocType',
+          label: '文档名称',
+          width: 100,
+          sort: true
+        },
 
-          {
-            prop: 'CreatedTime',
-            label: '生成时间',
-            width: 100,
-            sort: true
-          }
+        {
+          prop: 'CreatedTime',
+          label: '生成时间',
+          width: 100,
+          sort: true
+        }
         ],
         partuserlist: [],
         adddataentryFrom: {
@@ -415,25 +425,25 @@
         }
       }
     },
-    created() {
+    created () {
       // this.initData()
       this.getDictList()
       this.getDetaillist() // 检测明细项下拉
       this.initdata2()
     },
     watch: {
-      $route(val) {
+      $route (val) {
         this.initdata2()
       }
     },
     methods: {
       // 添加数据录入记录
-      adddataentry() {
+      adddataentry () {
         this.getpartuserlist()
         this.adddataentryShow = true
       },
       // 检测人列表
-      getpartuserlist() {
+      getpartuserlist () {
         let _this = this
         _this.$axios.get('limsbalance/partuserlist', {})
           .then(res => {
@@ -450,7 +460,7 @@
           })
       },
       // 数据录入添加确认按钮
-      makesureaddata() {
+      makesureaddata () {
         this.adddataentryFrom.ConUserBy = this.$refs.selectConUserId.selectedLabel + ''
         console.log('-----dataentryfrom---', this.adddataentryFrom)
         api.adddataentry(this.adddataentryFrom, this.$axios).then(res => {
@@ -471,7 +481,7 @@
           console.error(err)
         })
       },
-      initdata2() {
+      initdata2 () {
         let _this = this
         let BalanceTime = []
         if (!_this.BalanceTime) {
@@ -496,8 +506,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
@@ -507,17 +517,17 @@
             console.error(err)
           })
       },
-      //table背景
-      tableRowClassName({
+      // table背景
+      tableRowClassName ({
         row,
         rowIndex
       }) {
-        if (row.Recheck == 1) {
-          return 'warning-row';
+        if (row.Recheck === 1) {
+          return 'warning-row'
         }
-        return '';
+        return ''
       },
-      MoreCmdClick(cmd) {
+      MoreCmdClick (cmd) {
         if (cmd.Command === 'Open') {
           this.OpenOrignDataInput(cmd.row)
         } else if (cmd.Command === 'JiaoHe') {
@@ -526,9 +536,9 @@
           this.shenHeFunc(cmd.row)
         } else if (cmd.Command === 'History') {
           this.getvalues(cmd.row)
-        } else if(cmd.Command == 'ViewDocPdf') {
+        } else if (cmd.Command === 'ViewDocPdf') {
           this.ViewDocPdf(cmd.row)
-        }else if (cmd.Command === 'OpenExcel') {
+        } else if (cmd.Command === 'OpenExcel') {
           this.docdownload(cmd.row)
         } else if (cmd.Command === 'DownLoadExcel') {
           this.datadownload(cmd.row)
@@ -538,24 +548,27 @@
           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
       },
+      preauditdialog (row) {
+        this.dataentrytoexcel(row)
+      },
       // 审核
-      shenHeFunc(row) {
+      shenHeFunc (row) {
         this.dataentrytoexcel(row)
       },
       // 生成excel数据
-      dataentrytoexcel(row) {
+      dataentrytoexcel (row) {
         api.docexport(row.Id, this.$axios)
           .then(res => {
             // response
@@ -570,33 +583,34 @@
           })
       },
       // 审核页面跳转
-      changepage(row, DocAddress) {
+      changepage (row, DocAddress) {
         let _this = this
         let queryParams = {
           key: row.DocKey,
           docurl: DocAddress,
           dataentryId: row.Id,
-          docname : row.DocName
+          docname: row.DocName,
+          checkstaus: row.CheckStatus
         }
         _this.$router.push({
           path: '/lims/dataentry/onlyofficesframe',
           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
@@ -625,7 +639,7 @@
             console.error(err)
           }) */
       },
-      ViewDocPdf(row) {
+      ViewDocPdf (row) {
         api.docexport(row.Id, this.$axios)
           .then(res => {
             // response
@@ -640,13 +654,13 @@
           })
       },
       // 查看文档pdf
-      changepdfpage(row, DocAddress) {
+      changepdfpage (row, DocAddress) {
         let _this = this
         let queryParams = {
           key: row.DocKey,
           docurl: DocAddress,
           dataentryId: row.Id,
-          docname : row.DocName
+          docname: row.DocName
         }
         _this.$router.push({
           path: '/lims/dataentry/docviewframe',
@@ -654,7 +668,7 @@
         })
       },
       // 选择页码刷新历史数据
-      refreshdataentrydata() {
+      refreshdataentrydata () {
         const params = {
           _currentPage: this.historycurrentPage,
           _size: this.historysize,
@@ -669,7 +683,7 @@
             console.error(err)
           })
       },
-      datadownload(val) {
+      datadownload (val) {
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
@@ -690,7 +704,7 @@
           })
       },
       // 数据录入导出
-      docdownload(val) {
+      docdownload (val) {
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
@@ -711,7 +725,7 @@
           })
       },
       // 删除数据
-      deldataentry(val) {
+      deldataentry (val) {
         this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -739,7 +753,7 @@
           console.error(err)
         })
       },
-      opendocentry() {
+      opendocentry () {
         let docTempType = ''
         for (let idx in this.docTemplateDictList) {
           if (this.datadocId === this.docTemplateDictList[idx].Id) {
@@ -833,56 +847,56 @@
               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.ReportDetectorHSGas.Detail':
             this.$router.push({
               path: '/lims/reportdetectorHSgas/operation',
@@ -970,7 +984,7 @@
             this.$message.warning('无模板类型相匹配，请重试')
         }
       },
-      handleselectentry(val) {
+      handleselectentry (val) {
         let params = {
           eid: this.eid,
           tbid: this.tbid,
@@ -993,7 +1007,7 @@
             console.error(err)
           })
       },
-      dataentry(val) {
+      dataentry (val) {
         let _this = this
         _this.key = val.EntrustNo + '' + val.TestDetailId
         // var accCode = this.authUser.Profile.AccCode
@@ -1038,11 +1052,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({
@@ -1052,13 +1066,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
@@ -1098,7 +1112,7 @@
             })
         }
       },
-      gethistory(val) {
+      gethistory (val) {
         let _this = this
         _this.historydialog = true
         this.$axios.get('/limsdataentry/historylist/' + val.Id, {})
@@ -1110,12 +1124,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
@@ -1124,10 +1138,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()
@@ -1137,25 +1151,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 => {
@@ -1178,12 +1192,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') {
@@ -1191,7 +1205,7 @@
         }
       },
       // 列表排序功能
-      orderby(column) {
+      orderby (column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -1200,7 +1214,7 @@
         this.Column.Prop = column.prop
         this.initdata2()
       },
-      getDetaillist() {
+      getDetaillist () {
         let _this = this
         _this.$axios.get('/limsbalance/getdetaillist', {})
           .then(res => {
@@ -1211,7 +1225,7 @@
             console.error(err)
           })
       },
-      clearSearch() {
+      clearSearch () {
         this.searchform.EntrustNo = ''
         this.searchform.TestDetailId = ''
         this.searchform.CheckStatus = ''
@@ -1219,29 +1233,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') {
@@ -1253,7 +1267,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
@@ -1264,7 +1278,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
@@ -1279,7 +1293,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/datalist.vue

@@ -11,9 +11,9 @@
           <i class="icon icon-table2"></i> 空气泡沫数据
         </span>
         <span style="float: right;">
-          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
+          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="addDataEntity">添加明细</el-button>
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
-          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="setProoFreadShow">提交校核</el-button>
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
                      <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
 
@@ -35,7 +35,7 @@
                  :DataStatus="DataStatus" @init-data-main="initDatas"></data-main>
       <el-table ref="EntityTable" highlight-current-row :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby"
                 @current-change="saveTableRow" @row-dblclick="dbTableRow">
-        <el-table-column v-if="this.DataStatus == 0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="180" align="center" fixed>
+        <el-table-column v-if="this.DataStatus == 0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" label="操作" min-width="180" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="编辑"  @click="EditEntity(scope.row)">编辑</el-button>
             <el-popover placement="top" title="提示">
@@ -57,7 +57,7 @@
         </el-table-column>
         <el-table-column sortable min-width="80" label="序号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3" v-model="scope.row.OrderNo"
+            <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3 && DataStatus!=7" v-model="scope.row.OrderNo"
                       style="width: 100%"></el-input>
           </template>
         </el-table-column>
@@ -69,29 +69,29 @@
         </el-table-column>-->
         <el-table-column width="130" label="供给压力 MPa" align="center">
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.PosPress"  style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)">
+            <el-input size="small" v-model="scope.row.PosPress"  style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column width="120" label="玻璃破碎压力" align="center">
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.PosGlass"  style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)">
+            <el-input size="small" v-model="scope.row.PosGlass"  style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="BrandCheck"  width="120" label="标牌检查" align="center">
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.BrandCheck"  style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)"></el-input>
+            <el-input size="small" v-model="scope.row.BrandCheck"  style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="LineCheck" width="120" label="易裂线检查" align="center">
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.LineCheck"  style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)"></el-input>
+            <el-input size="small" v-model="scope.row.LineCheck"  style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="CustNo" sortable min-width="80" label="编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.CustNo" style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)"></el-input>
+            <el-input size="small" v-model="scope.row.CustNo" style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
           </template>
         </el-table-column>
         <!--<el-table-column prop="Temperature" sortable min-width="120" label="环境温度℃" align="center" show-overflow-tooltip></el-table-column>-->
@@ -99,7 +99,7 @@
         <el-table-column prop="Status" sortable min-width="105" label="产品状态" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select size="small" ref="selectStatus" v-model="scope.row.Status" filterable placeholder="请选择"
-                       style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)">
+                       style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
               <el-option
                 v-for="item in StatusOptions"
                 :key="item.Value"
@@ -112,7 +112,7 @@
         <el-table-column prop="PUType" sortable min-width="105" label="类型" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select size="small" ref="selectPUType" v-model="scope.row.PUType" filterable placeholder="请选择"
-                       style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)">
+                       style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
               <el-option
                 v-for="item in PUTypeOptions"
                 :key="item.Id"

src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/dataopera.vue

@@ -569,17 +569,21 @@
         this.formData.MainProducts = this.checkboxvalues.join(',')
       },
       setRemark1 () {
-        if (this.formData.Remark1.length > 0) {
-          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-        } else {
-          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        if (this.formData.Remark1) {
+          if (this.formData.Remark1.length > 0) {
+            this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+          } else {
+            this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+          }
         }
       },
       setRemark2 () {
-        if (this.formData.Remark2.length > 0) {
-          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-        } else {
-          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        if (this.formData.Remark1) {
+          if (this.formData.Remark2.length > 0) {
+            this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+          } else {
+            this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+          }
         }
       },
 

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

@@ -507,7 +507,7 @@
     },
     name: 's5ovelimsreportalertorEdit',
 
-    data() {
+    data () {
       return {
         ProoFreadShow: false,
         acceptUsers: [],
@@ -563,7 +563,7 @@
           InstrumentLevel: '',
           DielecStrength: ''
         },
-        //证书编号
+        // 证书编号
         formCertificateData: {
           Id: 0,
           StanDevice: '',
@@ -574,7 +574,7 @@
           EffectDate: new Date(),
           InstrumentNo: ''
         },
-        //certificateDataAll: [],
+        // certificateDataAll: [],
         certificateData: [{
           Id: 0,
           value: 1,
@@ -606,7 +606,7 @@
           StanDevice: '',
           InstrumentNo: ''
         }],
-        //报警误差
+        // 报警误差
         alerValData: [{
           Id: 0,
           AlertFunc: [],
@@ -638,7 +638,7 @@
           value: '1',
           label: '不正常'
         }],
-        //示值误差及响应时间
+        // 示值误差及响应时间
         deviationData: [{
           Id: 0,
           GasValue: 9.97,
@@ -670,7 +670,7 @@
           DeviationRelative: 0,
           Deviation: ''
         }],
-        //响应时间
+        // 响应时间
         responseTimeForm: {
           Id: 0,
           GasValue: '',
@@ -687,7 +687,7 @@
           Value3: '',
           Deviation: ''
         }],
-        //重复性
+        // 重复性
         RepeatData: [{
           Id: 0,
           GasValue: 40.3,
@@ -700,7 +700,7 @@
           AvgValue: '',
           RepeatValue: ''
         }],
-        //漂移
+        // 漂移
         ShiftData: [{
           Id: 0,
           ValueType: '零点示值',
@@ -725,14 +725,14 @@
           Value6: '',
           ZeroValue: '/',
           ShowValue: '/'
-        }],
-        //下拉选择项
-        //wellNoOptions: [],
-        //supervisersOptions: [],
+        }]
+        // 下拉选择项
+        // wellNoOptions: [],
+        // supervisersOptions: [],
 
       }
     },
-    created() {
+    created () {
       this.queryParams.EId = this.$route.query.eid
       this.queryParams.TaskBalanceId = this.$route.query.tbid
       this.queryParams.DataEntryId = this.$route.query.deid
@@ -741,11 +741,11 @@
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
       this.sign = this.$route.query.sign
-      //this.serviceId = this.$route.params.opera;
+      // this.serviceId = this.$route.params.opera;
       this.initDatas()
       this.getUsersByRole()
       this.getdevice()
-      //this.getDictOptions();
+      // this.getDictOptions();
       // console.log(this.serviceId);
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -753,29 +753,29 @@
       // } else {
       //   this.formData.Id = 0;
       // }
-      console.log("--------", )
+      console.log('--------')
     },
     methods: {
-      initDatas() {
+      initDatas () {
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log("------res------", res.data)
-            this.formData = res.data.mainitem;
-            this.formData.DetectBasis = 'JJG 693-2011《 可燃气体检测报警器》'
+            console.log('------res------', res.data)
+            this.formData = res.data.mainitem
+          this.formData.DetectBasis = 'JJG 693-2011《 可燃气体检测报警器》'
             this.formData.StandardDesc = '可燃气体检测报警器检定装置'
-            if (this.formData.CheckDate == "0001-01-01T00:00:00Z") {
-              this.formData.CheckDate = new Date();
-            }
+            if (this.formData.CheckDate == '0001-01-01T00:00:00Z') {
+              this.formData.CheckDate = new Date()
+          }
             if (res.data.ceritem != null) {
               for (var i = 0; i < res.data.ceritem.length - 1; i++) {
-                this.certificateData[i].Id = res.data.ceritem[i].Id;
-                this.certificateData[i].CerNum = res.data.ceritem[i].CerNum;
-                this.certificateData[i].StandVal = res.data.ceritem[i].StandVal;
-                this.certificateData[i].Uncertainty = res.data.ceritem[i].Uncertainty;
-                this.certificateData[i].EffectDate = res.data.ceritem[i].EffectDate;
-                this.certificateData[i].StanDevice = res.data.ceritem[i].StanDevice;
+                this.certificateData[i].Id = res.data.ceritem[i].Id
+              this.certificateData[i].CerNum = res.data.ceritem[i].CerNum
+              this.certificateData[i].StandVal = res.data.ceritem[i].StandVal
+              this.certificateData[i].Uncertainty = res.data.ceritem[i].Uncertainty
+              this.certificateData[i].EffectDate = res.data.ceritem[i].EffectDate
+              this.certificateData[i].StanDevice = res.data.ceritem[i].StanDevice
 
-              }
+            }
               this.formCertificateData.Id = res.data.ceritem[3].Id
               this.formCertificateData.StanDevice = res.data.ceritem[3].StanDevice
               this.formCertificateData.StandVal = res.data.ceritem[3].StandVal
@@ -788,72 +788,72 @@
             }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
-                this.alerValData[i] = res.data.alvalitem[i];
-                this.alerValData[i].AlertFunc = []
-                if (this.alerValData[i].AlertFunction != "") {
+                this.alerValData[i] = res.data.alvalitem[i]
+              this.alerValData[i].AlertFunc = []
+                if (this.alerValData[i].AlertFunction != '') {
                   this.alerValData[i].AlertFunc.push(this.alerValData[i].AlertFunction)
                 }
               }
             }
             if (res.data.deviitem != null) {
               for (var i = 0; i < res.data.deviitem.length; i++) {
-                this.deviationData[i].Id = res.data.deviitem[i].Id;
-                this.deviationData[i].GasValue = res.data.deviitem[i].GasValue;
-                this.deviationData[i].Value1 = res.data.deviitem[i].Value1;
-                this.deviationData[i].Value2 = res.data.deviitem[i].Value2;
-                this.deviationData[i].Value3 = res.data.deviitem[i].Value3;
-                this.deviationData[i].AvgValue = res.data.deviitem[i].AvgValue + "";
-                this.deviationData[i].DeviationAbs = res.data.deviitem[i].DeviationAbs;
-                this.deviationData[i].DeviationRelative = res.data.deviitem[i].DeviationRelative;
-                this.deviationData[i].Deviation = res.data.deviitem[i].Deviation;
-              }
+                this.deviationData[i].Id = res.data.deviitem[i].Id
+              this.deviationData[i].GasValue = res.data.deviitem[i].GasValue
+              this.deviationData[i].Value1 = res.data.deviitem[i].Value1
+              this.deviationData[i].Value2 = res.data.deviitem[i].Value2
+              this.deviationData[i].Value3 = res.data.deviitem[i].Value3
+              this.deviationData[i].AvgValue = res.data.deviitem[i].AvgValue + '';
+                this.deviationData[i].DeviationAbs = res.data.deviitem[i].DeviationAbs
+              this.deviationData[i].DeviationRelative = res.data.deviitem[i].DeviationRelative
+              this.deviationData[i].Deviation = res.data.deviitem[i].Deviation
+            }
             }
             if (res.data.responitem != null) {
               for (var i = 0; i < res.data.responitem.length; i++) {
-                this.responseTimeData[i] = res.data.responitem[i];
-              }
+                this.responseTimeData[i] = res.data.responitem[i]
+            }
             }
             if (res.data.repeatitem != null) {
               for (var i = 0; i < res.data.repeatitem.length; i++) {
-                this.RepeatData[i] = res.data.repeatitem[i];
-                this.RepeatData[i].AvgValue = res.data.repeatitem[i].AvgValue + ""
-                this.RepeatData[i].RepeatValue = res.data.repeatitem[i].RepeatValue;
-              }
+                this.RepeatData[i] = res.data.repeatitem[i]
+              this.RepeatData[i].AvgValue = res.data.repeatitem[i].AvgValue + ''
+                this.RepeatData[i].RepeatValue = res.data.repeatitem[i].RepeatValue
+            }
             }
             if (res.data.shiftitem != null) {
               for (var i = 0; i < res.data.shiftitem.length; i++) {
-                this.ShiftData[i] = res.data.shiftitem[i];
-                this.ShiftData[i].ZeroValue = '/'
+                this.ShiftData[i] = res.data.shiftitem[i]
+              this.ShiftData[i].ZeroValue = '/'
                 this.ShiftData[i].ShowValue = '/'
               }
             }
           }).catch(err => {
             console.error(err)
-          });
-        }
+          })
+      }
       },
-      getdevice() {
+      getdevice () {
         let _this = this
         _this.$axios.get('/instrument/initlistdata', {})
           .then(function (response) {
-            console.log("jkkfddf", response.data.items)
+            console.log('jkkfddf', response.data.items)
             _this.DeviceList = response.data.items
-            console.log("-_this._this.DeviceList------", _this.DeviceList)
+            console.log('-_this._this.DeviceList------', _this.DeviceList)
             if (!_this.DeviceList) {
               return false
             }
             for (var i = 0; i < _this.DeviceList.length; i++) {
               let devicelist = _this.DeviceList[i]
-              instapi.getList(_this.DeviceList[i].Id, "", _this.$axios).then(res => {
+              instapi.getList(_this.DeviceList[i].Id, '', _this.$axios).then(res => {
                 if (res.data.currentItemCount === 1) {
                   _this.StanDeviceoptions2.push({
                     id: devicelist.Id,
-                    name: devicelist.Name,
+                    name: devicelist.Name
                   })
                 } else {
                   _this.StanDeviceoptions.push({
                     id: devicelist.Id,
-                    name: devicelist.Name,
+                    name: devicelist.Name
                   })
                 }
               }).catch(err => {
@@ -865,37 +865,36 @@
             console.log(error)
           })
       },
-      chooseCertify2(value) {
+      chooseCertify2 (value) {
         let _this = this
-        let obj = {};
-        obj = this.StanDeviceoptions2.find((item) => {
-          return item.id === value;
-        });
-        this.formCertificateData.StanDevice = obj.name
+        let obj = {}
+      obj = this.StanDeviceoptions2.find((item) => {
+          return item.id === value
+      })
+      this.formCertificateData.StanDevice = obj.name
         let instrumentno = value
-        //访问接口
-        instapi.getList(instrumentno, "", this.$axios).then(res => {
+        // 访问接口
+        instapi.getList(instrumentno, '', this.$axios).then(res => {
           this.certificateDataform = res.data.items
           this.formCertificateData.CerNum = this.certificateDataform[0].CerNum
           this.formCertificateData.Uncertainty = this.certificateDataform[0].Uncertainty
           this.formCertificateData.StandVal = this.certificateDataform[0].StandVal
           this.formCertificateData.EffectDate = this.certificateDataform[0].EffectDate
-
         }).catch(err => {
           console.error(err)
         })
       },
-      chooseCertify(value) {
-        let obj = {};
-        obj = this.StanDeviceoptions.find((item) => {
-          return item.id === value;
-        });
-        this.formData.StanDevice = obj.name
-        console.log(obj.name);
-        let _this = this
+      chooseCertify (value) {
+        let obj = {}
+      obj = this.StanDeviceoptions.find((item) => {
+          return item.id === value
+      })
+      this.formData.StanDevice = obj.name
+        console.log(obj.name)
+      let _this = this
         _this.InstrumentNo = value
-        //访问接口
-        instapi.getList(_this.InstrumentNo, "", this.$axios).then(res => {
+        // 访问接口
+        instapi.getList(_this.InstrumentNo, '', this.$axios).then(res => {
           this.certificateDataform = res.data.items
           for (var i = 0; i < this.certificateDataform.length; i++) {
             this.certificateData[i].CerNum = this.certificateDataform[i].CerNum
@@ -909,7 +908,7 @@
         })
       },
       // 获取校核人列表
-      getUsersByRole() {
+      getUsersByRole () {
         // request
         this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
           .then(res => {
@@ -922,7 +921,7 @@
             console.error(err)
           })
       },
-      discountHeaderStyle1({
+      discountHeaderStyle1 ({
         row,
         column,
         rowIndex,
@@ -934,16 +933,16 @@
           }
         }
       },
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-          //this.wellNoOptions = res.data.items['WellNo']
-          //this.supervisersOptions = res.data.items['Supervisers']
+          // this.wellNoOptions = res.data.items['WellNo']
+          // this.supervisersOptions = res.data.items['Supervisers']
         }).catch(err => {
           console.error(err)
         })
       },
 
-      getDeValueAvg(row) {
+      getDeValueAvg (row) {
         var divisor = 0
         var sum = 0
         if (row.Value1 !== '' && parseFloat(row.Value1) !== 0) {
@@ -969,7 +968,7 @@
           row.Deviation = 0
         }
       },
-      getRepeValueAvg(row) {
+      getRepeValueAvg (row) {
         var divisor = 0
         var sum = 0.00
         if (row.Value1 !== '' && parseFloat(row.Value1) !== 0) {
@@ -1016,14 +1015,14 @@
           var v6 = (parseFloat(row.AvgValue) - parseFloat(row.Value6)).toFixed(2)
           var sumsq = v1 * v1 + v2 * v2 + v3 * v3 + v4 * v4 + v5 * v5 + v6 * v6
           var sqthen = Math.sqrt(sumsq / 5)
-          console.log("--sqthen----", sqthen)
+          console.log('--sqthen----', sqthen)
           row.RepeatValue = Number((parseFloat(sqthen) / parseFloat(row.AvgValue) * 100).toFixed(2))
-          console.log("--row.RepeatValue----", row.RepeatValue)
+          console.log('--row.RepeatValue----', row.RepeatValue)
         } else {
           row.RepeatValue = 0
         }
       },
-      getReTimeAvg(row) {
+      getReTimeAvg (row) {
         var divisor = 0
         var sum = 0
         if (row.Value1 !== '' && parseFloat(row.Value1) !== 0) {
@@ -1044,7 +1043,7 @@
           row.Deviation = 0
         }
       },
-      getShiftValue(row) {
+      getShiftValue (row) {
         // var shift = 0
         // var shift1 = 0
         // var shift2 = 0
@@ -1099,16 +1098,16 @@
         //   }
         // }
       },
-      setProoFreadShow() {
+      setProoFreadShow () {
         this.ProoFreadShow = true
       },
       // 提交校核
-      makesure() {
+      makesure () {
         this.$confirm('确定提交校核！', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             this.ProoFreadShow = false
             this.checkstatus()
@@ -1117,14 +1116,14 @@
           .catch(() => {})
       },
       // 添加运行记录
-      addRunRecord() {
-        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId, ).then(res => {
+      addRunRecord () {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId).then(res => {
 
         }).catch(error => {
           console.log(error)
         })
       },
-      checkstatus() {
+      checkstatus () {
         this.shenhesubmitForm.SuccessStatus = 1
         this.shenhesubmitForm.DataEntryId = parseInt(this.formData.DataEntryId)
         let params = this.shenhesubmitForm
@@ -1151,27 +1150,26 @@
             console.error(err)
           })
       },
-      //保存信息
-      saveEntity() {
-        console.log("------this.formData.Id----", this.formData.Id)
+      // 保存信息
+      saveEntity () {
+        console.log('------this.formData.Id----', this.formData.Id)
         this.$refs['formData'].validate((valid) => {
           if (valid) {
             if (!this.formData.Id) {
-              this.addEntityMain();
-            } else {
-              this.updateEntity();
-            }
-
+              this.addEntityMain()
+          } else {
+              this.updateEntity()
+          }
           } else {
             return false
           }
         })
       },
-      //添加数据
-      addEntityMain() {
+      // 添加数据
+      addEntityMain () {
         let _this = this
-        console.log("-------this.formdata---", this.formData)
-        if (this.certificateData != null && this.formData.StanDevice != "") {
+        console.log('-------this.formdata---', this.formData)
+        if (this.certificateData != null && this.formData.StanDevice != '') {
           for (var i = 0; i < this.certificateData.length; i++) {
             this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
             this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1214,43 +1212,41 @@
           this.ShiftData[i].Value4 = parseFloat(this.ShiftData[i].Value4)
           this.ShiftData[i].Value5 = parseFloat(this.ShiftData[i].Value5)
           this.ShiftData[i].Value6 = parseFloat(this.ShiftData[i].Value6)
-
         }
         let allform = {
           BenMainform: this.formData,
-          CertiArrayList: this.certificateData, //添加证书数据
-          AlertValArrayList: this.alerValData, //添加报警数据
-          DeviationArrayList: this.deviationData, //添加示值误差数据
-          ResponTimeArrayList: this.responseTimeData, //添加响应时间数据
-          RepeatArrayList: this.RepeatData, //添加重复性数据
-          ShiftArrayList: this.ShiftData, //添加漂移数据
+          CertiArrayList: this.certificateData, // 添加证书数据
+          AlertValArrayList: this.alerValData, // 添加报警数据
+          DeviationArrayList: this.deviationData, // 添加示值误差数据
+          ResponTimeArrayList: this.responseTimeData, // 添加响应时间数据
+          RepeatArrayList: this.RepeatData, // 添加重复性数据
+          ShiftArrayList: this.ShiftData // 添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("---------addallform===", allform)
+        console.log('---------addallform===', allform)
         api.addEntity(allform, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
-            this.formData.Id = res.data.item;
-            this.initDatas();
-            this.$message({
+            // 保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item
+          this.initDatas()
+          this.$message({
               type: 'success',
               message: res.data.message
-            });
-          } else {
+            })
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
         }).catch(err => {
           console.error(err)
-        });
-      },
-
+        })
+    },
 
-      updateEntity() {
+      updateEntity () {
         let _this = this
-        console.log("------updatethis.formData.Id----", this.formData.Id)
+        console.log('------updatethis.formData.Id----', this.formData.Id)
         if (this.certificateData != null) {
           for (var i = 0; i < this.certificateData.length; i++) {
             this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
@@ -1294,44 +1290,43 @@
           this.ShiftData[i].Value4 = parseFloat(this.ShiftData[i].Value4)
           this.ShiftData[i].Value5 = parseFloat(this.ShiftData[i].Value5)
           this.ShiftData[i].Value6 = parseFloat(this.ShiftData[i].Value6)
-
         }
         let allform = {
           BenMainform: this.formData,
-          CertiArrayList: this.certificateData, //添加证书数据
-          AlertValArrayList: this.alerValData, //添加报警数据
-          DeviationArrayList: this.deviationData, //添加示值误差数据
-          ResponTimeArrayList: this.responseTimeData, //添加响应时间数据
-          RepeatArrayList: this.RepeatData, //添加重复性数据
-          ShiftArrayList: this.ShiftData, //添加漂移数据
+          CertiArrayList: this.certificateData, // 添加证书数据
+          AlertValArrayList: this.alerValData, // 添加报警数据
+          DeviationArrayList: this.deviationData, // 添加示值误差数据
+          ResponTimeArrayList: this.responseTimeData, // 添加响应时间数据
+          RepeatArrayList: this.RepeatData, // 添加重复性数据
+          ShiftArrayList: this.ShiftData // 添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("------updataallform----", allform)
+        console.log('------updataallform----', allform)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
-            this.initDatas();
-            this.$message({
+            // 保存成功后，初始化数据，变成修改
+            this.initDatas()
+          this.$message({
               type: 'success',
               message: res.data.message
-            });
+            })
 
-          } else {
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
       // 返回
-      backFunc() {
+      backFunc () {
         this.$router.go(-1)
       },
 
-      renderHeader(createElement, {
+      renderHeader (createElement, {
         column,
         _self
       }) {
@@ -1339,14 +1334,14 @@
         const label = column.label
         const labelArr = label.split(',')
         return createElement(
-          'span', //创建最外层的标签可随意
+          'span', // 创建最外层的标签可随意
           [
             createElement('span', { // 创建第一个元素的标签可随意
               attrs: {
                 type: 'text'
               }
             }, [labelArr[0]]),
-            createElement('p', { // 创建第二个元素的标签可随意 
+            createElement('p', { // 创建第二个元素的标签可随意
               attrs: {
                 type: 'text',
                 style: 'font-size:12px'
@@ -1356,7 +1351,7 @@
         )
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1369,20 +1364,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
-      }
+      formatDateTime (date) {
+        var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+    }
     }
   }
-
 </script>
 
 <style lang="scss">

src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/datalist.vue

@@ -12,9 +12,9 @@
         </el-breadcrumb>
 
         <span style="float: right;">
-          <el-button type="plain" size="mini" style="margin-right:20px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
+          <el-button type="plain" size="mini" style="margin-right:20px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="addDataEntity">添加明细</el-button>
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
-          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="setProoFreadShow">提交校核</el-button>
 
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
                      <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
@@ -40,7 +40,7 @@
 
       <el-table ref="EntityTable" :data="entityList" border height="calc(100vh - 328px)" style="width: 100%" highlight-current-row @sort-change="orderby"
                 @current-change="saveTableRow" @row-dblclick="dbTableRow">
-        <el-table-column v-if="this.DataStatus == 0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="150" align="center" fixed>
+        <el-table-column v-if="this.DataStatus == 0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="编辑"  @click="EditEntity(scope.row)">编辑</el-button>
             <el-popover placement="top" title="提示">
@@ -58,7 +58,7 @@
         </el-table-column>
         <el-table-column sortable min-width="80" label="序号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3" v-model="scope.row.OrderNo"
+            <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3 && DataStatus!=7" v-model="scope.row.OrderNo"
                       style="width: 100%"></el-input>
           </template>
         </el-table-column>
@@ -66,9 +66,9 @@
 
         <el-table-column width="410" label="正开启压力Pa" align="center">
           <template slot-scope="scope">
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress1" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress1" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -78,9 +78,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.PosBaseNum1)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress2" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress2" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -90,9 +90,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.PosBaseNum2)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress3" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress3" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -102,9 +102,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.PosBaseNum3)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress4" placeholder="4" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress4" placeholder="4" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -114,9 +114,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.PosBaseNum4)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress5" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress5" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -126,9 +126,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.PosBaseNum5)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress6" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress6" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -138,9 +138,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.PosBaseNum6)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress7" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress7" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -150,9 +150,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.PosBaseNum7)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress8" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress8" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -162,9 +162,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.PosBaseNum8)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.PosPress9" placeholder="9" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPosPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.PosPress9" placeholder="9" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -195,7 +195,7 @@
             <!--<el-input size="small" @blur="getPosPressAvg(scope.row)" @keyup.native="PosPressCheck" v-model="scope.row.PosPress9" placeholder="+"-->
                       <!--style="width: 34%"></el-input>-->
             <el-tooltip content="平均值" placement="top" effect="dark">
-              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.PosPressAvg" placeholder="平均值 +" style="width: 100%"
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.PosPressAvg" placeholder="平均值 +" style="width: 100%"
                         readonly></el-input>
             </el-tooltip>
           </template>
@@ -203,14 +203,14 @@
 
         <el-table-column width="155" label="通气量m3/h" align="center">
           <template slot-scope="scope">
-            <el-input size="small" @blur="getPosCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.PosCloud1" placeholder="+"
+            <el-input size="small" @blur="getPosCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.PosCloud1" placeholder="+"
                       style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-            <el-input size="small" @blur="getPosCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.PosCloud2" placeholder="+"
+            <el-input size="small" @blur="getPosCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.PosCloud2" placeholder="+"
                       style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-            <el-input size="small" @blur="getPosCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.PosCloud3" placeholder="+"
+            <el-input size="small" @blur="getPosCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.PosCloud3" placeholder="+"
                       style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
             <el-tooltip content="平均值 +" placement="top" effect="dark">
-              <el-input size="small" v-model="scope.row.PosCloudAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" placeholder="平均值 +" style="width: 100%"
+              <el-input size="small" v-model="scope.row.PosCloudAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" placeholder="平均值 +" style="width: 100%"
                         readonly></el-input>
             </el-tooltip>
           </template>
@@ -219,14 +219,14 @@
         <el-table-column label="操作压力" align="center">
           <el-table-column width="155" label="+" align="center">
             <template slot-scope="scope">
-              <el-input size="small" @blur="getOperPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.OperPress1" placeholder="+"
+              <el-input size="small" @blur="getOperPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.OperPress1" placeholder="+"
                         style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-              <el-input size="small" @blur="getOperPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"  v-model="scope.row.OperPress2" placeholder="+"
+              <el-input size="small" @blur="getOperPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"  v-model="scope.row.OperPress2" placeholder="+"
                         style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-              <el-input size="small" @blur="getOperPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.OperPress3" placeholder="+"
+              <el-input size="small" @blur="getOperPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.OperPress3" placeholder="+"
                         style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
               <el-tooltip content="平均值" placement="top" effect="dark">
-                <el-input size="small" v-model="scope.row.OperPressAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" placeholder="平均值" style="width: 100%"
+                <el-input size="small" v-model="scope.row.OperPressAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" placeholder="平均值" style="width: 100%"
                           readonly></el-input>
               </el-tooltip>
             </template>
@@ -234,14 +234,14 @@
 
           <el-table-column width="155" label="-" align="center">
             <template slot-scope="scope">
-              <el-input size="small" @blur="getOperPressNgAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.OperPressNg1" placeholder="-"
+              <el-input size="small" @blur="getOperPressNgAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.OperPressNg1" placeholder="-"
                         style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-              <el-input size="small" @blur="getOperPressNgAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.OperPressNg2" placeholder="-"
+              <el-input size="small" @blur="getOperPressNgAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.OperPressNg2" placeholder="-"
                         style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-              <el-input size="small" @blur="getOperPressNgAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.OperPressNg3" placeholder="-"
+              <el-input size="small" @blur="getOperPressNgAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.OperPressNg3" placeholder="-"
                         style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
               <el-tooltip content="平均值" placement="top" effect="dark">
-                <el-input size="small" v-model="scope.row.OperPressNgAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" placeholder="平均值" style="width: 100%"
+                <el-input size="small" v-model="scope.row.OperPressNgAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" placeholder="平均值" style="width: 100%"
                           readonly></el-input>
               </el-tooltip>
             </template>
@@ -251,9 +251,9 @@
 
         <el-table-column width="410" label="开启压力-Pa" align="center">
           <template slot-scope="scope">
-            <el-input @blur="getNgPressAvg(scope.row)" size="small" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.NgPress1" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" size="small" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.NgPress1" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -263,9 +263,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.NgBaseNum1)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.NgPress2" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.NgPress2" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -275,9 +275,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.NgBaseNum2)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.NgPress3" placeholder="-" style="width: 34%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.NgPress3" placeholder="-" style="width: 34%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -287,9 +287,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.NgBaseNum3)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.NgPress4" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.NgPress4" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -299,9 +299,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.NgBaseNum4)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.NgPress5" placeholder="-"  style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.NgPress5" placeholder="-"  style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -311,9 +311,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.NgBaseNum5)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.NgPress6" placeholder="-" style="width: 34%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.NgPress6" placeholder="-" style="width: 34%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -323,9 +323,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.NgBaseNum6)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.NgPress7" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.NgPress7" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -335,9 +335,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.NgBaseNum7)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.NgPress8" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.NgPress8" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -347,9 +347,9 @@
                 <el-button slot="reference" size="mini" width="4">{{parseInt(scope.row.NgBaseNum8)}}/</el-button>
               </el-popover>
             </el-input>
-            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" size="small" v-model="scope.row.NgPress9" placeholder="-" style="width: 34%" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getNgPressAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" size="small" v-model="scope.row.NgPress9" placeholder="-" style="width: 34%" @focus="setCurrentRow(scope.row)">
               <el-popover
-              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"
+              :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -360,21 +360,21 @@
               </el-popover>
             </el-input>
             <el-tooltip content="平均值" placement="top" effect="dark">
-              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.NgPressAvg" placeholder="平均值 -" style="width: 100%" readonly></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.NgPressAvg" placeholder="平均值 -" style="width: 100%" readonly></el-input>
             </el-tooltip>
           </template>
         </el-table-column>
 
         <el-table-column width="155" label="通气量m3/h" align="center">
           <template slot-scope="scope">
-            <el-input size="small" @blur="getNgCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.NgCloud1" placeholder="-"
+            <el-input size="small" @blur="getNgCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.NgCloud1" placeholder="-"
                       style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-            <el-input size="small" @blur="getNgCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.NgCloud2" placeholder="-"
+            <el-input size="small" @blur="getNgCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.NgCloud2" placeholder="-"
                       style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-            <el-input size="small" @blur="getNgCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.NgCloud3" placeholder="-"
+            <el-input size="small" @blur="getNgCloudAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.NgCloud3" placeholder="-"
                       style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
             <el-tooltip content="平均值 -" placement="top" effect="dark">
-              <el-input size="small" v-model="scope.row.NgCloudAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" placeholder="平均值 -" style="width: 100%" readonly></el-input>
+              <el-input size="small" v-model="scope.row.NgCloudAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" placeholder="平均值 -" style="width: 100%" readonly></el-input>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -384,25 +384,25 @@
             <template slot-scope="scope">
               <el-row>
                 <el-col :span="12">
-                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"  v-model="scope.row.PosPa1" placeholder="+"
+                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"  v-model="scope.row.PosPa1" placeholder="+"
                             style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"  v-model="scope.row.PosPa2" placeholder="+"
+                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"  v-model="scope.row.PosPa2" placeholder="+"
                             style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3"  v-model="scope.row.PosPa3" placeholder="+"
+                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7"  v-model="scope.row.PosPa3" placeholder="+"
                             style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
                 </el-col>
                 <el-col :span="12">
-                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.NgPa1" placeholder="-"
+                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.NgPa1" placeholder="-"
                             style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.NgPa2" placeholder="-"
+                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.NgPa2" placeholder="-"
                             style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
-                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" v-model="scope.row.NgPa3" placeholder="-"
+                  <el-input size="small" @blur="getPosPaAvg(scope.row)" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" v-model="scope.row.NgPa3" placeholder="-"
                             style="width: 100%" @focus="setCurrentRow(scope.row)"></el-input>
                 </el-col>
               </el-row>
               <el-row>
                 <el-tooltip content="平均值" placement="top" effect="dark">
-                  <el-input size="small" v-model="scope.row.PosPaAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" placeholder="平均值" style="width: 100%" readonly></el-input>
+                  <el-input size="small" v-model="scope.row.PosPaAvg" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" placeholder="平均值" style="width: 100%" readonly></el-input>
                 </el-tooltip>
               </el-row>
             </template>
@@ -412,7 +412,7 @@
 
         <el-table-column prop="CustNo" sortable min-width="120" label="编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.CustNo" style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)"></el-input>
+            <el-input size="small" v-model="scope.row.CustNo" style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
           </template>
         </el-table-column>
 
@@ -420,14 +420,14 @@
 
         <el-table-column prop="Manufacturer" sortable :min-width="120" label="制造厂家" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.Manufacturer" style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)"></el-input>
+            <el-input size="small" v-model="scope.row.Manufacturer" style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
           </template>
         </el-table-column>
 
         <el-table-column prop="Status" sortable :min-width="120" label="产品状态" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select size="small" ref="selectStatus" v-model="scope.row.Status" filterable placeholder="请选择"
-                       style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)">
+                       style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
               <el-option
                 v-for="item in StatusOptions"
                 :key="item.Value"
@@ -441,7 +441,7 @@
         <el-table-column prop="PUType" sortable :min-width="120" label="类型" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select size="small" ref="selectPUType" v-model="scope.row.PUType" filterable placeholder="请选择"
-                       style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3" @focus="setCurrentRow(scope.row)">
+                       style="width: 100%" :disabled="DataStatus != 0 && DataStatus!=5&& DataStatus!=3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
               <el-option
                 v-for="item in PUTypeOptions"
                 :key="item.Id"

src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/dataopera.vue

@@ -1040,17 +1040,21 @@
           })
       },
       setRemark1 () {
-        if (this.formData.Remark1.length > 0) {
-          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-        } else {
-          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        if (this.formData.Remark1) {
+          if (this.formData.Remark1.length > 0) {
+            this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+          } else {
+            this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+          }
         }
       },
       setRemark2 () {
-        if (this.formData.Remark2.length > 0) {
-          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-        } else {
-          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        if (this.formData.Remark2) {
+          if (this.formData.Remark2.length > 0) {
+            this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+          } else {
+            this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+          }
         }
       },
       setAllPosBaseNum (num) {

src/dashoo.cn/frontend_web/src/pages/lims/reportbeampumpingUnits/subdata/datalist.vue

@@ -12,7 +12,7 @@
         </span>
         <span style="float: right;">
            <el-button type="primary" size="mini" :disabled="this.DataStatus!=0&&this.DataStatus!=5&&this.DataStatus!=3" @click="ProoFreadShow = true">提交校核</el-button>
-          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加</el-button>
+          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="addDataEntity">添加</el-button>
           <el-button type="plain" @click="searchCommand('search')" size="mini"
                      style="margin-left:10px; margin-top: -4px;">查询</el-button>
 
@@ -23,7 +23,7 @@
     </div>
       <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby"
                 @current-change="saveTableRow" @row-dblclick="dbTableRow">
-        <el-table-column v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="140" align="center" fixed >
+        <el-table-column v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" label="操作" min-width="140" align="center" fixed >
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="编辑"  @click="EditEntity(scope.row)">编辑</el-button>
             <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
@@ -57,9 +57,9 @@
         <el-table-column width="300" label="整机噪声" align="center">
           <template slot-scope="scope">
             <el-input size="small" v-model="scope.row.MachineNoise1"
-                      style="width: 33%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+                      style="width: 33%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             <el-input size="small" v-model="scope.row.MachineNoise2"
-                      style="width: 33%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+                      style="width: 33%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             <el-input size="small" v-model="scope.row.MachineNoise3"
                       style="width: 34%"></el-input>
           </template>
@@ -67,38 +67,38 @@
         <el-table-column width="500" label="悬点投影-X轴" align="center">
           <template slot-scope="scope">
             <el-tooltip content="下止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.DownX" placeholder="下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.DownX" placeholder="下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中下止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MidDownX" placeholder="中下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MidDownX" placeholder="中下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MiddleX" placeholder="中止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MiddleX" placeholder="中止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中上止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MidUpX" placeholder="中上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MidUpX" placeholder="中上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="上止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.UpX" placeholder="上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.UpX" placeholder="上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column width="500" label="悬点投影-Y轴" align="center">
           <template slot-scope="scope">
             <el-tooltip content="下止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.DownY" placeholder="下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.DownY" placeholder="下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中下止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MidDownY" placeholder="中下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MidDownY" placeholder="中下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MiddleY" placeholder="中止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MiddleY" placeholder="中止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中上止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MidUpY" placeholder="中上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MidUpY" placeholder="中上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="上止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.UpY" placeholder="上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.UpY" placeholder="上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&& DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -413,9 +413,9 @@
         },
         // 查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
-        //校核提交
+        // 校核提交
         shenhesubmitForm: {
-          AuditorUserId:'',
+          AuditorUserId: '',
           DataEntryId: '',
           SuccessStatus: 1,
           AuditorRemark: ''
@@ -465,8 +465,8 @@
           ModifiedBy: ''
         },
         rowHistory: {},
-        DataStatus:0,
-        acceptUsers: [],
+        DataStatus: 0,
+        acceptUsers: []
       }
     },
     created () {
@@ -538,11 +538,11 @@
           console.error(err)
         })
       },
-       //获取校核人列表
-      getUsersByRole() {
+      // 获取校核人列表
+      getUsersByRole () {
         let _this = this
         // request
-        this.$axios.get("/limsdataentry/getuserlistbyjhrole/", {})
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
           .then(res => {
             if (res.data instanceof Array && res.data.length > 0) {
               this.acceptUsers = res.data
@@ -553,23 +553,23 @@
             console.error(err)
           })
       },
-      //提交校核
-      makesure() {
-        this.$confirm("确定提交校核！", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      // 提交校核
+      makesure () {
+        this.$confirm('确定提交校核！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             this.ProoFreadShow = false
             this.checkstatus()
           })
           .catch(() => {})
       },
-      checkstatus() {
+      checkstatus () {
         this.shenhesubmitForm.SuccessStatus = 1
         this.shenhesubmitForm.DataEntryId = this.DataEntryId
-        console.log("------shenhe ",this.shenhesubmitForm)
+        console.log('------shenhe ', this.shenhesubmitForm)
         let params = this.shenhesubmitForm
         this.$axios.put('/limsdataentry/checksubmit/', params)
           .then(res => {
@@ -577,7 +577,7 @@
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
 
               })
               this.DataStatus = 1
@@ -585,7 +585,7 @@
             } else {
               this.$message({
                 type: 'warning',
-                message: "校核提交错误!"
+                message: '校核提交错误!'
               })
             }
           })

src/dashoo.cn/frontend_web/src/pages/lims/reportbeampumpingUnits/subdata/dataopera.vue

@@ -15,7 +15,7 @@
 
           <!--<el-button type="plain" @click="ShowSearchDialog" size="mini" style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
-          <el-button type="primary" size="mini" v-if="this.DataStatus==0 || this.DataStatus==5 || this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0 || this.DataStatus==5 || this.DataStatus==3||this.DataStatus==7" @click="setProoFreadShow">提交校核</el-button>
           <router-link v-if="this.sign == '1'" :to="'/lims/dataentry/tacktodo'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -47,7 +47,7 @@
               <el-form-item prop="PositionCheckId" label="检测地点" :rules="[{ required: true, message: '检测地点不能为空'}]">
                 <el-select ref="selectPositionCheck" v-model="formData.PositionCheckId" filterable placeholder="请选择"
                            style="width: 70%" default-first-option :filter-method="positionFilter" @change="initGroupOptions"
-                           :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                           :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <el-option-group
                     v-for="group in groupOptions"
                     :key="group.label"
@@ -68,7 +68,7 @@
                     trigger="click">
                     <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
                     <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>
+                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-plus"></i>
                     </el-button>
                   </el-popover>
                 </template>
@@ -76,25 +76,25 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="检测日期">
-                <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                 </el-date-picker>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <el-form-item label="制造厂家">
-                <el-input v-model="formData.Manufacturer" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.Manufacturer" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="出厂编号">
-                <el-input v-model="formData.CustNo" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.CustNo" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <el-form-item label="出厂日期">
-                <el-date-picker style="width: 100%" v-model="formData.ProductDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-date-picker style="width: 100%" v-model="formData.ProductDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -102,7 +102,7 @@
             <el-col :span="16">
               <el-form-item label="规格型号" required>
                 <!--<el-input v-model="formData.Spec" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>-->
-                <el-select  v-model="YLType.YLNo" placeholder="请选择" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"
+                <el-select  v-model="YLType.YLNo" placeholder="请选择" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"
                             style="width: 22%" filterable allow-create default-first-option>
                   <el-option
                     v-for="item in YLNoOptions"
@@ -111,10 +111,10 @@
                     :value="item.ItemValue">
                   </el-option>
                 </el-select>
-                <el-input v-model="YLType.Num1" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="NumCheck('Num1')"></el-input>&nbsp;-&nbsp;
-                <el-input v-model="YLType.Num2" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="NumCheck('Num2')"></el-input>&nbsp;-&nbsp;
-                <el-input v-model="YLType.Num3" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="NumCheck('Num3')"></el-input>
-                <el-select  v-model="YLType.Balance" placeholder="请选择" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"
+                <el-input v-model="YLType.Num1" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="NumCheck('Num1')"></el-input>&nbsp;-&nbsp;
+                <el-input v-model="YLType.Num2" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="NumCheck('Num2')"></el-input>&nbsp;-&nbsp;
+                <el-input v-model="YLType.Num3" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="NumCheck('Num3')"></el-input>
+                <el-select  v-model="YLType.Balance" placeholder="请选择" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"
                             style="width: 22%" filterable allow-create default-first-option>
                   <el-option
                     v-for="item in BalanceOptions"
@@ -127,7 +127,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="环境温度">
-                <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <template slot="append">℃</template>
                 </el-input>
               </el-form-item>
@@ -135,13 +135,13 @@
 
             <el-col :span="8">
               <el-form-item label="主要仪器名称">
-                <el-input v-model="formData.MainProducts" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.MainProducts" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="抽油机类型">
                 <el-select ref="selectPUType" v-model="formData.PUType" filterable placeholder="请选择"
-                           style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                           style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <el-option
                     v-for="item in PUTypeOptions"
                     :key="item.Id"
@@ -158,13 +158,13 @@
                              :props="props"
                              v-model="selectedOptions"
                              @change="handleChange"
-                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                 </el-cascader>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="描述">
-                <el-input v-model="formData.StandardDesc" placeholder="请输入" style="width: 100%" :disabled="Descdisabled || DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.StandardDesc" placeholder="请输入" style="width: 100%" :disabled="Descdisabled || DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -176,9 +176,9 @@
               <el-form-item label="外观-1">
                 <el-tooltip content="焊缝应均匀、平整" placement="top" effect="dark">
                   <el-input class="input-with-select" v-model="formData.FaceCheck1" placeholder="焊缝应均匀、平整" style="width: 100%"
-                            :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                            :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                     <el-select ref="selectFCResult1" slot="append" v-model="formData.FaceCheckResult1" filterable placeholder="请选择"
-                               :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" style="width: 90px">
+                               :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" style="width: 90px">
                       <el-option
                         v-for="item in FCROptions"
                         :key="item.Id"
@@ -195,9 +195,9 @@
               <el-form-item label="外观-2">
                 <el-tooltip content="铸件不应有影响游梁式抽油机外观质量和降低强度的缺陷" placement="top" effect="dark">
                   <el-input class="input-with-select" v-model="formData.FaceCheck2" placeholder="铸件不应有影响游梁式抽油机外观质量和降低强度的缺陷" style="width: 100%"
-                            :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                            :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                     <el-select ref="selectFCResult2" slot="append" v-model="formData.FaceCheckResult2" filterable placeholder="请选择"
-                               :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" style="width: 90px">
+                               :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" style="width: 90px">
                       <el-option
                         v-for="item in FCROptions"
                         :key="item.Id"
@@ -212,9 +212,9 @@
             <el-col :span="8">
               <el-form-item label="减速器密封性">
                 <el-input class="input-with-select" v-model="formData.Retarder" placeholder="减速器密封性" style="width: 100%"
-                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <el-select ref="selectRDCResult" slot="append" v-model="formData.RDCResult" filterable placeholder="请选择"
-                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" style="width: 90px">
+                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" style="width: 90px">
                     <el-option
                       v-for="item in FCROptions"
                       :key="item.Id"
@@ -227,7 +227,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="支架纵向振幅">
-                <el-input v-model="formData.LongSwing" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="LongSwingCheck">
+                <el-input v-model="formData.LongSwing" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="LongSwingCheck">
                   <el-popover
                     placement="top-start"
                     title="底数"
@@ -243,7 +243,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="支架横向振幅">
-                <el-input v-model="formData.TransSwing" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="TransSwingCheck">
+                <el-input v-model="formData.TransSwing" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="TransSwingCheck">
                   <el-popover
                     placement="top-start"
                     title="底数"
@@ -259,7 +259,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="减速器轴承温度" label-width="130px">
-                <el-input v-model="formData.RetarderTemp" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-input v-model="formData.RetarderTemp" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <template slot="append">℃</template>
                 </el-input>
               </el-form-item>
@@ -278,58 +278,58 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="整机噪声(A计权声级) dB">
-              <el-input v-model="formData.MachineNoise1" placeholder="" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="MachineNoiseCheck('MachineNoise1')"></el-input>
-              <el-input v-model="formData.MachineNoise2" placeholder="" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="MachineNoiseCheck('MachineNoise2')"></el-input>
-              <el-input v-model="formData.MachineNoise3" placeholder="" style="width: 34%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="MachineNoiseCheck('MachineNoise3')"></el-input>
+              <el-input v-model="formData.MachineNoise1" placeholder="" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="MachineNoiseCheck('MachineNoise1')"></el-input>
+              <el-input v-model="formData.MachineNoise2" placeholder="" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="MachineNoiseCheck('MachineNoise2')"></el-input>
+              <el-input v-model="formData.MachineNoise3" placeholder="" style="width: 34%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="MachineNoiseCheck('MachineNoise3')"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="9">
             <el-form-item label="悬点投影-X轴">
               <el-tooltip content="下止点" placement="top" effect="dark">
-                <el-input v-model="formData.DownX" placeholder="下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('DownX')"></el-input>
+                <el-input v-model="formData.DownX" placeholder="下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('DownX')"></el-input>
               </el-tooltip>
               <el-tooltip content="中下止点" placement="top" effect="dark">
-                <el-input v-model="formData.MidDownX" placeholder="中下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('MidDownX')"></el-input>
+                <el-input v-model="formData.MidDownX" placeholder="中下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('MidDownX')"></el-input>
               </el-tooltip>
               <el-tooltip content="中止点" placement="top" effect="dark">
-                <el-input v-model="formData.MiddleX" placeholder="中止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('MiddleX')"></el-input>
+                <el-input v-model="formData.MiddleX" placeholder="中止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('MiddleX')"></el-input>
               </el-tooltip>
               <el-tooltip content="中上止点" placement="top" effect="dark">
-                <el-input v-model="formData.MidUpX" placeholder="中上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('MidUpX')"></el-input>
+                <el-input v-model="formData.MidUpX" placeholder="中上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('MidUpX')"></el-input>
               </el-tooltip>
               <el-tooltip content="上止点" placement="top" effect="dark">
-                <el-input v-model="formData.UpX" placeholder="上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('UpX')"></el-input>
+                <el-input v-model="formData.UpX" placeholder="上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('UpX')"></el-input>
               </el-tooltip>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="悬点投影-Y轴">
               <el-tooltip content="下止点" placement="top" effect="dark">
-                <el-input v-model="formData.DownY" placeholder="下止点" style="width: 20%  " :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('DownY')"></el-input>
+                <el-input v-model="formData.DownY" placeholder="下止点" style="width: 20%  " :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('DownY')"></el-input>
               </el-tooltip>
               <el-tooltip content="中下止点" placement="top" effect="dark">
-                <el-input v-model="formData.MidDownY" placeholder="中下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('MidDownY')"></el-input>
+                <el-input v-model="formData.MidDownY" placeholder="中下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('MidDownY')"></el-input>
               </el-tooltip>
               <el-tooltip content="中止点" placement="top" effect="dark">
-                <el-input v-model="formData.MiddleY" placeholder="中止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('MiddleY')"></el-input>
+                <el-input v-model="formData.MiddleY" placeholder="中止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('MiddleY')"></el-input>
               </el-tooltip>
               <el-tooltip content="中上止点" placement="top" effect="dark">
-                <el-input v-model="formData.MidUpY" placeholder="中上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('MidUpY')"></el-input>
+                <el-input v-model="formData.MidUpY" placeholder="中上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('MidUpY')"></el-input>
               </el-tooltip>
               <el-tooltip content="上止点" placement="top" effect="dark">
-                <el-input v-model="formData.UpY" placeholder="上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('UpY')"></el-input>
+                <el-input v-model="formData.UpY" placeholder="上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('UpY')"></el-input>
               </el-tooltip>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-form-item label="备注">
-            <el-input type="textarea" v-model="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+            <el-input type="textarea" v-model="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
           </el-form-item>
           <el-col :span="24">
             <el-form-item :span="24" style="text-align: center;">
-              <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-circle-check"></i> {{
+              <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-circle-check"></i> {{
                 this.saveBtnName }}
               </el-button>
               <!--<el-button type="primary" size="small" @click="continueInsert"><i class="el-icon-circle-check"></i>-->

src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/datalist.vue

@@ -11,9 +11,9 @@
           <i class="icon icon-table2"></i> 液压安全阀检测数据
         </span>
         <span style="float: right;">
-          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
+          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="addDataEntity">添加明细</el-button>
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
-          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3 && DataStatus!=7" @click="setProoFreadShow">提交校核</el-button>
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
                      <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
 
@@ -37,7 +37,7 @@
 
       <el-table ref="EntityTable" highlight-current-row :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby"
                 @current-change="saveTableRow" @row-dblclick="dbTableRow">
-        <el-table-column  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="190" align="center" fixed>
+        <el-table-column  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3 && DataStatus!=7" label="操作" min-width="190" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="编辑"  @click="EditEntity(scope.row)">编辑</el-button>
             <el-popover placement="top" title="提示">
@@ -69,9 +69,9 @@
         <el-table-column width="410" label="正开启压力Pa" align="center">
           <template slot-scope="scope">
             <el-input @blur="getPosPressAvg(scope.row)" size="small" v-model="scope.row.PosPress1" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)"
-                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
               <el-popover
-                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -82,9 +82,9 @@
               </el-popover>
             </el-input>
             <el-input @blur="getPosPressAvg(scope.row)" size="small" v-model="scope.row.PosPress2" placeholder="+" style="width: 33%" @focus="setCurrentRow(scope.row)"
-                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3">
+                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7">
               <el-popover
-                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -95,9 +95,9 @@
               </el-popover>
             </el-input>
             <el-input @blur="getPosPressAvg(scope.row)" size="small" v-model="scope.row.PosPress3" placeholder="+" style="width: 34%" @focus="setCurrentRow(scope.row)"
-                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3">
+                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7">
               <el-popover
-                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -116,11 +116,11 @@
         <el-table-column width="300" label="正通气量m3/h" align="center">
           <template slot-scope="scope">
             <el-input size="small" @blur="getPosCloudAvg(scope.row)" v-model="scope.row.PosCloud1" placeholder="+"
-                      style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)"></el-input>
+                      style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
             <el-input size="small" @blur="getPosCloudAvg(scope.row)" v-model="scope.row.PosCloud2" placeholder="+"
-                      style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)"></el-input>
+                      style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
             <el-input size="small" @blur="getPosCloudAvg(scope.row)" v-model="scope.row.PosCloud3" placeholder="+"
-                      style="width: 34%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)"></el-input>
+                      style="width: 34%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
             <el-tooltip content="平均值 +" placement="top" effect="dark">
               <el-input size="small" v-model="scope.row.PosCloudAvg" placeholder="平均值 +" style="width: 100%"
                         readonly></el-input>
@@ -130,9 +130,9 @@
         <el-table-column width="410" label="开启压力-Pa" align="center">
           <template slot-scope="scope">
             <el-input @blur="getNgPressAvg(scope.row)" size="small" v-model="scope.row.NgPress1" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)"
-                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3">
+                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7">
               <el-popover
-                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -143,9 +143,9 @@
               </el-popover>
             </el-input>
             <el-input @blur="getNgPressAvg(scope.row)" size="small" v-model="scope.row.NgPress2" placeholder="-" style="width: 33%" @focus="setCurrentRow(scope.row)"
-                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3">
+                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7">
               <el-popover
-                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -156,9 +156,9 @@
               </el-popover>
             </el-input>
             <el-input @blur="getNgPressAvg(scope.row)" size="small" v-model="scope.row.NgPress3" placeholder="-" style="width: 34%" @focus="setCurrentRow(scope.row)"
-                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3">
+                      :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7">
               <el-popover
-                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7"
                 placement="top-start"
                 title="底数"
                 width="50"
@@ -177,11 +177,11 @@
         <el-table-column width="300" label="负通气量m3/h" align="center">
           <template slot-scope="scope">
             <el-input size="small" @blur="getNgCloudAvg(scope.row)" v-model="scope.row.NgCloud1" placeholder="-"
-                      style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)"></el-input>
+                      style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
             <el-input size="small" @blur="getNgCloudAvg(scope.row)" v-model="scope.row.NgCloud2" placeholder="-"
-                      style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)"></el-input>
+                      style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
             <el-input size="small" @blur="getNgCloudAvg(scope.row)" v-model="scope.row.NgCloud3" placeholder="-"
-                      style="width: 34%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)"></el-input>
+                      style="width: 34%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
             <el-tooltip content="平均值 -" placement="top" effect="dark">
               <el-input size="small" v-model="scope.row.NgCloudAvg" placeholder="平均值 -" style="width: 100%" readonly></el-input>
             </el-tooltip>
@@ -191,14 +191,14 @@
                          <!--show-overflow-tooltip></el-table-column>-->
         <el-table-column prop="CustNo" sortable min-width="90" label="编号" align="center" show-overflow-tooltip >
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.CustNo" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)"></el-input>
+            <el-input size="small" v-model="scope.row.CustNo" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="Spec" sortable :min-width="130" label="规格型号" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="PUType" sortable min-width="100" label="类型" align="center" show-overflow-tooltip >
           <template slot-scope="scope">
             <el-select size="small" ref="selectPUType" v-model="scope.row.PUType" filterable placeholder="请选择" @focus="setCurrentRow(scope.row)"
-                       style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3">
+                       style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7">
               <el-option
                 v-for="item in PUTypeOptions"
                 :key="item.Id"
@@ -476,8 +476,10 @@
       },
 
       dbTableRow (row) {
+        if (this.entityList) {
         if (this.entityList.length === 1) {
-          this.updateTableRow(row)
+            this.updateTableRow(row)
+          }
         }
       },
       saveTableRow (row, oldRow) {

src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/dataopera.vue

@@ -808,17 +808,21 @@
         }
       },
       setRemark1 () {
-        if (this.formData.Remark1.length > 0) {
-          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-        } else {
-          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        if (this.formData.Remark1) {
+          if (this.formData.Remark1.length > 0) {
+            this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+          } else {
+            this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+          }
         }
       },
       setRemark2 () {
-        if (this.formData.Remark2.length > 0) {
-          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-        } else {
-          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        if (this.formData.Remark2) {
+          if (this.formData.Remark2.length > 0) {
+            this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+          } else {
+            this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+          }
         }
       },
       setAllPosBaseNum (num) {

src/dashoo.cn/frontend_web/src/pages/lims/reportnobeampumpingUnits/subdata/datalist.vue

@@ -12,7 +12,7 @@
         </span>
         <span style="float: right;">
           <el-button type="primary" size="mini" :disabled="this.DataStatus!=0&& DataStatus!=5&&this.DataStatus!=3" @click="ProoFreadShow = true">提交校核</el-button>
-          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加</el-button>
+          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="addDataEntity">添加</el-button>
           <el-button type="plain" @click="searchCommand('search')" size="mini"
                      style="margin-left:10px; margin-top: -4px;">查询</el-button>
 
@@ -23,7 +23,7 @@
       </div>
       <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby"
                 @current-change="saveTableRow" @row-dblclick="dbTableRow">
-        <el-table-column v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="150" align="center" fixed>
+        <el-table-column v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="编辑"  @click="EditEntity(scope.row)">编辑</el-button>
             <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
@@ -54,48 +54,48 @@
         <el-table-column width="300" label="整机噪声" align="center">
           <template slot-scope="scope">
             <el-input size="small" v-model="scope.row.MachineNoise1"
-                      style="width: 33%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+                      style="width: 33%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             <el-input size="small" v-model="scope.row.MachineNoise2"
-                      style="width: 33%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+                      style="width: 33%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             <el-input size="small" v-model="scope.row.MachineNoise3"
-                      style="width: 34%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+                      style="width: 34%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
           </template>
         </el-table-column>
         <el-table-column width="500" label="悬点投影-X轴" align="center">
           <template slot-scope="scope">
             <el-tooltip content="下止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.DownX" placeholder="下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.DownX" placeholder="下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中下止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MidDownX" placeholder="中下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MidDownX" placeholder="中下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MiddleX" placeholder="中止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MiddleX" placeholder="中止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中上止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MidUpX" placeholder="中上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MidUpX" placeholder="中上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="上止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.UpX" placeholder="上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.UpX" placeholder="上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column width="500" label="悬点投影-Y轴" align="center">
           <template slot-scope="scope">
             <el-tooltip content="下止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.DownY" placeholder="下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.DownY" placeholder="下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中下止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MidDownY" placeholder="中下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MidDownY" placeholder="中下止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MiddleY" placeholder="中止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MiddleY" placeholder="中止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="中上止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.MidUpY" placeholder="中上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.MidUpY" placeholder="中上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
             <el-tooltip content="上止点" placement="top" effect="dark">
-              <el-input v-model="scope.row.UpY" placeholder="上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3"></el-input>
+              <el-input v-model="scope.row.UpY" placeholder="上止点" style="width: 20%" :disabled="DataStatus != 0&& DataStatus!=5&&this.DataStatus!=3 && DataStatus!=7"></el-input>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -225,7 +225,7 @@
       return {
         dialogVisible: false,
         ProoFreadShow: false,
-        DataStatus:0,
+        DataStatus: 0,
         acceptUsers: [],
         // 列表数据
         entityList: [],
@@ -238,9 +238,9 @@
           Order: '',
           Prop: ''
         },
-        //校核提交
+        // 校核提交
         shenhesubmitForm: {
-          AuditorUserId:'',
+          AuditorUserId: '',
           DataEntryId: '',
           SuccessStatus: 1,
           AuditorRemark: ''
@@ -313,11 +313,11 @@
           console.error(err)
         })
       },
-        //获取校核人列表
-      getUsersByRole() {
+      // 获取校核人列表
+      getUsersByRole () {
         let _this = this
         // request
-        this.$axios.get("/limsdataentry/getuserlistbyjhrole/", {})
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
           .then(res => {
             if (res.data instanceof Array && res.data.length > 0) {
               this.acceptUsers = res.data
@@ -328,23 +328,23 @@
             console.error(err)
           })
       },
-      //提交校核
-      makesure() {
-        this.$confirm("确定提交校核！", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      // 提交校核
+      makesure () {
+        this.$confirm('确定提交校核！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             this.ProoFreadShow = false
             this.checkstatus()
           })
           .catch(() => {})
       },
-      checkstatus() {
+      checkstatus () {
         this.shenhesubmitForm.SuccessStatus = 1
         this.shenhesubmitForm.DataEntryId = this.DataEntryId
-        console.log("------shenhe ",this.shenhesubmitForm)
+        console.log('------shenhe ', this.shenhesubmitForm)
         let params = this.shenhesubmitForm
         this.$axios.put('/limsdataentry/checksubmit/', params)
           .then(res => {
@@ -352,7 +352,7 @@
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
 
               })
               this.DataStatus = 1
@@ -360,7 +360,7 @@
             } else {
               this.$message({
                 type: 'warning',
-                message: "校核提交错误!"
+                message: '校核提交错误!'
               })
             }
           })

src/dashoo.cn/frontend_web/src/pages/lims/reportnobeampumpingUnits/subdata/dataopera.vue

@@ -20,7 +20,7 @@
 
           <!--<el-button type="plain" @click="ShowSearchDialog" size="mini" style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
-          <el-button type="primary" size="mini" v-if="this.DataStatus==0 || this.DataStatus==5 || this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0 || this.DataStatus==5 || this.DataStatus==3||this.DataStatus==7" @click="setProoFreadShow">提交校核</el-button>
           <router-link v-if="this.sign == '1'" :to="'/lims/dataentry/tacktodo'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -53,7 +53,7 @@
               <el-form-item label="检测地点" required>
                 <el-select ref="selectPositionCheck" v-model="formData.PositionCheckId" filterable placeholder="请选择"
                            style="width: 70%" default-first-option :filter-method="positionFilter"
-                           @change="initGroupOptions" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                           @change="initGroupOptions" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <el-option-group
                     v-for="group in groupOptions"
                     :key="group.label"
@@ -74,7 +74,7 @@
                     trigger="click">
                     <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
                     <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>
+                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-plus"></i>
                     </el-button>
                   </el-popover>
                 </template>
@@ -83,25 +83,25 @@
 
             <el-col :span="8">
               <el-form-item label="检测日期">
-                <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                 </el-date-picker>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <el-form-item label="制造厂家">
-                <el-input v-model="formData.Manufacturer" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.Manufacturer" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="出厂编号">
-                <el-input v-model="formData.CustNo" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.CustNo" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <el-form-item label="出厂日期">
-                <el-date-picker style="width: 100%" v-model="formData.ProductDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-date-picker style="width: 100%" v-model="formData.ProductDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -109,7 +109,7 @@
             <el-col :span="16">
               <el-form-item label="规格型号" required>
                 <!--<el-input v-model="formData.Spec" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>-->
-                <el-select  v-model="WYLType.WYLNo" placeholder="请选择" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"
+                <el-select  v-model="WYLType.WYLNo" placeholder="请选择" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"
                             style="width: 22%" filterable allow-create default-first-option>
                   <el-option
                     v-for="item in WYLNoOptions"
@@ -118,10 +118,10 @@
                     :value="item.ItemValue">
                   </el-option>
                 </el-select>
-                <el-input v-model="WYLType.Num1" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="NumCheck('Num1')"></el-input>&nbsp;-&nbsp;
-                <el-input v-model="WYLType.Num2" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="NumCheck('Num2')"></el-input>&nbsp;-&nbsp;
-                <el-input v-model="WYLType.Num3" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="NumCheck('Num3')"></el-input>
-                <el-select  v-model="WYLType.Balance" placeholder="请选择" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"
+                <el-input v-model="WYLType.Num1" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="NumCheck('Num1')"></el-input>&nbsp;-&nbsp;
+                <el-input v-model="WYLType.Num2" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="NumCheck('Num2')"></el-input>&nbsp;-&nbsp;
+                <el-input v-model="WYLType.Num3" style="width: 15%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="NumCheck('Num3')"></el-input>
+                <el-select  v-model="WYLType.Balance" placeholder="请选择" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"
                             style="width: 22%" filterable allow-create default-first-option>
                   <el-option
                     v-for="item in BalanceOptions"
@@ -134,7 +134,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="环境温度">
-                <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <template slot="append">℃</template>
                 </el-input>
               </el-form-item>
@@ -142,13 +142,13 @@
 
             <el-col :span="8">
               <el-form-item label="主要仪器名称">
-                <el-input v-model="formData.MainProducts" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.MainProducts" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="抽油机类型">
                 <el-select ref="selectPUType" v-model="formData.PUType" filterable placeholder="请选择"
-                           style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                           style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <el-option
                     v-for="item in PUTypeOptions"
                     :key="item.Id"
@@ -165,13 +165,13 @@
                              :props="props"
                              v-model="selectedOptions"
                              @change="handleChange"
-                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                 </el-cascader>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="描述">
-                <el-input v-model="formData.StandardDesc" placeholder="请输入" style="width: 100%" :disabled="Descdisabled || DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.StandardDesc" placeholder="请输入" style="width: 100%" :disabled="Descdisabled || DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -184,9 +184,9 @@
             <el-col :span="8">
               <el-form-item label="外观1">
                 <el-input class="input-with-select" v-model="formData.FaceCheck1" placeholder="外观" style="width: 100%"
-                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <el-select ref="selectFCResult1" slot="append" v-model="formData.FaceCheckResult1" filterable placeholder="请选择"
-                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" style="width: 90px">
+                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" style="width: 90px">
                     <el-option
                       v-for="item in FCROptions"
                       :key="item.Id"
@@ -201,9 +201,9 @@
             <el-col :span="8">
               <el-form-item label="外观2">
                 <el-input class="input-with-select" v-model="formData.FaceCheck2" placeholder="外观" style="width: 100%"
-                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <el-select ref="selectFCResult2" slot="append" v-model="formData.FaceCheckResult2" filterable placeholder="请选择"
-                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" style="width: 90px">
+                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" style="width: 90px">
                     <el-option
                       v-for="item in FCROptions"
                       :key="item.Id"
@@ -217,9 +217,9 @@
             <el-col :span="8">
               <el-form-item label="减速器密封性">
                 <el-input class="input-with-select" v-model="formData.Retarder" placeholder="减速器密封性" style="width: 100%"
-                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7">
                   <el-select ref="selectRDCResult" slot="append" v-model="formData.RDCResult" filterable placeholder="请选择"
-                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" style="width: 90px">
+                             :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" style="width: 90px">
                     <el-option
                       v-for="item in FCROptions"
                       :key="item.Id"
@@ -232,7 +232,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="支架纵向振幅">
-                <el-input v-model="formData.LongSwing" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="LongSwingCheck">
+                <el-input v-model="formData.LongSwing" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="LongSwingCheck">
                   <el-popover
                     placement="top-start"
                     title="底数"
@@ -247,7 +247,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="支架横向振幅">
-                <el-input v-model="formData.TransSwing" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="TransSwingCheck">
+                <el-input v-model="formData.TransSwing" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="TransSwingCheck">
                   <el-popover
                     placement="top-start"
                     title="底数"
@@ -262,7 +262,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="减速器轴承温度" label-width="130px">
-                <el-input v-model="formData.RetarderTemp" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input v-model="formData.RetarderTemp" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -279,11 +279,11 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="整机噪声(A计权声级)">
-              <el-input v-model="formData.MachineNoise1" placeholder="" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"
+              <el-input v-model="formData.MachineNoise1" placeholder="" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"
                         @keyup.native="MachineNoiseCheck('MachineNoise1')"></el-input>
-              <el-input v-model="formData.MachineNoise2" placeholder="" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"
+              <el-input v-model="formData.MachineNoise2" placeholder="" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"
                         @keyup.native="MachineNoiseCheck('MachineNoise2')"></el-input>
-              <el-input v-model="formData.MachineNoise3" placeholder="" style="width: 34%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"
+              <el-input v-model="formData.MachineNoise3" placeholder="" style="width: 34%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"
                         @keyup.native="MachineNoiseCheck('MachineNoise3')"></el-input>
             </el-form-item>
           </el-col>
@@ -291,51 +291,51 @@
           <el-col :span="9">
             <el-form-item label="悬点投影-X轴" label-width="300px">
               <el-tooltip content="下止点" placement="top" effect="dark">
-                <el-input v-model="formData.DownX" placeholder="下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('DownX')"></el-input>
+                <el-input v-model="formData.DownX" placeholder="下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('DownX')"></el-input>
               </el-tooltip>
               <el-tooltip content="中下止点" placement="top" effect="dark">
-                <el-input v-model="formData.MidDownX" placeholder="中下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('MidDownX')"></el-input>
+                <el-input v-model="formData.MidDownX" placeholder="中下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('MidDownX')"></el-input>
               </el-tooltip>
               <el-tooltip content="中止点" placement="top" effect="dark">
-                <el-input v-model="formData.MiddleX" placeholder="中止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('MiddleX')"></el-input>
+                <el-input v-model="formData.MiddleX" placeholder="中止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('MiddleX')"></el-input>
               </el-tooltip>
               <el-tooltip content="中上止点" placement="top" effect="dark">
-                <el-input v-model="formData.MidUpX" placeholder="中上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('MidUpX')"></el-input>
+                <el-input v-model="formData.MidUpX" placeholder="中上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('MidUpX')"></el-input>
               </el-tooltip>
               <el-tooltip content="上止点" placement="top" effect="dark">
-                <el-input v-model="formData.UpX" placeholder="上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="XaxisCheck('UpX')"></el-input>
+                <el-input v-model="formData.UpX" placeholder="上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="XaxisCheck('UpX')"></el-input>
               </el-tooltip>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="悬点投影-Y轴">
               <el-tooltip content="下止点" placement="top" effect="dark">
-                <el-input v-model="formData.DownY" placeholder="下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('DownY')"></el-input>
+                <el-input v-model="formData.DownY" placeholder="下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('DownY')"></el-input>
               </el-tooltip>
               <el-tooltip content="中下止点" placement="top" effect="dark">
-                <el-input v-model="formData.MidDownY" placeholder="中下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('MidDownY')"></el-input>
+                <el-input v-model="formData.MidDownY" placeholder="中下止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('MidDownY')"></el-input>
               </el-tooltip>
               <el-tooltip content="中止点" placement="top" effect="dark">
-                <el-input v-model="formData.MiddleY" placeholder="中止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('MiddleY')"></el-input>
+                <el-input v-model="formData.MiddleY" placeholder="中止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('MiddleY')"></el-input>
               </el-tooltip>
               <el-tooltip content="中上止点" placement="top" effect="dark">
-                <el-input v-model="formData.MidUpY" placeholder="中上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('MidUpY')"></el-input>
+                <el-input v-model="formData.MidUpY" placeholder="中上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('MidUpY')"></el-input>
               </el-tooltip>
               <el-tooltip content="上止点" placement="top" effect="dark">
-                <el-input v-model="formData.UpY" placeholder="上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @keyup.native="YaxisCheck('UpY')"></el-input>
+                <el-input v-model="formData.UpY" placeholder="上止点" style="width: 20%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" @keyup.native="YaxisCheck('UpY')"></el-input>
               </el-tooltip>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-form-item label="备注">
-            <el-input type="textarea" v-model="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+            <el-input type="textarea" v-model="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"></el-input>
           </el-form-item>
 
 
           <el-col :span="24">
             <el-form-item :span="24" style="text-align: center;">
-              <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-circle-check"></i> {{
+              <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-circle-check"></i> {{
                 this.saveBtnName }}</el-button>
               <!--<el-button type="primary" size="small" @click="continueInsert"><i class="el-icon-circle-check"></i>-->
               <!--继续新增</el-button>-->

src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/subdata/datalist.vue

@@ -11,9 +11,9 @@
           <i class="icon icon-table2"></i> 阻火器数据
         </span>
         <span style="float: right;">
-          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
+          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="addDataEntity">添加明细</el-button>
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
-           <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
+           <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" @click="setProoFreadShow">提交校核</el-button>
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
                      <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
 
@@ -37,7 +37,7 @@
 
       <el-table ref="EntityTable" :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" highlight-current-row @sort-change="orderby"
                 @current-change="saveTableRow" @row-dblclick="dbTableRow">
-        <el-table-column v-if="this.DataStatus == 0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="150" align="center" fixed>
+        <el-table-column v-if="this.DataStatus == 0||this.DataStatus==5||this.DataStatus==3||this.DataStatus==7" label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="编辑"  @click="EditEntity(scope.row)">编辑</el-button>
             <el-popover placement="top" title="提示">
@@ -59,7 +59,7 @@
           <!--show-overflow-tooltip></el-table-column>-->
         <el-table-column sortable min-width="80" label="序号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3" v-model="scope.row.OrderNo"
+            <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3 && DataStatus!=7" v-model="scope.row.OrderNo"
                       style="width: 100%"></el-input>
           </template>
         </el-table-column>
@@ -67,11 +67,11 @@
 
         <el-table-column width="270" label="通气量 m3/h" align="center">
           <template slot-scope="scope">
-            <el-input @blur="getVentVolumeAvg(scope.row)" size="small" v-model="scope.row.VentVolume1"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getVentVolumeAvg(scope.row)" size="small" v-model="scope.row.VentVolume1"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
-            <el-input @blur="getVentVolumeAvg(scope.row)" size="small" v-model="scope.row.VentVolume2" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getVentVolumeAvg(scope.row)" size="small" v-model="scope.row.VentVolume2" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
-            <el-input @blur="getVentVolumeAvg(scope.row)" size="small" v-model="scope.row.VentVolume3"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getVentVolumeAvg(scope.row)" size="small" v-model="scope.row.VentVolume3"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
             <el-tooltip content="平均值" placement="top" effect="dark">
               <el-input size="small" v-model="scope.row.VentVolume4" placeholder="平均值 +" style="width: 100%"
@@ -81,11 +81,11 @@
         </el-table-column>
         <el-table-column width="270" label="Py Pa" align="center">
           <template slot-scope="scope">
-            <el-input @blur="getPyPaAvg(scope.row)" size="small" v-model="scope.row.PyPa1"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPyPaAvg(scope.row)" size="small" v-model="scope.row.PyPa1"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
-            <el-input @blur="getPyPaAvg(scope.row)" size="small" v-model="scope.row.PyPa2" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPyPaAvg(scope.row)" size="small" v-model="scope.row.PyPa2" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
-            <el-input @blur="getPyPaAvg(scope.row)" size="small" v-model="scope.row.PyPa3"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPyPaAvg(scope.row)" size="small" v-model="scope.row.PyPa3"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
             <el-tooltip content="平均值" placement="top" effect="dark">
               <el-input size="small" v-model="scope.row.PyPaAvg" placeholder="平均值 +" style="width: 100%"
@@ -95,11 +95,11 @@
         </el-table-column>
         <el-table-column width="270" label="Pw Pa" align="center">
           <template slot-scope="scope">
-            <el-input @blur="getPwPaAvg(scope.row)" size="small" v-model="scope.row.PwPa1"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPwPaAvg(scope.row)" size="small" v-model="scope.row.PwPa1"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
-            <el-input @blur="getPwPaAvg(scope.row)" size="small" v-model="scope.row.PwPa2" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPwPaAvg(scope.row)" size="small" v-model="scope.row.PwPa2" style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
-            <el-input @blur="getPwPaAvg(scope.row)" size="small" v-model="scope.row.PwPa3"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+            <el-input @blur="getPwPaAvg(scope.row)" size="small" v-model="scope.row.PwPa3"  style="width: 33%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
             </el-input>
             <el-tooltip content="平均值" placement="top" effect="dark">
               <el-input size="small" v-model="scope.row.PwPaAvg" placeholder="平均值 +" style="width: 100%"
@@ -111,7 +111,7 @@
         </el-table-column>
         <el-table-column prop="CustNo" sortable min-width="80" label="编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.CustNo" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)"></el-input>
+            <el-input size="small" v-model="scope.row.CustNo" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)"></el-input>
           </template>
         </el-table-column>
 
@@ -123,7 +123,7 @@
         <el-table-column prop="Status" sortable min-width="115" label="产品状态" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select size="small" ref="selectStatus" v-model="scope.row.Status" filterable placeholder="请选择"
-                       style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+                       style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
               <el-option
                 v-for="item in StatusOptions"
                 :key="item.Value"
@@ -136,7 +136,7 @@
         <el-table-column prop="PUType" sortable min-width="115" label="类型" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select size="small" ref="selectPUType" v-model="scope.row.PUType" filterable placeholder="请选择"
-                       style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3" @focus="setCurrentRow(scope.row)">
+                       style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5&&　DataStatus　!=　3 && DataStatus!=7" @focus="setCurrentRow(scope.row)">
               <el-option
                 v-for="item in PUTypeOptions"
                 :key="item.Id"

src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/subdata/dataopera.vue

@@ -587,17 +587,21 @@
       //   }
       // },
       setRemark1 () {
-        if (this.formData.Remark1.length > 0) {
-          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-        } else {
-          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        if (this.formData.Remark1) {
+          if (this.formData.Remark1.length > 0) {
+            this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+          } else {
+            this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+          }
         }
       },
       setRemark2 () {
-        if (this.formData.Remark2.length > 0) {
-          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-        } else {
-          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        if (this.formData.Remark2) {
+          if (this.formData.Remark2.length > 0) {
+            this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+          } else {
+            this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+          }
         }
       },
       getPwPaAvg () {