审批流程-

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

@@ -67,6 +67,11 @@ type OilSupplierVM struct {
 	SupplierTypeName string
 }
 
+type UserList struct {
+	UserId       int64  `json:"userid"`
+	UserName string `json:"username"`
+}
+
 const (
 	DRAFT_STATUS string = "0" //草稿状态
 	FIRST_TRIAL_STATUS string = "1" //二级单位初审

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

@@ -80,6 +80,8 @@ const (
 	PROF_AUDIT string = "PROF_AUDIT"
 	// 集中审批
 	PROF_CONCENT string = "PROF_CONCENT"
+	// 企业法规处审核
+	PROF_REGULATION string = "PROF_REGULATION"
 
 	//年审流程图
 	OIL_AUDIT_APPLY string = "oil_audit_apply"

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

@@ -379,6 +379,26 @@ func (this *OrganizesController) ListByDeptId() {
 	ids := svc.GetAllChildById(strconv.Itoa(user.Companyid))
 	where := " Id in ( " + ids + " ) and AccCode='" + this.User.AccCode + "'"
 
+	list := make([]organize.Base_Organize, 0)
+	svc.GetEntities(&list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 报警器列表
+// @Description 设备列表
+// @Success 200 {object} business.device.DeviceChannels
+// @router /orgalllist [get]
+func (this *OrganizesController) OrgAllList() {
+	svc := organize.GetOrganizeService(utils.DBE)
+
+	var user userRole.Base_User
+	svc.GetEntityById(this.User.Id, &user)
+	ids := svc.GetAllChildById("0")
+	where := " Id in ( " + ids + " ) and AccCode='" + this.User.AccCode + "'"
+
 	list := make([]organize.Base_Organize, 0)
 	svc.GetEntities(&list, where)
 	var datainfo DataInfo

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

@@ -1066,22 +1066,23 @@ func (this *OilSupplierController) GetDictListByStatus() {
 	//dictList["EntrustCorp"] = &dictCustomer
 
 	//获得有审核权限的人员
-	var users []userRole.Base_RoleList
-	var auditWorkflow auditsetting.Base_OilAuditSetting
+	var users []suppliercert.UserList
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	if status == suppliercert.FIRST_TRIAL_STATUS {
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.SECOND_TRIAL, &auditWorkflow)
-		users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
+		//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.SECOND_TRIAL, &auditWorkflow)
+		//users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
+		where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + workflow.SECOND_TRIAL + "'"
+		rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)
 		dictList["Auditer"] = users
 	} else if status == suppliercert.SECOND_TRIAL_STATUS {
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.SECOND_TRIAL, &auditWorkflow)
+		//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.SECOND_TRIAL, &auditWorkflow)
 	} else if status == suppliercert.THIRD_TRIAL_STATUS {
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, majorAduit, workflow.PROF_RECE, &auditWorkflow)
-		users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), "")
+		where := "OrganizeId=" + majorAduit + " and AuditStepCode='" + workflow.SECOND_TRIAL + "'"
+		rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)
 		dictList["Auditer"] = users
 	} else if status == suppliercert.PROF_AUDIT_STATUS {
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.PROF_AUDIT, &auditWorkflow)
-		users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), "")
+		where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + workflow.PROF_AUDIT + "'"
+		rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)
 		dictList["Auditer"] = users
 	} else if status == suppliercert.CENT_AUDIT_STATUS {
 
@@ -1463,14 +1464,17 @@ func (this *OilSupplierController) CanUpdateSupplier() {
 // @router /getauditerbydept/:deptId [get]
 func (this *OilSupplierController) GetAuditerByDept() {
 	Id := this.Ctx.Input.Param(":deptId")
-
-	var auditWorkflow auditsetting.Base_OilAuditSetting
+	auditstepcode := this.GetString("auditstepcode")
+	//var auditWorkflow []auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, Id, workflow.FIRST_TRIAL, &auditWorkflow)
-	users := rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode)
+	//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, Id, workflow.FIRST_TRIAL, &auditWorkflow)
+
+	var user []suppliercert.UserList
+	where := "OrganizeId=" + Id + " and AuditStepCode='" + auditstepcode + "'"
+	rsvc.GetEntitysByWhere(OilAuditSettingName,where, &user)
 
 	var datainfo ErrorDataInfo
-	datainfo.Item = users
+	datainfo.Item = user
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
-}
+}

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

@@ -530,13 +530,13 @@ func (this *OilSupplierCertController) AuditEntity() {
 	//}
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
-	//获得有审核权限的人员
-	var users []userRole.Base_RoleList
-	var userIds string
-	var auditWorkflow auditsetting.Base_OilAuditSetting
-	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, firstAudit, workflow.FIRST_TRIAL, &auditWorkflow)
-	users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
+	////获得有审核权限的人员
+	//var users []userRole.Base_RoleList
+	//var userIds string
+	//var auditWorkflow auditsetting.Base_OilAuditSetting
+	//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, firstAudit, workflow.FIRST_TRIAL, &auditWorkflow)
+	//users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
 
 	processInstanceId := ""
 	if supplierCertEntity.WorkflowId == "0" || len(supplierCertEntity.WorkflowId) <= 0 {
@@ -545,14 +545,14 @@ func (this *OilSupplierCertController) AuditEntity() {
 	}
 
 	//processInstanceId,_ := certSrv.SubmitOrgAudit(certId, workflow.OIL_SUPPLIER_APPLY, workflow.FIRST_TRIAL, this.User.Id, result, "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName, "", "")
-	for _, tmpUser := range users {
-		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-	}
-	userIds = strings.Trim(userIds, ",")
+	//for _, tmpUser := range users {
+	//	userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+	//}
+	//userIds = strings.Trim(userIds, ",")
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
 	ActiComplete.BusinessKey = certId
-	ActiComplete.UserNames = userIds
+	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
 	ActiComplete.Remarks = ""
@@ -719,9 +719,9 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	//remarks := ""
 	step := 2
 	status := ""
-	var users string
+	var userIds string
 	if supplierCertEntity.Status == "1" {
-		users = auditer
+		userIds = auditer
 		status = suppliercert.SECOND_TRIAL_STATUS
 		step = 2
 		supplierCertEntity.ThirdAudit,_ = strconv.Atoi(majorDept)
@@ -733,32 +733,42 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		status = suppliercert.THIRD_TRIAL_STATUS
 		step = 2
 		//获得有专业审核接收权限的人员
-		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)
-		for _, tmpUser := range users1 {
-			users += strconv.FormatInt(tmpUser.Id, 10) + ","
+		//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 users []suppliercert.UserList
+		where := "OrganizeId=" + strconv.Itoa(supplierCertEntity.ThirdAudit) + " and AuditStepCode='" + workflow.PROF_RECE + "'"
+		certSrv.GetEntitysByWhere(OilAuditSettingName,where, &users)
+
+		for _, tmpUser := range users {
+			userIds += strconv.FormatInt(tmpUser.UserId, 10) + ","
 		}
-		users = strings.Trim(users, ",")
+		userIds = strings.Trim(userIds, ",")
 	} else if supplierCertEntity.Status == "3" {
-		users = auditer
+		userIds = auditer
 		status = suppliercert.PROF_AUDIT_STATUS
 		step = 2
 	} else if supplierCertEntity.Status == "4" {
 		status = suppliercert.CENT_AUDIT_STATUS
 		step = 2
-		//获得有专业审核接收权限的人员
-		var users1 []userRole.Base_RoleList
-		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		users1 = rsvc.GetUserByRole("10000204", this.User.AccCode)
-		for _, tmpUser := range users1 {
-			users += strconv.FormatInt(tmpUser.Id, 10) + ","
+		////获得有专业审核接收权限的人员
+		//var users1 []userRole.Base_RoleList
+		//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+		//users1 = rsvc.GetUserByRole("10000204", this.User.AccCode)
+
+		var users []suppliercert.UserList
+		where := "OrganizeId=100000178 and AuditStepCode='" + workflow.PROF_REGULATION + "'"
+		certSrv.GetEntitysByWhere(OilAuditSettingName,where, &users)
+
+		for _, tmpUser := range users {
+			userIds += strconv.FormatInt(tmpUser.UserId, 10) + ","
 		}
-		users = strings.Trim(users, ",")
+		userIds = strings.Trim(userIds, ",")
 	} else if supplierCertEntity.Status == "5" {
-		users = auditer
+		userIds = auditer
 		status = suppliercert.PAYING_AUDIT_STATUS
 		step = 3
 	}
@@ -767,7 +777,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
 	ActiComplete.BusinessKey = certId
-	ActiComplete.UserNames = users
+	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Remarks = dataother.AuditorRemark
 	ActiComplete.CallbackUrl = ""
@@ -865,7 +875,7 @@ func (this *OilSupplierCertController) IsAccess() {
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	res := false
 
-	if auditstepcode == workflow.PROF_CONCENT {
+	if auditstepcode == workflow.PROF_CONCENT { // 集中审批
 		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.PROF_AUDIT, &auditWorkflow)
 		users = rsvc.GetUserByRole("10000204", this.User.AccCode)
 		for _, user := range users {
@@ -875,10 +885,13 @@ func (this *OilSupplierCertController) IsAccess() {
 			}
 		}
 	} else {
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, auditstepcode, &auditWorkflow)
-		users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode)
+		var users []suppliercert.UserList
+		where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + auditstepcode + "'"
+		rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)
+		//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, auditstepcode, &auditWorkflow)
+		//users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode)
 		for _, user := range users {
-			if this.User.Id == strconv.Itoa(int(user.Id))  {
+			if this.User.Id == strconv.Itoa(int(user.UserId))  {
 				res = true
 				break
 			}

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

@@ -90,9 +90,9 @@ export default {
       method: 'get'
     })
   },
-  getAuditerByDept (deptId, myAxios) {
+  getAuditerByDept (deptId, auditstepcode, myAxios) {
     return myAxios({
-      url: '/supplier/getauditerbydept/' + deptId,
+      url: '/supplier/getauditerbydept/' + deptId + '?auditstepcode=' + auditstepcode,
       method: 'GET'
     })
   }

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

@@ -208,15 +208,10 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="二级单位">
-              <el-select ref="selectauditOrg" v-model="firstAudit" placeholder="请选择"
-                         style="width: 90%" filterable allow-create default-first-option @change="auditOrgChang">
-                <el-option
-                  v-for="item in organizeOption"
-                  :key="item.Id"
-                  :label="item.Fullname"
-                  :value="item.Id">
-                </el-option>
-              </el-select>
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                           filterable style="width: 100%" @change="auditOrgChang"
+                           placeholder="请选择组织">
+              </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -225,9 +220,9 @@
                          style="width: 90%" filterable allow-create default-first-option>
                 <el-option
                   v-for="item in auditerOption"
-                  :key="item.id"
-                  :label="item.realname"
-                  :value="item.id">
+                  :key="item.userid"
+                  :label="item.username"
+                  :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -293,11 +288,17 @@
         businessList: [], // 准入业务
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
+        orgtreelist: [],
         auditer: '',
         firstAudit: '',
         serviceId: '',
         certId: '',
         classId: '02',
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         formData: {
           Id: '',
           SupplierName: '',
@@ -420,6 +421,7 @@
       }
       this.getDictOptions()
       this.initDatas()
+      this.getorgtreelist()
     },
     methods: {
       inputCompany (val) {
@@ -577,17 +579,28 @@
           console.error(err)
         })
       },
+      getorgtreelist () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+          params
+        })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       auditOrgChang (val) {
+        let deptid = val[val.length - 1]
+        console.log(deptid)
         this.auditerOption = []
         this.auditer = ''
-        api.getAuditerByDept(val, this.$axios).then(res => {
-          if (res.data.item.length === 0) {
-            this.$message({
-              type: 'warning',
-              message: '该单位未设置审批人员！'
-            })
-            return
-          }
+        let auditstepcode = 'FIRST_TRIAL'
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.auditerOption = res.data.item
         }).catch(err => {
           console.error(err)
@@ -716,6 +729,7 @@
       },
       AuditEntity () {
         this.applyLoading = true
+        this.firstAudit = this.auditer
         apiCert.auditEntity(this.certId, this.firstAudit, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

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

@@ -209,15 +209,19 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="二级单位">
-              <el-select ref="selectauditOrg" v-model="FirstAudit" placeholder="请选择"
-                         style="width: 90%" filterable allow-create default-first-option @change="auditOrgChang">
-                <el-option
-                  v-for="item in organizeOption"
-                  :key="item.Id"
-                  :label="item.Fullname"
-                  :value="item.Id">
-                </el-option>
-              </el-select>
+              <!--<el-select ref="selectauditOrg" v-model="FirstAudit" placeholder="请选择"-->
+                         <!--style="width: 90%" filterable allow-create default-first-option @change="auditOrgChang">-->
+                <!--<el-option-->
+                  <!--v-for="item in organizeOption"-->
+                  <!--:key="item.Id"-->
+                  <!--:label="item.Fullname"-->
+                  <!--:value="item.Id">-->
+                <!--</el-option>-->
+              <!--</el-select>-->
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                           filterable style="width: 100%" @change="auditOrgChang"
+                           placeholder="请选择组织">
+              </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -226,9 +230,9 @@
                          style="width: 90%" filterable allow-create default-first-option>
                 <el-option
                   v-for="item in auditerOption"
-                  :key="item.id"
-                  :label="item.realname"
-                  :value="item.id">
+                  :key="item.userid"
+                  :label="item.username"
+                  :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -294,11 +298,17 @@
         businessList: [], // 准入业务
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
+        orgtreelist: [],
         auditer: '',
         serviceId: '',
         certId: '',
         classId: '01',
         FirstAudit: '',
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         formData: {
           Id: '',
           SupplierName: '',
@@ -419,6 +429,7 @@
         this.formData.Id = 0
       }
       this.getDictOptions()
+      this.getorgtreelist()
       this.initDatas()
     },
     methods: {
@@ -577,17 +588,28 @@
           console.error(err)
         })
       },
+      getorgtreelist () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+          params
+        })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       auditOrgChang (val) {
+        let deptid = val[val.length - 1]
+        console.log(deptid)
         this.auditerOption = []
         this.auditer = ''
-        api.getAuditerByDept(val, this.$axios).then(res => {
-          if (res.data.item.length === 0) {
-            this.$message({
-              type: 'warning',
-              message: '该单位未设置审批人员！'
-            })
-            return
-          }
+        let auditstepcode = 'FIRST_TRIAL'
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.auditerOption = res.data.item
         }).catch(err => {
           console.error(err)
@@ -715,6 +737,7 @@
       },
       AuditEntity () {
         this.applyLoading = true
+        this.FirstAudit = this.auditer
         apiCert.auditEntity(this.certId, this.FirstAudit, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

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

@@ -205,15 +205,10 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="二级单位">
-              <el-select ref="selectauditOrg" v-model="firstAudit" placeholder="请选择"
-                         style="width: 90%" filterable allow-create default-first-option @change="auditOrgChang">
-                <el-option
-                  v-for="item in organizeOption"
-                  :key="item.Id"
-                  :label="item.Fullname"
-                  :value="item.Id">
-                </el-option>
-              </el-select>
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                           filterable style="width: 100%" @change="auditOrgChang"
+                           placeholder="请选择组织">
+              </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -222,9 +217,9 @@
                          style="width: 90%" filterable allow-create default-first-option>
                 <el-option
                   v-for="item in auditerOption"
-                  :key="item.id"
-                  :label="item.realname"
-                  :value="item.id">
+                  :key="item.userid"
+                  :label="item.username"
+                  :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -290,11 +285,17 @@
         businessList: [], // 准入业务
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
+        orgtreelist: [],
         auditer: '',
         firstAudit: '',
         serviceId: '',
         certId: '',
         classId: '03',
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         formData: {
           Id: '',
           SupplierName: '',
@@ -417,6 +418,7 @@
       }
       this.getDictOptions()
       this.initDatas()
+      this.getorgtreelist()
     },
     methods: {
       inputCompany (val) {
@@ -578,17 +580,28 @@
           console.error(err)
         })
       },
+      getorgtreelist () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+          params
+        })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       auditOrgChang (val) {
+        let deptid = val[val.length - 1]
+        console.log(deptid)
         this.auditerOption = []
         this.auditer = ''
-        api.getAuditerByDept(val, this.$axios).then(res => {
-          if (res.data.item.length === 0) {
-            this.$message({
-              type: 'warning',
-              message: '该单位未设置审批人员！'
-            })
-            return
-          }
+        let auditstepcode = 'FIRST_TRIAL'
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.auditerOption = res.data.item
         }).catch(err => {
           console.error(err)
@@ -716,6 +729,7 @@
       },
       AuditEntity () {
         this.applyLoading = true
+        this.firstAudit = this.auditer
         apiCert.auditEntity(this.certId, this.firstAudit, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

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

@@ -164,19 +164,14 @@
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-select ref="selectauditOrg" v-model="majorDept" placeholder="请选择"
-                     style="width: 90%" filterable allow-create default-first-option>
-            <el-option
-              v-for="item in organizeOption"
-              :key="item.Id"
-              :label="item.Fullname"
-              :value="item.Id">
-            </el-option>
-          </el-select>
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" v-model="majorDept"
+                       placeholder="请选择组织">
+          </el-cascader>
         </el-form-item>
         <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                     style="width: 90%" filterable allow-create default-first-option>
+                     style="width: 100%" filterable allow-create default-first-option>
             <el-option
               v-for="item in auditerOptions"
               :key="item.id"
@@ -200,16 +195,62 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="审核" :visible.sync="dialogMakeSure2">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" v-model="majorDept"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" @change="auditOrgChange"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
+          <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.userid"
+              :label="item.username"
+              :value="item.userid">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审批人部门">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" @change="auditOrgChange"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
                      style="width: 90%" filterable allow-create default-first-option>
             <el-option
-              v-for="item in auditerOptions"
-              :key="item.id"
-              :label="item.realname"
-              :value="item.id">
+              v-for="item in secauditerOptions"
+              :key="item.userid"
+              :label="item.username"
+              :value="item.userid">
             </el-option>
           </el-select>
         </el-form-item>
@@ -267,20 +308,29 @@
         winningList: [], // 近三年获得省部级及以上主要技术、管理成果、获奖项目
         auditbusList: [], // 待审核业务
         auditerOptions: [], // 审核人员
+        secauditerOptions: [],
         auditerCurOptions: [],
         organizeOption: [],
-        majorDept: '',
+        orgtreelist: [],
+        secorgtreelist: [],
+        majorDept: [],
         serviceId: '',
         certId: '',
         classId: '02',
         dictData: null,
         dialogMakeSure: false,
+        dialogMakeSure2: false,
         dialogAllocation: false,
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
         auditstepcode: '',
         auditBtn: false,
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         shenheForm: {
           SuccessStatus: 1,
           AuditorRemark: '',
@@ -393,6 +443,8 @@
       }
       // this.getDictOptions()
       this.initDatas()
+      this.getorgtreelist()
+      this.getorgtreelistbydeptid()
     },
     methods: {
       equipmentdialog () {
@@ -443,7 +495,7 @@
               this.auditstepcode = 'PROF_AUDIT'
             } else if (this.formData.Status === '5') {
               this.auditTitle = '集中审批'
-              this.auditstepcode = 'PROF_CONCENT'
+              this.auditstepcode = 'PROF_REGULATION'
             }
             this.getDictOptions()
             this.isAccess()
@@ -474,6 +526,56 @@
         })
       },
 
+      getorgtreelist () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+          params
+        })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      getorgtreelistbydeptid () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/listbydeptid', {
+          params
+        })
+          .then(res => {
+            _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      auditOrgChange (val) {
+        console.log(this.formData.Status, 'status')
+        let auditstepcode = ''
+        if (this.formData.Status === '1') {
+          auditstepcode = 'SECOND_TRIAL'
+        } else if (this.formData.Status === '3') {
+          auditstepcode = 'PROF_AUDIT'
+        } else {
+          return
+        }
+        let deptid = val[val.length - 1]
+        console.log(deptid)
+        this.auditerOptions = []
+        this.auditer = ''
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 保存信息
       saveEntity () {
         this.$refs['EntityForm'].validate((valid) => {
@@ -583,6 +685,8 @@
       AuditEntity () {
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
+        } else if (this.formData.Status === '1') {
+          this.dialogMakeSure2 = true
         } else {
           this.dialogMakeSure = true
         }
@@ -609,13 +713,14 @@
         let params = this.shenheForm
         let audit = {
           auditer: this.auditer,
-          majorDept: this.majorDept
+          majorDept: this.majorDept[this.majorDept.length - 1]
         }
         apiCert.auditEntityFir(this.certId, audit, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas()
             this.dialogMakeSure = false
             this.dialogAllocation = false
+            this.dialogMakeSure2 = false
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -164,19 +164,23 @@
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-select ref="selectauditOrg" v-model="majorDept" placeholder="请选择"
-                     style="width: 90%" filterable allow-create default-first-option>
-            <el-option
-              v-for="item in organizeOption"
-              :key="item.Id"
-              :label="item.Fullname"
-              :value="item.Id">
-            </el-option>
-          </el-select>
+          <!--<el-select ref="selectauditOrg" v-model="majorDept" placeholder="请选择"-->
+                     <!--style="width: 90%" filterable allow-create default-first-option>-->
+            <!--<el-option-->
+              <!--v-for="item in organizeOption"-->
+              <!--:key="item.Id"-->
+              <!--:label="item.Fullname"-->
+              <!--:value="item.Id">-->
+            <!--</el-option>-->
+          <!--</el-select>-->
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" v-model="majorDept"
+                       placeholder="请选择组织">
+          </el-cascader>
         </el-form-item>
         <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                     style="width: 90%" filterable allow-create default-first-option>
+                     style="width: 100%" filterable allow-create default-first-option>
             <el-option
               v-for="item in auditerOptions"
               :key="item.id"
@@ -200,16 +204,62 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="审核" :visible.sync="dialogMakeSure2">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" v-model="majorDept"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" @change="auditOrgChange"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
+          <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.userid"
+              :label="item.username"
+              :value="item.userid">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审批人部门">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" @change="auditOrgChange"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
                      style="width: 90%" filterable allow-create default-first-option>
             <el-option
-              v-for="item in auditerOptions"
-              :key="item.id"
-              :label="item.realname"
-              :value="item.id">
+              v-for="item in secauditerOptions"
+              :key="item.userid"
+              :label="item.username"
+              :value="item.userid">
             </el-option>
           </el-select>
         </el-form-item>
@@ -267,19 +317,28 @@
         winningList: [], // 近三年获得省部级及以上主要技术、管理成果、获奖项目
         auditbusList: [], // 待审核业务
         auditerOptions: [], // 审核人员
+        secauditerOptions: [],
         auditerCurOptions: [],
         organizeOption: [],
-        majorDept: '',
+        orgtreelist: [],
+        secorgtreelist: [],
+        majorDept: [],
         serviceId: '',
         certId: '',
         classId: '01',
         dictData: null,
         dialogMakeSure: false,
+        dialogMakeSure2: false,
         dialogAllocation: false,
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
         auditBtn: false,
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         shenheForm: {
           SuccessStatus: 1,
           AuditorRemark: '',
@@ -393,6 +452,8 @@
       }
       // this.getDictOptions()
       this.initDatas()
+      this.getorgtreelist()
+      this.getorgtreelistbydeptid()
     },
     methods: {
       equipmentdialog () {
@@ -443,7 +504,7 @@
               this.auditstepcode = 'PROF_AUDIT'
             } else if (this.formData.Status === '5') {
               this.auditTitle = '集中审批'
-              this.auditstepcode = 'PROF_CONCENT'
+              this.auditstepcode = 'PROF_REGULATION'
             }
             this.getDictOptions()
             this.isAccess()
@@ -473,6 +534,56 @@
           console.error(err)
         })
       },
+      getorgtreelist () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+          params
+        })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      getorgtreelistbydeptid () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/listbydeptid', {
+          params
+        })
+          .then(res => {
+            _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      auditOrgChange (val) {
+        console.log(this.formData.Status, 'status')
+        let auditstepcode = ''
+        if (this.formData.Status === '1') {
+          auditstepcode = 'SECOND_TRIAL'
+        } else if (this.formData.Status === '3') {
+          auditstepcode = 'PROF_AUDIT'
+        } else {
+          return
+        }
+        let deptid = val[val.length - 1]
+        console.log(deptid)
+        this.auditerOptions = []
+        this.auditer = ''
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 保存信息
       saveEntity () {
         this.$refs['EntityForm'].validate((valid) => {
@@ -582,6 +693,8 @@
       AuditEntity () {
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
+        } else if (this.formData.Status === '1') {
+          this.dialogMakeSure2 = true
         } else {
           this.dialogMakeSure = true
         }
@@ -607,13 +720,14 @@
         let params = this.shenheForm
         let audit = {
           auditer: this.auditer,
-          majorDept: this.majorDept
+          majorDept: this.majorDept[this.majorDept.length - 1]
         }
         apiCert.auditEntityFir(this.certId, audit, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas()
             this.dialogMakeSure = false
             this.dialogAllocation = false
+            this.dialogMakeSure2 = false
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -164,19 +164,14 @@
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-select ref="selectauditOrg" v-model="majorDept" placeholder="请选择"
-                     style="width: 90%" filterable allow-create default-first-option>
-            <el-option
-              v-for="item in organizeOption"
-              :key="item.Id"
-              :label="item.Fullname"
-              :value="item.Id">
-            </el-option>
-          </el-select>
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" v-model="majorDept"
+                       placeholder="请选择组织">
+          </el-cascader>
         </el-form-item>
         <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                     style="width: 90%" filterable allow-create default-first-option>
+                     style="width: 100%" filterable allow-create default-first-option>
             <el-option
               v-for="item in auditerOptions"
               :key="item.id"
@@ -200,16 +195,62 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="审核" :visible.sync="dialogMakeSure2">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" v-model="majorDept"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" @change="auditOrgChange"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
+          <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.userid"
+              :label="item.username"
+              :value="item.userid">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审批人部门">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                       filterable style="width: 100%" @change="auditOrgChange"
+                       placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
                      style="width: 90%" filterable allow-create default-first-option>
             <el-option
-              v-for="item in auditerOptions"
-              :key="item.id"
-              :label="item.realname"
-              :value="item.id">
+              v-for="item in secauditerOptions"
+              :key="item.userid"
+              :label="item.username"
+              :value="item.userid">
             </el-option>
           </el-select>
         </el-form-item>
@@ -267,10 +308,14 @@
         winningList: [], // 近三年获得省部级及以上主要技术、管理成果、获奖项目
         auditbusList: [], // 待审核业务
         auditerOptions: [], // 审核人员
+        secauditerOptions: [],
         auditerCurOptions: [],
         organizeOption: [],
-        majorDept: '',
+        orgtreelist: [],
+        secorgtreelist: [],
+        majorDept: [],
         dialogMakeSure: false,
+        dialogMakeSure2: false,
         dialogAllocation: false,
         aduitlabel: '审核人',
         auditer: '',
@@ -281,6 +326,11 @@
         classId: '03',
         dictData: null,
 
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         formData: {
           Id: '',
           SupplierName: '',
@@ -393,6 +443,8 @@
       }
       // this.getDictOptions()
       this.initDatas()
+      this.getorgtreelist()
+      this.getorgtreelistbydeptid()
     },
     methods: {
       equipmentdialog () {
@@ -443,7 +495,7 @@
               this.auditstepcode = 'PROF_AUDIT'
             } else if (this.formData.Status === '5') {
               this.auditTitle = '集中审批'
-              this.auditstepcode = 'PROF_CONCENT'
+              this.auditstepcode = 'PROF_REGULATION'
             }
             this.getDictOptions()
             this.isAccess()
@@ -474,6 +526,56 @@
         })
       },
 
+      getorgtreelist () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+          params
+        })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      getorgtreelistbydeptid () {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/listbydeptid', {
+          params
+        })
+          .then(res => {
+            _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      auditOrgChange (val) {
+        console.log(this.formData.Status, 'status')
+        let auditstepcode = ''
+        if (this.formData.Status === '1') {
+          auditstepcode = 'SECOND_TRIAL'
+        } else if (this.formData.Status === '3') {
+          auditstepcode = 'PROF_AUDIT'
+        } else {
+          return
+        }
+        let deptid = val[val.length - 1]
+        console.log(deptid)
+        this.auditerOptions = []
+        this.auditer = ''
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 保存信息
       saveEntity () {
         this.$refs['EntityForm'].validate((valid) => {
@@ -583,6 +685,8 @@
       AuditEntity () {
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
+        } else if (this.formData.Status === '1') {
+          this.dialogMakeSure2 = true
         } else {
           this.dialogMakeSure = true
         }
@@ -610,7 +714,7 @@
         let params = this.shenheForm
         let audit = {
           auditer: this.auditer,
-          majorDept: this.majorDept
+          majorDept: this.majorDept[this.majorDept.length - 1]
         }
         console.log(this.shenheForm, '---this.shenheForm----')
         apiCert.auditEntityFir(this.certId, audit, params, this.$axios).then(res => {
@@ -618,6 +722,7 @@
             this.initDatas()
             this.dialogMakeSure = false
             this.dialogAllocation = false
+            this.dialogMakeSure2 = false
             this.$message({
               type: 'success',
               message: res.data.message