管理员权限

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

@@ -85,5 +85,14 @@ const (
 	STOREING_STATUS     string = "7"  //待入库
 	STORE_STATUS        string = "8"  //已入库
 	FEN_TRIAL_STATUS    string = "10" //二级单位初审
-	NOPASS_STATUS       string = "-1" // 最终审核没有通过
+	NOPASS_STATUS       string = "-1" // 初审未通过
+	NO_SECOND_TRIAL_STATUS   string = "-2" // 复审未通过
+	NO_THIRD_TRIAL_STATUS    string = "-3" // 专业处接收未通过
+	NO_PROF_AUDIT_STATUS     string = "-4" // 专业处室未通过
+	NO_CENT_AUDIT_STATUS    string = "-5" // 集中评审未通过
+
+	DOOGS_TYPECODE string = "01" // 物资类
+	BASIS_TYPECODE string = "02" // 基建类
+	TECH_TYPECODE string = "03" // 技术服务类
+
 )

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

@@ -1,6 +1,7 @@
 package casbin
 
 import (
+	"dashoo.cn/business2/parameter"
 	"encoding/json"
 	//"fmt"
 
@@ -378,8 +379,17 @@ func (this *OrganizesController) ListByDeptId() {
 	//ParentId := this.GetString("ParentId")
 	//var user userRole.Base_User
 	svc := organize.GetOrganizeService(utils.DBE)
-	unitId := svc.GetMyUnitDepartmentId(this.User.DepartmentId)
-
+	//unitId := svc.GetMyUnitDepartmentId(this.User.DepartmentId)
+
+	svcPerm := permission.GetPermissionService(utils.DBE)
+	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_admin")
+	unitId := ""
+	if isauth {
+		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+		unitId = paramSvc.GetBaseparameterMessage("", "paramset", "HeadquartersID") // 总公司Id
+	} else {
+		unitId = svc.GetMyUnitDepartmentId(this.User.DepartmentId)
+	}
 	//svc.GetEntityById(this.User.Id, &user)
 	//companyids := strings.Split(user.Superior, ",")
 	ids := svc.GetAllChildById(unitId)

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

@@ -145,7 +145,16 @@ func (this *UserController) List() {
 	svc := permission.GetPermissionService(utils.DBE)
 	organsvc := organize.GetOrganizeService(utils.DBE)
 	var users []userRole.Base_User
-	topid := organsvc.GetMyUnitDepartmentId(this.User.DepartmentId)
+
+	svcPerm := permission.GetPermissionService(utils.DBE)
+	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_admin")
+	topid := ""
+	if isauth {
+		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+		topid = paramSvc.GetBaseparameterMessage("", "paramset", "HeadquartersID") // 总公司Id
+	} else {
+		topid = organsvc.GetMyUnitDepartmentId(this.User.DepartmentId)
+	}
 	depids := organsvc.GetAllChildById(topid)
 	where := "(IsVisible=1 and IsCompanyUser = 0 and DepartmentId in (" + depids + ") or Id = '" + utils.ToStr(this.User.Id) + "') "
 	//外部用户 IsCompanyUser == 1

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

@@ -833,7 +833,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	if supplierCertEntity.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = utils.ToStr(supplierCertEntity.SecondAudit)
 		status = suppliercert.SECOND_TRIAL_STATUS
-		backstatus = "-1"
+		backstatus = suppliercert.NOPASS_STATUS
 		step = 2
 		//supplierCertEntity.ThirdAudit,_ = strconv.Atoi(majorDept)
 		//cols := []string{
@@ -843,7 +843,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	} else if supplierCertEntity.Status == suppliercert.SECOND_TRIAL_STATUS {
 		status = suppliercert.THIRD_TRIAL_STATUS
 		step = 2
-		backstatus = "-2"
+		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 		//获得有专业审核接收权限的人员
 		//var users1 []userRole.Base_RoleList
 		//var auditWorkflow1 auditsetting.Base_OilAuditSetting
@@ -866,11 +866,11 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		userIds = auditer
 		status = suppliercert.PROF_AUDIT_STATUS
 		step = 2
-		backstatus = "-3"
+		backstatus = suppliercert.NO_THIRD_TRIAL_STATUS
 	} else if supplierCertEntity.Status == suppliercert.PROF_AUDIT_STATUS {
 		status = suppliercert.CENT_AUDIT_STATUS
 		step = 2
-		backstatus = "-4"
+		backstatus = suppliercert.NO_PROF_AUDIT_STATUS
 		////获得有专业审核接收权限的人员
 		//var users1 []userRole.Base_RoleList
 		//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
@@ -882,17 +882,19 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		dictSvc := items.GetItemsService(utils.DBE)
 		deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
 		var users []userRole.Base_RoleList
-		certSrv.GetAuditUser(deptIds[0].Value, workflow.PROF_REGULATION, &users)
-
-		for _, tmpUser := range users {
-			userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		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 {
 		userIds = auditer
 		status = suppliercert.PAYING_AUDIT_STATUS
 		step = 3
-		backstatus = "-5"
+		backstatus = suppliercert.NO_CENT_AUDIT_STATUS
 	}
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
@@ -912,11 +914,11 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 				if supplierCertEntity.InStyle == "1" {
 					paysvc := paymentinfo.GetPaymentService(utils.DBE)
 					var Amount float64
-					if supplierCertEntity.SupplierTypeCode == "01" {
+					if supplierCertEntity.SupplierTypeCode == suppliercert.DOOGS_TYPECODE {
 						Amount = 6000
-					} else if supplierCertEntity.SupplierTypeCode == "02" {
+					} else if supplierCertEntity.SupplierTypeCode == suppliercert.BASIS_TYPECODE {
 						Amount = 7000
-					} else if supplierCertEntity.SupplierTypeCode == "03" {
+					} else if supplierCertEntity.SupplierTypeCode == suppliercert.TECH_TYPECODE {
 						Amount = 8000
 					}
 					paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount, "1")

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

@@ -211,7 +211,7 @@
             @close="selectAuditOrg" height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
-        <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
+        <el-tab-pane label="审批流程" v-if="formDataCert.Status != 0">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
@@ -225,14 +225,14 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
-          <el-card class="box-card" style="margin-top: 20px">
-            <div slot="header" class="clearfix">
-              <span>审批历史</span>
-            </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-          </el-card>
-        </el-tab-pane>
+        <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
+          <!--<el-card class="box-card" style="margin-top: 20px">-->
+            <!--<div slot="header" class="clearfix">-->
+              <!--<span>审批历史</span>-->
+            <!--</div>-->
+            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+          <!--</el-card>-->
+        <!--</el-tab-pane>-->
 
         <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
         </el-tab-pane>

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

@@ -218,7 +218,7 @@
             @close="selectAuditOrg"></subfile-list>
         </el-tab-pane>
 
-        <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
+        <el-tab-pane label="审批流程" v-if="formDataCert.Status != 0">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
@@ -232,14 +232,14 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
-          <el-card class="box-card" style="margin-top: 20px">
-            <div slot="header" class="clearfix">
-              <span>审批历史</span>
-            </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-          </el-card>
-        </el-tab-pane>
+        <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
+          <!--<el-card class="box-card" style="margin-top: 20px">-->
+            <!--<div slot="header" class="clearfix">-->
+              <!--<span>审批历史</span>-->
+            <!--</div>-->
+            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+          <!--</el-card>-->
+        <!--</el-tab-pane>-->
 
         <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5"></el-tab-pane>
       </el-tabs>

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

@@ -211,7 +211,7 @@
             @close="selectAuditOrg" height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
-        <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
+        <el-tab-pane label="审批流程" v-if="formDataCert.Status != 0">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
@@ -224,14 +224,14 @@
             <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
-          <el-card class="box-card" style="margin-top: 20px">
-            <div slot="header" class="clearfix">
-              <span>审批历史</span>
-            </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-          </el-card>
-        </el-tab-pane>
+        <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
+          <!--<el-card class="box-card" style="margin-top: 20px">-->
+            <!--<div slot="header" class="clearfix">-->
+              <!--<span>审批历史</span>-->
+            <!--</div>-->
+            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+          <!--</el-card>-->
+        <!--</el-tab-pane>-->
         <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>

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

@@ -27,9 +27,7 @@
             v-if="auditBtn && this.formData.Status == '5'">集中审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <router-link :to="'/oilsupplier/supplieraudit'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
 
@@ -180,14 +178,14 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
-          <el-card class="box-card" style="margin-top: 20px">
-            <div slot="header" class="clearfix">
-              <span>审批历史</span>
-            </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-          </el-card>
-        </el-tab-pane>
+        <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
+          <!--<el-card class="box-card" style="margin-top: 20px">-->
+            <!--<div slot="header" class="clearfix">-->
+              <!--<span>审批历史</span>-->
+            <!--</div>-->
+            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+          <!--</el-card>-->
+        <!--</el-tab-pane>-->
 
       </el-tabs>
     </el-card>

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

@@ -25,9 +25,9 @@
             v-if="auditBtn && this.formData.Status == '5' && this.formData.InStyle != '3'">集中审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <router-link :to="'/oilsupplier/supplieraudit'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <!--<router-link>-->
+            <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
+          <!--</router-link>-->
         </span>
       </div>
 
@@ -178,14 +178,14 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
-          <el-card class="box-card" style="margin-top: 20px">
-            <div slot="header" class="clearfix">
-              <span>审批历史</span>
-            </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-          </el-card>
-        </el-tab-pane>
+        <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
+          <!--<el-card class="box-card" style="margin-top: 20px">-->
+            <!--<div slot="header" class="clearfix">-->
+              <!--<span>审批历史</span>-->
+            <!--</div>-->
+            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+          <!--</el-card>-->
+        <!--</el-tab-pane>-->
 
       </el-tabs>
     </el-card>

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

@@ -26,9 +26,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
-          <router-link :to="'/oilsupplier/supplieraudit'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
 
@@ -177,14 +175,14 @@
             <wf-history :entryinfo="entrydetail"></wf-history>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
-          <el-card class="box-card" style="margin-top: 20px">
-            <div slot="header" class="clearfix">
-              <span>审批历史</span>
-            </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-          </el-card>
-        </el-tab-pane>
+        <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
+          <!--<el-card class="box-card" style="margin-top: 20px">-->
+            <!--<div slot="header" class="clearfix">-->
+              <!--<span>审批历史</span>-->
+            <!--</div>-->
+            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+          <!--</el-card>-->
+        <!--</el-tab-pane>-->
       </el-tabs>
     </el-card>
     <el-dialog title="审核" :visible.sync="dialogMakeSure">