审批配置

src/dashoo.cn/backend/api/business/auditsetting/oilauditsetting.go

@@ -31,6 +31,8 @@ type OilAuditUser struct {
 	SettingId      int       `xorm:"INT(11)"`
 	UserId         int       `xorm:"INT(11)"`
 	UserName       string    `xorm:"VARCHAR(20)"`
+	CompanyId      int       `xorm:"INT(11)"`
+	DepartmentId   int       `xorm:"INT(11)"`
 	CreateOn       time.Time `xorm:"DATETIME"`
 	CreateUserId   int       `xorm:"INT(10)"`
 	CreateBy       string    `xorm:"VARCHAR(50)"`

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

@@ -133,7 +133,7 @@ func (s *OilSupplierCertService) IsCanApplyByExtOrganizeUser(applyType, departme
 }
 
 func (s *OilSupplierCertService) GetAuditUser(organizeId, auditstepcode string, entitiesPtr interface{}){
-	where := "OrganizeId=" + organizeId + " and AuditStepCode='" + auditstepcode + "'"
+	where := "a.DepartmentId=" + organizeId + " and AuditStepCode='" + auditstepcode + "'"
 	sql := "SELECT a.UserId Id, a.UserName RealName FROM Base_OilAuditSetting o LEFT JOIN OilAuditUser a ON o.Id = a.SettingId where " + where
 	s.DBE.SQL(sql).Find(entitiesPtr)
 	return

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

@@ -41,6 +41,7 @@ func (this *OilAuditSettingController) GetEntityList() {
 			asc = true
 		}
 	}
+
 	OrganizeId := this.GetString("OrganizeId")
 	OrganizeName := this.GetString("OrganizeName")
 	//	AuditStepCode := this.GetString("AuditStepCode")
@@ -55,9 +56,14 @@ func (this *OilAuditSettingController) GetEntityList() {
 	svcPerm := permission.GetPermissionService(utils.DBE)
 	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.AuditSetting.AllRecord")
 	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-		OrganizeId = this.User.DepartmentId //无权限看所有时，只看当前部门的数据
+		//OrganizeId = this.User.DepartmentId //无权限看所有时，只看当前部门的数据
+		var org  organize.Base_Organize
+		orgsvc := organize.GetOrganizeService(utils.DBE)
+		orgsvc.GetEntityById(this.User.DepartmentId, &org)
+		OrganizeId = strconv.Itoa(org.Parentid)
 		if OrganizeId != "" {
-			where = where + " and OrganizeId = '" + OrganizeId + "'"
+			where = where +
+				" and OrganizeId = '" + OrganizeId + "'"
 		}
 	}
 
@@ -180,6 +186,7 @@ func (this *OilAuditSettingController) AddEntity() {
 	fmt.Println(audits)
 	var model auditsetting.Base_OilAuditSetting
 	var audituser auditsetting.OilAuditUser
+	var org  organize.Base_Organize
 	var jsonBlob = this.Ctx.Input.RequestBody
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
 
@@ -187,28 +194,37 @@ func (this *OilAuditSettingController) AddEntity() {
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
+	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
+	svc.GetEntityById(this.User.DepartmentId, &org)
+	model.OrganizeId = org.Parentid
+	var org1  organize.Base_Organize
+	svc.GetEntityById(org.Parentid, &org1)
+	model.OrganizeName = org1.Fullname
 
 	var errinfo ErrorDataInfo
-	var modelsele auditsetting.Base_OilAuditSetting
-	where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + model.AuditStepCode + "'"
-	has := svc.GetEntity(&modelsele, where)
-	if (has) {
-		errinfo.Message = "审批步骤已经存在，不允许重复添加！"
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
+	//var modelsele auditsetting.Base_OilAuditSetting
+	//where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + model.AuditStepCode + "'"
+	//has := svc.GetEntity(&modelsele, where)
+	//if (has) {
+	//	errinfo.Message = "审批步骤已经存在，不允许重复添加！"
+	//	errinfo.Code = -1
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//	return
+	//}
 
 	var err error
 	_, err = svc.InsertEntityBytbl(OilAuditSettingName, &model)
 	if (err == nil) {
 		for _, Id := range auditIds {
 			var user userRole.Base_User
+
 			svc.GetEntityById(Id, &user)
+			svc.GetEntityById(user.Departmentid, &org)
 			audituser.Id = 0
 			audituser.SettingId = model.Id
+			audituser.DepartmentId,_ = strconv.Atoi(user.Departmentid)
+			audituser.CompanyId = org.Parentid
 			audituser.UserId,_ = strconv.Atoi(Id)
 			audituser.UserName = user.Realname
 			audituser.CreateOn = time.Now()
@@ -259,6 +275,13 @@ func (this *OilAuditSettingController) UpdateEntity() {
 	model.ModifiedOn = time.Now()
 	model.ModifiedBy = this.User.Realname
 	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	var org  organize.Base_Organize
+	svc.GetEntityById(this.User.DepartmentId, &org)
+	model.OrganizeId = org.Parentid
+	var org1  organize.Base_Organize
+	svc.GetEntityById(org.Parentid, &org1)
+	model.OrganizeName = org1.Fullname
+
 
 	cols := []string{
 
@@ -291,6 +314,10 @@ func (this *OilAuditSettingController) UpdateEntity() {
 		for _, Id := range auditIds {
 			var user userRole.Base_User
 			svc.GetEntityById(Id, &user)
+			var org  organize.Base_Organize
+			svc.GetEntityById(user.Departmentid, &org)
+			audituser.DepartmentId,_ = strconv.Atoi(user.Departmentid)
+			audituser.CompanyId = org.Parentid
 			audituser.Id = 0
 			audituser.SettingId = model.Id
 			audituser.UserId,_ = strconv.Atoi(Id)

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/_opera/operation.vue

@@ -24,7 +24,7 @@
               <div slot="header" class="clearfix">
                 <span>请选择部门</span>
               </div>
-              <el-tree :data="orgtreelist" :props="orgtreeprops"
+              <el-tree :data="orgtreelist" :props="orgtreeprops" ref="tree"
                        @node-click="handleNodeClick" ></el-tree>
             </el-card>
           </el-col>
@@ -136,8 +136,8 @@
     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";
+  import ElCol from 'element-ui/packages/col/src/col';
+  import ElIcon from '../../../../../node_modules/element-ui/packages/icon/src/icon';
   export default {
     components: {
       ElIcon,
@@ -155,6 +155,7 @@
         auditStepOptions: [],
         roleList: [],
         auditers: '',
+        departmentId: '',
         userOptions: [],
         userselectOptions: [],
         selectedOptions: [],
@@ -210,7 +211,7 @@
     },
     methods: {
       handleNodeClick (data) {
-        console.log(data)
+        console.log(data, '========')
         this.userOptions = []
         api.getAuditerByDept(data.id, this.$axios).then(res => {
           if (res.data.code === 1) {
@@ -370,7 +371,6 @@
               this.formData.AuditStepName = '企业法规处审核'
             }
             // this.formData.WorkFlowName = this.$refs.selectWorkFlow.selectedLabel + ''
-            this.formData.OrganizeId = parseInt(this.formData.OrganizeId)
             if (!this.userselectOptions || this.userselectOptions.length <= 0) {
               this.$message({
                 type: 'error',