信息变更 增项

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

@@ -146,7 +146,7 @@ func (s *QualChangeService) SubmitOrgAudit(workflowid, certId, annualId, wfName,
 	return processInstanceId
 }
 
-func (s *QualChangeService) GetQualPagingEntities(FileName, qualChangeName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where string) (total int64) {
+func (s *QualChangeService) GetQualPagingEntities(FileName, qualChangeName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where, MInfoId string) (total int64) {
 	var resultsSlice []map[string][]byte
 
 	//获取总记录数
@@ -160,7 +160,11 @@ func (s *QualChangeService) GetQualPagingEntities(FileName, qualChangeName strin
 	sql += ` a.EffectDate OldEffectDate, a.FileUrl OldFileUrl, a.FileName OldFileName, `
 	sql += ` b.EffectDate EffectDate, b.FileUrl FileUrl, b.FileName FileName, b.ParentId `
 	sql += ` from ` + FileName + ` a `
-	sql += ` left join ` + qualChangeName + " b on b.FileId = a.Id"
+	if MInfoId != "" {
+		sql += ` left join ` + qualChangeName + " b on b.FileId = a.Id AND b.ParentId =" + MInfoId
+	} else {
+		sql += ` left join ` + qualChangeName + " b on b.FileId = a.Id"
+	}
 	sql += ` where ` + where
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `

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

@@ -202,6 +202,7 @@ type OilSupplierView struct {
 	OutsideFlog       string    `xorm:"comment('境外项目') VARCHAR(255)"`
 	ThirdAudit        string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	IsRestrict        int       `xorm:"INT(11)"`
 	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`
 	BusinessKey       string    `xorm:"VARCHAR(255)"`
 	AuditIndex        int       `xorm:"INT(10)"`

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -39,7 +39,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 	sql += ` b.DesignerTotal, `
 	sql += ` b.SkillerTotal, `
 	sql += ` b.Status, `
-	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark`
+	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark,b.IsRestrict`
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
 	sql += ` where ` + where

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -50,6 +50,7 @@ type OilSupplierCert struct {
 	DesignerTotal     int       `xorm:"default 0 comment('设计人员总数') INT(10)"`
 	SkillerTotal      int       `xorm:"default 0 comment('技术工人总数') INT(10)"`
 	IsPay             int       `xorm:"default 0 comment('是否交费 0 未交费 1 已交费 2 不需要交费') INT(11)"`
+	IsRestrict        int       `xorm:"default 0 comment('是否限制增项申请 0 否 1 是') INT(11)"`
 	WorkflowId        string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
 	ProcessKey        string    `xorm:"default '0' comment('工作流的名称') VARCHAR(255)"`
 	FirstAudit        int       `xorm:"default 0 comment('初审') INT(10)"`
@@ -116,6 +117,7 @@ type Del_OilSupplierCert struct {
 	DesignerTotal     int       `xorm:"default 0 comment('设计人员总数') INT(10)"`
 	SkillerTotal      int       `xorm:"default 0 comment('技术工人总数') INT(10)"`
 	IsPay             int       `xorm:"default 0 comment('是否交费 0 未交费 1 已交费 2 不需要交费') INT(11)"`
+	IsRestrict        int       `xorm:"default 0 comment('是否限制增项申请 0 否 1 是') INT(11)"`
 	WorkflowId        string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
 	ProcessKey        string    `xorm:"default '0' comment('工作流的名称') VARCHAR(255)"`
 	FirstAudit        int       `xorm:"default 0 comment('初审') INT(10)"`

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

@@ -705,6 +705,55 @@ func (this *InfoChangeController) DeleteEntity() {
 	}
 }
 
+
+// @Title 删除信息变更
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /delinfochangech/:Id [delete]
+func (this *InfoChangeController) DelInfoChangech() {
+	Id := this.Ctx.Input.Param(":Id")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	var infoChange infochange.OilInfoChange
+	where := "Id=" + Id + " and Status <= '0'"
+	has1 := svc.GetEntity(infoChange, where)
+ 	if !has1 {
+		errinfo.Message = "删除失败"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	where = "ParentId=" + Id
+	svc.DeleteEntityBytbl(OilQualChangeDetailName, where)
+	where = "InfoId=" + Id
+	svc.DeleteEntityBytbl(OilInfoChangeItemName, where)
+	where = "Id=" + Id
+	err := svc.DeleteEntityBytbl(OilInfoChangeName, where)
+
+	if err == nil {
+		errinfo.Message = "删除成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 // @Title 添加
 // @Description 新增
 // @Success	200	{object} controllers.Request

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

@@ -188,7 +188,7 @@ func (this *QualChangeController) FileList() {
 	var list []qualchange.OilQualChangeDetail
 	svc := qualchange.GetQualChangeService(utils.DBE)
 	where := " 1=1"
-	orderby := "a.SupplierTypeCode"
+	orderby := "a.Id"
 	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
@@ -199,14 +199,15 @@ func (this *QualChangeController) FileList() {
 		}
 	}
 	SupplierId := this.GetString("SupplierId")
+	MInfoId := this.GetString("MInfoId")
 	if SupplierId != "" {
 		where = where + " and a.SupplierId = '" + SupplierId + "'"
 	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	if SupplierTypeCode != "" {
-		where = where + " and a.SupplierTypeCode in ( '000', " + SupplierTypeCode + ")"
+		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
 	}
-	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where, MInfoId)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
@@ -272,7 +273,7 @@ func (this *QualChangeController) AuditFileList() {
 		where = where + " and a.SupplierTypeCode in ( '000', " + SupplierTypeCode + ")"
 	}
 	where = where + " and b.FileUrl != ''"
-	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where, "")
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
@@ -514,7 +515,7 @@ func (this *QualChangeController) EditQualChange() {
 	mainentirt.Step = 1
 	err = svc.UpdateEntityBywheretbl(OilQualChangeMainName, &mainentirt, []string{"SupplierCertId", "Status", "Step"}, qmwhere)
 
-	qdwhere := " SupplierId = " + utils.ToStr(model.SupplierId) + " and FileId = "+ utils.ToStr(model.Id)
+	qdwhere := " SupplierId = " + utils.ToStr(model.SupplierId) + " and FileId = " + utils.ToStr(model.Id) + " and ParentId=" + id
 	svc.GetEntitysByWhere(OilQualChangeDetailName, qdwhere, &qualdetaimodel)
 	entity = model
 	entity.Id = 0
@@ -526,7 +527,7 @@ func (this *QualChangeController) EditQualChange() {
 		entity.CreateBy = this.User.Realname
 		entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 		_, err = svc.InsertEntityBytbl(OilQualChangeDetailName, &entity)
-	}else {
+	} else {
 		err = svc.UpdateEntityBywheretbl(OilQualChangeDetailName, &entity, []string{"OldEffectDate", "FileUrl", "FileName", "OtherRemark"}, qdwhere)
 	}
 
@@ -543,6 +544,83 @@ func (this *QualChangeController) EditQualChange() {
 	}
 }
 
+// @Title 添加资金
+// @Description 添加资金
+// @Success	200	{object}
+// @router /addqualchange/:id [post]
+func (this *QualChangeController) AddQualChange() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	var model qualchange.OilQualChangeDetail
+	var jsonblob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonblob, &model)
+
+	svc := qualchange.GetQualChangeService(utils.DBE)
+
+	var supplierfile supplierfile.OilSupplierFile
+
+	where := "SupplierId = '" + strconv.Itoa(model.SupplierId) + "' and NeedFileType='" + model.NeedFileType + "'"
+	has := svc.GetEntity(&supplierfile, where)
+
+	if has {
+		errinfo.Message = "操作失败！不能重复添加"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	supplierfile.SupplierId = model.SupplierId
+	supplierfile.SupplierTypeCode = model.SupplierTypeCode
+	supplierfile.IsManuf = ""
+	supplierfile.NeedFileType = model.NeedFileType
+	supplierfile.FileType = 1
+	supplierfile.SupType = 4
+	supplierfile.CreateOn = time.Now()
+	supplierfile.CreateUserId, _ = strconv.Atoi(this.User.Id)
+	supplierfile.CreateBy = this.User.Realname
+
+	svc.InsertEntity(&supplierfile)
+
+	model.ParentId, _ = strconv.Atoi(id)
+	model.FileId = supplierfile.Id
+	model.FileUrl = strings.Trim(model.FileUrl, "$")
+	model.FileName = strings.Trim(model.FileName, "$")
+
+	var err error
+	var qualdetaimodel []qualchange.OilQualChangeDetail
+
+	qdwhere := " SupplierId = " + utils.ToStr(model.SupplierId) + " and FileId = " + utils.ToStr(supplierfile.Id) + " and ParentId=" + id
+	svc.GetEntitysByWhere(OilQualChangeDetailName, qdwhere, &qualdetaimodel)
+	if len(qualdetaimodel) == 0 {
+		model.CreateOn = time.Now()
+		model.CreateBy = this.User.Realname
+		model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+		_, err = svc.InsertEntityBytbl(OilQualChangeDetailName, &model)
+	} else {
+		err = svc.UpdateEntityBywheretbl(OilQualChangeDetailName, &model, []string{"OldEffectDate", "FileUrl", "FileName", "OtherRemark"}, qdwhere)
+	}
+
+	if err == nil {
+		errinfo.Message = "操作成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 // @Title 提交审批
 // @Description 提交审批
 // @Success	200	{object} controllers.Request
@@ -650,11 +728,11 @@ func (this *QualChangeController) AuditEntity() {
 // @router /qualaudit [post]
 func (this *QualChangeController) QualAudit() {
 	svc := qualchange.GetQualChangeService(utils.DBE)
-	var jsonblob= this.Ctx.Input.RequestBody
+	var jsonblob = this.Ctx.Input.RequestBody
 	var dataother QualShenHeModel
 	json.Unmarshal(jsonblob, &dataother)
 	//取出审批列表
-	var qualid= dataother.QualId
+	var qualid = dataother.QualId
 	var qualmodel qualchange.OilQualChangeMain
 	svc.GetEntityById(utils.ToStr(dataother.QualId), &qualmodel)
 	var qualdetail []qualchange.OilQualChangeDetail
@@ -827,4 +905,4 @@ func (this *QualChangeController) QualAudit() {
 			}
 		}
 	}
-}
+}

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

@@ -1460,7 +1460,7 @@ func (this *OilSupplierController) GetEntityAndCert() {
 
 	var sql string
 	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.Step, b.WorkerTotal, b.ContractNum, b.UniversityNum, b.TechnicalNum, b.AboveProfNum, b.InFlag, b.ApplyTime,
-         b.MiddleProfNum, b.NationalRegNum, b.NationalCertTotal, b.DesignerTotal, b.SkillerTotal, b.InStyle, b.WorkflowId, b.Status, b.ThirdAudit, b.BusinessKey, b.AuditIndex ,b.ProcessKey from ` + OilSupplierName + ` a `
+         b.MiddleProfNum, b.NationalRegNum, b.NationalCertTotal, b.DesignerTotal, b.SkillerTotal, b.InStyle, b.WorkflowId, b.Status, b.ThirdAudit, b.BusinessKey, b.AuditIndex ,b.ProcessKey, b.IsRestrict from ` + OilSupplierName + ` a `
 	sql += ` left join ` + OilSupplierCertName + " b on b.SupplierId = a.Id"
 	sql += ` where b.Id ='` + Id + `'`
 	utils.DBE.SQL(sql).Get(&model)

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

@@ -336,6 +336,7 @@ func (this *OilSupplierCertController) AddEntity() {
 	svc := suppliercert.GetOilSupplierCertService(utils.DBE)
 
 	json.Unmarshal(jsonBlob, &model)
+	model.IsRestrict = 1
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -1127,7 +1128,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 
 		if receiveVal == "true" {
 			if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
-				if supplierCertEntity.InStyle == "1" &&  supplierCertEntity.IsPay == 0{
+				if supplierCertEntity.InStyle == "1" && supplierCertEntity.IsPay == 0 {
 					paysvc := paymentinfo.GetPaymentService(utils.DBE)
 					var Amount float64
 					asvc := oilcostmanage.GetOilCostManageService(utils.DBE)
@@ -1702,7 +1703,7 @@ func (this *OilSupplierCertController) SendingSMS() {
 	where := "b.InFlag = '1'"
 	svcsupp.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, 0, 0, "Id", true, &list, where)
 	currenttime := time.Now()
-    loginName := "TimingTask"
+	loginName := "TimingTask"
 	if this.User != nil {
 		loginName = this.User.Username
 	}
@@ -1746,8 +1747,8 @@ func (this *OilSupplierCertController) SendingSMSSupplierFile() {
 		for _, item := range expireFile {
 			fileName := ""
 			if utf8.RuneCountInString(item.NeedAllFile) > 50 {
-				fileName = string([]rune(item.NeedAllFile)[0: 50])
-				fileName = fileName[0: strings.LastIndex(fileName, ";")] + "等资质"
+				fileName = string([]rune(item.NeedAllFile)[0:50])
+				fileName = fileName[0:strings.LastIndex(fileName, ";")] + "等资质"
 			} else {
 				fileName = item.NeedAllFile
 			}
@@ -1784,7 +1785,7 @@ func (this *OilSupplierCertController) ChangeSupplierStatus() {
 		sert.InFlag = "2"
 		where := "SupplierId=" + strconv.Itoa(item.Id) + " AND InFlag = '1'"
 		if item.SupplierTypeCode != "000" {
-			where = where + " and SupplierTypeCode='" + item.SupplierTypeCode +"'"
+			where = where + " and SupplierTypeCode='" + item.SupplierTypeCode + "'"
 		}
 		svcsupp.UpdateEntityBywheretbl(OilSupplierCertName, &sert, cols, where)
 	}
@@ -2198,3 +2199,39 @@ func (this *OilSupplierCertController) GetApplyTimeList() {
 	this.ServeJSON()
 
 }
+
+// @Title 修改增项是否需要限制 针对企业
+// @Description 修改年审到期时间
+// @Success 200 {object} controllers.Request
+// @router /updataisrestrict/:id [post]
+func (this *OilSupplierCertController) UpdataIsRestrict() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	isRestrict := this.GetString("IsRestrict")
+	var model suppliercert.OilSupplierCert
+	svc := suppliercert.GetOilSupplierCertService(utils.DBE)
+	cols := []string{
+		"IsRestrict",
+	}
+	model.IsRestrict, _ = strconv.Atoi(isRestrict)
+	err := svc.UpdateEntityBytbl(OilSupplierCertName, id, &model, cols)
+	if err == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}

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

@@ -196,16 +196,39 @@ func (this *OilSupplierCertAppendController) AddAppend() {
 	where := " Id = "+ utils.ToStr(model.SupplierCertId)+ " and SupplierTypeCode = '"+ model.AppendType +"'"
 	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	where_app := " SupplierCertId = "+ utils.ToStr(model.SupplierCertId)+ " and SupplierId = "+ utils.ToStr(model.SupplierId)+ " and AppendType = '"+ model.AppendType +"'"
-	where_app += " and Status < 6"
-	var modeltmp suppliercertappend.OilSupplierCertAppend
-	has := svc.GetEntityByWhere(OilSupplierCertAppendName, where_app, &modeltmp)
-	if has {
-		errinfo.Message = "已提交增项申请，审批通过后才可再提交申请！"
-		errinfo.Code = -1
-		errinfo.Info = model.Id
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
+	//where_app += " and Status < 11"
+	orderby := "ApplyDate DESC"
+	var modeltmp []suppliercertappend.OilSupplierCertAppend
+	svc.GetEntitysByOrderbyWhere(OilSupplierCertAppendName, where_app, orderby, &modeltmp)
+	if len(modeltmp) > 0 {
+		status, _ := strconv.Atoi(modeltmp[0].Status)
+		if status < 11 {
+			errinfo.Message = "已提交增项申请，审批通过后才可再提交申请！"
+			errinfo.Code = -1
+			errinfo.Info = model.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
+		}
+		var cert suppliercert.OilSupplierCert
+		svc.GetEntityById(model.SupplierCertId, &cert)
+		if cert.IsRestrict == 1 {
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+			sAddLimitMonth, _ := strconv.Atoi(paramSvc.GetBaseparameterMessage("GFGL1", "paramset", "sAddLimitMonth"))
+			fmt.Println(modeltmp[0].AuditDate)
+
+			ApplyDate, _ := time.Parse("2006-01-02", modeltmp[0].ApplyDate.AddDate(0, sAddLimitMonth, 0).Format("2006-01-02"))
+			nowtime, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
+			fmt.Println(ApplyDate, nowtime)
+			if nowtime.Before(ApplyDate) {
+				errinfo.Message = "增项申请时间未到！请" + ApplyDate.Format("2006-01-02") + "日以后再来申请"
+				errinfo.Code = -1
+				errinfo.Info = model.Id
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+		}
 	}
 	svc.GetEntityByWhere(OilSupplierCertName, where, &cermodel)
 
@@ -591,6 +614,15 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
+
+	var cert suppliercert.OilSupplierCert
+	svc := suppliercert.GetOilSupplierCertService(utils.DBE)
+	colscert := []string{
+		"IsRestrict",
+	}
+	cert.IsRestrict = 1
+	svc.UpdateEntityBytbl(OilSupplierCertName, supplierCertAppendEntity.SupplierCertId, &cert, colscert)
+
 	if receiveVal == "true" {
 		if supplierCertAppendEntity.AuditIndex > 0 {
 			// 审批历史

src/dashoo.cn/backend/api/controllers/setting/paramset.go

@@ -15,7 +15,7 @@ type ParamSetController struct {
 type ParamSerModel struct {
 	IsInvestigate     bool `json:"isInvestigate"`
 	IsGetBarCode      bool `json:"isGetBarCode"`
-	SFlupFrontDay     int  `json:"sFlupFrontDay"`
+	SAddLimitMonth    string  `json:"sAddLimitMonth"`
 	SFlupLastDay      int  `json:"sFlupLastDay"`
 	STestFrontDay     int  `json:"sTestFrontDay"`
 }
@@ -60,10 +60,10 @@ func (this *ParamSetController) ParamSetPost() {
 	//}
 	//paramentitylist = append(paramentitylist, paramentity)
 	//
-	//paramentity.Parametercode = "sFlupFrontDay"
-	//sFlupFrontDay := utils.ToStr(model.SFlupFrontDay)
-	//paramentity.Parametercontent = sFlupFrontDay
-	//paramentitylist = append(paramentitylist, paramentity)
+	paramentity.Parametercode = "sAddLimitMonth"
+	sAddLimitMonth := utils.ToStr(model.SAddLimitMonth)
+	paramentity.Parametercontent = sAddLimitMonth
+	paramentitylist = append(paramentitylist, paramentity)
 	//
 	//paramentity.Parametercode = "sFlupLastDay"
 	//sFlupLastDay := utils.ToStr(model.SFlupLastDay)

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -161,13 +161,13 @@ module.exports = {
   },
   ignore: [
     'pages/oilsupplier/addtionaudit/*.*',
-    // 'pages/oilsupplier/annualaudit/*.*',
+    'pages/oilsupplier/annualaudit/*.*',
     'pages/oilsupplier/badrecord/*.*',
-    // 'pages/oilsupplier/basisbuild/*.*',
+    'pages/oilsupplier/basisbuild/*.*',
     'pages/oilsupplier/compayaudit/*.*',
-    // 'pages/oilsupplier/goodsaptitude/*.*',
+    'pages/oilsupplier/goodsaptitude/*.*',
     'pages/oilsupplier/infochange/*.*',
-    'pages/oilsupplier/infochangech/*.*',
+    // 'pages/oilsupplier/infochangech/*.*',
     // 'pages/oilsupplier/supplier/*.*',
     // 'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',

src/dashoo.cn/frontend_web/src/api/oilsupplier/infochange.js

@@ -11,7 +11,7 @@ export default {
       url: '/infochange/addsupplierlist/',
       method: 'GET'
     })
-  }, 
+  },
   getSuppList (CreateOn, params, myAxios) {
     return myAxios({
       url: '/infochange/supplist?CreateOn=' + CreateOn,
@@ -115,5 +115,11 @@ export default {
       url: '/infochange/getauditerbydept/' + deptId,
       method: 'GET'
     })
+  },
+  delInfoChangech (entityId, myAxios) {
+    return myAxios({
+      url: '/infochange/delinfochangech/' + entityId,
+      method: 'delete'
+    })
   }
 }

src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

@@ -132,5 +132,12 @@ export default {
       method: 'post',
       params: params
     })
+  },
+  updataIsRestrict (id, params, myAxios) {
+    return myAxios({
+      url: '/suppliercert/updataisrestrict/' + id,
+      method: 'post',
+      params: params
+    })
   }
 }

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

@@ -433,6 +433,7 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog('01')">添加</el-button>
             </div>
             <el-table :data="subfileList1" border>
               <el-table-column label="操作" width="150" align="center" fixed>
@@ -486,24 +487,10 @@
         </el-tab-pane>
 
         <el-tab-pane label="基建类">
-          <!--<el-card class="box-card">-->
-            <!--<el-form :model="formData">-->
-              <!--<el-col :span="8">-->
-                <!--<el-form-item label="准入编码">-->
-                  <!--<el-input v-model="AccessCardNo2" :readonly="true" placeholder="请输入" style="width: 100%">-->
-                  <!--</el-input>-->
-                <!--</el-form-item>-->
-              <!--</el-col>-->
-            <!--</el-form>-->
-            <!--<el-table :data="businessList2" border>-->
-              <!--<el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>-->
-              <!--<el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>-->
-              <!--<el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>-->
-            <!--</el-table>-->
-          <!--</el-card>-->
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog('02')">添加</el-button>
             </div>
             <el-table :data="subfileList2" border>
               <el-table-column label="操作" width="150" align="center" fixed>
@@ -511,6 +498,9 @@
                   <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)"
                     :disabled="InfoStatus > 0 || butnab">
                     变更</el-button>
+                  <el-button type="primary" plain size="mini" title="文件变更" @click="delFile(scope.row)"
+                             :disabled="InfoStatus > 0 || butnab">
+                    删除</el-button>
                 </template>
               </el-table-column>
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
@@ -545,24 +535,10 @@
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="技术服务类">
-          <!--<el-card class="box-card">-->
-            <!--<el-form :model="formData">-->
-              <!--<el-col :span="8">-->
-                <!--<el-form-item label="准入编码">-->
-                  <!--<el-input v-model="AccessCardNo3" :readonly="true" placeholder="请输入" style="width: 100%">-->
-                  <!--</el-input>-->
-                <!--</el-form-item>-->
-              <!--</el-col>-->
-            <!--</el-form>-->
-            <!--<el-table :data="businessList3" border>-->
-              <!--<el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>-->
-              <!--<el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>-->
-              <!--<el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>-->
-            <!--</el-table>-->
-          <!--</el-card>-->
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog('03')">添加</el-button>
             </div>
             <el-table :data="subfileList3" border>
               <el-table-column label="操作" width="150" align="center" fixed>
@@ -606,20 +582,18 @@
       </el-tabs>
     </el-card>
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">
-      <el-form :model="SubfileForm" label-width="100px">
+      <el-form ref="subfileForm" :model="SubfileForm" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="资质文件">
-              <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
-                :http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload">
-                <i class="el-icon-plus attach-uploader-icon"></i>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType !=yasuoname">大小为512KB-5MB
-                </div>
-              </el-upload>
+            <el-form-item label="资质名称" prop="NeedFileType">
+              <el-select v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" :disabled="IsMust">
+                <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有效日期" required>
+            <el-form-item label="有效日期" prop="EffectDate">
               <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
               </el-date-picker>
             </el-form-item>
@@ -629,6 +603,17 @@
               <el-input v-model="SubfileForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="资质文件">
+              <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
+                         :http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload">
+                <i class="el-icon-plus attach-uploader-icon"></i>
+                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType !=yasuoname">大小为512KB-5MB
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
@@ -743,6 +728,7 @@
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import fileapi from '@/api/oilsupplier/supplierfile'
   import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
+  import setapi from '@/api/oilsupplier/oilclassorgset'
   export default {
     components: {
       WfMultiHistory,
@@ -864,6 +850,7 @@
         }
       }
       return {
+        IsMust: false,
         Grade: '',
         size: 10,
         sizeProject: 10,
@@ -877,6 +864,7 @@
         userOptions: [],
         waituploads: [], // 等待上传的附件列表
         AccessCardNolist: [],
+        dynamicTableColumns: [],
         AccessCardNo1: '',
         AccessCardNo2: '',
         AccessCardNo3: '',
@@ -1277,12 +1265,20 @@
             message: '用户名',
             trigger: 'blur'
           }]
+        },
+        rules: {
+          NeedFileType: [
+            {required: true, message: '资质名称不能为空', trigger: 'blur'}
+          ],
+          EffectDate:
+            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
         }
       }
     },
     created () {
       this.serviceId = this.$route.params.opera
       this.supplierId = this.serviceId
+      console.log(this.supplierId, this.serviceId)
       this.InfoStatus = this.$route.query.InfoStatus
       this.MInfoId = this.$route.query.infoId + ''
       this.backhistroy.certId = this.MInfoId
@@ -1296,9 +1292,20 @@
       // this.getbusList3()
       this.getsubfile3()
       this.getFileDictOptions()
+      this.initTableHeader()
       // this.getAccessCardNo()
     },
     methods: {
+      delFile (row) {
+        this.$confirm('此操作将彻底删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+          })
+          .catch(() => {})
+      },
       SubpEntity () {
         if (this.UnitOrg === '') {
           this.$message({
@@ -1420,6 +1427,7 @@
         const params = {
           SupplierId: this.supplierId,
           SupplierTypeCode: '01',
+          MInfoId: this.MInfoId,
           _currentPage: this.currentPageProject,
           _size: this.sizeProject
         }
@@ -1463,6 +1471,7 @@
         const params = {
           SupplierId: this.supplierId,
           SupplierTypeCode: '02',
+          MInfoId: this.MInfoId,
           _currentPage: 1,
           _size: 1000
         }
@@ -1506,6 +1515,7 @@
         const params = {
           SupplierId: this.supplierId,
           SupplierTypeCode: '03',
+          MInfoId: this.MInfoId,
           _currentPage: 1,
           _size: 1000
         }
@@ -1797,26 +1807,93 @@
           }
         })
       },
-      // 保存修改
       makesure () {
-        if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
-          // 上传附件是否完成判断
-          if (!this.attachissuccess()) {
-            this.$message.error('有附件未成功上传！不能保存数据')
-            return
+        let _this = this
+        _this.$refs['subfileForm'].validate((valid) => {
+          if (valid) {
+            if (_this.Title === '新增文件') {
+              if (_this.$refs.refuploadattach.uploadFiles && _this.$refs.refuploadattach.uploadFiles.length > 0) {
+                // 上传附件是否完成判断
+                if (!_this.attachissuccess()) {
+                  _this.$message.error('有附件未成功上传！不能保存数据')
+                  return
+                }
+                console.log(_this.SubfileForm, '===============')
+                _this.getattachissuccess()
+                _this.addqualchange()
+              } else {
+                _this.$message({
+                  type: 'warning',
+                  message: '请上传文件！'
+                })
+              }
+            } else if (_this.Title === '资质变更') {
+              if (_this.$refs.refuploadattach.uploadFiles && _this.$refs.refuploadattach.uploadFiles.length > 0) {
+                // 上传附件是否完成判断
+                if (!_this.attachissuccess()) {
+                  _this.$message.error('有附件未成功上传！不能保存数据')
+                  return
+                }
+                _this.getattachissuccess()
+                _this.editqualchange()
+              } else {
+                _this.$message({
+                  type: 'warning',
+                  message: '请上传文件！'
+                })
+              }
+            }
           }
-          this.getattachissuccess()
-          this.editqualchange()
-        } else {
-          this.editqualchange()
-        }
+        })
+      },
+      // // 保存修改
+      // makesure () {
+      //   if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+      //     // 上传附件是否完成判断
+      //     if (!this.attachissuccess()) {
+      //       this.$message.error('有附件未成功上传！不能保存数据')
+      //       return
+      //     }
+      //     this.getattachissuccess()
+      //     this.editqualchange()
+      //   } else {
+      //     this.editqualchange()
+      //   }
+      // },
+      addqualchange () {
+        let _this = this
+        _this.SubfileForm.SupplierId = parseInt(_this.SubfileForm.SupplierId)
+        _this.SubfileForm.SupplierCertSubId = parseInt(_this.SubfileForm.SupplierCertSubId)
+        _this.SubfileForm.SupplierCertId = parseInt(_this.SupplierCertId)
+        _this.$axios.post('/qualchange/addqualchange/' + this.MInfoId, _this.SubfileForm)
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+              this.visible = false
+              this.getsubfile1()
+              this.getsubfile2()
+              this.getsubfile3()
+              this.$refs.refuploadattach.uploadFiles = []
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
       },
       editqualchange () {
         let _this = this
         _this.SubfileForm.SupplierId = parseInt(_this.SubfileForm.SupplierId)
         _this.SubfileForm.SupplierCertSubId = parseInt(_this.SubfileForm.SupplierCertSubId)
         _this.SubfileForm.SupplierCertId = parseInt(_this.SupplierCertId)
-        _this.$axios.put('/qualchange/editqualchange/' + _this.QualId, _this.SubfileForm)
+        _this.$axios.put('/qualchange/editqualchange/' + _this.MInfoId, _this.SubfileForm)
           .then(res => {
             if (res.data.code === 0) {
               _this.$message({
@@ -1825,8 +1902,8 @@
               })
               this.visible = false
               this.getsubfile1()
-              // this.getsubfile2()
-              // this.getsubfile3()
+              this.getsubfile2()
+              this.getsubfile3()
               this.$refs.refuploadattach.uploadFiles = []
             } else {
               _this.$message({
@@ -1839,7 +1916,49 @@
             console.error(err)
           })
       },
+      initTableHeader (code) {
+        if (code === '01') {
+          setapi.initGoodTableHeader(this.$axios).then(res => {
+            this.dynamicTableColumns = res.data.items
+          })
+        } else if (code === '02') {
+          setapi.initBbTableHeader(this.$axios).then(res => {
+            this.dynamicTableColumns = res.data.items
+          })
+        } else {
+          setapi.initTsTableHeader(this.$axios).then(res => {
+            this.dynamicTableColumns = res.data.items
+          })
+        }
+        console.log(this.dynamicTableColumns, 'this.dynamicTableColumns')
+      },
+      showDialog (code) {
+        this.initTableHeader(code)
+        this.IsMust = false
+        this.Title = '新增文件'
+        this.SubfileForm.Id = ''
+        this.SubfileForm.SupplierId = this.supplierId
+        this.SubfileForm.SupplierTypeCode = code
+        this.SubfileForm.SupplierCertSubId = ''
+        this.SubfileForm.CertSubName = ''
+        this.SubfileForm.NeedFileType = ''
+        this.SubfileForm.NeedFileCode = ''
+        this.SubfileForm.FileExt = ''
+        this.SubfileForm.FileType = ''
+        this.SubfileForm.FileName = ''
+        this.SubfileForm.EffectDate = null
+        this.SubfileForm.FileUrl = ''
+        this.SubfileForm.OtherRemark = ''
+        this.SubfileForm.Remark = ''
+        this.SubfileForm.IsDelete = 0
+        this.SubfileForm.OldFileName = ''
+        this.SubfileForm.OldEffectDate = null
+        this.SubfileForm.OldFileUrl = ''
+        console.log(this.SubfileForm, 'this.SubfileForm')
+        this.visible = true
+      },
       openDialog (val) {
+        this.IsMust = true
         this.Title = '资质变更'
         this.waituploads = []
         this.SubfileForm.Id = val.Id
@@ -2019,34 +2138,34 @@
       },
       // 保存信息变更数据
       saveinfochange () {
-      this.$refs['formData'].validate((valid) => {
-        if (valid) {
+        this.$refs['formData'].validate((valid) => {
+          if (valid) {
             let AllInfochangeItemList = {
-            SupplierId: this.serviceId,
-            MInfoId: this.MInfoId,
-            InfochangeForm: this.infochangeItemList
-          }
-          // console.log('----', AllInfochangeItemList)
-          // debugger
-          api.addInfoChangeItemCh(AllInfochangeItemList, this.$axios).then(res => {
-            if (res.data.code === 0) {
-              // 保存成功后，初始化数据，变成修改
-              this.initDatas()
-              this.$message({
-                type: 'success',
-                message: res.data.message
-              })
-            } else {
-              this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
+              SupplierId: this.serviceId,
+              MInfoId: this.MInfoId,
+              InfochangeForm: this.infochangeItemList
             }
-          }).catch(err => {
-            console.error(err)
-          })
-        }
-      })
+            // console.log('----', AllInfochangeItemList)
+            // debugger
+            api.addInfoChangeItemCh(AllInfochangeItemList, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                // 保存成功后，初始化数据，变成修改
+                this.initDatas()
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                })
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                })
+              }
+            }).catch(err => {
+              console.error(err)
+            })
+          }
+        })
       },
       chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist()

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/index.vue

@@ -48,8 +48,9 @@
             <template slot-scope="scope">
               <router-link
                 :to="'/oilsupplier/infochangech/' + scope.row.Id + '/operation?InfoStatus='+ scope.row.Status +'&infoId='+scope.row.InfoId">
-                <el-button type="primary" plain title="信息变更" size="mini">变更</el-button>
+                <el-button type="primary" plain title="信息变更" style="margin-right: 10px" size="mini">变更</el-button>
               </router-link>
+              <el-button type="danger" plain title="信息变更" size="mini" @click="delInfoChangech(scope.row.InfoId)" :disabled="scope.row.Status > 0">删除</el-button>
             </template>
           </el-table-column>
           <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
@@ -382,9 +383,9 @@
             console.error(err)
           })
       },
-      getselectsupplier() {
+      getselectsupplier () {
         api.getAddSupList(this.$axios).then(res => {
-          if (res.data.items.length != 0) {
+          if (res.data.items != null && res.data.items.length != 0) {
             for (var i = 0; i < res.data.items.length; i++) {
               this.selectsupplierlist.push({
                 Id: res.data.items[i].Id,
@@ -466,6 +467,22 @@
         })
 
       },
+      delInfoChangech (Id) {
+        api.delInfoChangech(Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        })
+      },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           //this.dictOptions.customerList = res.data.items['customerList']

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/basisedit.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-right: 5px" @click="editIsRestrict('0')" v-if="formData.IsRestrict == '1' && showBtn ">增项限制已开启</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" @click="editIsRestrict('1')" v-if="formData.IsRestrict == '0' && showBtn">增项限制已关闭</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" @click="showApplyTime" v-if="formData.InFlag != '3' && showBtn ">延长有效期</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" @click="reInput" v-if="formData.InFlag == '3'">确认重新准入</el-button>
           <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
@@ -471,6 +473,7 @@
           Remark: '',
           InFlag: '',
           IsDelete: '',
+          IsRestrict: '',
           CreateOn: '',
           CreateUserId: '',
           CreateBy: '',
@@ -545,6 +548,27 @@
       this.isAccess()
     },
     methods: {
+      editIsRestrict (val) {
+        let params = {
+          IsRestrict: val
+        }
+        apiCert.updataIsRestrict(this.formData.CertId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       isAccess () {
         let params = {
           RoleId: '10000203'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/goodsedit.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-right: 5px" @click="editIsRestrict('0')" v-if="formData.IsRestrict == '1' && showBtn ">增项限制已开启</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" @click="editIsRestrict('1')" v-if="formData.IsRestrict == '0' && showBtn">增项限制已关闭</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" @click="showApplyTime" v-if="formData.InFlag != '3' && showBtn ">延长有效期</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" @click="reInput" v-if="formData.InFlag == '3'">确认重新准入</el-button>
           <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
@@ -449,6 +451,7 @@
           Remark: '',
           InStyle: '',
           IsDelete: '',
+          IsRestrict: '',
           CreateOn: '',
           CreateUserId: '',
           CreateBy: '',
@@ -524,6 +527,27 @@
       this.isAccess()
     },
     methods: {
+      editIsRestrict (val) {
+        let params = {
+          IsRestrict: val
+        }
+        apiCert.updataIsRestrict(this.formData.CertId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       isAccess () {
         let params = {
           RoleId: '10000203'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/techedit.vue

@@ -11,6 +11,8 @@
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-right: 5px" @click="editIsRestrict('0')" v-if="formData.IsRestrict == '1' && showBtn ">增项限制已开启</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" @click="editIsRestrict('1')" v-if="formData.IsRestrict == '0' && showBtn">增项限制已关闭</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" @click="showApplyTime" v-if="formData.InFlag != '3' && showBtn ">延长有效期</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" @click="reInput" v-if="formData.InFlag == '3'">确认重新准入</el-button>
           <el-button plain icon="el-icon-right"  size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
@@ -478,6 +480,7 @@
           Remark: '',
           InFlag: '',
           IsDelete: '',
+          IsRestrict: '',
           CreateOn: '',
           CreateUserId: '',
           CreateBy: '',
@@ -553,6 +556,27 @@
       this.isAccess()
     },
     methods: {
+      editIsRestrict (val) {
+        let params = {
+          IsRestrict: val
+        }
+        apiCert.updataIsRestrict(this.formData.CertId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       isAccess () {
         let params = {
           RoleId: '10000203'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -382,12 +382,12 @@ import certApi from '@/api/oilsupplier/suppliercert'
             width: 130,
             sort: true
           },
-          {
-            prop: 'InFlag',
-            label: '准入标识',
-            width: 110,
-            sort: true
-          },
+          // {
+          //   prop: 'InFlag',
+          //   label: '准入标识',
+          //   width: 110,
+          //   sort: true
+          // },
           {
             prop: 'SupplierName',
             label: '企业名称',

src/dashoo.cn/frontend_web/src/pages/setting/paramset/index.vue

@@ -17,7 +17,7 @@
       <el-row>
         <el-col :span="4">&nbsp;
         </el-col>
-        <el-col :span="8">
+        <el-col :span="4">
           <el-form :model="parameterform" label-width="200px" label-position="top">
             <el-form-item label="是否需要现场考察报告 ">
               <el-switch on-text="是" off-text="否" on-color="#13ce66" v-model="parameterform.isInvestigate"></el-switch>
@@ -25,9 +25,11 @@
             <!--<el-form-item label="录入样本时是否自动打印标签 ">-->
               <!--<el-switch on-text="是" off-text="否" on-color="#13ce66" v-model="parameterform.isAutoPrintSample"></el-switch>-->
             <!--</el-form-item>-->
-            <!--<el-form-item label="随访提前提醒天数 " prop="newpass" v-if="!yeartest">-->
-              <!--<el-input-number v-model="parameterform.sFlupFrontDay" :min="0" style="width:100%"></el-input-number>-->
-            <!--</el-form-item>-->
+            <el-form-item label="增项申请时间限制 " prop="newpass">
+              <el-input v-model="parameterform.sAddLimitMonth" :min="0" style="width:100%" @keyup.native="proving1">
+                <template slot="append">个月</template>
+              </el-input>
+            </el-form-item>
             <!--<el-form-item label="随访过期后仍提醒天数 " prop="checknewPass" v-if="!yeartest">-->
               <!--<el-input-number v-model="parameterform.sFlupLastDay" :min="0" style="width:100%"></el-input-number>-->
             <!--</el-form-item>-->
@@ -47,7 +49,8 @@
     data () {
       return {
         parameterform: {
-          isInvestigate: false
+          isInvestigate: false,
+          sAddLimitMonth: ''
         },
         yeartest: false
       }
@@ -69,6 +72,9 @@
                       _this.parameterform.isInvestigate = true
                     }
                     break
+                  case 'sAddLimitMonth':
+                    _this.parameterform.sAddLimitMonth = (res.data[i].Parametercontent)
+                    break
                 }
               }
             }
@@ -92,6 +98,10 @@
             }
           })
           .catch(() => {})
+      },
+      proving1 () {
+        this.parameterform.sAddLimitMonth = this.parameterform.sAddLimitMonth.replace(/[^\.\d]/g, '')
+        this.parameterform.sAddLimitMonth = this.parameterform.sAddLimitMonth.replace('.', '')
       }
     }
   }