审批设置

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

@@ -141,6 +141,14 @@ func (s *OilSupplierCertService) GetAuditUser(organizeId, auditstepcode string,
 	return
 }
 
+func (s *OilSupplierCertService) GetAuditUserInSetting(organizeId, auditstepcode string, entitiesPtr interface{}) {
+	where := "u.UnitId=" + organizeId
+	//where := "a.DepartmentId=" + organizeId + " and AuditStepCode='" + auditstepcode + "'"
+	sql := "SELECT a.UserId Id, a.UserName RealName FROM Base_OilAuditSetting o LEFT JOIN Base_User a ON o.Id = a.SettingId where " + where
+	s.DBE.SQL(sql).Find(entitiesPtr)
+	return
+}
+
 func (s *OilSupplierCertService) GetAuditUserByNoLogin(organizeId string, entitiesPtr interface{}) {
 	where := "( a.DepartmentId=" + organizeId + " OR a.CompanyId=" + organizeId + ")"
 	sql := "SELECT a.UserId Id, a.UserName RealName FROM Base_OilAuditSetting o LEFT JOIN OilAuditUser a ON o.Id = a.SettingId where " + where

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

@@ -592,11 +592,29 @@ func (this *AnnualAuditController) AnnualAudit() {
 		status = suppliercert.THIRD_TRIAL_STATUS
 		step = 2
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
-		supsvc := suppliercert.GetOilSupplierCertService(utils.DBE)
-		var users []userRole.Base_RoleList
-		supsvc.GetAuditUser(strconv.Itoa(list.ThirdAudit), workflow.PROF_RECE, &users)
-		for _, tmpUser := range users {
-			userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		svc := organize.GetOrganizeService(utils.DBE)
+		//var users []userRole.Base_RoleList
+		//supsvc.GetAuditUser(strconv.Itoa(list.ThirdAudit), workflow.PROF_RECE, &users)
+		//paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+		//topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+		unitId := svc.GetMyUnitDepartmentId(strconv.Itoa(list.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) + ","//strconv.FormatInt(tmpUser.Id, 10) + ","
 		}
 		userIds = strings.Trim(userIds, ",")
 	} else if list.Status == suppliercert.THIRD_TRIAL_STATUS {

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

@@ -6,7 +6,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
-	"dashoo.cn/business2/items"
+	"dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/permission"
 	"dashoo.cn/business2/userRole"
 	"encoding/json"
@@ -765,14 +765,29 @@ func (this *InfoChangeController) GetAuditerByDept() {
 // @router /getauditer [get]
 func (this *InfoChangeController) GetAuditer() {
 	//svc := infochange.GetInfoChangeService(utils.DBE)
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	var users []userRole.Base_RoleList
-	certSrv.GetAuditUser("100000178", workflow.PROF_REGULATION, &users)
+	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var userlist []userRole.Base_User
+	var setting auditsetting.Base_OilAuditSetting
+	svc := userRole.GetUserService(utils.DBE)
+	where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+	svc.GetEntity(&setting, where)
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+	ids := svc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+	tempstr := strings.Join(ids, ",")
+	userIds := strings.Replace(tempstr, "uid_", "", -1)
+	userIds = strings.Trim(userIds, ",")
+	if userIds != "" {
+		where := "Id in (" + userIds + ")" + "and UnitId=" + topid
+		svc.GetEntities(&userlist, where)
+	}
+	//var users []userRole.Base_RoleList
+	//certSrv.GetAuditUser("100000178", workflow.PROF_REGULATION, &users)
 	//var users []suppliercert.UserList
 	// where := "OrganizeId=100000178 and AuditStepCode='" + workflow.PROF_REGULATION + "'"
 	//svc.GetEntitysByWhere(OilAuditSettingName, where, &users)
 	var datainfo ErrorDataInfo
-	datainfo.Item = users
+	datainfo.Item = userlist
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
@@ -1084,15 +1099,33 @@ func (this *InfoChangeController) InfoAudit() {
 		status = suppliercert.CENT_AUDIT_STATUS
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 		step = 2
-		dictSvc := items.GetItemsService(utils.DBE)
-		deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
-		var users []userRole.Base_RoleList
-		certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-		for _, dept := range deptIds {
-			certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
+		//dictSvc := items.GetItemsService(utils.DBE)
+		//deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
+		//var users []userRole.Base_RoleList
+		//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+		//for _, dept := range deptIds {
+		//	certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
+		//	for _, tmpUser := range users {
+		//		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		//	}
+		//}
+		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 infomodel.Status == suppliercert.CENT_AUDIT_STATUS {

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

@@ -2,7 +2,8 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/audithistory"
-	"dashoo.cn/business2/items"
+	"dashoo.cn/backend/api/business/auditsetting"
+	"dashoo.cn/business2/parameter"
 	"encoding/json"
 	"strconv"
 	"strings"
@@ -18,7 +19,7 @@ import (
 	"dashoo.cn/backend/api/business/workflow"
 
 	"dashoo.cn/backend/api/business/baseUser"
-	"dashoo.cn/business/userRole"
+	"dashoo.cn/business2/userRole"
 
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
@@ -689,15 +690,33 @@ func (this *QualChangeController) QualAudit() {
 		status = suppliercert.CENT_AUDIT_STATUS
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 		step = 2
-		dictSvc := items.GetItemsService(utils.DBE)
-		deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
-		var users []userRole.Base_RoleList
-		certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-		for _, dept := range deptIds {
-			certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
+		//dictSvc := items.GetItemsService(utils.DBE)
+		//deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
+		//var users []userRole.Base_RoleList
+		//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+		//for _, dept := range deptIds {
+		//	certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
+		//	for _, tmpUser := range users {
+		//		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		//	}
+		//}
+		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 qualmodel.Status == suppliercert.CENT_AUDIT_STATUS {

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

@@ -1798,6 +1798,8 @@ func (this *OilSupplierController) GetDictListByStatus() {
 	dictList["CountryList"] = areaJsonSvc.GetCountryList()
 	//获取专业审批处室部门
 	var preorglist []organize.Base_Organizetree
+	//paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	//topid := paramSvc.GetBaseparameterMessage("", "paramset", "HeadquartersID") // 总公司Id
 	ids := orgsvc.GetAllChildUnitById("0")
 	svc.GetProOrTreeList(ids, &preorglist)
 	dictList["ProOrgList"] = preorglist
@@ -2229,31 +2231,29 @@ func (this *OilSupplierController) GetAuditerByDept() {
 	auditstepcode := this.GetString("auditstepcode")
 	svc := organize.GetOrganizeService(utils.DBE)
 	unitId := svc.GetMyUnitDepartmentId(Id)
-	ids := svc.GetAllChildById(unitId)
-	//var org organize.Base_Organize
-	//svc := organize.GetOrganizeService(utils.DBE)
-	//has := svc.GetEntityById(Id, &org)
-	//ids := Id
-	//if has && org.Category == "unit" {
-	//	ids = svc.GetAllChildById(Id)
-	//}
-	//var auditWorkflow []auditsetting.Base_OilAuditSetting
-	//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, Id, workflow.FIRST_TRIAL, &auditWorkflow)
-
-	//var auditset []auditsetting.Base_OilAuditSetting
-	//where := "OrganizeId=" + Id + " and AuditStepCode='" + auditstepcode + "'"
-	//rsvc.GetEntitysByWhere(OilAuditSettingName, where, &auditset)
+	//ids := svc.GetAllChildById(unitId)
+	//
+	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	//var users []userRole.Base_RoleList
-	//if auditset != nil {
-	//	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	//	svc.GetAuditUserList(strconv.Itoa(auditset[0].Id), &users)
-	//}
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	var users []userRole.Base_RoleList
-	certSrv.GetAuditUser(ids, auditstepcode, &users)
+	//certSrv.GetAuditUser(ids, auditstepcode, &users)
+
+	var userlist []userRole.Base_User
+	var setting auditsetting.Base_OilAuditSetting
+	usvc := userRole.GetUserService(utils.DBE)
+	where := "AuditStepCode='" + auditstepcode + "'"
+	svc.GetEntity(&setting, where)
+
+	ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+	tempstr := strings.Join(ids, ",")
+	userIds := strings.Replace(tempstr, "uid_", "", -1)
+	userIds = strings.Trim(userIds, ",")
+	if userIds != "" {
+		where := "Id in (" + userIds + ")" + " and UnitId=" + unitId
+		svc.GetEntities(&userlist, where)
+	}
+
 	var datainfo ErrorDataInfo
-	datainfo.Item = users
+	datainfo.Item = userlist
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
@@ -2265,15 +2265,30 @@ func (this *OilSupplierController) GetFirAuditerByDept() {
 	Id := this.Ctx.Input.Param(":deptId")
 	auditstepcode := this.GetString("auditstepcode")
 
-	svc := organize.GetOrganizeService(utils.DBE)
+	var userlist []userRole.Base_User
+	var setting auditsetting.Base_OilAuditSetting
+	svc := userRole.GetUserService(utils.DBE)
+	where := "AuditStepCode='" + auditstepcode + "'"
+	svc.GetEntity(&setting, where)
 
-	ids := svc.GetAllChildById(Id)
+	ids := svc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+	tempstr := strings.Join(ids, ",")
+	userIds := strings.Replace(tempstr, "uid_", "", -1)
+	userIds = strings.Trim(userIds, ",")
+	if userIds != "" {
+		where := "Id in (" + userIds + ")" + "and UnitId=" + Id
+		svc.GetEntities(&userlist, where)
+	}
 
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	var users []userRole.Base_RoleList
-	certSrv.GetAuditUser(ids, auditstepcode, &users)
+	//svc := organize.GetOrganizeService(utils.DBE)
+	//
+	//ids := svc.GetAllChildById(Id)
+	//
+	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	//var users []userRole.Base_RoleList
+	//certSrv.GetAuditUser(ids, auditstepcode, &users)
 	var datainfo ErrorDataInfo
-	datainfo.Item = users
+	datainfo.Item = userlist
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
@@ -2289,14 +2304,29 @@ func (this *OilSupplierController) GetAuditerByFist() {
 	var userentity userRole.Base_User
 	certSrv.GetEntityById(Id, &userentity)
 
-	svc := organize.GetOrganizeService(utils.DBE)
-	unitId := svc.GetMyUnitDepartmentId(userentity.Departmentid)
-	ids := svc.GetAllChildById(unitId)
-	//depId := strings.Split(userentity.Superior,",")
-	var users []userRole.Base_RoleList
-	certSrv.GetAuditUser(ids, auditstepcode, &users)
+	var userlist []userRole.Base_User
+	var setting auditsetting.Base_OilAuditSetting
+	svc := userRole.GetUserService(utils.DBE)
+	where := "AuditStepCode='" + auditstepcode + "'"
+	svc.GetEntity(&setting, where)
+
+	ids := svc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+	tempstr := strings.Join(ids, ",")
+	userIds := strings.Replace(tempstr, "uid_", "", -1)
+	userIds = strings.Trim(userIds, ",")
+	if userIds != "" {
+		where := "Id in (" + userIds + ")" + "and UnitId=" + strconv.Itoa(userentity.UnitId)
+		svc.GetEntities(&userlist, where)
+	}
+
+	//svc := organize.GetOrganizeService(utils.DBE)
+	//unitId := svc.GetMyUnitDepartmentId(userentity.Departmentid)
+	//ids := svc.GetAllChildById(unitId)
+	////depId := strings.Split(userentity.Superior,",")
+	//var users []userRole.Base_RoleList
+	//certSrv.GetAuditUser(ids, auditstepcode, &users)
 	var datainfo ErrorDataInfo
-	datainfo.Item = users
+	datainfo.Item = userlist
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
@@ -2308,12 +2338,28 @@ func (this *OilSupplierController) GetAuditerByDeptAndNoLogin() {
 	Id := this.GetString("deptId")
 	auditstepcode := this.GetString("auditstepcode")
 
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	var users []userRole.Base_RoleList
-	certSrv.GetAuditUser(Id, auditstepcode, &users)
+	var userlist []userRole.Base_User
+	var setting auditsetting.Base_OilAuditSetting
+	svc := userRole.GetUserService(utils.DBE)
+	where := "AuditStepCode='" + auditstepcode + "'"
+	svc.GetEntity(&setting, where)
+
+	ids := svc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+	tempstr := strings.Join(ids, ",")
+	userIds := strings.Replace(tempstr, "uid_", "", -1)
+	userIds = strings.Trim(userIds, ",")
+	if userIds != "" {
+		where := "Id in (" + userIds + ")" + "and UnitId=" + Id
+		svc.GetEntities(&userlist, where)
+	}
+
+
+	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	//var users []userRole.Base_RoleList
+	//certSrv.GetAuditUser(Id, auditstepcode, &users)
 	//	certSrv.GetAuditUserByNoLogin(Id, &users)
 	var datainfo ErrorDataInfo
-	datainfo.Item = users
+	datainfo.Item = userlist
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }

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

@@ -4,9 +4,9 @@ import (
 	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/codecsequence"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
+	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/paymentinfo"
 	"dashoo.cn/business2/items"
-	"dashoo.cn/backend/api/business/organize"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -844,22 +844,29 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		status = suppliercert.THIRD_TRIAL_STATUS
 		step = 2
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
-		//获得有专业审核接收权限的人员
-		//var users1 []userRole.Base_RoleList
-		//var auditWorkflow1 auditsetting.Base_OilAuditSetting
-		//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, strconv.Itoa(supplierCertEntity.ThirdAudit), workflow.PROF_RECE, &auditWorkflow1)
-		//users1 = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow1.RoleId), this.User.AccCode)
 
-		//var auditset []auditsetting.Base_OilAuditSetting
-		//where := "OrganizeId=" + strconv.Itoa(supplierCertEntity.ThirdAudit) + " and AuditStepCode='" + workflow.PROF_RECE + "'"
-		//certSrv.GetEntitysByWhere(OilAuditSettingName,where, &users)
-		var users []userRole.Base_RoleList
-		certSrv.GetAuditUser(strconv.Itoa(supplierCertEntity.ThirdAudit), workflow.PROF_RECE, &users)
+		//var users []userRole.Base_RoleList
+		//certSrv.GetAuditUser(strconv.Itoa(supplierCertEntity.ThirdAudit), workflow.PROF_RECE, &users)
+		svc := organize.GetOrganizeService(utils.DBE)
+		unitId := svc.GetMyUnitDepartmentId(strconv.Itoa(supplierCertEntity.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 users {
-			userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		for _, tmpUser := range userlist {
+			userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
 		}
 		userIds = strings.Trim(userIds, ",")
 	} else if supplierCertEntity.Status == suppliercert.THIRD_TRIAL_STATUS {
@@ -881,13 +888,31 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		//certSrv.GetEntitysByWhere(OilAuditSettingName,where, &users)
 		dictSvc := items.GetItemsService(utils.DBE)
 		deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
-		var users []userRole.Base_RoleList
-		for _, dept := range deptIds {
-			certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
+
+		var userlist []userRole.Base_User
+		var setting auditsetting.Base_OilAuditSetting
+		usvc := userRole.GetUserService(utils.DBE)
+		where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+		usvc.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=" + deptIds[0].Value
+			usvc.GetEntities(&userlist, where)
+		}
+		for _, tmpUser := range userlist {
+			userIds += strconv.Itoa(tmpUser.Id) + ","
 		}
+		//var users []userRole.Base_RoleList
+		//for _, dept := range deptIds {
+		//	certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
+		//	for _, tmpUser := range users {
+		//		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		//	}
+		//}
 
 		userIds = strings.Trim(userIds, ",")
 	} else if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
@@ -1063,15 +1088,22 @@ func (this *OilSupplierCertController) IsAccess() {
 		//rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)
 		//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, auditstepcode, &auditWorkflow)
 		//users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode)
-		var users []userRole.Base_RoleList
-		certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-		certSrv.GetAuditUser(this.User.DepartmentId, auditstepcode, &users)
-		for _, user := range users {
-			if this.User.Id == strconv.Itoa(int(user.Id))  {
-				res = true
-				break
-			}
-		}
+		//var users []userRole.Base_RoleList
+		//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+		//certSrv.GetAuditUser(this.User.DepartmentId, auditstepcode, &users)
+
+		var setting auditsetting.Base_OilAuditSetting
+		svc := organize.GetOrganizeService(utils.DBE)
+		where := "AuditStepCode='" + auditstepcode + "'"
+		svc.GetEntity(&setting, where)
+		res = svc.UserInRoleById(this.User.Id, strconv.Itoa(setting.RoleId))
+
+		//for _, user := range users {
+		//	if this.User.Id == strconv.Itoa(int(user.Id))  {
+		//		res = true
+		//		break
+		//	}
+		//}
 	}
 
 	this.Data["json"] = res

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

@@ -2,9 +2,11 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/audithistory"
+	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
+	"dashoo.cn/backend/api/business/organize"
+	"dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/userRole"
-	"dashoo.cn/business2/items"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -570,7 +572,7 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	appendId := this.Ctx.Input.Param(":id")
 	//取出审批列表
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
 	svc.GetEntityById(appendId, &supplierCertAppendEntity)
@@ -612,11 +614,27 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		status = suppliercert.THIRD_TRIAL_STATUS
 		step = 2
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
-		supsvc := suppliercert.GetOilSupplierCertService(utils.DBE)
-		var users []userRole.Base_RoleList
-		supsvc.GetAuditUser(strconv.Itoa(supplierCertAppendEntity.ThirdAudit), workflow.PROF_RECE, &users)
-		for _, tmpUser := range users {
-			userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		//supsvc := suppliercert.GetOilSupplierCertService(utils.DBE)
+		//var users []userRole.Base_RoleList
+		//supsvc.GetAuditUser(strconv.Itoa(supplierCertAppendEntity.ThirdAudit), workflow.PROF_RECE, &users)
+		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 {
@@ -628,16 +646,33 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		status = suppliercert.CENT_AUDIT_STATUS
 		step = 2
 		backstatus = suppliercert.NO_PROF_AUDIT_STATUS
-		dictSvc := items.GetItemsService(utils.DBE)
-		deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
-		var users []userRole.Base_RoleList
-		for _, dept := range deptIds {
-			certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
+		//dictSvc := items.GetItemsService(utils.DBE)
+		//deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
+		//var users []userRole.Base_RoleList
+		//for _, dept := range deptIds {
+		//	certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
+		//	for _, tmpUser := range users {
+		//		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		//	}
+		//}
+		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)

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -1,7 +1,6 @@
 package register
 
 import (
-	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"encoding/json"
 	"strconv"
 	"strings"
@@ -493,15 +492,28 @@ func (this *OilCorporateInfoController) GetAuditerByDept() {
 	Id := this.GetString("deptId")
 	auditstepcode := this.GetString("auditstepcode")
 
-	svc := organize.GetOrganizeService(utils.DBE)
-
-	ids := svc.GetAllChildById(Id)
+	var userlist []userRole.Base_User
+	var setting auditsetting.Base_OilAuditSetting
+	svc := userRole.GetUserService(utils.DBE)
+	where := "AuditStepCode='" + auditstepcode + "'"
+	svc.GetEntity(&setting, where)
+
+	ids := svc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+	tempstr := strings.Join(ids, ",")
+	userIds := strings.Replace(tempstr, "uid_", "", -1)
+	userIds = strings.Trim(userIds, ",")
+	if userIds != "" {
+		where := "Id in (" + userIds + ")" + "and UnitId=" + Id
+		svc.GetEntities(&userlist, where)
+	}
 
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	var users []userRole.Base_RoleList
-	certSrv.GetAuditUser(ids, auditstepcode, &users)
+	//ids := svc.GetAllChildById(Id)
+	//
+	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	//var users []userRole.Base_RoleList
+	//certSrv.GetAuditUser(ids, auditstepcode, &users)
 	var datainfo ErrorDataInfo
-	datainfo.Item = users
+	datainfo.Item = &userlist
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -114,6 +114,7 @@ func (this *OilAuditSettingController) GetEntityList() {
 	if Remark != "" {
 		where = where + " and Remark like '%" + Remark + "%'"
 	}
+	where = where + " and OrganizeId = 1"
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	var list []auditsetting.Base_OilAuditSetting
 	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
@@ -465,3 +466,106 @@ func (this *OilAuditSettingController) GetAuditUserList() {
 	this.Data["json"] = &users
 	this.ServeJSON()
 }
+
+// @Title 获取审核角色列表
+// @Description 获取审核角色列表
+// @Success 200 {object} auditsetting.Base_OilAuditSetting
+// @router /getauditrolelist [get]
+func (this *OilAuditSettingController) GetAuditRoleList() {
+	id := this.GetString("acode")
+
+	var auditset auditsetting.Base_OilAuditSetting
+	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	svc.GetEntityById(id, &auditset)
+
+	//var aduitroles []auditsetting.OilAuditUser
+	//svc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	//where := "SettingId=" + id
+	//svc.GetEntities(&aduitroles, where)
+	//var aduitrolearr []string
+	//for _,aduitrole := range aduitroles {
+	//	aduitrolearr = append(aduitrolearr, strconv.Itoa(aduitrole.UserId))
+	//}
+
+	this.Data["json"] = &auditset
+	this.ServeJSON()
+
+}
+
+// @Title 添加审核角色
+// @Description 新增
+// @Param 	body body auditsetting.OilAuditSetting
+// @Success	200	{object} controllers.Request
+// @router /addauditrole [post]
+func (this *OilAuditSettingController) Addauditrole() {
+	setid := this.GetString("setid")
+	//auditstepcode := this.GetString("auditStepCode")
+	roleid := this.GetString("roleids")
+
+	var auditset auditsetting.Base_OilAuditSetting
+	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	auditset.RoleId,_ = strconv.Atoi(roleid)
+	cols := []string{
+		"RoleId",
+	}
+	_,err := svc.UpdateEntityByIdCols(setid, &auditset, cols)
+	//roleidarr := strings.Split(roleids, ",")
+	//
+	//var auditset auditsetting.OilAuditUser
+	//svc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	//where := "SettingId=" + setid
+	//svc.DeleteEntityBytbl(OilAuditUserName, where)
+	//
+	//var err error
+	//for _,roleid := range roleidarr {
+	//	auditset.Id = 0
+	//	auditset.SettingId,_ = strconv.Atoi(setid)
+	//	auditset.UserId,_ = strconv.Atoi(roleid)
+	//	auditset.CreateUserId,_ = strconv.Atoi(this.User.Id)
+	//	auditset.CreateOn = time.Now()
+	//	auditset.CreateBy = this.User.Realname
+	//	_,err = svc.InsertEntity(&auditset)
+	//}
+
+	var errinfo ErrorDataInfo
+	if err == nil {
+		errinfo.Message = "保存成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "保存失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 根据角色获取用户
+// @Description 获取用户by角色
+// @Param 	body body auditsetting.OilAuditSetting
+// @Success	200	{object} controllers.Request
+// @router /getuserbyrole [get]
+func (this *OilAuditSettingController) GetUserByRole() {
+	roleId := this.GetString("roleids")
+	//rolearr := strings.Split(roleIds, ",")
+
+	var userlist []userRole.Base_User
+	svc := userRole.GetUserService(utils.DBE)
+	var ids []string
+	userIds := ""
+	//for _,roleid := range rolearr {
+	ids = svc.GetUserIdsByRoleId(roleId)
+	tempstr := strings.Join(ids, ",")
+	userIds = strings.Replace(tempstr, "uid_", "", -1)
+	//}
+	userIds = strings.Trim(userIds, ",")
+	if userIds != "" {
+		where := "Id in (" + userIds + ")"
+		svc.GetEntities(&userlist, where)
+	}
+
+	this.Data["json"] = &userlist
+	this.ServeJSON()
+
+}

src/dashoo.cn/frontend_web/src/api/system/auditsetting.js

@@ -49,5 +49,25 @@ export default {
       url: '/auditsetting/getaudituserlist/' + Id,
       method: 'GET'
     })
+  },
+  getAuditRoleList (Id, myAxios) {
+    return myAxios({
+      url: '/auditsetting/getauditrolelist?acode=' + Id,
+      method: 'GET'
+    })
+  },
+  addauditrole (params, myAxios) {
+    return myAxios({
+      url: '/auditsetting/addauditrole',
+      method: 'POST',
+      params: params
+    })
+  },
+  getUserByRole (params, myAxios) {
+    return myAxios({
+      url: '/auditsetting/getuserbyrole',
+      method: 'GET',
+      params: params
+    })
   }
 }

src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditor.vue

@@ -17,7 +17,7 @@
               <el-table :data="userOptions" style="width: 100%" ref="multipleTable"
                         @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column prop="realname" label="可选用户">
+                <el-table-column prop="Realname" label="可选用户">
                   <template slot="header" slot-scope="scope">
                     <el-button type="primary" style="float: right;" size="small" @click="toggleSelection">
                       选择审核人 <el-icon class="el-icon-d-arrow-right"></el-icon>
@@ -156,7 +156,7 @@
         supapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.userOptions = res.data.item
           if (res.data.item != null && res.data.item.length > 0) {
-            this.AuditorForm.UserId = res.data.item[0].id
+            this.AuditorForm.UserId = res.data.item[0].Id
           }
         }).catch(err => {
           console.error(err)
@@ -172,7 +172,7 @@
         }
       },
       toggleSelection () {
-        this.$emit('close', this.selectedOptions.id, this.selectedOptions.realname)
+        this.$emit('close', this.selectedOptions.Id, this.selectedOptions.Realname)
       },
       hideChooseAuditer () {
         this.$emit('hideChooseAuditer')

src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditor2.vue

@@ -17,7 +17,7 @@
               <el-table :data="userOptions" style="width: 100%" ref="multipleTable"
                         @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column prop="realname" label="可选用户">
+                <el-table-column prop="Realname" label="可选用户">
                   <template slot="header" slot-scope="scope">
                     <el-button type="primary" style="float: right;" size="small" @click="toggleSelection">
                       选择审核人 <el-icon class="el-icon-d-arrow-right"></el-icon>
@@ -103,7 +103,7 @@
         supapi.getAuditerByDeptAndNoLogin(params, this.$axios).then(res => {
           this.userOptions = res.data.item
           if (res.data.item != null && res.data.item.length > 0) {
-            this.AuditorForm.UserId = res.data.item[0].id
+            this.AuditorForm.UserId = res.data.item[0].Id
           }
         }).catch(err => {
           console.error(err)
@@ -119,7 +119,7 @@
         }
       },
       toggleSelection () {
-        this.$emit('close', this.selectedOptions.id, this.selectedOptions.realname)
+        this.$emit('close', this.selectedOptions.Id, this.selectedOptions.Realname)
       },
       hideChooseAuditer () {
         this.$emit('hideChooseAuditer')

src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditorfenban.vue

@@ -17,7 +17,7 @@
               <el-table :data="userOptions" style="width: 100%" ref="multipleTable"
                         @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column prop="realname" label="可选用户">
+                <el-table-column prop="Realname" label="可选用户">
                   <template slot="header" slot-scope="scope">
                     <el-button type="primary" style="float: right;" size="small" @click="toggleSelection">
                       选择审核人 <el-icon class="el-icon-d-arrow-right"></el-icon>
@@ -157,7 +157,7 @@
           this.userOptions = res.data.item
           console.log("---this.userOptions--",this.userOptions)
           if (res.data.item != null && res.data.item.length > 0) {
-            this.AuditorForm.UserId = res.data.item[0].id
+            this.AuditorForm.UserId = res.data.item[0].Id
           }
         }).catch(err => {
           console.error(err)
@@ -173,7 +173,7 @@
         }
       },
       toggleSelection () {
-        this.$emit('close', this.selectedOptions.id, this.selectedOptions.realname)
+        this.$emit('close', this.selectedOptions.Id, this.selectedOptions.Realname)
       },
       hideChooseAuditer () {
         this.$emit('hideChooseAuditer')

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

@@ -209,7 +209,7 @@
         <!--</el-row>-->
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
-        <el-button  type="primary" size="mini" @click="ComAudit">审核</el-button>
+        <el-button  type="primary" size="mini" @click="ComAudit" v-if="formData.CheckStatus == 0">审核</el-button>
       </div>
     </el-dialog>
     <el-dialog title="审核" :visible.sync="Auditshow">

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

@@ -255,7 +255,7 @@
             <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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -262,7 +262,7 @@
             <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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -253,7 +253,7 @@
             <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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -199,7 +199,7 @@
         <el-form-item :label="aduitlabel" v-if="this.formData.Status == '3'">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in auditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -240,7 +240,7 @@
         <el-form-item :label="aduitlabel" v-if="this.formData.Status == '3'">
           <el-select ref="selectAuditer" v-model="auditer" 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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -271,7 +271,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" 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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -296,7 +296,7 @@
             <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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -208,7 +208,7 @@
         <el-form-item :label="aduitlabel" v-if="this.formData.Status == '3'">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in auditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -249,7 +249,7 @@
         <el-form-item :label="aduitlabel" v-if="this.formData.Status == '3'">
           <el-select ref="selectAuditer" v-model="auditer" 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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" 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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -307,7 +307,7 @@
             <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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -206,7 +206,7 @@
         <el-form-item :label="aduitlabel" v-if="this.formData.Status == '3'">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in auditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -238,7 +238,7 @@
         <el-form-item :label="aduitlabel" v-if="this.formData.Status == '3'">
           <el-select ref="selectAuditer" v-model="auditer" 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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -269,7 +269,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" 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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -294,13 +294,13 @@
             <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 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-form-item label="业务处室">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
-                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
+                style="width: 100%" v-model="majorDept" placeholder="请选择业务处室">
               </el-cascader>
             </el-form-item>
           </el-col>
@@ -394,6 +394,7 @@
         dialogMakeSure: false,
         dialogMakeSure2: false,
         dialogAllocation: false,
+        chooseAuditorVisible: false,
         add_flat: false,
         aduitlabel: '审核人',
         auditer: '',
@@ -654,6 +655,7 @@
         let auditstepcode = "SECOND_TRIAL";
         api.getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
+            console.log(res.data.item, '====')
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
@@ -674,6 +676,7 @@
           majorAduit: this.formData.ThirdAudit
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
+          console.log(res.data.items, 'res.data.items')
           this.dictData = res.data.items
           this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
 
@@ -732,6 +735,7 @@
         // this.auditerOptions = []
         // this.auditer = ''
         api.getAuditerByDept(this.authUser.Profile.DepartmentId, auditstepcode, this.$axios).then(res => {
+          console.log(res.data.item, 'res.data.item')
           this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -520,6 +520,8 @@
         }
       },
       orgChange (val) {
+        this.formData.CheckUserId = 0
+        this.formData.CheckUserName = ''
         let auditstepcode = 'COMPONY_AUDIT' // 初审人
         let params = {
           deptId: val,
@@ -528,8 +530,8 @@
         this.$axios.get('/register/getauditerbydept', {params}).then(res => {
           if (res.data.item != null && res.data.item.length > 0) {
             for (let i = 0; i < res.data.item.length; i++) {
-              this.formData.CheckUserName = this.formData.CheckUserName + res.data.item[i].realname + ','
-              this.formData.CheckUserId = this.formData.CheckUserId + res.data.item[i].id + ','
+              this.formData.CheckUserName = this.formData.CheckUserName + res.data.item[i].Realname + ','
+              this.formData.CheckUserId = this.formData.CheckUserId + res.data.item[i].Id + ','
             }
           }
           // this.userOptions = res.data.item

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index.vue

@@ -3,170 +3,112 @@
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/system/auditsetting' }">单位审批步骤自定义配置</el-breadcrumb-item>
+      <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
+    <el-card class="box-card">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 自定义配置
+          <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <router-link :to="'/system/auditsetting/add/operation?step='+this.$route.query.step">
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+            <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
         </span>
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <!--<el-form-item label="上报时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>-->
-          <el-form-item label="上级组织" label-width="120px" v-if="false">
-            <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-              v-model="selectedorg" placeholder="请选择组织"></el-cascader>
-          </el-form-item>
-
-          <el-form-item>
-            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
-              查询
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="search">高级查询</el-dropdown-item>
-                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-form-item>
-        </el-form>
       </div>
-      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" width="160" align="center" fixed="right">
-          <template slot-scope="scope">
-             <router-link :to="'/system/auditsetting/'+scope.row.Id+ '/operation'">
-              <el-button type="primary" title="编辑" size="mini" >编辑</el-button>
-            </router-link>
-
-            <el-popover placement="top" title="提示">
-              <el-alert title="" description="确认要删除吗？" trigger="click" type="warning" :closable="false">
-              </el-alert>
-              <br />
-              <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="plain" title="删除" style="margin-left:3px" size="mini">删除</el-button>
-            </el-popover>
-          </template>
-        </el-table-column>
-
-        <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
-          :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
-        </el-table-column>
-
-        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>-->
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount">
-      </el-pagination>
-    </el-card>
-
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="advancedsearchForm" label-width="110px">
+      <!--<el-checkbox :indeterminate="isrolecheckall" v-model="roleCheckAll" @change="handleCheckAllChange">全选</el-checkbox>-->
+      <div style="margin-top:20px;">
+        <!--<el-checkbox-group v-model="selectedrole">-->
+          <!--<el-checkbox v-for="role in rolelist" @change="handlecheckedrolechange" :label="role.Id" :value="role.Id" :key="role.Id">{{role.Realname}}</el-checkbox>-->
+        <!--</el-checkbox-group>-->
         <el-row>
-
-          <el-col :span="12">
-            <el-form-item label="生成时间">
-              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="单位ID">
-              <el-input size="mini" v-model="searchForm.OrganizeId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="单位名称">
-              <el-input size="mini" v-model="searchForm.OrganizeName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
+          <el-col :span="8">
+            <el-select v-model="selectedrole" placeholder="请选择"
+                       style="width: 100%;">
+              <el-option v-for="item in rolelist" :key="item.Id" :label="item.Realname" :value="item.Id">
+              </el-option>
+            </el-select>
           </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="审批步骤编码">
-              <el-input size="mini" v-model="searchForm.AuditStepCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="审批步骤名称">
-              <el-input size="mini" v-model="searchForm.AuditStepName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="角色ID">
-              <el-input size="mini" v-model="searchForm.RoleId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="角色名称">
-              <el-input size="mini" v-model="searchForm.RoleName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" 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="handleSearch">查 询</el-button>
-      </span>
-    </el-dialog>
-
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <!--<div slot="header" class="clearfix">-->
+        <!--<span></span>-->
+      <!--</div>-->
+      <el-table :data="userlist"  size="mini" border>
+        <el-table-column prop="Username" align="center" label="账号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Realname" align="center" label="用户名"></el-table-column>
+        <el-table-column prop="Departmentname" align="center" label="部门"></el-table-column>
+        <el-table-column prop="Unit" align="center" label="单位"></el-table-column>
+        <!--<el-table-column prop="Description" align="center" label="备注"-->
+                         <!--show-overflow-tooltip></el-table-column>-->
+      </el-table>
+    </el-card>
   </div>
 </template>
+
 <script>
   import {
     mapGetters
   } from 'vuex'
   import api from '@/api/system/auditsetting'
-
+  // import ElCol from 'element-ui/packages/col/src/col'
+  // import ElIcon from '../../../../node_modules/element-ui/packages/icon/src/icon'
   export default {
+    components: {
+      // ElIcon,
+      // ElCol
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
       })
     },
-    name: 'oilauditsetting',
-    data() {
+    name: 'oilauditsettingEdit',
+
+    data () {
       return {
-        dialogVisible: false,
-        // 列表数据
-        entityList: [],
+        roleCheckAll: false,
+        isrolecheckall: false,
+        ACode: '',
         // 分页参数
         size: 10,
-
         currentPage: 1,
         currentItemCount: 0,
-        ACode: "",
+        auditStepCode: '',
+        auditStepName: '',
+
+        rolelist: [],
+        rolelistcheckall: [],
+        selectedrole: '',
+        mustrolelist: [],
+        entityList: [],
+        userlist: [],
         // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
-        // 查询项
-        searchFormReset: {},
-        searchForm: {
+
+        serviceId: '',
+        auditStepOptions: [],
+        roleList: [],
+        auditers: '',
+        departmentId: '',
+        userOptions: [],
+        userselectOptions: [],
+        selectedOptions: [],
+        selectdelOptions: [],
+        orgtreelist: [],
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
+        selectedorg: [],
+        step: 1,
+        WorkFlowOptions: [],
+        formData: {
           Id: '',
           OrganizeId: '',
           OrganizeName: '',
@@ -174,8 +116,10 @@
           AuditStepName: '',
           RoleId: '',
           RoleName: '',
-          UesrId: '',
+          UserId: '',
           UserName: '',
+          WorkFlowCord: '',
+          WorkFlowName: '',
           Remark: '',
           IsDelete: '',
           CreateOn: '',
@@ -184,126 +128,89 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: ''
-        },
-        tableColumns: [{
-          prop: 'OrganizeName',
-          label: '单位名称',
-          width: 100,
-          sort: true
-        },
-        // {
-        //   prop: 'AuditStepCode',
-        //   label: '审批步骤编码',
-        //   width: 100,
-        //   sort: true
-        // },
-        {
-          prop: 'AuditStepName',
-          label: '审批步骤名称',
-          width: 100,
-          sort: true
-        },
-        // {
-        //   prop: 'RoleName',
-        //   label: '角色名称',
-        //   width: 100,
-        //   sort: true
-        // },
-        {
-          prop: 'UserName',
-          label: '审批人',
-          width: 100,
-          sort: true
-        },
-        // {
-        //   prop: 'WorkFlowName',
-        //   label: '工作流名称',
-        //   width: 100,
-        //   sort: true
-        // },
-        {
-          prop: 'Remark',
-          label: '备注',
-          width: 100,
-          sort: true
-        },
-        {
-          prop: 'CreateOn',
-          label: '创建时间',
-          width: 100,
-          sort: true
+
         }
-        ]
-      }
-    },
-    created() {
-      // 查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm)
-      // 查询列表
-      if (this.$route.query.step == 1) {
-        //企业法规处审核
-        this.ACode = "FIRST_TRIAL"
-      } else if (this.$route.query.step == 2) {
-        //二级单位复审
-        this.ACode = "SECOND_TRIAL"
-      } else if (this.$route.query.step == 3) {
-        //业务处室接收
-        this.ACode = "PROF_RECE"
-      } else if (this.$route.query.step == 4) {
-        //业务处室专业审核
-        this.ACode = "PROF_AUDIT"
-      } else if (this.$route.query.step == 5) {
-        //集中评审
-        this.ACode = "PROF_CONCENT"
-      } else if (this.$route.query.step == 6) {
-        //企业法规处审核
-        this.ACode = "PROF_REGULATION"
-      } else if (this.$route.query.step == 7) {
-        // 二级单位分办
-        this.ACode = "SUB_OFFICE"
-      } else if (this.$route.query.step == 8) {
-        //注册公司审核
-        this.ACode = "COMPONY_AUDIT"
+        // 下拉选择项
+        // wellNoOptions: [],
+        // supervisersOptions: [],
+
       }
-      this.initDatas()
-      // his.getDictOptions()
     },
 
     watch: {
       $route (val) {
         if (val.query.step == 1) {
-          //企业法规处审核
-          this.ACode = "FIRST_TRIAL"
+          // 企业法规处审核
+          this.ACode = 'FIRST_TRIAL'
         } else if (val.query.step == 2) {
-          //二级单位复审
-          this.ACode = "SECOND_TRIAL"
+          // 二级单位复审
+          this.ACode = 'SECOND_TRIAL'
         } else if (val.query.step == 3) {
-          //业务处室接收
-          this.ACode = "PROF_RECE"
+          // 业务处室接收
+          this.ACode = 'PROF_RECE'
         } else if (val.query.step == 4) {
-          //业务处室专业审核
-          this.ACode = "PROF_AUDIT"
+          // 业务处室专业审核
+          this.ACode = 'PROF_AUDIT'
         } else if (val.query.step == 5) {
-          //集中评审
-          this.ACode = "PROF_CONCENT"
+          // 集中评审
+          this.ACode = 'PROF_CONCENT'
         } else if (val.query.step == 6) {
-          //企业法规处审核
-          this.ACode = "PROF_REGULATION"
+          // 企业法规处审核
+          this.ACode = 'PROF_REGULATION'
         } else if (val.query.step == 7) {
           // 二级单位分办
           this.ACode = 'SUB_OFFICE'
         } else if (val.query.step == 8) {
-          //注册公司审核
-          this.ACode = "COMPONY_AUDIT"
+          // 注册公司审核
+          this.ACode = 'COMPONY_AUDIT'
         }
-        this.initDatas()
+        this.initData()
       }
     },
 
+    created () {
+      // this.serviceId = this.$route.params.opera
+      // this.step = this.$route.query.step
+      // if (this.serviceId !== 'add' && this.serviceId > 0) {
+      //   this.formData.Id = this.serviceId
+      //   this.initDatas()
+      // } else {
+      //   this.formData.Id = 0
+      // }
+      this.step = this.$route.query.step
+      if (this.$route.query.step == 1) {
+        // 企业法规处审核
+        this.ACode = 'FIRST_TRIAL'
+      } else if (this.$route.query.step == 2) {
+        // 二级单位复审
+        this.ACode = 'SECOND_TRIAL'
+      } else if (this.$route.query.step == 3) {
+        // 业务处室接收
+        this.ACode = 'PROF_RECE'
+      } else if (this.$route.query.step == 4) {
+        // 业务处室专业审核
+        this.ACode = 'PROF_AUDIT'
+      } else if (this.$route.query.step == 5) {
+        // 集中评审
+        this.ACode = 'PROF_CONCENT'
+      } else if (this.$route.query.step == 6) {
+        // 企业法规处审核
+        this.ACode = 'PROF_REGULATION'
+      } else if (this.$route.query.step == 7) {
+        // 二级单位分办
+        this.ACode = 'SUB_OFFICE'
+      } else if (this.$route.query.step == 8) {
+        // 注册公司审核
+        this.ACode = 'COMPONY_AUDIT'
+      }
+      this.initData()
+      // this.getAllRole()
+      this.getDictOptions()
+      this.getorgtreelist()
+    },
     methods: {
-      initDatas () {
+      initData () {
         // 分页及列表条件
-
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -311,80 +218,198 @@
           Prop: this.Column.Prop,
           Code: this.ACode
         }
-        let myCreateOn = []
-        // 解析时间
-        if (this.CreateOn.length === 2) {
-          this.CreateOn[1].setHours(23)
-          this.CreateOn[1].setMinutes(59)
-          this.CreateOn[1].setSeconds(59)
-          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
-          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
-        }
+        // let myCreateOn = []
+        // // 解析时间
+        // if (this.CreateOn.length === 2) {
+        //   this.CreateOn[1].setHours(23)
+        //   this.CreateOn[1].setMinutes(59)
+        //   this.CreateOn[1].setSeconds(59)
+        //   myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+        //   myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        // }
         // 查询条件
         Object.assign(params, this.searchForm)
         // 访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getList([], params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
+          this.getAllRole()
         }).catch(err => {
           console.error(err)
         })
       },
+      getAllRole () {
+        this.$axios.get('role/list', {})
+          .then(res => {
+            // response
+            this.rolelist = res.data.items
+            this.roleItemCount = res.data.currentItemCount
+            for (var i = 0; i < this.roleItemCount; i++) {
+              this.rolelistcheckall.push(this.rolelist[i].Id)
+            }
+            this.selectauditrole(this.entityList[0])
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      selectauditrole (val) {
+        api.getAuditRoleList(val.Id, this.$axios).then(res => {
+          this.selectedrole = ''
+          this.userlist = []
+          console.log(res.data, 'res.data')
+          if (res.data != null && res.data.RoleId > 0) {
+            this.selectedrole = res.data.RoleId
+            this.getuserbyrole(res.data.RoleId)
+          }
+          // if (res.data != null) {
+          //   for (let i = 0; i < res.data.length; i++) {
+          //     if (this.roleisexist(parseInt(res.data[i]))) {
+          //       this.selectedrole.push(parseInt(res.data[i]))
+          //     }
+          //
+          //     let flag = false
+          //     let rdx = 0
+          //     for (rdx = 0; rdx < this.rolelist.length; rdx++) {
+          //       if (parseInt(this.rolelist[rdx].Id) == parseInt(res.data[i])) {
+          //         flag = true
+          //         break
+          //       }
+          //     }
+          //     if (!flag) {
+          //       this.mustrolelist.push(parseInt(res.data[i]))
+          //     }
+          //   }
+          //   let checkedCount = this.selectedrole.length
+          //   this.roleCheckAll = checkedCount === this.rolelist.length
+          //   this.isrolecheckall = checkedCount > 0 && checkedCount < this.rolelist.length
+          //   this.getuserbyrole(res.data)
+          // }
+        })
+      },
+      getuserbyrole (val) {
+        let roleids = val
+        api.getUserByRole({roleids}, this.$axios).then(res => {
+          this.userlist = res.data
+        })
+      },
+      handlecheckedrolechange () {
+        let checkedCount = this.selectedrole.length
+        this.roleCheckAll = checkedCount === this.rolelist.length
+        this.isrolecheckall = checkedCount > 0 && checkedCount < this.rolelist.length
+      },
+      handleCheckAllChange (val) {
+        this.selectedrole = val ? this.rolelistcheckall : []
+        this.isrolecheckall = false
+      },
+      roleisexist (val) {
+        for (let i = 0; i < this.rolelist.length; i++) {
+          if (this.rolelist[i].Id === val) {
+            return true
+          }
+        }
+        return false
+      },
 
-      /* getDictOptions () {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-          this.searchForm.OrganizeId = res.data.items['OrganizeId']
+          this.auditStepOptions = res.data.items['AuditStep']
+          this.roleList = res.data.items['RoleList']
+          this.formData.OrganizeId = res.data.items['OrganizeId']
+          if (this.formData.Id === 0) {
+            this.formData.OrganizeName = res.data.items['OrganizeName']
+          }
+          this.WorkFlowOptions = res.data.items['WorkFlow']
+          // this.userOptions = res.data.items['users']
+          // this.supervisersOptions = res.data.items['Supervisers']
         }).catch(err => {
           console.error(err)
         })
-      }, */
-
-      searchCommand(command) {
-        if (command === 'search') {
-          this.dialogVisible = true
-        } else if (command === 'clear') {
-          this.clearSearch()
-        }
       },
-      // 列表排序功能
-      orderby(column) {
-        if (column.order === 'ascending') {
-          this.Column.Order = 'asc'
-        } else if (column.order === 'descending') {
-          this.Column.Order = 'desc'
+      getorgtreelist () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
         }
-        this.Column.Prop = column.prop
-        this.initDatas()
-      },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset)
-        // this.searchForm = this.searchFormReset;
-        this.CreateOn = ''
-        this.initDatas()
-      },
-      handleSearch() {
-        this.currentPage = 1
-        this.dialogVisible = false
-        this.initDatas()
-      },
-      handleCurrentChange(value) {
-        this.currentPage = value
-        this.initDatas()
+        _this.$axios.get('organizes/listbydeptid', {
+          params
+        })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
       },
-      handleSizeChange(value) {
-        this.size = value
-        this.currentPage = 1
-        this.initDatas()
+      auditOrgChang (val) {
+        // let deptId = val[val.length - 1]
+        // this.userOptions = []
+        // this.auditers = []
+        // api.getAuditerByDept(deptId, this.$axios).then(res => {
+        //   if (res.data.code === 1) {
+        //     this.userOptions = res.data.item
+        //   }
+        // }).catch(err => {
+        //   console.error(err)
+        // })
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+      // 保存信息
+      saveEntity () {
+        if (this.step == 1) {
+          // 二级单位初审
+          this.auditStepCode = 'FIRST_TRIAL'
+          this.auditStepName = '二级单位初审'
+        } else if (this.step == 2) {
+          // 二级单位复审
+          this.auditStepCode = 'SECOND_TRIAL'
+          this.auditStepName = '二级单位复审'
+        } else if (this.step == 2) {
+          // 业务处室接收
+          this.auditStepCode = 'PROF_RECE'
+          this.auditStepName = '业务处室接收'
+        } else if (this.step == 4) {
+          // 业务处室专业审核
+          this.auditStepCode = 'PROF_AUDIT'
+          this.auditStepName = '业务处室专业审核'
+        } else if (this.step == 5) {
+          // 集中评审
+          this.auditStepCode = 'PROF_CONCENT'
+          this.auditStepName = '集中评审'
+        } else if (this.step == 6) {
+          // 企业法规处审核
+          this.auditStepCode = 'PROF_REGULATION'
+          this.auditStepName = '企业法规处审核'
+        } else if (this.step == 7) {
+          this.auditStepCode = 'SUB_OFFICE'
+          this.auditStepName = '二级单位分办'
+        } else if (this.step == 8) {
+          this.auditStepCode = 'COMPONY_AUDIT'
+          this.auditStepName = '注册公司审核'
+        }
+        // this.formData.WorkFlowName = this.$refs.selectWorkFlow.selectedLabel + ''
+        // if (!this.userselectOptions || this.userselectOptions.length <= 0) {
+        //   this.$message({
+        //     type: 'error',
+        //     message: '审批人为空，不允许保存！'
+        //   })
+        //   return
+        // }
+        // let roleids = this.selectedrole.join(',')
+        let params = {
+          setid: this.entityList[0].Id,
+          auditStepName: this.auditStepName,
+          auditStepCode: this.auditStepCode,
+          roleids: this.selectedrole
+        }
+        api.addauditrole(params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            // 刷新一下界面
+            this.initData()
           } else {
             this.$message({
               type: 'warning',
@@ -396,7 +421,7 @@
         })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -409,7 +434,7 @@
         }
       },
 
-      formatDateTime(date) {
+      formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -422,13 +447,8 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">
-  .el-pagination {
-    margin: 1rem 0 2rem;
-    text-align: right;
-  }
 
 </style>

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index_2.vue

@@ -0,0 +1,434 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/system/auditsetting' }">单位审批步骤自定义配置</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 自定义配置
+        </span>
+        <span style="float: right;">
+          <router-link :to="'/system/auditsetting/add/operation?step='+this.$route.query.step">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+          </router-link>
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <!--<el-form-item label="上报时间">
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>-->
+          <el-form-item label="上级组织" label-width="120px" v-if="false">
+            <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+              v-model="selectedorg" placeholder="请选择组织"></el-cascader>
+          </el-form-item>
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" width="160" align="center" fixed="right">
+          <template slot-scope="scope">
+             <router-link :to="'/system/auditsetting/'+scope.row.Id+ '/operation'">
+              <el-button type="primary" title="编辑" size="mini" >编辑</el-button>
+            </router-link>
+
+            <el-popover placement="top" title="提示">
+              <el-alert title="" description="确认要删除吗？" trigger="click" type="warning" :closable="false">
+              </el-alert>
+              <br />
+              <div style="text-align: right; margin: 0">
+                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+              </div>
+              <el-button slot="reference" type="plain" title="删除" style="margin-left:3px" size="mini">删除</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+
+        <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
+          :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
+        </el-table-column>
+
+        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </el-table-column>-->
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="单位ID">
+              <el-input size="mini" v-model="searchForm.OrganizeId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="单位名称">
+              <el-input size="mini" v-model="searchForm.OrganizeName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="审批步骤编码">
+              <el-input size="mini" v-model="searchForm.AuditStepCode" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="审批步骤名称">
+              <el-input size="mini" v-model="searchForm.AuditStepName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="角色ID">
+              <el-input size="mini" v-model="searchForm.RoleId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="角色名称">
+              <el-input size="mini" v-model="searchForm.RoleName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" 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="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/system/auditsetting'
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oilauditsetting',
+    data() {
+      return {
+        dialogVisible: false,
+        // 列表数据
+        entityList: [],
+        // 分页参数
+        size: 10,
+
+        currentPage: 1,
+        currentItemCount: 0,
+        ACode: "",
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        // 查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        // 查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          OrganizeId: '',
+          OrganizeName: '',
+          AuditStepCode: '',
+          AuditStepName: '',
+          RoleId: '',
+          RoleName: '',
+          UesrId: '',
+          UserName: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
+        },
+        tableColumns: [{
+          prop: 'OrganizeName',
+          label: '单位名称',
+          width: 100,
+          sort: true
+        },
+        // {
+        //   prop: 'AuditStepCode',
+        //   label: '审批步骤编码',
+        //   width: 100,
+        //   sort: true
+        // },
+        {
+          prop: 'AuditStepName',
+          label: '审批步骤名称',
+          width: 100,
+          sort: true
+        },
+        // {
+        //   prop: 'RoleName',
+        //   label: '角色名称',
+        //   width: 100,
+        //   sort: true
+        // },
+        {
+          prop: 'UserName',
+          label: '审批人',
+          width: 100,
+          sort: true
+        },
+        // {
+        //   prop: 'WorkFlowName',
+        //   label: '工作流名称',
+        //   width: 100,
+        //   sort: true
+        // },
+        {
+          prop: 'Remark',
+          label: '备注',
+          width: 100,
+          sort: true
+        },
+        {
+          prop: 'CreateOn',
+          label: '创建时间',
+          width: 100,
+          sort: true
+        }
+        ]
+      }
+    },
+    created() {
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      if (this.$route.query.step == 1) {
+        //企业法规处审核
+        this.ACode = "FIRST_TRIAL"
+      } else if (this.$route.query.step == 2) {
+        //二级单位复审
+        this.ACode = "SECOND_TRIAL"
+      } else if (this.$route.query.step == 3) {
+        //业务处室接收
+        this.ACode = "PROF_RECE"
+      } else if (this.$route.query.step == 4) {
+        //业务处室专业审核
+        this.ACode = "PROF_AUDIT"
+      } else if (this.$route.query.step == 5) {
+        //集中评审
+        this.ACode = "PROF_CONCENT"
+      } else if (this.$route.query.step == 6) {
+        //企业法规处审核
+        this.ACode = "PROF_REGULATION"
+      } else if (this.$route.query.step == 7) {
+        // 二级单位分办
+        this.ACode = "SUB_OFFICE"
+      } else if (this.$route.query.step == 8) {
+        //注册公司审核
+        this.ACode = "COMPONY_AUDIT"
+      }
+      this.initDatas()
+      // his.getDictOptions()
+    },
+
+    watch: {
+      $route (val) {
+        if (val.query.step == 1) {
+          //企业法规处审核
+          this.ACode = "FIRST_TRIAL"
+        } else if (val.query.step == 2) {
+          //二级单位复审
+          this.ACode = "SECOND_TRIAL"
+        } else if (val.query.step == 3) {
+          //业务处室接收
+          this.ACode = "PROF_RECE"
+        } else if (val.query.step == 4) {
+          //业务处室专业审核
+          this.ACode = "PROF_AUDIT"
+        } else if (val.query.step == 5) {
+          //集中评审
+          this.ACode = "PROF_CONCENT"
+        } else if (val.query.step == 6) {
+          //企业法规处审核
+          this.ACode = "PROF_REGULATION"
+        } else if (val.query.step == 7) {
+          // 二级单位分办
+          this.ACode = 'SUB_OFFICE'
+        } else if (val.query.step == 8) {
+          //注册公司审核
+          this.ACode = "COMPONY_AUDIT"
+        }
+        this.initDatas()
+      }
+    },
+
+    methods: {
+      initDatas () {
+        // 分页及列表条件
+
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+          Code: this.ACode
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length === 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        // 查询条件
+        Object.assign(params, this.searchForm)
+        // 访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      /* getDictOptions () {
+        api.getDictList(this.$axios).then(res => {
+          this.searchForm.OrganizeId = res.data.items['OrganizeId']
+        }).catch(err => {
+          console.error(err)
+        })
+      }, */
+
+      searchCommand(command) {
+        if (command === 'search') {
+          this.dialogVisible = true
+        } else if (command === 'clear') {
+          this.clearSearch()
+        }
+      },
+      // 列表排序功能
+      orderby(column) {
+        if (column.order === 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order === 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false
+        api.deleteEntity(row.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
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
+
+</style>

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -308,6 +308,7 @@
             // response
             _this.rolelist = res.data.items
             _this.roleItemCount = res.data.currentItemCount
+            console.log(_this.rolelist, 'rolelist')
             for (var i = 0; i < _this.roleItemCount; i++) {
               _this.rolelistcheckall.push(_this.rolelist[i].Id)
             }