设置审批部门

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

@@ -5,18 +5,20 @@ import (
 )
 
 type OilClassOrgSetting struct {
-	Id             int       `xorm:"not null pk autoincr INT(10)"`
-	ClassId        int       `xorm:"not null default 0 comment('分类编码ID') INT(11)"`
-	OrganizeId     int       `xorm:"not null default 0 comment('单位ID') INT(10)"`
-	OrganizeName   string    `xorm:"comment('单位名称') VARCHAR(100)"`
-	AuditStepCode  string    `xorm:"not null default '0' comment('审批步骤编码') VARCHAR(20)"`
-	AuditStepName  string    `xorm:"comment('审批步骤名称') VARCHAR(50)"`
-	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
-	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
-	CreateOn       time.Time `xorm:"DATETIME"`
-	CreateUserId   int       `xorm:"INT(10)"`
-	CreateBy       string    `xorm:"VARCHAR(50)"`
-	ModifiedOn     time.Time `xorm:"DATETIME"`
-	ModifiedUserId int       `xorm:"INT(10)"`
-	ModifiedBy     string    `xorm:"VARCHAR(50)"`
-}
+	Id               int       `xorm:"not null pk autoincr INT(10)"`
+	ClassId          int       `xorm:"not null default 0 comment('分类编码ID') INT(11)"`
+	OrganizeId       int       `xorm:"not null default 0 comment('单位ID') INT(10)"`
+	OrganizeName     string    `xorm:"comment('单位名称') VARCHAR(100)"`
+	SupplierTypeCode string    `xorm:"comment('准入类别代码（1 物资类，2 基建类，3 技术服务类）') VARCHAR(20)"`
+	SupplierTypeName string    `xorm:"comment('准入类别名称（1 物资类，2 基建类，3 技术服务类）') VARCHAR(20)"`
+	AuditStepCode    string    `xorm:"not null default '0' comment('审批步骤编码') VARCHAR(20)"`
+	AuditStepName    string    `xorm:"comment('审批步骤名称') VARCHAR(50)"`
+	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn         time.Time `xorm:"DATETIME"`
+	CreateUserId     int       `xorm:"INT(10)"`
+	CreateBy         string    `xorm:"VARCHAR(50)"`
+	ModifiedOn       time.Time `xorm:"DATETIME"`
+	ModifiedUserId   int       `xorm:"INT(10)"`
+	ModifiedBy       string    `xorm:"VARCHAR(50)"`
+}

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/items"
 	"encoding/json"
 	"time"
 
@@ -55,14 +56,14 @@ func (this *OilBasisBuildController) GetEntityList() {
 // @router /dictlist [get]
 func (this *OilBasisBuildController) GetDictList() {
 	dictList := make(map[string]interface{})
-	//dictSvc := items.GetItemsService(utils.DBE)
+	dictSvc := items.GetItemsService(utils.DBE)
 	userSvc := baseUser.GetBaseUserService(utils.DBE)
 	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
 	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", "")
 	var userEntity userRole.Base_User
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId("", userEntity.Departmentid)
-
+	dictList["AuditStep"] = dictSvc.GetKeyValueItems("AuditStep", this.User.AccCode)
 	//var dictCustomer []svccustomer.Customer
 	//customerSvc.GetEntitysByWhere("" + CustomerName, "", &dictCustomer)
 	//dictList["EntrustCorp"] = &dictCustomer

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

@@ -1,7 +1,12 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/oilclassorgsetting"
+	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitude"
+	"dashoo.cn/business2/organize"
+	"dashoo.cn/business2/permission"
 	"encoding/json"
+	"strconv"
 	"strings"
 	"time"
 
@@ -16,6 +21,12 @@ type OilClassOrgSettingController struct {
 	BaseController
 }
 
+type OrganizeAjaxModel struct {
+	Organize         []organize.Base_Organizetree
+	SelectedOrganize []int
+	AuditStepCode     string
+}
+
 // @Title 获取列表
 // @Description get user by token
 // @Success 200 {object} []classorgsetting.OilClassOrgSetting
@@ -299,3 +310,87 @@ func (this *OilClassOrgSettingController) DeleteEntity() {
 		this.ServeJSON()
 	}
 }
+
+// @Title 添加审批部门
+// @Description 新增
+// @Param 	body body oilclassorgsetting.OilClassOrgSetting
+// @Success	200	{object} controllers.Request
+// @router /addorganize  [post]
+func (this *OilClassOrgSettingController) AddOrganize() {
+	var organizes []organize.Base_Organize
+	classid := this.GetString("classId")
+	organizeids := strings.Split(this.GetString("organizeids"), ",")
+	supplierTypeCode := this.GetString("SupplierTypeCode")
+	supplierTypeName := this.GetString("SupplierTypeName")
+	auditStepCode := this.GetString("AuditStepCode")
+	auditStepName:= this.GetString("AuditStepName")
+	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+
+	var err error
+	where := "classId=" + classid
+	svc.DeleteEntityBytbl(OilClassOrgSettingName, where)
+	var model oilclassorgsetting.OilClassOrgSetting
+	if (len(organizeids) > 0) {
+		for i := 0; i < len(organizeids); i++ {
+			where := "Id=" + organizeids[i]
+			svc.GetEntitysByWhere("Base_Organize", where, &organizes)
+		}
+		if (organizes != nil) {
+			for i := 0;i < len(organizes);i++ {
+				var model oilclassorgsetting.OilClassOrgSetting
+				model.ClassId,_ = strconv.Atoi(classid)
+				model.OrganizeId = organizes[i].Id
+				model.OrganizeName = organizes[i].Fullname
+				model.AuditStepCode = auditStepCode
+				model.AuditStepName = auditStepName
+				model.SupplierTypeCode = supplierTypeCode
+				model.SupplierTypeName = supplierTypeName
+				model.CreateOn = time.Now()
+				model.CreateBy = this.User.Realname
+				model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				_, err = svc.InsertEntityBytbl(OilClassOrgSettingName, &model)
+			}
+		}
+	}
+	var errinfo ErrorDataInfo
+	if err == nil {
+		//新增
+		errinfo.Message = "添加成功！"
+		errinfo.Code = 0
+		errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 获得部门
+// @Description 获得部门
+// @Success	200	{object} controllers.Request
+// @router /getdepartment [get]
+func (this *OilClassOrgSettingController) DepartmentListGet() {
+	id := this.GetString("id") //
+	stcode := this.GetString("stcode") //
+	svc := permission.GetPermissionService(utils.DBE)
+	currentuser := this.User
+	userid := utils.ToStr(currentuser.Id)
+	organizemodu := svc.GetOrganizeTree(userid)
+
+	var selected []int
+	auditStepCode := ""
+	var list []oilclassorgsetting.OilClassOrgSetting
+	where := "classId=" + id + " and SupplierTypeCode=" + "'" + stcode + "'"
+	svc.GetEntities(&list, where)
+	for _, item := range list {
+		selected = append(selected, item.OrganizeId)
+		auditStepCode = item.AuditStepCode
+	}
+	//organizeselectedmodu := svc.GetOrganizeTreeByRole(id)
+	rest := OrganizeAjaxModel{organizemodu, selected, auditStepCode}
+	this.Data["json"] = &rest
+	this.ServeJSON()
+}

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/items"
 	"encoding/json"
 	"time"
 
@@ -53,7 +54,7 @@ func (this *OilGoodsAptitudeController) GetEntityList() {
 // @router /dictlist [get]
 func (this *OilGoodsAptitudeController) GetDictList() {
 	dictList := make(map[string]interface{})
-	//dictSvc := items.GetItemsService(utils.DBE)
+	dictSvc := items.GetItemsService(utils.DBE)
 	userSvc := baseUser.GetBaseUserService(utils.DBE)
 	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
 	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", "")
@@ -61,6 +62,10 @@ func (this *OilGoodsAptitudeController) GetDictList() {
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId("", userEntity.Departmentid)
 
+	dictList["AuditStep"] = dictSvc.GetKeyValueItems("AuditStep", this.User.AccCode)
+
+
+
 	//var dictCustomer []svccustomer.Customer
 	//customerSvc.GetEntitysByWhere("" + CustomerName, "", &dictCustomer)
 	//dictList["EntrustCorp"] = &dictCustomer

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

@@ -1,96 +0,0 @@
-package oilsupplier
-
-import (
-	"dashoo.cn/backend/api/business/oilclassorgsetting"
-	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitude"
-	"dashoo.cn/business2/organize"
-	"dashoo.cn/business2/permission"
-	"dashoo.cn/utils"
-	"strconv"
-	"strings"
-	"time"
-	. "dashoo.cn/backend/api/controllers"
-)
-
-type OilclassorgsettingController struct {
-	BaseController
-}
-
-type OrganizeAjaxModel struct {
-	Organize         []organize.Base_Organizetree
-	SelectedOrganize []int
-}
-
-
-// @Title 添加审批部门
-// @Description 新增
-// @Param 	body body oilclassorgsetting.OilClassOrgSetting
-// @Success	200	{object} controllers.Request
-// @router /addorganize  [post]
-func (this *OilclassorgsettingController) AddOrganize() {
-	var organizes []organize.Base_Organize
-	classid := this.GetString("classId")
-	organizeids := strings.Split(this.GetString("organizeids"), ",")
-	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
-
-	var err error
-	where := "classId=" + classid
-	svc.DeleteEntityBytbl(OilClassOrgSettingName, where)
-	var model oilclassorgsetting.OilClassOrgSetting
-	if (len(organizeids) > 0) {
-		for i := 0; i < len(organizeids); i++ {
-			where := "Id=" + organizeids[i]
-			svc.GetEntitysByWhere("Base_Organize", where, &organizes)
-		}
-		if (organizes != nil) {
-			for i := 0;i < len(organizes);i++ {
-				var model oilclassorgsetting.OilClassOrgSetting
-				model.ClassId,_ = strconv.Atoi(classid)
-				model.OrganizeId = organizes[i].Id
-				model.OrganizeName = organizes[i].Fullname
-				model.CreateOn = time.Now()
-				model.CreateBy = this.User.Realname
-				model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-				_, err = svc.InsertEntityBytbl(OilClassOrgSettingName, &model)
-			}
-		}
-	}
-	var errinfo ErrorDataInfo
-	if err == nil {
-		//新增
-		errinfo.Message = "添加成功！"
-		errinfo.Code = 0
-		errinfo.Item = model.Id
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-
-// @Title 获得部门
-// @Description 获得部门
-// @Success	200	{object} controllers.Request
-// @router /getdepartment [get]
-func (this *OilclassorgsettingController) DepartmentListGet() {
-	id := this.GetString("id") //roleid
-	svc := permission.GetPermissionService(utils.DBE)
-	currentuser := this.User
-	userid := utils.ToStr(currentuser.Id)
-	organizemodu := svc.GetOrganizeTree(userid)
-
-	var selected []int
-	var list []oilclassorgsetting.OilClassOrgSetting
-	where := "classId=" + id
-	svc.GetEntities(&list, where)
-	for _, item := range list {
-		selected = append(selected, item.OrganizeId)
-	}
-	//organizeselectedmodu := svc.GetOrganizeTreeByRole(id)
-	rest := OrganizeAjaxModel{organizemodu, selected}
-	this.Data["json"] = &rest
-	this.ServeJSON()
-}

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/items"
 	"encoding/json"
 	"time"
 
@@ -59,14 +60,14 @@ func (this *OilTechnologyServiceController) GetEntityList() {
 // @router /dictlist [get]
 func (this *OilTechnologyServiceController) GetDictList() {
 	dictList := make(map[string]interface{})
-	//dictSvc := items.GetItemsService(utils.DBE)
+	dictSvc := items.GetItemsService(utils.DBE)
 	userSvc := baseUser.GetBaseUserService(utils.DBE)
 	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
 	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", "")
 	var userEntity userRole.Base_User
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId("", userEntity.Departmentid)
-
+	dictList["AuditStep"] = dictSvc.GetKeyValueItems("AuditStep", this.User.AccCode)
 	//var dictCustomer []svccustomer.Customer
 	//customerSvc.GetEntitysByWhere("" + CustomerName, "", &dictCustomer)
 	//dictList["EntrustCorp"] = &dictCustomer

src/dashoo.cn/backend/api/routers/router.go

@@ -310,12 +310,6 @@ func init() {
 				&oilsupplier.AnnualAuditController{},
 			),
 		),
-		//审批部门设置
-		beego.NSNamespace("/oilclassorgsetting",
-			beego.NSInclude(
-				&oilsupplier.OilclassorgsettingController{},
-			),
-		),
 	)
 	beego.AddNamespace(ns)
 }

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

@@ -37,11 +37,5 @@ export default {
       url: '/goodsaptitude/delete/' + entityId,
       method: 'delete'
     })
-  },
-  addOrganize (classId, organizeids, myAxios) {
-    return myAxios({
-      url: '/oilclassorgsetting/addorganize?classId=' + classId + '&organizeids=' + organizeids,
-      method: 'post'
-    })
   }
 }

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

@@ -0,0 +1,9 @@
+export default {
+  addOrganize (classId, organizeids, params, myAxios) {
+    return myAxios({
+      url: '/classorgsetting/addorganize?classId=' + classId + '&organizeids=' + organizeids,
+      method: 'post',
+      params: params
+    })
+  }
+}

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

@@ -37,11 +37,5 @@ export default {
       url: '/technologyservice/delete/' + entityId,
       method: 'delete'
     })
-  },
-  addOrganize (classId, organizeids, myAxios) {
-    return myAxios({
-      url: '/oilclassorgsetting/addorganize?classId=' + classId + '&organizeids=' + organizeids,
-      method: 'post'
-    })
   }
 }

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

@@ -43,7 +43,7 @@
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="GetCommand('Set', scope.row)">审核部门</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)">删除数据</el-dropdown-item>
+                <!--<el-dropdown-item :command="GetCommand('Delete', scope.row)">删除数据</el-dropdown-item>-->
               </el-dropdown-menu>
             </el-dropdown>
             <!--<el-popover placement="top" title="提示">-->
@@ -391,8 +391,24 @@
       </span>
     </el-dialog>
     <el-dialog title="设置审批部门" :visible.sync="deptsetVisible">
-      <el-tree style="border: 0" show-checkbox node-key="id" :data="operationOrganizeData" :props="organizeProps" ref="operationOriganizeTree">
-      </el-tree>
+      <el-row>
+        <el-col :span="12">
+          审批步骤：
+          <el-select v-model="setForm.AuditStepCode" ref="selectAuditStep" placeholder="请选择" size="small">
+            <el-option
+              v-for="item in AuditStepOptions"
+              :key="item.Id"
+              :label="item.Key"
+              :value="item.Value">
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          审批部门：
+          <el-tree style="border: 0" show-checkbox node-key="id" :data="operationOrganizeData" :props="organizeProps" ref="operationOriganizeTree">
+          </el-tree>
+        </el-col>
+      </el-row>
       <div slot="footer">
         <el-button @click="deptsetVisible = false">取消</el-button>
         <el-button type="primary" @click="saveApprovalDept()">确定</el-button>
@@ -406,6 +422,7 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/basisbuild'
+  import setapi from '@/api/oilsupplier/oilclassorgset'
 
   export default {
     computed: {
@@ -481,6 +498,12 @@
           Remark: ''
 
         },
+        setForm: {
+          SupplierTypeCode: '2',
+          SupplierTypeName: '基建类',
+          AuditStepCode: '',
+          AuditStepName: ''
+        },
         tableColumns: [
 
           {
@@ -809,7 +832,8 @@
           label: 'name',
           children: 'children'
         },
-        operationOrganizeData: []
+        operationOrganizeData: [],
+        AuditStepOptions: []
       }
     },
     created () {
@@ -817,7 +841,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
       this.initDatas()
-      // this.getDictOptions()
+      this.getDictOptions()
     },
     methods: {
       saveApprovalDept () {
@@ -826,9 +850,8 @@
         organize.forEach(row => {
           organizeids.push(row.id)
         })
-        console.log(organizeids, 'organizeids')
-
-        api.addOrganize(this.selecteclassid, organizeids, this.$axios).then(res => {
+        this.setForm.AuditStepName = this.$refs.selectAuditStep.selectedLabel + ''
+        setapi.addOrganize(this.selecteclassid, organizeids, this.setForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.$message({
               type: 'success',
@@ -847,13 +870,14 @@
         })
       },
       deptSet (val) {
+        let stcode = this.setForm.SupplierTypeCode
         this.deptsetVisible = true
         this.selecteclassid = val.Id
         // request
-        this.$axios.get('goodsaptitude/getdepartment?id=' + this.selecteclassid, {})
+        this.$axios.get('classorgsetting/getdepartment?id=' + this.selecteclassid + '&stcode=' + stcode, {})
           .then(res => {
-            console.log(res.data, '===')
             // response
+            this.setForm.AuditStepCode = res.data.AuditStepCode
             this.operationOrganizeData = window.toolfun_gettreejson(res.data.Organize, 'id', 'pId', 'id,name,scope')
             if (!res.data.SelectedOrganize) {
               res.data.SelectedOrganize = []
@@ -909,7 +933,7 @@
         api.getDictList(this.$axios).then(res => {
           // this.dictOptions.customerList = res.data.items['customerList']
           // this.dictOptions.projectList = res.data.items['projectList']
-
+          this.AuditStepOptions = res.data.items['AuditStep']
         }).catch(err => {
           console.error(err)
         })

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

@@ -43,7 +43,7 @@
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="GetCommand('Set', scope.row)">审核部门</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)">删除数据</el-dropdown-item>
+                <!--<el-dropdown-item :command="GetCommand('Delete', scope.row)">删除数据</el-dropdown-item>-->
               </el-dropdown-menu>
             </el-dropdown>
             <!--<el-button size="small" type="text" style="margin-left:3px" title="审批部门" @click="deptSet(scope.row)">-->
@@ -495,8 +495,24 @@
       </span>
     </el-dialog>
     <el-dialog title="设置审批部门" :visible.sync="deptsetVisible">
-      <el-tree style="border: 0" show-checkbox node-key="id" :data="operationOrganizeData" :props="organizeProps" ref="operationOriganizeTree">
-      </el-tree>
+      <el-row>
+        <el-col :span="12">
+            审批步骤：
+            <el-select v-model="setForm.AuditStepCode" ref="selectAuditStep" placeholder="请选择" size="small">
+              <el-option
+                v-for="item in AuditStepOptions"
+                :key="item.Id"
+                :label="item.Key"
+                :value="item.Value">
+              </el-option>
+            </el-select>
+        </el-col>
+        <el-col :span="12">
+          审批部门：
+          <el-tree style="border: 0" show-checkbox node-key="id" :data="operationOrganizeData" :props="organizeProps" ref="operationOriganizeTree">
+          </el-tree>
+        </el-col>
+      </el-row>
       <div slot="footer">
         <el-button @click="deptsetVisible = false">取消</el-button>
         <el-button type="primary" @click="saveApprovalDept()">确定</el-button>
@@ -507,6 +523,7 @@
 <script>
   import { mapGetters } from 'vuex'
   import api from '@/api/oilsupplier/goodsaptitude'
+  import setapi from '@/api/oilsupplier/oilclassorgset'
 
   export default {
     computed: {
@@ -603,6 +620,12 @@
           ModifiedBy: ''
 
         },
+        setForm: {
+          SupplierTypeCode: '1',
+          SupplierTypeName: '物质类',
+          AuditStepCode: '',
+          AuditStepName: ''
+        },
         tableColumns: [
 
           {
@@ -994,7 +1017,8 @@
           label: 'name',
           children: 'children'
         },
-        operationOrganizeData: []
+        operationOrganizeData: [],
+        AuditStepOptions: []
       }
     },
     created () {
@@ -1002,7 +1026,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
       this.initDatas()
-      // this.getDictOptions()
+      this.getDictOptions()
     },
     methods: {
       saveApprovalDept () {
@@ -1011,9 +1035,9 @@
         organize.forEach(row => {
           organizeids.push(row.id)
         })
-        console.log(organizeids, 'organizeids')
+        this.setForm.AuditStepName = this.$refs.selectAuditStep.selectedLabel + ''
 
-        api.addOrganize(this.selecteclassid, organizeids, this.$axios).then(res => {
+        setapi.addOrganize(this.selecteclassid, organizeids, this.setForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.$message({
               type: 'success',
@@ -1032,13 +1056,14 @@
         })
       },
       deptSet (val) {
+        let stcode = this.setForm.SupplierTypeCode
         this.deptsetVisible = true
         this.selecteclassid = val.Id
         // request
-        this.$axios.get('goodsaptitude/getdepartment?id=' + this.selecteclassid, {})
+        this.$axios.get('classorgsetting/getdepartment?id=' + this.selecteclassid + '&stcode=' + stcode, {})
           .then(res => {
-            console.log(res.data, '===')
             // response
+            this.setForm.AuditStepCode = res.data.AuditStepCode
             this.operationOrganizeData = window.toolfun_gettreejson(res.data.Organize, 'id', 'pId', 'id,name,scope')
             if (!res.data.SelectedOrganize) {
               res.data.SelectedOrganize = []
@@ -1079,9 +1104,9 @@
 
       getDictOptions () {
         api.getDictList(this.$axios).then(res => {
+          this.AuditStepOptions = res.data.items['AuditStep']
           // this.dictOptions.customerList = res.data.items['customerList']
           // this.dictOptions.projectList = res.data.items['projectList']
-
         }).catch(err => {
           console.error(err)
         })
@@ -1203,3 +1228,9 @@
     }
   }
 </script>
+
+<style>
+  .el-col {
+    margin-bottom: 5px;
+  }
+</style>

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

@@ -43,7 +43,7 @@
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="GetCommand('Set', scope.row)">审核部门</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)">删除数据</el-dropdown-item>
+                <!--<el-dropdown-item :command="GetCommand('Delete', scope.row)">删除数据</el-dropdown-item>-->
               </el-dropdown-menu>
             </el-dropdown>
             <!--<el-popover placement="top" title="提示">-->
@@ -171,8 +171,24 @@
       </span>
     </el-dialog>
     <el-dialog title="设置审批部门" :visible.sync="deptsetVisible">
-      <el-tree style="border: 0" show-checkbox node-key="id" :data="operationOrganizeData" :props="organizeProps" ref="operationOriganizeTree">
-      </el-tree>
+      <el-row>
+        <el-col :span="12">
+          审批步骤：
+          <el-select v-model="setForm.AuditStepCode" ref="selectAuditStep" placeholder="请选择" size="small">
+            <el-option
+              v-for="item in AuditStepOptions"
+              :key="item.Id"
+              :label="item.Key"
+              :value="item.Value">
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          审批部门：
+          <el-tree style="border: 0" show-checkbox node-key="id" :data="operationOrganizeData" :props="organizeProps" ref="operationOriganizeTree">
+          </el-tree>
+        </el-col>
+      </el-row>
       <div slot="footer">
         <el-button @click="deptsetVisible = false">取消</el-button>
         <el-button type="primary" @click="saveApprovalDept()">确定</el-button>
@@ -184,6 +200,7 @@
 <script>
   import { mapGetters } from 'vuex'
   import api from '@/api/oilsupplier/technologyservice'
+  import setapi from '@/api/oilsupplier/oilclassorgset'
 
   export default {
     computed: {
@@ -268,6 +285,12 @@
 
           Remark: ''
         },
+        setForm: {
+          SupplierTypeCode: '3',
+          SupplierTypeName: '技术服务类',
+          AuditStepCode: '',
+          AuditStepName: ''
+        },
         tableColumns: [
           {
             prop: 'Code',
@@ -651,7 +674,8 @@
           label: 'name',
           children: 'children'
         },
-        operationOrganizeData: []
+        operationOrganizeData: [],
+        AuditStepOptions: []
       }
     },
     created () {
@@ -659,7 +683,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
       this.initDatas()
-      // this.getDictOptions()
+      this.getDictOptions()
     },
     methods: {
       saveApprovalDept () {
@@ -668,9 +692,8 @@
         organize.forEach(row => {
           organizeids.push(row.id)
         })
-        console.log(organizeids, 'organizeids')
-
-        api.addOrganize(this.selecteclassid, organizeids, this.$axios).then(res => {
+        this.setForm.AuditStepName = this.$refs.selectAuditStep.selectedLabel + ''
+        setapi.addOrganize(this.selecteclassid, organizeids, this.setForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.$message({
               type: 'success',
@@ -689,13 +712,14 @@
         })
       },
       deptSet (val) {
+        let stcode = this.setForm.SupplierTypeCode
         this.deptsetVisible = true
         this.selecteclassid = val.Id
         // request
-        this.$axios.get('goodsaptitude/getdepartment?id=' + this.selecteclassid, {})
+        this.$axios.get('classorgsetting/getdepartment?id=' + this.selecteclassid + '&stcode=' + stcode, {})
           .then(res => {
-            console.log(res.data, '===')
             // response
+            this.setForm.AuditStepCode = res.data.AuditStepCode
             this.operationOrganizeData = window.toolfun_gettreejson(res.data.Organize, 'id', 'pId', 'id,name,scope')
             if (!res.data.SelectedOrganize) {
               res.data.SelectedOrganize = []
@@ -749,9 +773,9 @@
 
       getDictOptions () {
         api.getDictList(this.$axios).then(res => {
+          this.AuditStepOptions = res.data.items['AuditStep']
           // this.dictOptions.customerList = res.data.items['customerList']
           // this.dictOptions.projectList = res.data.items['projectList']
-
         }).catch(err => {
           console.error(err)
         })