前后:增项,年审,信息变更上传资质都能看见

src/dashoo.cn/backend/api/business/oilsupplier/qualchange/qualchangeService.go

@@ -161,8 +161,10 @@ func (s *QualChangeService) GetQualPagingEntities(FileName, qualChangeName strin
 	var sql string
 	sql = `select a.Id Id, a.SupplierId SupplierId, a.SupplierTypeCode SupplierTypeCode, a.SupplierCertSubId SupplierCertSubId, a.CertSubName CertSubName, a.OtherRemark Remark,`
 	sql += ` a.NeedFileType NeedFileType, a.NeedFileCode NeedFileCode, a.FileExt FileExt, a.FileType FileType, `
-	sql += ` a.EffectDate OldEffectDate, a.FileUrl OldFileUrl, a.FileName OldFileName, `
-	sql += ` b.EffectDate EffectDate, b.FileUrl FileUrl, b.FileName FileName, b.ParentId,b.Remark Remark1, a.IsDelete `
+	//sql += ` a.EffectDate OldEffectDate, a.FileUrl OldFileUrl, a.FileName OldFileName, `
+	sql += ` (CASE WHEN a.SupType = 2 || a.SupType = 4 THEN '' ELSE a.EffectDate END) as OldEffectDate,(CASE WHEN a.SupType = 2 || a.SupType = 4 THEN '' ELSE a.FileName END) as OldFileName,(CASE WHEN a.SupType = 2 || a.SupType = 4 THEN '' ELSE a.FileUrl END) as OldFileUrl, `
+	sql += ` (CASE WHEN (b.EffectDate is null) && a.SupType != 2 && a.SupType != 4  THEN b.EffectDate WHEN b.EffectDate THEN b.EffectDate ELSE a.EffectDate END) as EffectDate,(CASE WHEN (b.FileName is null || b.FileName = '') && a.SupType != 2 && a.SupType != 4  THEN b.FileName WHEN b.FileName != '' THEN b.FileName  ELSE a.FileName END) as FileName,(CASE WHEN (b.FileUrl is null || b.FileUrl = '') && a.SupType != 2 && a.SupType != 4 THEN b.FileUrl WHEN b.FileUrl != '' THEN b.FileUrl  ELSE a.FileUrl END) as FileUrl,`
+	sql += ` b.ParentId,b.Remark Remark1, a.IsDelete `
 	sql += ` from ` + FileName + ` a `
 	if MInfoId != "" {
 		sql += ` left join ` + qualChangeName + " b on b.FileId = a.Id AND b.ParentId =" + MInfoId

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappendsub/oilsuppliercertappendsubService.go

@@ -27,7 +27,9 @@ func (s *OilSupplierCertAppendSubService) GetQualPagingEntities(FileName, qualCh
 	var sql string
 	sql = `select a.Id Id, a.SupplierId SupplierId, a.SupplierTypeCode SupplierTypeCode, a.SupplierCertSubId SupplierCertSubId, a.CertSubName CertSubName,a.OtherRemark Remark, `
 	sql += ` a.NeedFileType NeedFileType, a.NeedFileCode NeedFileCode, a.FileExt FileExt, a.FileType FileType, `
-	sql += ` a.EffectDate OldEffectDate, a.FileUrl OldFileUrl, a.FileName OldFileName, `
+	//sql += ` a.EffectDate OldEffectDate, a.FileUrl OldFileUrl, a.FileName OldFileName, `
+	sql += ` (CASE WHEN a.SupType = 2 || a.SupType = 4 THEN '' ELSE a.EffectDate END) as OldEffectDate,(CASE WHEN a.SupType = 2 || a.SupType = 4 THEN '' ELSE a.FileName END) as OldFileName,(CASE WHEN a.SupType = 2 || a.SupType = 4 THEN '' ELSE a.FileUrl END) as OldFileUrl, `
+	sql += ` (CASE WHEN (b.EffectDate is null) && a.SupType != 2 && a.SupType != 4  THEN b.EffectDate WHEN b.EffectDate THEN b.EffectDate ELSE a.EffectDate END) as EffectDate,(CASE WHEN (b.FileName is null || b.FileName = '') && a.SupType != 2 && a.SupType != 4  THEN b.FileName WHEN b.FileName != '' THEN b.FileName  ELSE a.FileName END) as FileName,(CASE WHEN (b.FileUrl is null || b.FileUrl = '') && a.SupType != 2 && a.SupType != 4 THEN b.FileUrl WHEN b.FileUrl != '' THEN b.FileUrl  ELSE a.FileUrl END) as FileUrl,`
 	sql += ` b.EffectDate EffectDate, b.FileUrl FileUrl, b.FileName FileName, b.ParentId, b.OtherRemark Remark1, a.IsDelete `
 	sql += ` from ` + FileName + ` a `
 	if MInfoId != "" {

src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -8,6 +8,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/oilcostmanage"
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierlog"
 	"dashoo.cn/backend/api/business/oilsupplier/tableheader"
@@ -1693,7 +1694,7 @@ func (this *AnnualAuditController) AddQualChange() {
 	svc.GetEntityByWhere(BaseTableHeader, where1, &tableHeader)
 
 	if has {
-		errinfo.Message = "操作失败！该资质已添加或正在参与其他流程审核"
+		errinfo.Message = "操作失败！该资质已添加"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
@@ -1709,6 +1710,10 @@ func (this *AnnualAuditController) AddQualChange() {
 	supplierfile.CreateOn = time.Now()
 	supplierfile.CreateUserId, _ = strconv.Atoi(this.User.Id)
 	supplierfile.CreateBy = this.User.Realname
+	supplierfile.FileUrl = strings.Trim(model.FileUrl, "$")
+	supplierfile.FileName = strings.Trim(model.FileName, "$")
+	supplierfile.EffectDate = model.EffectDate
+	supplierfile.OtherRemark = model.Remark
 
 	svc.InsertEntity(&supplierfile)
 
@@ -1767,6 +1772,22 @@ func (this *AnnualAuditController) EditQualChange() {
 	model.FileName = strings.Trim(model.FileName, "$")
 	model.OldFileUrl = strings.Trim(model.OldFileUrl, "$")
 	model.OldFileName = strings.Trim(model.OldFileName, "$")
+
+	var supplierfile supplierfile.OilSupplierFile
+	svc.GetEntityByIdBytbl(OilSupplierFileName, model.Id, &supplierfile)
+	if supplierfile.FileUrl == "" {
+		//区别 更新前和更新后文件
+		supplierfile.FileUrl = strings.Trim(model.FileUrl, "$")
+		supplierfile.FileName = strings.Trim(model.FileName, "$")
+		supplierfile.EffectDate = model.EffectDate
+	}
+	supplierfile.ModifiedOn = time.Now()
+	supplierfile.ModifiedUserId, _ = strconv.Atoi(this.User.Id)
+	supplierfile.ModifiedBy = this.User.Realname
+	supplierfile.OtherRemark = model.Remark
+	svc.UpdateEntityBywheretbl(OilSupplierFileName, &supplierfile, []string{"EffectDate", "FileUrl", "FileName", "ModifiedOn", "ModifiedUserId", "ModifiedBy", "OtherRemark"}, "Id = " + strconv.Itoa(model.Id))
+
+
 	var err error
 	var entity annualaudit.OilAnnualChangeDetail
 	var qualdetaimodel []annualaudit.OilAnnualChangeDetail
@@ -1858,6 +1879,30 @@ func (this *AnnualAuditController) DeleteAddFile() {
 
 	svc := infochange.GetInfoChangeService(utils.DBE)
 
+	var file supplierfile.OilSupplierFile
+	has1 := svc.GetEntity(&file, "Id=" + Id)
+	if !has1 {
+		errinfo.Message = "删除失败"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	// 如果有正在进行中的流程,不允许删除任何资质
+	var certList []suppliercert.OilSupplierCert
+	svc.GetEntitysByWhere(OilSupplierCertName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &certList)
+	var appendList suppliercertappend.OilSupplierCertAppend
+	svc.GetEntityByWhere(OilSupplierCertAppendName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &appendList)
+	var infoList infochange.OilInfoChange
+	svc.GetEntityByWhere(OilInfoChangeName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &infoList)
+	if len(certList) > 0 || appendList.Id > 0 || infoList.Id > 0 {
+		errinfo.Message = "有正在审核中的流程,不允许删除任何资质"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
 	where := "FileId=" + Id
 	err := svc.DeleteEntityBytbl(OilAnnualChangeDetailName, where)
 
@@ -1906,7 +1951,7 @@ func (this *AnnualAuditController) AddAppChange() {
 	svc.GetEntityByWhere(BaseTableHeader, where1, &tableHeader)
 
 	if has {
-		errinfo.Message = "操作失败！该资质已添加或正在参与其他流程审核"
+		errinfo.Message = "操作失败！该资质已添加"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
@@ -1922,6 +1967,10 @@ func (this *AnnualAuditController) AddAppChange() {
 	file.CreateOn = time.Now()
 	file.CreateUserId, _ = strconv.Atoi(this.User.Id)
 	file.CreateBy = this.User.Realname
+	file.FileUrl = strings.Trim(model.FileUrl, "$")
+	file.FileName = strings.Trim(model.FileName, "$")
+	file.EffectDate = model.EffectDate
+	file.OtherRemark = model.Remark
 
 	svc.InsertEntity(&file)
 

src/dashoo.cn/backend/api/controllers/oilsupplier/infochange.go

@@ -7,6 +7,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierlog"
@@ -825,6 +826,20 @@ func (this *InfoChangeController) DelFile() {
 		this.ServeJSON()
 		return
 	}
+	// 如果有正在进行中的流程,不允许删除任何资质
+	var certList []suppliercert.OilSupplierCert
+	svc.GetEntitysByWhere(OilSupplierCertName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &certList)
+	var appendList suppliercertappend.OilSupplierCertAppend
+	svc.GetEntityByWhere(OilSupplierCertAppendName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &appendList)
+	var annualList annualaudit.OilAnnualAudit
+	svc.GetEntityByWhere(OilAnnualAuditName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &annualList)
+	if len(certList) > 0 || appendList.Id > 0 || annualList.Id > 0 {
+		errinfo.Message = "有正在审核中的流程,不允许删除任何资质"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
 
 	// 之前的资质改状态， 新增资质删除
 	var err error

src/dashoo.cn/backend/api/controllers/oilsupplier/qualchange.go

@@ -200,7 +200,6 @@ func (this *QualChangeController) FileList() {
 		}
 	}
 	SupplierId := this.GetString("SupplierId")
-	SupType := this.GetString("SupType")
 	MInfoId := this.GetString("MInfoId")
 	if SupplierId != "" {
 		where = where + " and a.SupplierId = '" + SupplierId + "'"
@@ -209,10 +208,7 @@ func (this *QualChangeController) FileList() {
 	if SupplierTypeCode != "" {
 		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
 	}
-	if SupType != "" {
-		// 信息变更不获取增项和年审 审核中的资质文件,一个资质只能参与一个流程
-		where = where + " and a.SupType in (0,1,3,4,5)"
-	}
+
 	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where, MInfoId)
 	var datainfo DataInfo
 	datainfo.Items = list
@@ -277,7 +273,7 @@ func (this *QualChangeController) AuditFileList() {
 	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	if SupplierTypeCode != "" {
-		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "') and a.SupType in (0,1,3,4,5)"
+		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
 	}
 	//where = where + " and (b.FileUrl != '' OR a.IsDelete = 1)"
 	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where, MInfoId)
@@ -510,6 +506,21 @@ func (this *QualChangeController) EditQualChange() {
 	model.FileName = strings.Trim(model.FileName, "$")
 	model.OldFileUrl = strings.Trim(model.OldFileUrl, "$")
 	model.OldFileName = strings.Trim(model.OldFileName, "$")
+
+	var supplierfile supplierfile.OilSupplierFile
+	svc.GetEntityByIdBytbl(OilSupplierFileName, model.Id, &supplierfile)
+	if supplierfile.FileUrl == "" {
+		//区别 更新前和更新后文件
+		supplierfile.FileUrl = strings.Trim(model.FileUrl, "$")
+		supplierfile.FileName = strings.Trim(model.FileName, "$")
+		supplierfile.EffectDate = model.EffectDate
+	}
+	supplierfile.ModifiedOn = time.Now()
+	supplierfile.ModifiedUserId, _ = strconv.Atoi(this.User.Id)
+	supplierfile.ModifiedBy = this.User.Realname
+	supplierfile.OtherRemark = model.Remark
+	svc.UpdateEntityBywheretbl(OilSupplierFileName, &supplierfile, []string{"EffectDate", "FileUrl", "FileName", "ModifiedOn", "ModifiedUserId", "ModifiedBy", "OtherRemark"}, "Id = " + strconv.Itoa(model.Id))
+
 	var err error
 	var entity qualchange.OilQualChangeDetail
 	var qualdetaimodel []qualchange.OilQualChangeDetail
@@ -580,7 +591,7 @@ func (this *QualChangeController) AddQualChange() {
 	svc.GetEntityByWhere(BaseTableHeader, where1, &tableHeader)
 
 	if has {
-		errinfo.Message = "操作失败！该资质已添加或正在参与其他流程审核"
+		errinfo.Message = "操作失败！该资质已添加!"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
@@ -596,6 +607,10 @@ func (this *QualChangeController) AddQualChange() {
 	supplierfile.CreateOn = time.Now()
 	supplierfile.CreateUserId, _ = strconv.Atoi(this.User.Id)
 	supplierfile.CreateBy = this.User.Realname
+	supplierfile.FileUrl = strings.Trim(model.FileUrl, "$")
+	supplierfile.FileName = strings.Trim(model.FileName, "$")
+	supplierfile.EffectDate = model.EffectDate
+	supplierfile.OtherRemark = model.Remark
 
 	svc.InsertEntity(&supplierfile)
 

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -2924,7 +2924,7 @@ func (this *OilSupplierController) CheckSupplierFile() {
 	var supplierCertEntity []suppliercert.OilSupplierCert
 	// 查询出已有哪些资质
 	var tableheaderList []qualchange.OilQualChangeDetail1
-	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId) + " and SupType in (0,1,3,4,5)"
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId)
 	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string
@@ -3034,15 +3034,6 @@ func (this *OilSupplierController) CheckSupplierFile() {
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
 				return
-			} else {
-				if filelist2.FileName == "" && fileist1.FileName == "" {
-					//缺少的资质
-					errinfo.Message = "请上传！" + needHeader.FileName + "! 详情请点击检查资质按钮查看!"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-					return
-				}
 			}
 		}
 	}
@@ -3071,7 +3062,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 
 	// 查询出已有哪些资质
 	var tableheaderList []qualchange.OilQualChangeDetail1
-	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId) + " and SupType in (0,1,2,3,5)"
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId)
 	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string
@@ -3426,14 +3417,14 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 
 	// 查询出已有哪些资质
 	var tableheaderList []qualchange.OilQualChangeDetail1
-	whereInfoFile := ""
-	if file.CertId == "0" {
-		// 信息变更 不获取 增项和年审审核中的数据
-		whereInfoFile = " and SupType in (0,1,3,4,5)"
-	} else {
-		whereInfoFile = " and SupType in (0,1,2,3,5)"
-	}
-	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId) + whereInfoFile
+	//whereInfoFile := ""
+	//if file.CertId == "0" {
+	//	// 信息变更 不获取 增项和年审审核中的数据
+	//	whereInfoFile = " and SupType in (0,1,3,4,5)"
+	//} else {
+	//	whereInfoFile = " and SupType in (0,1,2,3,5)"
+	//}
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId)
 	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -4,6 +4,7 @@ import (
 	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/auditsetting"
 	msg2 "dashoo.cn/backend/api/business/msg"
+	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/oilcostmanage"
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
@@ -1801,7 +1802,7 @@ func (this *OilSupplierCertAppendController) AddAppChange() {
 	svc.GetEntityByWhere(BaseTableHeader, where1, &tableHeader)
 
 	if has {
-		errinfo.Message = "操作失败！该资质已添加或正在参与其他流程审核"
+		errinfo.Message = "操作失败！该资质已添加"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
@@ -1817,6 +1818,10 @@ func (this *OilSupplierCertAppendController) AddAppChange() {
 	supplierfile.CreateOn = time.Now()
 	supplierfile.CreateUserId, _ = strconv.Atoi(this.User.Id)
 	supplierfile.CreateBy = this.User.Realname
+	supplierfile.FileUrl = strings.Trim(model.FileUrl, "$")
+	supplierfile.FileName = strings.Trim(model.FileName, "$")
+	supplierfile.EffectDate = model.EffectDate
+	supplierfile.OtherRemark = model.Remark
 
 	svc.InsertEntity(&supplierfile)
 
@@ -1870,6 +1875,30 @@ func (this *OilSupplierCertAppendController) DeleteNewFile() {
 
 	svc := infochange.GetInfoChangeService(utils.DBE)
 
+	var file supplierfile.OilSupplierFile
+	has1 := svc.GetEntity(&file, "Id=" + Id)
+	if !has1 {
+		errinfo.Message = "删除失败"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	// 如果有正在进行中的流程,不允许删除任何资质
+	var certList []suppliercert.OilSupplierCert
+	svc.GetEntitysByWhere(OilSupplierCertName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &certList)
+	var annualList annualaudit.OilAnnualAudit
+	svc.GetEntityByWhere(OilAnnualAuditName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &annualList)
+	var infoList infochange.OilInfoChange
+	svc.GetEntityByWhere(OilInfoChangeName, "Status > 0 and Status < 8 and SupplierId = " + strconv.Itoa(file.SupplierId), &infoList)
+	if len(certList) > 0 || annualList.Id > 0 || infoList.Id > 0 {
+		errinfo.Message = "有正在审核中的流程,不允许删除任何资质"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
 	where := "FileId=" + Id
 	err := svc.DeleteEntityBytbl(OilAppendChangeDetailName, where)
 

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappendsub.go

@@ -1034,7 +1034,7 @@ func (this *OilSupplierCertAppendSubController) FileList() {
 	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	if SupplierTypeCode != "" {
-		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "') and a.SupType in (0,1,2,3,5)"
+		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
 	}
 	total := svc.GetQualPagingEntities(OilSupplierFileName, OilAppendChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where, MInfoId)
 	var datainfo DataInfo
@@ -1067,6 +1067,21 @@ func (this *OilSupplierCertAppendSubController) EditQualChange() {
 	model.FileName = strings.Trim(model.FileName, "$")
 	model.OldFileUrl = strings.Trim(model.OldFileUrl, "$")
 	model.OldFileName = strings.Trim(model.OldFileName, "$")
+
+	var supplierfile supplierfile.OilSupplierFile
+	svc.GetEntityByIdBytbl(OilSupplierFileName, model.Id, &supplierfile)
+	if supplierfile.FileUrl == "" {
+		//区别 更新前和更新后文件
+		supplierfile.FileUrl = strings.Trim(model.FileUrl, "$")
+		supplierfile.FileName = strings.Trim(model.FileName, "$")
+		supplierfile.EffectDate = model.EffectDate
+	}
+	supplierfile.ModifiedOn = time.Now()
+	supplierfile.ModifiedUserId, _ = strconv.Atoi(this.User.Id)
+	supplierfile.ModifiedBy = this.User.Realname
+	supplierfile.OtherRemark = model.Remark
+	svc.UpdateEntityBywheretbl(OilSupplierFileName, &supplierfile, []string{"EffectDate", "FileUrl", "FileName", "ModifiedOn", "ModifiedUserId", "ModifiedBy", "OtherRemark"}, "Id = " + strconv.Itoa(model.Id))
+
 	var err error
 	var entity suppliercertappendsub.OilAppendChangeDetail
 	var qualdetaimodel []suppliercertappendsub.OilAppendChangeDetail

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -2556,7 +2556,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -65,6 +65,8 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="供应商类型">
                     <el-select ref="OperType"
@@ -113,7 +115,8 @@
                 <!--</el-select>-->
                 <!--</el-form-item>-->
                 <!--</el-col>-->
-
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="中石油准入证编号">
                     <el-input v-model="supplierData.PACNumber"
@@ -153,7 +156,8 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="三证合一">
                     <el-select v-model="supplierData.CredentialFlag" placeholder="请选择" @change="showorhid" style="width: 100%" :disabled="formData.Status > 0"
@@ -2725,7 +2729,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -2542,7 +2542,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -2952,7 +2952,7 @@ export default {
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -2647,7 +2647,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -671,9 +671,9 @@
                         </div>
                         </viewer>
                       </el-col>
-                    <el-col :span="4" v-if="scope.row.FileUrl != '' && Status <= 0 ">
-                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                    </el-col>
+<!--                    <el-col :span="4" v-if="scope.row.FileUrl != '' && Status <= 0 ">-->
+<!--                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                    </el-col>-->
                     </el-row>
 
                   <!-- <el-row align="middle">
@@ -3451,7 +3451,7 @@ import Viewer from 'v-viewer'
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -836,9 +836,9 @@
                       </div>
                       </viewer>
                     </el-col>
-                    <el-col :span="4" v-if="scope.row.FileUrl != '' && Status <= 0 ">
-                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                    </el-col>
+<!--                    <el-col :span="4" v-if="scope.row.FileUrl != '' && Status <= 0 ">-->
+<!--                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                    </el-col>-->
                   </el-row>
 
 
@@ -3668,7 +3668,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -598,9 +598,9 @@
                         </div>
                         </viewer>
                       </el-col>
-                     <el-col :span="4" v-if="scope.row.FileUrl != '' && Status <= 0 ">
-                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                    </el-col>
+<!--                     <el-col :span="4" v-if="scope.row.FileUrl != '' && Status <= 0 ">-->
+<!--                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                    </el-col>-->
                     </el-row>
 
 
@@ -3424,7 +3424,7 @@ import Viewer from 'v-viewer'
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -2679,7 +2679,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -2460,7 +2460,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -842,7 +842,7 @@
                   <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)"
                     :disabled="InfoStatus > 0 || butnab">
                     变更</el-button>
-                  <el-button type="danger" plain size="mini" title="文件变更" @click="delFile(scope.row)"
+                  <el-button type="danger" plain size="mini" title="删除" @click="delFile(scope.row)"
                              :disabled="InfoStatus > 0 || butnab">
                     删除</el-button>
                 </template>
@@ -902,9 +902,9 @@
                         </div>
                         </viewer>
                       </el-col>
-<!--                      <el-col :span="4" v-if="scope.row.FileUrl != ''">-->
-<!--                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
-<!--                    </el-col>-->
+<!--                      <el-col :span="4" v-if="scope.row.FileUrl != '' && checkFileUrl(scope.row.FileUrl)">-->
+<!--                        <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                      </el-col>-->
                     </el-row>
 
 
@@ -958,7 +958,7 @@
                   <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)"
                              :disabled="InfoStatus > 0 || butnab">
                     变更</el-button>
-                  <el-button type="danger" plain size="mini" title="文件变更" @click="delFile(scope.row)"
+                  <el-button type="danger" plain size="mini" title="删除" @click="delFile(scope.row)"
                              :disabled="InfoStatus > 0 || butnab">
                     删除</el-button>
                 </template>
@@ -1074,7 +1074,7 @@
                   <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)"
                     :disabled="InfoStatus > 0 || butnab">
                     变更</el-button>
-                  <el-button type="danger" plain size="mini" title="文件变更" @click="delFile(scope.row)"
+                  <el-button type="danger" plain size="mini" title="删除" @click="delFile(scope.row)"
                              :disabled="InfoStatus > 0 || butnab">
                     删除</el-button>
                 </template>
@@ -1137,7 +1137,7 @@
                         </viewer>
                       </el-col>
 <!--                     <el-col :span="4" v-if="scope.row.FileUrl != ''">-->
-<!--                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                      <i class="jstimehandle" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
 <!--                    </el-col>-->
                     </el-row>
 
@@ -2362,6 +2362,14 @@
       },
       iblur () {
 
+      },
+      checkFileUrl (urlString) {
+        let urlArr = urlString.split('$')
+        if (urlArr.length > 1 ) {
+          return true
+        } else {
+          return false
+        }
       },
       iconclear (row) {
         this.$confirm('该操作将删除新上传的资质，是否继续？', '提示', {
@@ -3694,7 +3702,7 @@
         }
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return ''
         } else if (val === '0001-01-01T00:00:00Z') {
           return ''

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -3623,7 +3623,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -4037,7 +4037,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -3668,7 +3668,7 @@
         return remark
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T08:05:43+08:05') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
           return '----'