增项年审修改

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

@@ -86,6 +86,13 @@ const (
 	//企业用户二级物资准入流程图
 	OIL_SECOND_ENUSER_SUPPLIER_APPLY string = "oil_second_enuser_supplier_apply"
 
+	//企业用户一级物资增项流程图
+	OIL_FIRST_ENUSER_APPEND_APPLY string = "oil_first_enuser_append_apply"
+	//企业用户二级物资增项流程图
+	OIL_SECOND_ENUSER_APPEND_APPLY string = "oil_second_enuser_append_apply"
+	//企业用户增项流程图
+	OIL_ENUSER_APPEND_APPLY string = "oil_enuser_append_apply"
+
 	//一级物资供方增项流程图
 	OIL_FIRST_APPEND_APPLY string = "oil_first_append_apply"
 	//二级物资供方准入流程图

src/dashoo.cn/backend/api/controllers/casbin/role.go

@@ -63,7 +63,7 @@ func (this *RoleController) RoleList() {
 		roleofrole = strings.Trim(roleofrole, ",")
 		where = where + " and Id in (" + roleofrole + ")"
 	}
-	total := svc.GetRoleList(page.CurrentPage, page.Size, "SortCode", utils.ToStr(this.User.Id), &roles, where)
+	total := svc.GetRoleList(page.CurrentPage, page.Size, "SortCode asc", utils.ToStr(this.User.Id), &roles, where)
 	var datainfo DataInfo
 	datainfo.Items = roles
 	datainfo.CurrentItemCount = total
@@ -84,7 +84,7 @@ func (this *RoleController) RoleAllList() {
 	if searchkey != "" {
 		where = where + " and Realname like '%" + searchkey + "%'"
 	}
-	total := svc.GetRoleList(page.CurrentPage, page.Size, "SortCode", utils.ToStr(this.User.Id), &roles, where)
+	total := svc.GetRoleList(page.CurrentPage, page.Size, "SortCode asc", utils.ToStr(this.User.Id), &roles, where)
 	var datainfo DataInfo
 	datainfo.Items = roles
 	datainfo.CurrentItemCount = total

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

@@ -511,24 +511,46 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	if supplierCertAppendEntity.WorkFlowId == "0" || len(supplierCertAppendEntity.WorkFlowId) <= 0 {
 		//启动工作流
 		businessKey = certappendId + "-" +  strconv.Itoa(supplierCertAppendEntity.AuditIndex)
-		if supplierCertAppendEntity.InStyle == "2" {
-			processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
-		}else if  supplierCertAppendEntity.InStyle == "3" {
-			processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_APPEND_APPLY, businessKey, this.User.Id)
-		}else {
-			processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, businessKey, this.User.Id)
+		if this.User.IsCompanyUser == 1 {
+			if supplierCertAppendEntity.InStyle == "2" {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+			} else if supplierCertAppendEntity.InStyle == "3" {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+			} else {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+			}
+		}else if this.User.IsCompanyUser == 0 {
+			if supplierCertAppendEntity.InStyle == "2" {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
+			}else if  supplierCertAppendEntity.InStyle == "3" {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_APPEND_APPLY, businessKey, this.User.Id)
+			}else {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, businessKey, this.User.Id)
+			}
 		}
 
+
 	}
 	var ActiComplete workflow.ActiCompleteVM
-	if supplierCertAppendEntity.InStyle == "2" {
-		ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
-	}else if  supplierCertAppendEntity.InStyle == "3" {
-		ActiComplete.ProcessKey = workflow.OIL_SECOND_APPEND_APPLY
-	}else{
-		ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
+	if this.User.IsCompanyUser == 1 {
+		if supplierCertAppendEntity.InStyle == "2" {
+			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_APPEND_APPLY
+		} else if supplierCertAppendEntity.InStyle == "3" {
+			ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_APPEND_APPLY
+		} else {
+			ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
+		}
+	}else if this.User.IsCompanyUser == 0 {
+		if supplierCertAppendEntity.InStyle == "2" {
+			ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
+		}else if  supplierCertAppendEntity.InStyle == "3" {
+			ActiComplete.ProcessKey = workflow.OIL_SECOND_APPEND_APPLY
+		}else{
+			ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
+		}
 	}
 
+
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
@@ -566,7 +588,11 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	//记下workflowID(首次提交时才会记录，中间状态请忽略) 及审批状态
 	var model suppliercertappend.OilSupplierCertAppend
 	model.WorkFlowId = processInstanceId
-	model.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
+	if this.User.IsCompanyUser == 1 {
+		model.Status = suppliercert.FEN_TRIAL_STATUS //分办
+	}else if this.User.IsCompanyUser == 0 {
+		model.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
+	}
 	model.FirstAudit, _ = strconv.Atoi(firstAudit)
 	model.SecondAudit, _ = strconv.Atoi(SecondAudit)
 	model.ThirdAudit, _ = strconv.Atoi(ThirdAudit)
@@ -594,6 +620,9 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 // @router /auditEntityFir/:id [post]
 func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	appendId := this.Ctx.Input.Param(":id")
+	firstAudit := this.GetString("FirstAuditName")
+	secondAudit := this.GetString("SecondAudit")
+	thirdAudit := this.GetString("ThirdAudit")
 	//取出审批列表
 	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
@@ -623,6 +652,21 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	status := ""
 	backstatus := "0"
 	var userIds string
+	if supplierCertAppendEntity.Status == suppliercert.FEN_TRIAL_STATUS {
+		userIds = firstAudit
+		status = suppliercert.FIRST_TRIAL_STATUS
+		step = 2
+		supplierCertAppendEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
+		supplierCertAppendEntity.SecondAudit,_ = strconv.Atoi(secondAudit)
+		supplierCertAppendEntity.ThirdAudit,_ = strconv.Atoi(thirdAudit)
+		cols := []string{
+			"Id",
+			"FirstAudit",
+			"SecondAudit",
+			"ThirdAudit",
+		}
+		svc.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
+	}
 	if supplierCertAppendEntity.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = utils.ToStr(supplierCertAppendEntity.SecondAudit)
 		status = suppliercert.SECOND_TRIAL_STATUS
@@ -668,26 +712,6 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		userIds = strings.Trim(userIds, ",")
 		step = 2
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
-		//svc := organize.GetOrganizeService(utils.DBE)
-		//unitId := svc.GetMyUnitDepartmentId(strconv.Itoa(supplierCertAppendEntity.ThirdAudit))
-		//var userlist []userRole.Base_User
-		//var setting auditsetting.Base_OilAuditSetting
-		//usvc := userRole.GetUserService(utils.DBE)
-		//where := "AuditStepCode='" + workflow.PROF_RECE + "'"
-		//svc.GetEntity(&setting, where)
-		//ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
-		//tempstr := strings.Join(ids, ",")
-		//uids := strings.Replace(tempstr, "uid_", "", -1)
-		//uids = strings.Trim(uids, ",")
-		//if uids != "" {
-		//	where := "Id in (" + uids + ")" + " and UnitId=" + unitId
-		//	svc.GetEntities(&userlist, where)
-		//}
-		//
-		//for _, tmpUser := range userlist {
-		//	userIds += strconv.Itoa(tmpUser.Id) + ","
-		//}
-		//userIds = strings.Trim(userIds, ",")
 	} else if supplierCertAppendEntity.Status == suppliercert.THIRD_TRIAL_STATUS {
 		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.PROF_AUDIT_STATUS
@@ -726,28 +750,6 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 
 			userIds = strings.Trim(userIds, ",")
 		}
-		//status = suppliercert.CENT_AUDIT_STATUS
-		//step = 2
-		//backstatus = suppliercert.NO_PROF_AUDIT_STATUS
-		//paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
-		//topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
-		//var userlist []userRole.Base_User
-		//var setting auditsetting.Base_OilAuditSetting
-		//usvc := userRole.GetUserService(utils.DBE)
-		//where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
-		//svc.GetEntity(&setting, where)
-		//ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
-		//tempstr := strings.Join(ids, ",")
-		//uids := strings.Replace(tempstr, "uid_", "", -1)
-		//uids = strings.Trim(uids, ",")
-		//if uids != "" {
-		//	where := "Id in (" + uids + ")" + " and UnitId=" + topid
-		//	svc.GetEntities(&userlist, where)
-		//}
-		//for _, tmpUser := range userlist {
-		//	userIds += strconv.Itoa(tmpUser.Id) + ","
-		//}
-		//userIds = strings.Trim(userIds, ",")
 	} else if supplierCertAppendEntity.Status == suppliercert.CENT_AUDIT_STATUS {
 		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.PAYING_AUDIT_STATUS

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

@@ -118,17 +118,12 @@ func (this *OilSupplierCertAppendSubController) GetListAppend() {
 // @router /addappendsub [post]
 func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 	var model suppliercertsub.OilSupplierCertSub
-	var jsonblob = this.Ctx.Input.RequestBody
-	var errinfo ErrorDataInfo
 	var err error
-
+	var jsonblob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonblob, &model)
-	model.Type = "2"
-	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-
-	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
 	var submodel suppliercertsub.OilSupplierCertSub
 	where_certsub := " SupplierCertId = "+ utils.ToStr(model.SupplierCertId) + " and SupplierTypeCode = 02"
 	where_certsub += " and SubClassId = '" + utils.ToStr(model.SubClassId) + "'"
@@ -144,8 +139,14 @@ func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 	svcCert := suppliercert.GetOilSupplierCertService(utils.DBE)
 	svcCert.GetEntityById(model.SupplierCertId, &supplierCertModel)
 
+	var supplierModel supplier.OilSupplier
+	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
+	svcSupplier.GetEntityById(model.SupplierId, &supplierModel)
+
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
 	filesvc := supplierfile.GetSupplierfileService(utils.DBE)
 	var needList []supplierfile.FileList
+
 	if model.SupplierTypeCode == "01" {
 		//		needList = filesvc.GetGoodsNeedFileList(model.SubClassId)
 	} else if model.SupplierTypeCode == "02" {
@@ -156,7 +157,7 @@ func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 
 	if supplierCertModel.InStyle == "4" {
 		var needFile supplierfile.FileList
-		needFile.FileName = "战略合作协议扫描件"
+		needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
 		needList = append(needList, needFile)
 	}
 
@@ -165,14 +166,28 @@ func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 		where := "SupplierId = '" + strconv.Itoa(model.SupplierId) + "'"
 		svc.GetEntitysByWhere(OilSupplierFileName, where, &list)
 
-		hasField := ""
-		for i := 0; i < len(list); i++ {
-			hasField += list[i].NeedFileType + ","
-		}
-		mustField := "营业执照,组织代码,税务登记,开户许可,银行开户许可证,承诺书,企业信息系统截图,战略合作协议扫描件,"
+		//三证合一或五证合一不需要的字段
+		mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
+
+		//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
+		mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
+
 		for i := 0; i < len(needList); i++ {
 			var entity supplierfile.OilSupplierFile
 			entity.SupplierId = model.SupplierId
+			//加入对应表OilSupplierCert2File
+			var cert2File suppliercertsub.OilSupplierCert2File //创建结构体
+			cert2File.SupplierId = model.SupplierId
+			cert2File.SupplierCertId = model.SupplierCertId
+			cert2File.SupplierTypeCode = model.SupplierTypeCode
+			cert2File.SubClassId= model.SubClassId
+			cert2File.Code = model.Code
+			cert2File.Name = model.Name
+			cert2File.NeedFileType = needList[i].FileName
+			svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
+			if (supplierModel.CredentialFlag == "1" || supplierModel.CredentialFlag == "2") && strings.Contains(mergerCertSkipField, needList[i].FileName+",") { //三证合一或五证合一了
+				continue
+			}
 
 			if strings.Contains(mustField, needList[i].FileName+",") {
 				entity.SupplierTypeCode = "000"
@@ -184,6 +199,7 @@ func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 			entity.EffectDate = time.Now()
 			entity.CreateBy = this.User.Realname
 			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			entity.SupType = 2
 
 			isRepeat := false
 			for j := 0; j < len(list); j++ {
@@ -195,10 +211,11 @@ func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 			if isRepeat == true {
 				continue
 			}
-			entity.SupType = 2
 			svc.InsertEntityBytbl(OilSupplierFileName, &entity)
 		}
+
 	}
+	var errinfo ErrorDataInfo
 	if err == nil {
 		errinfo.Message = "操作成功！"
 		errinfo.Code = 0
@@ -227,6 +244,10 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 	svcCert := suppliercert.GetOilSupplierCertService(utils.DBE)
 	svcCert.GetEntityById(datamain.SupplierCertId, &supplierCertModel)
 
+	var supplierModel supplier.OilSupplier
+	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
+	svcSupplier.GetEntityById(datamain.SupplierId, &supplierModel)
+
 	for n := 0; n < len(dataother.CheckList); n++ {
 		where_sub := "SupplierTypeCode = 03 and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
 		where_sub += " and SupplierCertId = '" + strconv.Itoa(dataother.SupplierCertId) + "'"
@@ -236,7 +257,6 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 		has := svc.GetEntityByWhere(OilSupplierCertSubName, where_sub, &model)
 
 		if !has {
-			datamain.Type = "2"
 			datamain.SubClassId = dataother.CheckList[n].Id
 			datamain.Code = dataother.CheckList[n].Code
 			datamain.Name = dataother.CheckList[n].Name
@@ -246,38 +266,53 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 			datamain.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			svc.InsertEntityBytbl(OilSupplierCertSubName, &datamain)
 
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
 			filesvc := supplierfile.GetSupplierfileService(utils.DBE)
 			needList := filesvc.GetTechNeedFileList(dataother.CheckList[n].Id)
 
 			if supplierCertModel.InStyle == "4" {
 				var needFile supplierfile.FileList
-				needFile.FileName = "战略合作协议扫描件"
+				needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
 				needList = append(needList, needFile)
 			}
 
 			var list []supplierfile.OilSupplierFile
 			where := "SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
 			svc.GetEntitysByWhere(OilSupplierFileName, where, &list)
-			hasField := ""
-			for i := 0; i < len(list); i++ {
-				hasField += list[i].NeedFileType + ","
-			}
-			mustField := "营业执照,组织代码,税务登记,开户许可,银行开户许可证,承诺书,企业信息系统截图,战略合作协议扫描件,"
+
+			//三证合一或五证合一不需要的字段
+			mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
+
+			//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
+			mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
 			for i := 0; i < len(needList); i++ {
 				var entity supplierfile.OilSupplierFile
 				entity.SupplierId = dataother.SupplierId
 
+				if (supplierModel.CredentialFlag == "1" || supplierModel.CredentialFlag == "2") && strings.Contains(mergerCertSkipField, needList[i].FileName+",") { //三证合一或五证合一了
+					continue
+				}
+				//加入对应表OilSupplierCert2File
+				var cert2File suppliercertsub.OilSupplierCert2File //创建结构体
+				cert2File.SupplierId = dataother.SupplierId
+				cert2File.SupplierCertId = dataother.SupplierCertId
+				cert2File.SupplierTypeCode = dataother.SupplierTypeCode
+				cert2File.SubClassId= dataother.CheckList[n].Id
+				cert2File.Code = dataother.CheckList[n].Code
+				cert2File.Name = dataother.CheckList[n].Name
+				cert2File.NeedFileType = needList[i].FileName
+				svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
 				if strings.Contains(mustField, needList[i].FileName+",") {
 					entity.SupplierTypeCode = "000"
 				} else {
 					entity.SupplierTypeCode = dataother.SupplierTypeCode
 				}
 				entity.NeedFileType = needList[i].FileName
-				entity.SupType = 2
 				entity.FileType = 1
 				entity.EffectDate = time.Now()
 				entity.CreateBy = this.User.Realname
 				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				entity.SupType = 2
 
 				isRepeat := false
 				for j := 0; j < len(list); j++ {
@@ -289,11 +324,13 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 				if isRepeat == true {
 					continue
 				}
+
 				svc.InsertEntityBytbl(OilSupplierFileName, &entity)
 			}
 
 		}
 	}
+
 	var errinfo ErrorDataInfo
 	errinfo.Message = "操作成功！"
 	errinfo.Code = 0
@@ -319,7 +356,7 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 
 	var supplierModel supplier.OilSupplier
 	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
-	svcSupplier.GetEntityById(datamain.SupplierCertId, &supplierModel)
+	svcSupplier.GetEntityById(datamain.SupplierId, &supplierModel)
 
 	for n := 0; n < len(dataother.CheckList); n++ {
 		where_sub := "SupplierTypeCode = 01 and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
@@ -330,7 +367,6 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 		has := svc.GetEntityByWhere(OilSupplierCertSubName, where_sub, &model)
 
 		if !has {
-			datamain.Type = "2"
 			datamain.SubClassId, _ = utils.StrTo(dataother.CheckList[n].Id).Int()
 			datamain.Code = dataother.CheckList[n].Code
 			datamain.Name = dataother.CheckList[n].Name
@@ -353,14 +389,12 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 			var list []supplierfile.OilSupplierFile
 			where := "SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
 			svc.GetEntitysByWhere(OilSupplierFileName, where, &list)
-			hasField := ""
-			for i := 0; i < len(list); i++ {
-				hasField += list[i].NeedFileType + ","
-			}
+
 			//三证合一或五证合一不需要的字段
 			mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
 			//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
 			mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
+
 			for i := 0; i < len(needList); i++ {
 				var entity supplierfile.OilSupplierFile
 				entity.SupplierId = dataother.SupplierId
@@ -368,6 +402,16 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 				if (supplierModel.CredentialFlag == "1" || supplierModel.CredentialFlag == "2") && strings.Contains(mergerCertSkipField, needList[i].FileName+",") { //三证合一或五证合一了
 					continue
 				}
+				//加入对应表OilSupplierCert2File
+				var cert2File suppliercertsub.OilSupplierCert2File //创建结构体
+				cert2File.SupplierId = dataother.SupplierId
+				cert2File.SupplierCertId = dataother.SupplierCertId
+				cert2File.SupplierTypeCode = dataother.SupplierTypeCode
+				cert2File.SubClassId, _ = utils.StrTo(dataother.CheckList[n].Id).Int()
+				cert2File.Code = dataother.CheckList[n].Code
+				cert2File.Name = dataother.CheckList[n].Name
+				cert2File.NeedFileType = needList[i].FileName
+				svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
 
 				if strings.Contains(mustField, needList[i].FileName+",") {
 					entity.SupplierTypeCode = "000"
@@ -376,10 +420,10 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 				}
 				entity.NeedFileType = needList[i].FileName
 				entity.FileType = 1
-				entity.SupType = 2
 				entity.EffectDate = time.Now()
 				entity.CreateBy = this.User.Realname
 				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				entity.SupType = 2
 
 				isRepeat := false
 				for j := 0; j < len(list); j++ {

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

@@ -136,6 +136,21 @@ func (this *TodoListController) GetMyTaskEntityList() {
 			appendIdList = fmt.Sprintf("%s %s", appendIdList, ids)
 			appendIdList = appendIdList + ","
 		}
+		ids = actisvc.GetMyTasks(workflow.OIL_ENUSER_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, ids)
+			appendIdList = appendIdList + ","
+		}
+		ids = actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, ids)
+			appendIdList = appendIdList + ","
+		}
+		ids = actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, ids)
+			appendIdList = appendIdList + ","
+		}
 
 		appendIdarr := strings.Split(appendIdList, ",")
 		for i, item := range appendIdarr {

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

@@ -47,11 +47,12 @@ export default {
       params: params
     })
   },
-  auditEntityFir (entityId, params, myAxios) {
+  auditEntityFir (entityId, params, shenheform, myAxios) {
     return myAxios({
       url: '/suppliercertappend/auditEntityFir/' + entityId,
       method: 'post',
-      data: params
+      params: params,
+      data: shenheform
     })
   }
 }

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

@@ -24,7 +24,9 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
-            v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
+            v-if="auditBtn && this.formData.Status != '6'&& this.formData.Status != '10'">{{auditTitle}}</el-button>
+            <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="this.formData.Status == '10'">分办</el-button>
           <router-link :to="'/oilsupplier/addtionaudit/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -166,6 +168,43 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="初审人员">
+              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="复审人员">
+              <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="专业处室">
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="makeSure()">确定</el-button>
+      </span>
+    </el-dialog>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
   </div>
 </template>
 
@@ -178,10 +217,12 @@
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
     components: {
       WfMultiHistory,
+      ChooseAuditor
     },
     computed: {
       ...mapGetters({
@@ -220,13 +261,15 @@
         organizeOption: [],
         orgtreelist: [],
         secorgtreelist: [],
-        majorDept: [],
+        majorDept: [100000000, 100000128, 100000151],
         auditbusList: [], // 待审核业务
         dialogMakeSure: false,
         dialogAllocation: false,
         dialogMakeSure2: false,
         aduitlabel: '审核人',
         auditer: '',
+        auditerName: '',
+        fushenauditer: '', //复审人员
         auditTitle: '审批',
         companyid: '',
         orgtreeprops: {
@@ -261,7 +304,7 @@
           business: "",
           instance: ""
         },
-        dialogVisible: false, //增项分类dialog
+        dialogVisible: false, //增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
@@ -416,6 +459,8 @@
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
           this.dialogMakeSure2 = true
+        } else if (this.formData.Status === '10') {
+          this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
         }
@@ -495,6 +540,28 @@
             console.error(err)
           })
       },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+        this.auditOrgChang(this.auditer)
+      },
+      auditOrgChang(val) {
+        let auditstepcode = "SECOND_TRIAL";
+        suppapi
+          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .then(res => {
+            this.secauditerOptions = res.data.item
+          })
+          .catch(err => {
+            console.error(err);
+          });
+      },
+
       auditOrgChange(val) {
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
@@ -522,7 +589,7 @@
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
           if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' && this.formData.Status !== '4' &&
-            this.formData.Status !== '5') {
+            this.formData.Status !== '5'&& this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
@@ -536,14 +603,19 @@
       checkstatus() {
         this.shenheForm.Auditer = this.auditer
         this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
-        let params = this.shenheForm
-        console.log("------shenheform", this.shenheForm)
-        api2.auditEntityFir(this.formData.Id, params, this.$axios).then(res => {
+        let params = {
+          FirstAuditName: this.auditer,
+          SecondAudit: this.fushenauditer,
+          ThirdAudit: this.majorDept[this.majorDept.length - 1],
+        }
+        console.log("---params",params)
+        api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()
             this.dialogMakeSure = false
             this.dialogAllocation = false
             this.dialogMakeSure2 = false
+            this.dialogVisible = false
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -25,6 +25,8 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
+            <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="this.formData.Status == '10'">分办</el-button>
           <router-link :to="'/oilsupplier/addtionaudit/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -57,7 +59,7 @@
         <!-- 增项分类列表 -->
         <el-card class="box-card" style="margin-top: 10px;">
           <div slot="header">
-            <span><i class="icon icon-table2"></i> 增项分类</span>
+            <span><i class="icon icon-table2"></i> 准入范围</span>
           </div>
           <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
@@ -171,6 +173,43 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="初审人员">
+              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="复审人员">
+              <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="专业处室">
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="makeSure()">确定</el-button>
+      </span>
+    </el-dialog>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
 
   </div>
 </template>
@@ -184,10 +223,12 @@
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
     components: {
       WfMultiHistory,
+      ChooseAuditor
     },
     computed: {
       ...mapGetters({
@@ -226,13 +267,15 @@
         organizeOption: [],
         orgtreelist: [],
         secorgtreelist: [],
-        majorDept: [],
+        majorDept: [100000000, 100000001, 100000071], //专业可是
         auditbusList: [], // 待审核业务
         dialogMakeSure: false,
         dialogAllocation: false,
         dialogMakeSure2: false,
         aduitlabel: '审核人',
         auditer: '',
+        auditerName: '',
+        fushenauditer: '', //复审人员
         auditTitle: '审批',
         companyid: '',
         orgtreeprops: {
@@ -272,7 +315,7 @@
           classId: '01',
           workflowId: ''
         },
-        dialogVisible: false, //增项分类dialog
+        dialogVisible: false, //增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
@@ -459,6 +502,8 @@
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
           this.dialogMakeSure2 = true
+        } else if (this.formData.Status === '10') {
+          this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
         }
@@ -507,6 +552,28 @@
             console.error(err)
           })
       },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+        this.auditOrgChang(this.auditer)
+      },
+      auditOrgChang(val) {
+        let auditstepcode = "SECOND_TRIAL";
+        suppapi
+          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .then(res => {
+            this.secauditerOptions = res.data.item
+          })
+          .catch(err => {
+            console.error(err);
+          });
+      },
+
       auditOrgChange() {
 
         console.log(this.formData.Status, 'status')
@@ -535,7 +602,7 @@
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
           if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1'&& this.formData.Status !== '2' && this.formData.Status !== '4' &&
-            this.formData.Status !== '5') {
+            this.formData.Status !== '5'&& this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
@@ -549,14 +616,19 @@
       checkstatus() {
         this.shenheForm.Auditer = this.auditer
         this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
-        let params = this.shenheForm
-        console.log("------shenheform", this.shenheForm)
-        api2.auditEntityFir(this.formData.Id, params, this.$axios).then(res => {
+        let params = {
+          FirstAuditName: this.auditer,
+          SecondAudit: this.fushenauditer,
+          ThirdAudit: this.majorDept[this.majorDept.length - 1],
+        }
+        console.log("---params",params)
+        api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()
             this.dialogMakeSure = false
             this.dialogAllocation = false
             this.dialogMakeSure2 = false
+            this.dialogVisible = false
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -25,6 +25,8 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
+            <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="this.formData.Status == '10'">分办</el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -167,6 +169,43 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="初审人员">
+              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="复审人员">
+              <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="专业处室">
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="makeSure()">确定</el-button>
+      </span>
+    </el-dialog>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
 
   </div>
 </template>
@@ -180,10 +219,12 @@
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
     components: {
       WfMultiHistory,
+      ChooseAuditor
     },
     computed: {
       ...mapGetters({
@@ -232,6 +273,8 @@
         dialogMakeSure2: false,
         aduitlabel: '审核人',
         auditer: '',
+        auditerName: '',
+        fushenauditer: '', //复审人员
         auditTitle: '审批',
         auditBtn: false,
         auditstepcode: '',
@@ -285,7 +328,7 @@
           AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
           Remark: '', //备注
         },
-        dialogVisible: false, //增项分类dialog
+        dialogVisible: false, //增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
@@ -472,6 +515,8 @@
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
           this.dialogMakeSure2 = true
+        } else if (this.formData.Status === '10') {
+          this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
         }
@@ -520,6 +565,28 @@
             console.error(err)
           })
       },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+        this.auditOrgChang(this.auditer)
+      },
+      auditOrgChang(val) {
+        let auditstepcode = "SECOND_TRIAL";
+        suppapi
+          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .then(res => {
+            this.secauditerOptions = res.data.item
+          })
+          .catch(err => {
+            console.error(err);
+          });
+      },
+
       auditOrgChange(val) {
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
@@ -547,7 +614,7 @@
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
           if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' && this.formData.Status !== '4' &&
-            this.formData.Status !== '5') {
+            this.formData.Status !== '5'&& this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
@@ -561,14 +628,19 @@
       checkstatus() {
         this.shenheForm.Auditer = this.auditer
         this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
-        let params = this.shenheForm
-        console.log("------shenheform", this.shenheForm)
-        api2.auditEntityFir(this.formData.Id, params, this.$axios).then(res => {
+        let params = {
+          FirstAuditName: this.auditer,
+          SecondAudit: this.fushenauditer,
+          ThirdAudit: this.majorDept[this.majorDept.length - 1],
+        }
+        console.log("---params",params)
+        api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()
             this.dialogMakeSure = false
             this.dialogAllocation = false
             this.dialogMakeSure2 = false
+            this.dialogVisible = false
             this.$message({
               type: 'success',
               message: res.data.message

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -329,6 +329,7 @@
         IsCompanyUser: 0,
         supplierList: [],
         suplen: 0,
+        certId:'',
       }
     },
     created() {
@@ -382,6 +383,7 @@
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
               _this.entityForm.SupplierId = parseInt(_this.supplierList[0].SupplierId)
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
+              _this.certId  = _this.supplierList[0].SupplierCertId
             }
           })
           .catch(err => {
@@ -462,6 +464,16 @@
             this.entityForm.Id = res.data.item;
             this.initDatas();
             this.addshow = false
+            this.$router.push({
+              path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
+              query: {
+                certid: this.certId,
+                //WorkflowId: ,
+                Status: 0,
+                Step: 1,
+                annualId: this.entityForm.Id ,
+              }
+            })
             this.$message({
               type: 'success',
               message: res.data.message

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -331,6 +331,7 @@
         IsCompanyUser: 0,
         supplierList: [],
         suplen: 0,
+        certId:'',
       }
     },
     created() {
@@ -385,6 +386,7 @@
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
               _this.entityForm.SupplierId = parseInt(_this.supplierList[0].SupplierId)
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
+              _this.certId  = _this.supplierList[0].SupplierCertId
             }
           })
           .catch(err => {
@@ -466,11 +468,20 @@
             this.entityForm.Id = res.data.item;
             this.initDatas();
             this.addshow = false
+            this.$router.push({
+              path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
+              query: {
+                certid: this.certId,
+                //WorkflowId: ,
+                Status: 0,
+                Step: 1,
+                annualId: this.entityForm.Id ,
+              }
+            })
             this.$message({
               type: 'success',
               message: res.data.message
             });
-
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -329,6 +329,7 @@
         IsCompanyUser: 0,
         supplierList: [],
         suplen: 0,
+        certId:'',
       }
     },
     created() {
@@ -382,6 +383,7 @@
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
               _this.entityForm.SupplierId = parseInt(_this.supplierList[0].SupplierId)
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
+              _this.certId  = _this.supplierList[0].SupplierCertId
             }
           })
           .catch(err => {
@@ -462,6 +464,16 @@
             this.entityForm.Id = res.data.item;
             this.initDatas();
             this.addshow = false
+            this.$router.push({
+              path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
+              query: {
+                certid: this.certId,
+                //WorkflowId: ,
+                Status: 0,
+                Step: 1,
+                annualId: this.entityForm.Id ,
+              }
+            })
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -24,7 +24,10 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
+          </el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="ComAuditdialogShow = true"
+            v-if="formData.Id !='' && formData.Status == 0 && IsCompanyUser == 1">分办
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -277,8 +280,34 @@
       </span>
     </el-dialog>
 
+    <el-dialog title="分办" :visible.sync="ComAuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分办人员">
+              <el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="ComAuditdialogShow = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="SubpEntity">确定</el-button>
+      </span>
+    </el-dialog>
+
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+      <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
   </div>
 </template>
 
@@ -294,11 +323,13 @@
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
   import fileapi from '@/api/oilsupplier/supplierfile'
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 
   export default {
     components: {
       WfMultiHistory,
       ChooseAuditor,
+      ChooseAuditorFen
     },
     computed: {
       ...mapGetters({
@@ -330,10 +361,12 @@
         auditbusList: [],
         audithistoryshow: false,
         chooseAuditorVisible: false,
+        chooseAuditorVisibleFen: false,
         orgtreelist: [], //二级单位
         preorgtreelist: [],
         secauditerOptions: [],
         AuditdialogShow: false, //提交审核弹框
+        ComAuditdialogShow: false,
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
         orgtreeprops: {
@@ -417,7 +450,7 @@
           RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          AppendType: '02', //增项类别(01 物资类，02 基建类，03 技术服务类)
           Remark: '', //备注
         },
         dialogVisible: false, //增项分类dialog
@@ -864,10 +897,6 @@
       getMySortList() {
         //分页及列表条件
         let params = {
-          // _currentPage: this.currentPage,
-          // _size: this.size,
-          // Order: this.Column.Order,
-          // Prop: this.Column.Prop,
           SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
           SupCertId: this.formData.SupplierCertId,
           SupTypeCode: this.formData.AppendType,
@@ -876,7 +905,6 @@
         //访问接口
         api.getMyList(params, this.$axios).then(res => {
           this.myentityList = res.data.item
-          // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
         })
@@ -1036,6 +1064,16 @@
             console.error(err);
           });
       },
+      chooseAuditorShowFen() {
+        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisibleFen = true
+      },
+      setAuditerFen(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
 
       //提交审批
       AuditEntity() {
@@ -1087,6 +1125,39 @@
               message: res.data.message
             })
           }
+          this.applyLoading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      SubpEntity() {
+        if (this.auditer === "") {
+          this.$message({
+            type: "warning",
+            message: "请选择分办人！"
+          })
+          return
+        }
+        this.applyLoading = true
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.formData.Id
+        api2.auditEntity(this.formData.Id, this.auditform, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.getEntityById()
+            this.ComAuditdialogShow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.applyLoading = false
         }).catch(err => {
           console.error(err)
         })

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

@@ -24,7 +24,10 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
+          </el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="ComAuditdialogShow = true"
+            v-if="formData.Id !='' && formData.Status == 0 && IsCompanyUser == 1">提交分办
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -271,8 +274,34 @@
       </span>
     </el-dialog>
 
+    <el-dialog title="分办" :visible.sync="ComAuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分办人员">
+              <el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="ComAuditdialogShow = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="SubpEntity">确定</el-button>
+      </span>
+    </el-dialog>
+
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+      <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
   </div>
 </template>
 
@@ -287,11 +316,13 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 
   export default {
     components: {
       WfMultiHistory,
-      ChooseAuditor
+      ChooseAuditor,
+      ChooseAuditorFen
     },
     computed: {
       ...mapGetters({
@@ -333,6 +364,7 @@
         switchstatus: false,
         audithistoryshow: false,
         chooseAuditorVisible: false,
+        chooseAuditorVisibleFen: false,
         sectreelist: [],
         orgtreelist: [], //二级单位
         preorgtreelist: [],
@@ -340,6 +372,7 @@
         fushenauditer: '', //复审人员
         majorDept: [100000000, 100000001, 100000071], //专业可是
         AuditdialogShow: false, //提交审核弹框
+        ComAuditdialogShow: false,
         filterText: '',
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
@@ -494,9 +527,11 @@
         Id: '', //传的参数
         editFlag: '', //编辑操作标记
         waituploads: [], // 等待上传的附件列表
+        IsCompanyUser: '',
       }
     },
     created() {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.Id = this.$route.query.Id
       this.editFlag = this.$route.query.editFlag
@@ -1157,6 +1192,16 @@
             console.error(err);
           });
       },
+      chooseAuditorShowFen() {
+        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisibleFen = true
+      },
+      setAuditerFen(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
       //提交审批
       AuditEntity() {
         if (this.auditer === "") {
@@ -1212,6 +1257,38 @@
         })
       },
 
+      SubpEntity() {
+        if (this.auditer === "") {
+          this.$message({
+            type: "warning",
+            message: "请选择分办人！"
+          })
+          return
+        }
+        this.applyLoading = true
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.formData.Id
+        api2.auditEntity(this.formData.Id, this.auditform, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.getEntityById()
+            this.ComAuditdialogShow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.applyLoading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
       getorgtreelist() {
         let _this = this
         let params = {

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

@@ -24,7 +24,10 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
+          </el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="ComAuditdialogShow = true"
+            v-if="formData.Id !='' && formData.Status == 0 && IsCompanyUser == 1">提交分办
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -246,8 +249,34 @@
       </span>
     </el-dialog>
 
+    <el-dialog title="分办" :visible.sync="ComAuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分办人员">
+              <el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="ComAuditdialogShow = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="SubpEntity">确定</el-button>
+      </span>
+    </el-dialog>
+
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+      <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
 
   </div>
 </template>
@@ -264,11 +293,13 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 
   export default {
     components: {
       WfMultiHistory,
-      ChooseAuditor
+      ChooseAuditor,
+      ChooseAuditorFen
     },
     computed: {
       ...mapGetters({
@@ -302,12 +333,14 @@
       return {
         audithistoryshow: false,
         chooseAuditorVisible: false,
+        chooseAuditorVisibleFen: false,
         orgtreelist: [], //二级单位
         preorgtreelist: [],
         secauditerOptions: [],
         fushenauditer: '', //复审人员
         majorDept: [], //专业可是
         AuditdialogShow: false, //提交审核弹框
+        ComAuditdialogShow: false,
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
         orgtreeprops: {
@@ -450,10 +483,12 @@
         },
         Id: '', //传的参数
         editFlag: '', //编辑操作标记
-        waituploads: []
+        waituploads: [],
+        IsCompanyUser: '',
       }
     },
     created() {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.Id = this.$route.query.Id
       this.editFlag = this.$route.query.editFlag
@@ -1011,6 +1046,16 @@
             console.error(err);
           });
       },
+      chooseAuditorShowFen() {
+        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisibleFen = true
+      },
+      setAuditerFen(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
 
       //提交审批
       AuditEntity() {
@@ -1068,6 +1113,38 @@
         })
       },
 
+      SubpEntity() {
+        if (this.auditer === "") {
+          this.$message({
+            type: "warning",
+            message: "请选择分办人！"
+          })
+          return
+        }
+        this.applyLoading = true
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.formData.Id
+        api2.auditEntity(this.formData.Id, this.auditform, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.getEntityById()
+            this.ComAuditdialogShow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.applyLoading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
       showDialog() {
         this.getorgtreelist()
         this.techDialog = true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -304,7 +304,7 @@
               //this.entityList = res.data.item
               let AppendId = res.data.info
               this.$router.push({
-                path: `/oilsupplier/supplierappend/1/basisdataopera`,
+                path: `/oilsupplier/supplierappend/1/goodsdataopera`,
                 query: {
                   Id: AppendId,
                   editFlag: 1 //编辑标记： 1 修改，0 不修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -307,7 +307,7 @@
               //this.entityList = res.data.item
               let AppendId = res.data.info
               this.$router.push({
-                path: `/oilsupplier/supplierappend/3/basisdataopera`,
+                path: `/oilsupplier/supplierappend/3/techdataopera`,
                 query: {
                   Id: AppendId,
                   editFlag: 1 //编辑标记： 1 修改，0 不修改