物资类增项审批

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappend.go

@@ -19,6 +19,11 @@ type OilSupplierCertAppend struct {
 	WorkFlowId     string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	Step           int       `xorm:"comment('页面上第几步') INT(10)"`
+	FirstAudit     int       `xorm:"default 0 comment('初审') INT(10)"`
+	SecondAudit    int       `xorm:"default 0 comment('复审') INT(10)"`
+	ThirdAudit     int       `xorm:"default 0 comment('专业科室审批') INT(10)"`
+	FourthAudit    int       `xorm:"default 0 comment('集中审批') INT(10)"`
 	CreateOn       time.Time `xorm:"DATETIME"`
 	CreateUserId   int       `xorm:"INT(10)"`
 	CreateBy       string    `xorm:"VARCHAR(50)"`

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

@@ -803,7 +803,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 				}else if supplierCertEntity.SupplierTypeCode == "03" {
 					Amount = 8000
 				}
-				paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount,"2")
+				paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount,"1")
 			}
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0

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

@@ -1,11 +1,10 @@
 package oilsupplier
 
 import (
-	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
+	"dashoo.cn/backend/api/business/paymentinfo"
 	"dashoo.cn/backend/api/business/workflow"
 	"dashoo.cn/business2/permission"
-	"dashoo.cn/business2/userRole"
 	"encoding/json"
 	"strconv"
 	"strings"
@@ -22,6 +21,14 @@ type OilSupplierCertAppendController struct {
 	BaseController
 }
 
+type AppShenHeModel struct {
+	AnnualId      int
+	SuccessStatus int
+	AuditorRemark string
+	Auditer       int
+	MajorDept     int
+}
+
 // @Title 获取列表
 // @Description 获取列表
 // @Success 200 {object} []suppliercertappend.OilSupplierCertAppend
@@ -390,7 +397,6 @@ func (this *OilSupplierCertAppendController) GetMyTaskEntityList() {
 	this.ServeJSON()
 }
 
-
 // @Title 提交审批
 // @Description 提交审批
 // @Success	200	{object} controllers.Request
@@ -420,27 +426,15 @@ func (this *OilSupplierCertAppendController) 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) //
-
 	processInstanceId := ""
 	if supplierCertAppendEntity.WorkFlowId == "0" || len(supplierCertAppendEntity.WorkFlowId) <= 0 {
 		//启动工作流
 		processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, certappendId, this.User.Id)
 	}
-	for _, tmpUser := range users {
-		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-	}
-	userIds = strings.Trim(userIds, ",")
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
 	ActiComplete.BusinessKey = certappendId
-	ActiComplete.UserNames = userIds
+	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
 	ActiComplete.Remarks = ""
@@ -463,10 +457,12 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	var model suppliercertappend.OilSupplierCertAppend
 	model.WorkFlowId = processInstanceId
 	model.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
+	model.FirstAudit, _ = strconv.Atoi(firstAudit)
 	cols := []string{
 		"Id",
 		"WorkFlowId",
 		"Status",
+		"FirstAudit",
 	}
 	certSrv.UpdateEntityByIdCols(certappendId, model, cols)
 }
@@ -477,16 +473,14 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 // @Success	200	{object} controllers.Request
 // @router /auditEntityFir/:id [post]
 func (this *OilSupplierCertAppendController) AuditEntityFir() {
-	certId := this.Ctx.Input.Param(":id")
-	auditer := this.GetString("auditer")
-
+	appendId := this.Ctx.Input.Param(":id")
 	//取出审批列表
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	var supplierCertEntity suppliercert.OilSupplierCert
-	certSrv.GetEntityById(certId, &supplierCertEntity)
+	certSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
+	certSrv.GetEntityById(appendId, &supplierCertAppendEntity)
 
 	var jsonblob = this.Ctx.Input.RequestBody
-	var dataother ShenHeModel
+	var dataother AppShenHeModel
 	json.Unmarshal(jsonblob, &dataother)
 	var errinfo ErrorDataInfo
 	defer func() { //finally处理失败的异常
@@ -504,40 +498,46 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		}
 	}()
 
-	//remarks := ""
 	step := 2
 	status := ""
-	if supplierCertEntity.Status == "1" {
+	var userIds string
+	if supplierCertAppendEntity.Status == "1" {
+		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.SECOND_TRIAL_STATUS
 		step = 2
-	} else if supplierCertEntity.Status == "2" {
+		supplierCertAppendEntity.ThirdAudit = dataother.MajorDept
+		cols := []string{
+			"ThirdAudit",
+		}
+		certSrv.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
+	} else if supplierCertAppendEntity.Status == "2" {
 		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, "100000172", workflow.PROF_RECE, &auditWorkflow1)
-		users1 = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow1.RoleId), this.User.AccCode)
-		for _, tmpUser := range users1 {
-			auditer += strconv.FormatInt(tmpUser.Id, 10) + ","
+		var users []suppliercert.UserList
+		where := "OrganizeId=" + strconv.Itoa(supplierCertAppendEntity.ThirdAudit) + " and AuditStepCode='" + workflow.PROF_RECE + "'"
+		certSrv.GetEntitysByWhere(OilAuditSettingName, where, &users)
+
+		for _, tmpUser := range users {
+			userIds += strconv.FormatInt(tmpUser.UserId, 10) + ","
 		}
-		auditer = strings.Trim(auditer, ",")
-	} else if supplierCertEntity.Status == "3" {
+		userIds = strings.Trim(userIds, ",")
+	} else if supplierCertAppendEntity.Status == "3" {
+		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.PROF_AUDIT_STATUS
 		step = 2
-	} else if supplierCertEntity.Status == "4" {
+	} else if supplierCertAppendEntity.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 {
-			auditer += strconv.FormatInt(tmpUser.Id, 10) + ","
+		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) + ","
 		}
-		auditer = strings.Trim(auditer, ",")
-	} else if supplierCertEntity.Status == "5" {
+		userIds = strings.Trim(userIds, ",")
+	} else if supplierCertAppendEntity.Status == "5" {
+		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.PAYING_AUDIT_STATUS
 		step = 3
 	}
@@ -545,8 +545,8 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
-	ActiComplete.BusinessKey = certId
-	ActiComplete.UserNames = auditer
+	ActiComplete.BusinessKey = appendId
+	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Remarks = dataother.AuditorRemark
 	ActiComplete.CallbackUrl = ""
@@ -555,13 +555,25 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 		if receiveVal == "true" {
-			supplierCertEntity.Status = status
-			supplierCertEntity.Step = step
+			supplierCertAppendEntity.Status = status
+			supplierCertAppendEntity.Step = step
 			cols := []string{
 				"Status",
 				"Step",
 			}
-			certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+			certSrv.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
+			if supplierCertAppendEntity.Status == "5" {
+				paysvc := paymentinfo.GetPaymentService(utils.DBE)
+				var Amount float64
+				if supplierCertAppendEntity.AppendType == "01" {
+					Amount = 6000
+				} else if supplierCertAppendEntity.AppendType == "02" {
+					Amount = 7000
+				} else if supplierCertAppendEntity.AppendType == "03" {
+					Amount = 8000
+				}
+				paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
+			}
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0
 			this.Data["json"] = &errinfo
@@ -578,13 +590,13 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 		if receiveVal == "true" {
-			supplierCertEntity.Status = "0"
-			supplierCertEntity.Step = step
+			supplierCertAppendEntity.Status = "0"
+			supplierCertAppendEntity.Step = step
 			cols := []string{
 				"Status",
 				"Step",
 			}
-			certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+			certSrv.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0
 			this.Data["json"] = &errinfo
@@ -597,4 +609,4 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 			return
 		}
 	}
-}
+}

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

@@ -46,9 +46,9 @@ export default {
       method: 'post'
     })
   },
-  auditEntityFir (entityId, auditer, params, myAxios) {
+  auditEntityFir (entityId, params, myAxios) {
     return myAxios({
-      url: '/suppliercertappend/auditEntityFir/' + entityId + '?auditer=' + auditer,
+      url: '/suppliercertappend/auditEntityFir/' + entityId,
       method: 'post',
       data: params
     })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -11,44 +11,42 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">分配</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>
-          <router-link :to="'/oilsupplier/addtionaudit/techlist'">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
+           <router-link :to="'/oilsupplier/addtionaudit/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
       </div>
       <div>
+        <el-steps :active="formData.Step" simple align-center finish-status="success">
+          <el-step title="填信息"></el-step>
+          <el-step title="待审批"></el-step>
+          <el-step title="已审批"></el-step>
+          <el-step title="待交费"></el-step>
+          <el-step title="待入库"></el-step>
+          <el-step title="完成"></el-step>
+        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="saveEntity()">保存信息</el-button>
           </div>
-          <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
+          <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
-                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
-                    change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
-                    placeholder="请选择推荐单位" style="width: 100%">
-                  </el-cascader>
+                <el-form-item label="推荐单位名称" prop="RecUnitName">
+                  <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
-                    style="width: 100%">
+                  <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司" style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="12">
-                <el-form-item label="推荐单位编码" prop="RecUnitId">
-                  <el-input v-model="formData.RecUnitId" placeholder="请输入推荐单位编码"></el-input>
-                </el-form-item>
-              </el-col> -->
               <el-col :span="24">
                 <el-form-item label="备注" prop="Remark">
                   <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
@@ -59,19 +57,7 @@
         </el-card>
         <!-- 增项分类列表 -->
         <el-card class="box-card" style="margin-top: 10px;">
-          <div slot="header">
-            <span><i class="icon icon-table2"></i> 增项分类</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="addSortData()">添加</el-button>
-          </div>
           <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
-            <el-table-column label="操作" min-width="100" align="center" fixed>
-              <template slot-scope="scope">
-                <el-button type="text" title="编辑" size="medium" icon="el-icon-edit" @click="editSortData(scope.row)">
-                </el-button>
-                <el-button type="text" title="删除" size="medium" icon="el-icon-delete" @click="deleteData(scope.row.Id)">
-                </el-button>
-              </template>
-            </el-table-column>
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
@@ -84,36 +70,6 @@
         </el-card>
       </div>
     </el-card>
-    <!-- 增项分类添加、修改 -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="800px">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="分类名称" prop="checkSelectedOptList">
-              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="orgtreeprops"
-                change-on-select :show-all-levels="false" v-model="selectedOptList" @change="getCode"
-                placeholder="请选择分类">
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="分类编码" prop="Code">
-              <el-input v-model="dialogFormData.Code" placeholder="请输入分类编码" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="Remark">
-              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注" style="width: 100%">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="cancelOption()">取 消</el-button>
-        <el-button size="mini" type="primary" @click="ensureOption()">确 定</el-button>
-      </span>
-    </el-dialog>
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
@@ -165,6 +121,7 @@
   import suppapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
+  import apiCert from '@/api/oilsupplier/suppliercert'
 
   export default {
     computed: {
@@ -197,40 +154,38 @@
         }
       }
       return {
-        auditbusList: [], // 待审核业务
         auditerOptions: [], // 审核人员
+        secauditerOptions: [],
+        auditerCurOptions: [],
+        organizeOption: [],
+        orgtreelist: [],
+        secorgtreelist: [],
+        majorDept: [],
+        auditbusList: [], // 待审核业务
         dialogMakeSure: false,
         dialogAllocation: false,
+        dialogMakeSure2: false,
         aduitlabel: '审核人',
         auditer: '',
+        auditTitle: '审批',
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
+        auditBtn: false,
+        auditstepcode: '',
         dictData: null,
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
-        optionsList: [], //增项分类层级列表
         selectedOptList: [], //已选择的增项分类列表
-        orgtreeprops: {
-          value: 'id',
-          label: 'Name',
-          children: 'children'
-        },
-        organizeTreeList: [], //推荐单位层级列表
         selectedOrgList: [], //已选择的单位列表
-        organizeTreeProps: {
-          value: 'id',
-          label: 'Fullname',
-          children: 'children'
-        },
-        organizeform: {
-          IsInnerOrganize: 1,
-          parentid: 0,
-          fullname: '',
-          description: '',
-          id: 0
-        },
         //增项信息表
         formData: {
           Id: '',
+          Step: 1,
+          Status: '',
           SupplierId: 1,
           SupplierCertId: 1,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -287,7 +242,9 @@
         shenheForm: {
           SuccessStatus: 1,
           AuditorRemark: '',
-          AppendId: 0
+          AppendId: 0,
+          Auditer: '',
+          MajorDept: '',
         },
         AppendId: '', //传的参数
         serviceId: '',
@@ -297,110 +254,40 @@
     created() {
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.serviceId = this.$route.params.opera
-      console.log("---this.serviceId----", this.serviceId)
-      this.editFlag = this.$route.query.editFlag
       this.AppendId = this.serviceId
+      this.editFlag = '1'
       this.getEntityById()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getSortList()
-      this.getOrgTreeList() //获取推荐单位层级列表
-      this.getTechTreeList() //获取技术服务类层级列表
-      this.getSupplierList() //获取供应方公司列表
+      this.getorgtreelist()
+      this.getorgtreelistbydeptid()
     },
     methods: {
-
-      //获取推荐单位列表
-      getOrgTreeList() {
-        let _this = this
-        let params = {
-          IsInnerOrganize: this.organizeform.IsInnerOrganize
-        }
-        _this.$axios.get('organizes/list', {
-            params
-          })
-          .then(res => {
-            _this.organizeTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取供应方公司列表
-      getSupplierList() {
-        let _this = this
-        _this.$axios.get('/suppliercertappend/getsupplier/' + '2', {})
-          .then(res => {
-            _this.supplierList = res.data
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取技术服务类层级列表
-      getTechTreeList() {
-        let _this = this
-        this.$axios.get('technologyservice/businesslist', {})
-          .then(res => {
-            _this.optionsList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取SupplierId和SupplierCertId
-      getInfo(vId) { //这个vId也就是value值
-        let obj = {}
-        obj = this.supplierList.find((item) => {
-          return item.SupplierId === vId; //筛选出匹配数据
-        })
-        this.formData.SupplierId = parseInt(obj.SupplierId)
-        this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
-      },
-
-      //获取分类级联Id
-      getCode(item) {
-        let sortFlagStr = item.toString()
-        this.dialogFormData.SortFlag = sortFlagStr
-        this.getCodeById(item[item.length - 1]) //根据分类Id获取Code
-      },
-
-      //根据分类Id获取Code
-      getCodeById(Id) {
-        let _this = this
-        this.$axios.get('technologyservice/getcode/' + Id, {})
-          .then(res => {
-            _this.dialogFormData.Code = res.data.items[0].Code
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取推荐单位级联Id
-      getCode2(item) {
-        let codeStr = item.toString()
-        this.formData.RecUnitFlag = codeStr
-      },
-
       //获取需要修改的增项信息
       getEntityById() {
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
-          this.getDictOptions()
-          console.log("--_this.formData---", _this.formData)
-          //显示原推荐单位
-          if (_this.formData.RecUnitFlag != null) {
-            let arr = _this.formData.RecUnitFlag.split(',')
-            let arr2 = []
-            for (let i = 0; i < arr.length; i++) {
-              arr2.push(parseInt(arr[i]))
-            }
-            _this.selectedOrgList = arr2
+          console.log("-=-_this.formData ---",_this.formData )
+          if (this.formData.Status === '1') {
+            this.aduitlabel = '复审人员'
+            this.auditTitle = '初审'
+            this.auditstepcode = 'FIRST_TRIAL'
+          } else if (this.formData.Status === '2') {
+            this.auditTitle = '复审'
+            this.auditstepcode = 'SECOND_TRIAL'
+          } else if (this.formData.Status === '3') {
+            this.auditTitle = '提交专业审批'
+            this.auditstepcode = 'PROF_RECE'
+          } else if (this.formData.Status === '4') {
+            this.auditTitle = '专业审批'
+            this.auditstepcode = 'PROF_AUDIT'
+          } else if (this.formData.Status === '5') {
+            this.auditTitle = '集中审批'
+            this.auditstepcode = 'PROF_REGULATION'
           }
+          this.getDictOptions()
+          this.isAccess()
           //显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
@@ -408,41 +295,12 @@
         })
       },
 
-      //保存增项信息
-      saveEntity() {
-        let _this = this
-        this.$refs['EntityForm'].validate((valid) => {
-          if (valid) {
-            let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
-            if (_this.editFlag == '1' && _this.AppendId !== '') {
-              _this.updateData()
-            } else {
-              _this.addAppend()
-            }
-          } else {
-            return false
-          }
-        })
-      },
-
-      //更新增项信息
-      updateData() {
-        let _this = this
-        api2.updateEntity(_this.AppendId, _this.formData, _this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
-          }
+      isAccess() {
+        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+          this.auditBtn = res.data
+          console.log("---this.auditBtn --",this.auditBtn )
         }).catch(err => {
-          console.error(err)
+          console.log(err)
         })
       },
 
@@ -465,195 +323,78 @@
         })
       },
 
-      //添加增项信息
-      addAppend() {
+      AuditEntity() {
+        if (this.formData.Status === '3') {
+          this.dialogAllocation = true
+        } else if (this.formData.Status === '1') {
+          this.dialogMakeSure2 = true
+        } else {
+          this.dialogMakeSure = true
+        }
+      },
+      getDictOptions() {
+        let params = {
+          status: this.formData.Status,
+          majorAduit: this.formData.ThirdAudit
+        }
+        suppapi.getDictListByStatus(params, this.$axios).then(res => {
+          this.dictData = res.data.items
+          this.auditerOptions = res.data.items['Auditer']
+          this.organizeOption = res.data.items['Organizes']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      getorgtreelist() {
         let _this = this
-        _this.formData.AppendType = '2'
-        _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+            params
+          })
           .then(res => {
-            if (res.data.code === 0) {
-              _this.dialogFormData.SupplierCertAppendId = res.data.item //接收插入数据后返回的Id
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
             console.error(err)
           })
       },
-
-      //添加增项分类
-      addSortData() {
+      getorgtreelistbydeptid() {
         let _this = this
-        //先判断是否保存了增项信息
-        if (this.checkAppendSave()) {
-          _this.dialogTitle = '添加'
-          _this.dialogVisible = true
-          _this.selectedOptList = [] //置空，防止先修改再添加时的已选分类信息保留
-          _this.dialogFormData.Id = ''
-          _this.dialogFormData.SortFlag = ''
-          _this.dialogFormData.Code = ''
-          _this.dialogFormData.Remark = ''
-        }
-      },
-
-      //编辑增项分类
-      editSortData(row) {
-        let _this = this
-        _this.dialogTitle = '编辑'
-        _this.dialogVisible = true
-        _this.dialogFormData = row
-        //显示原增项结构
-        if (_this.dialogFormData.SortFlag != null) {
-          let arr = _this.dialogFormData.SortFlag.split(',')
-          let arr2 = []
-          for (let i = 0; i < arr.length; i++) {
-            arr2.push(parseInt(arr[i]))
-          }
-          _this.selectedOptList = arr2
+        let params = {
+          IsInnerOrganize: 1
         }
-      },
-
-      //取消
-      cancelOption() {
-        let _this = this
-        _this.dialogVisible = false
-      },
-
-      //确定
-      ensureOption() {
-        this.$refs['dialogFormData'].validate((valid) => {
-          if (valid) {
-            let _this = this
-            if (_this.dialogTitle == '添加') {
-              let arr = []
-              arr = _this.$refs['cascader'].currentLabels //_this.$refs['cascader'].currentLabels获取当前级联选项的id对应的value
-              _this.dialogFormData.Name = arr[arr.length - 1]
-              _this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
-              _this.addSortAppend()
-            }
-            if (_this.dialogTitle == '编辑') {
-              let arr = []
-              arr = _this.$refs['cascader'].currentLabels
-              _this.dialogFormData.Name = arr[arr.length - 1]
-              api.updateEntity(_this.dialogFormData.Id, _this.dialogFormData, _this.$axios).then(res => {
-                if (res.data.code === 0) {
-                  this.$message({
-                    type: 'success',
-                    message: res.data.message
-                  });
-                  //关闭dialog
-                  _this.dialogVisible = false
-                  //更新列表
-                  this.getSortList()
-                } else {
-                  this.$message({
-                    type: 'warning',
-                    message: res.data.message
-                  });
-                }
-              }).catch(err => {
-                console.error(err)
-              })
-            }
-          } else {
-            return false
-          }
-        })
-      },
-
-      //判断是否保存了增项信息
-      checkAppendSave() {
-        if (this.dialogFormData.SupplierCertAppendId == '' && this.editFlag == null) {
-          this.$message({
-            type: 'error',
-            message: '无法执行该命令，请先保存增项信息！'
+        _this.$axios.get('organizes/listbydeptid', {
+            params
           })
-          return false
-        }
-        return true
-      },
-
-      //添加增项分类信息
-      addSortAppend() {
-        let _this = this
-        _this.$axios.post('/suppliercertappendsub/addappendsub/', _this.dialogFormData)
           .then(res => {
-            if (res.data.code === 0) {
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-              //关闭dialog
-              _this.dialogVisible = false
-              //更新增项分类表
-              _this.getSortList()
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
+            _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
             console.error(err)
           })
       },
-
-      //删除增项分类信息
-      deleteData(Id) {
-        let _this = this
-        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            api.deleteEntity(Id, _this.$axios)
-              .then(res => {
-                // response
-                if (res.data.code === 0) {
-                  _this.$message({
-                    type: 'success',
-                    message: res.data.message
-                  })
-                  // 更新列表
-                  this.getSortList()
-                } else {
-                  _this.$message({
-                    type: 'warning',
-                    message: res.data.message
-                  })
-                }
-              })
-              .catch(() => {})
-          })
-          .catch(() => {})
-      },
-
-      getDictOptions() {
-        console.log("---this.formData----", this.formData)
-        suppapi.getDictListByStatus(this.formData.Status, this.$axios).then(res => {
-          this.dictData = res.data.items
-          this.auditerOptions = res.data.items['Auditer']
-          console.log(this.auditerOptions, 'this.auditerOptions')
+      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 = ''
+        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)
         })
       },
-
-      allocationBtn() {
-        this.dialogAllocation = true
-      },
-      AuditEntity() {
-        this.dialogMakeSure = true
-      },
       // 审核通过
       makeSure() {
         console.log(this.auditer)
@@ -671,13 +412,16 @@
       },
 
       checkstatus() {
+        this.shenheForm.Auditer = this.auditer
+        this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
         let params = this.shenheForm
-        console.log(this.shenheForm, '---this.shenheForm----')
-        api2.auditEntityFir(this.AppendId, this.auditer, params, this.$axios).then(res => {
+        console.log("------shenheform", this.shenheForm)
+        api2.auditEntityFir(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()
             this.dialogMakeSure = false
             this.dialogAllocation = false
+            this.dialogMakeSure2 = false
             this.$message({
               type: 'success',
               message: res.data.message
@@ -688,12 +432,12 @@
               message: res.data.message
             })
           }
-          this.applyLoading = false
         }).catch(err => {
           console.error(err)
         })
       },
 
+
       //列表排序功能
       orderby(column) {
         if (column.order == 'ascending') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -11,31 +11,36 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">分配</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
           <router-link :to="'/oilsupplier/addtionaudit/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
       </div>
       <div>
+        <el-steps :active="formData.Step" simple align-center finish-status="success">
+          <el-step title="填信息"></el-step>
+          <el-step title="待审批"></el-step>
+          <el-step title="已审批"></el-step>
+          <el-step title="待交费"></el-step>
+          <el-step title="待入库"></el-step>
+          <el-step title="完成"></el-step>
+        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
           </div>
-          <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
+          <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
-                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps" change-on-select :show-all-levels="false" 
-                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位" style="width: 100%">
-                  </el-cascader>
+                <el-form-item label="推荐单位名称" prop="RecUnitName">
+                  <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
-                    style="width: 100%">
+                  <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司" style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                     </el-option>
@@ -73,47 +78,53 @@
         </el-card>
       </div>
     </el-card>
-    <!-- 增项分类添加、修改 -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="800px">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="分类名称" prop="checkSelectedOptList">
-              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="orgtreeprops"
-                change-on-select :show-all-levels="false" v-model="selectedOptList" @change="getCode"
-                placeholder="请选择分类">
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="分类编码" prop="Code">
-              <el-input v-model="dialogFormData.Code" placeholder="请输入分类编码" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="Remark">
-              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注" style="width: 100%">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+    <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-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: 100%" filterable allow-create
+            default-first-option>
+            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            </el-option>
+          </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>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="cancelOption()">取 消</el-button>
-        <el-button size="mini" type="primary" @click="ensureOption()">确 定</el-button>
-      </span>
+      <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="dialogMakeSure">
+    <el-dialog title="审核" :visible.sync="dialogMakeSure2">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <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>
-            <el-option
-              v-for="item in auditerOptions"
-              :key="item.id"
-              :label="item.realname"
-              :value="item.id">
+        <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>
@@ -134,14 +145,15 @@
     </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">
+          <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>
@@ -162,6 +174,7 @@
   import suppapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
+  import apiCert from '@/api/oilsupplier/suppliercert'
 
   export default {
     computed: {
@@ -194,40 +207,38 @@
         }
       }
       return {
-        auditbusList: [], // 待审核业务
         auditerOptions: [], // 审核人员
+        secauditerOptions: [],
+        auditerCurOptions: [],
+        organizeOption: [],
+        orgtreelist: [],
+        secorgtreelist: [],
+        majorDept: [],
+        auditbusList: [], // 待审核业务
         dialogMakeSure: false,
         dialogAllocation: false,
+        dialogMakeSure2: false,
         aduitlabel: '审核人',
         auditer: '',
+        auditTitle: '审批',
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
+        auditBtn: false,
+        auditstepcode: '',
         dictData: null,
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
-        optionsList: [], //增项分类层级列表
         selectedOptList: [], //已选择的增项分类列表
-        orgtreeprops: {
-          value: 'id',
-          label: 'Name',
-          children: 'children'
-        },
-        organizeTreeList: [], //推荐单位层级列表
         selectedOrgList: [], //已选择的单位列表
-        organizeTreeProps: {
-          value: 'id',
-          label: 'Fullname',
-          children: 'children'
-        },
-        organizeform: {
-          IsInnerOrganize: 1,
-          parentid: 0,
-          fullname: '',
-          description: '',
-          id: 0
-        },
         //增项信息表
         formData: {
           Id: '',
+          Step: 1,
+          Status: '',
           SupplierId: 1,
           SupplierCertId: 1,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -284,7 +295,9 @@
         shenheForm: {
           SuccessStatus: 1,
           AuditorRemark: '',
-          AppendId: 0
+          AppendId: 0,
+          Auditer: '',
+          MajorDept: '',
         },
         AppendId: '', //传的参数
         serviceId: '',
@@ -296,106 +309,37 @@
       this.serviceId = this.$route.params.opera
       this.AppendId = this.serviceId
       this.editFlag = '1'
-      this.getEntityById()  
+      this.getEntityById()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getSortList()
-      this.getOrgTreeList() //获取推荐单位层级列表
-      this.getTechTreeList() //获取技术服务类层级列表
-      this.getSupplierList() //获取供应方公司列表
+      this.getorgtreelist()
+      this.getorgtreelistbydeptid()
     },
     methods: {
-
-      //获取推荐单位列表
-      getOrgTreeList() {
-        let _this = this
-        let params = {
-          IsInnerOrganize: this.organizeform.IsInnerOrganize
-        }
-        _this.$axios.get('organizes/list', {
-            params
-          })
-          .then(res => {
-            _this.organizeTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取供应方公司列表
-      getSupplierList() {
-        let _this = this
-        _this.$axios.get('/suppliercertappend/getsupplier/' + '1', {})
-          .then(res => {
-            _this.supplierList = res.data
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取技术服务类层级列表
-      getTechTreeList() {
-        let _this = this
-        this.$axios.get('technologyservice/businesslist', {})
-          .then(res => {
-            _this.optionsList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取SupplierId和SupplierCertId
-      getInfo(vId) { //这个vId也就是value值
-        let obj = {}
-        obj = this.supplierList.find((item) => {
-          return item.SupplierId === vId; //筛选出匹配数据
-        })
-        this.formData.SupplierId = parseInt(obj.SupplierId)
-        this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
-      },
-
-      //获取分类级联Id
-      getCode(item) {
-        let sortFlagStr = item.toString()
-        this.dialogFormData.SortFlag = sortFlagStr
-        this.getCodeById(item[item.length - 1]) //根据分类Id获取Code
-      },
-
-      //根据分类Id获取Code
-      getCodeById(Id) {
-        let _this = this
-        this.$axios.get('technologyservice/getcode/' + Id, {})
-          .then(res => {
-            _this.dialogFormData.Code = res.data.items[0].Code
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取推荐单位级联Id
-      getCode2(item) {
-        let codeStr = item.toString()
-        this.formData.RecUnitFlag = codeStr
-      },
-
       //获取需要修改的增项信息
       getEntityById() {
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
-          this.getDictOptions()
-          //显示原推荐单位
-          if (_this.formData.RecUnitFlag != null) {
-            let arr = _this.formData.RecUnitFlag.split(',')
-            let arr2 = []
-            for (let i = 0; i < arr.length; i++) {
-               arr2.push(parseInt(arr[i]))
-            }
-            _this.selectedOrgList = arr2
+          if (this.formData.Status === '1') {
+            this.aduitlabel = '复审人员'
+            this.auditTitle = '初审'
+            this.auditstepcode = 'FIRST_TRIAL'
+          } else if (this.formData.Status === '2') {
+            this.auditTitle = '复审'
+            this.auditstepcode = 'SECOND_TRIAL'
+          } else if (this.formData.Status === '3') {
+            this.auditTitle = '提交专业审批'
+            this.auditstepcode = 'PROF_RECE'
+          } else if (this.formData.Status === '4') {
+            this.auditTitle = '专业审批'
+            this.auditstepcode = 'PROF_AUDIT'
+          } else if (this.formData.Status === '5') {
+            this.auditTitle = '集中审批'
+            this.auditstepcode = 'PROF_REGULATION'
           }
+          this.getDictOptions()
+          this.isAccess()
           //显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
@@ -403,41 +347,11 @@
         })
       },
 
-      //保存增项信息
-      saveEntity() {
-        let _this = this
-        this.$refs['EntityForm'].validate((valid) => {
-          if (valid) {
-            let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
-            if (_this.editFlag == '1' && _this.AppendId !== '') {
-              _this.updateData()
-            } else {
-              _this.addAppend()
-            }
-          } else {
-            return false
-          }
-        })
-      },
-
-      //更新增项信息
-      updateData() {
-        let _this = this
-        api2.updateEntity(_this.AppendId, _this.formData, _this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
-          }
+      isAccess() {
+        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+          this.auditBtn = res.data
         }).catch(err => {
-          console.error(err)
+          console.log(err)
         })
       },
 
@@ -460,200 +374,84 @@
         })
       },
 
-      //添加增项信息
-      addAppend() {
+      AuditEntity() {
+        if (this.formData.Status === '3') {
+          this.dialogAllocation = true
+        } else if (this.formData.Status === '1') {
+          this.dialogMakeSure2 = true
+        } else {
+          this.dialogMakeSure = true
+        }
+      },
+      getDictOptions() {
+        let params = {
+          status: this.formData.Status,
+          majorAduit: this.formData.ThirdAudit
+        }
+        suppapi.getDictListByStatus(params, this.$axios).then(res => {
+          this.dictData = res.data.items
+          this.auditerOptions = res.data.items['Auditer']
+          this.organizeOption = res.data.items['Organizes']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      getorgtreelist() {
         let _this = this
-        _this.formData.AppendType = '1'
-        _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+            params
+          })
           .then(res => {
-            if (res.data.code === 0) {
-              _this.dialogFormData.SupplierCertAppendId = res.data.item //接收插入数据后返回的Id
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
             console.error(err)
           })
       },
-
-      //添加增项分类
-      addSortData() {
-        let _this = this
-        //先判断是否保存了增项信息
-        if (this.checkAppendSave()) {
-          _this.dialogTitle = '添加'
-          _this.dialogVisible = true
-          _this.selectedOptList = [] //置空，防止先修改再添加时的已选分类信息保留
-          _this.dialogFormData.Id = ''
-          _this.dialogFormData.SortFlag = ''
-          _this.dialogFormData.Code = ''
-          _this.dialogFormData.Remark = ''
-        }
-      },
-
-      //编辑增项分类
-      editSortData(row) {
+      getorgtreelistbydeptid() {
         let _this = this
-        _this.dialogTitle = '编辑'
-        _this.dialogVisible = true
-        _this.dialogFormData = row
-        //显示原增项结构
-        if (_this.dialogFormData.SortFlag != null) {
-          let arr = _this.dialogFormData.SortFlag.split(',')
-          let arr2 = []
-          for (let i = 0; i < arr.length; i++) {
-            arr2.push(parseInt(arr[i]))
-          }
-          _this.selectedOptList = arr2
+        let params = {
+          IsInnerOrganize: 1
         }
-      },
-
-      //取消
-      cancelOption() {
-        let _this = this
-        _this.dialogVisible = false
-      },
-
-      //确定
-      ensureOption() {
-        this.$refs['dialogFormData'].validate((valid) => {
-          if (valid) {
-            let _this = this
-            if (_this.dialogTitle == '添加') {
-              let arr = []
-              arr = _this.$refs['cascader'].currentLabels //_this.$refs['cascader'].currentLabels获取当前级联选项的id对应的value
-              _this.dialogFormData.Name = arr[arr.length - 1]
-              _this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
-              _this.addSortAppend()
-            }
-            if (_this.dialogTitle == '编辑') {
-              let arr = []
-              arr = _this.$refs['cascader'].currentLabels
-              _this.dialogFormData.Name = arr[arr.length - 1]
-              api.updateEntity(_this.dialogFormData.Id, _this.dialogFormData, _this.$axios).then(res => {
-                if (res.data.code === 0) {
-                  this.$message({
-                    type: 'success',
-                    message: res.data.message
-                  });
-                  //关闭dialog
-                  _this.dialogVisible = false
-                  //更新列表
-                  this.getSortList()
-                } else {
-                  this.$message({
-                    type: 'warning',
-                    message: res.data.message
-                  });
-                }
-              }).catch(err => {
-                console.error(err)
-              })
-            }
-          } else {
-            return false
-          }
-        })
-      },
-
-      //判断是否保存了增项信息
-      checkAppendSave() {
-        if (this.dialogFormData.SupplierCertAppendId == '' && this.editFlag == null) {
-          this.$message({
-            type: 'error',
-            message: '无法执行该命令，请先保存增项信息！'
+        _this.$axios.get('organizes/listbydeptid', {
+            params
           })
-          return false
-        }
-        return true
-      },
-
-      //添加增项分类信息
-      addSortAppend() {
-        let _this = this
-        _this.$axios.post('/suppliercertappendsub/addappendsub/', _this.dialogFormData)
           .then(res => {
-            if (res.data.code === 0) {
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-              //关闭dialog
-              _this.dialogVisible = false
-              //更新增项分类表
-              _this.getSortList()
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
+            _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
             console.error(err)
           })
       },
-
-      //删除增项分类信息
-      deleteData(Id) {
-        let _this = this
-        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            api.deleteEntity(Id, _this.$axios)
-              .then(res => {
-                // response
-                if (res.data.code === 0) {
-                  _this.$message({
-                    type: 'success',
-                    message: res.data.message
-                  })
-                  // 更新列表
-                  this.getSortList()
-                } else {
-                  _this.$message({
-                    type: 'warning',
-                    message: res.data.message
-                  })
-                }
-              })
-              .catch(() => {})
-          })
-          .catch(() => {})
-      },
-
-      getDictOptions () {
-        console.log("---this.formData----",this.formData)
-        suppapi.getDictListByStatus(this.formData.Status, this.$axios).then(res => {
-          this.dictData = res.data.items
-          this.auditerOptions = res.data.items['Auditer']
-          console.log(this.auditerOptions, 'this.auditerOptions')
+      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 = ''
+        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)
         })
       },
-
-      allocationBtn () {
-        this.dialogAllocation = true
-      },
-      AuditEntity () {
-        this.dialogMakeSure = true
-      },
-       // 审核通过
-      makeSure () {
+      // 审核通过
+      makeSure() {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '2' && this.formData.Status !== '4' && this.formData.Status !== '5') {
+          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '2' && this.formData.Status !== '4' &&
+            this.formData.Status !== '5') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
@@ -664,14 +462,17 @@
         this.checkstatus()
       },
 
-      checkstatus () {
+      checkstatus() {
+        this.shenheForm.Auditer = this.auditer
+        this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
         let params = this.shenheForm
-        console.log(this.shenheForm, '---this.shenheForm----')
-        api2.auditEntityFir(this.AppendId, this.auditer, params, this.$axios).then(res => {
+        console.log("------shenheform", this.shenheForm)
+        api2.auditEntityFir(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()
             this.dialogMakeSure = false
             this.dialogAllocation = false
+            this.dialogMakeSure2 = false
             this.$message({
               type: 'success',
               message: res.data.message
@@ -682,7 +483,6 @@
               message: res.data.message
             })
           }
-          this.applyLoading = false
         }).catch(err => {
           console.error(err)
         })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/addtionaudit/techlist' }">增项审批</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend/techlist' }">技术服务类列表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
@@ -11,32 +11,36 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">分配</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>
-          <router-link :to="'/oilsupplier/addtionaudit/techlist'">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
+          <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
       </div>
       <div>
+        <el-steps :active="formData.Step" simple align-center finish-status="success">
+          <el-step title="填信息"></el-step>
+          <el-step title="待审批"></el-step>
+          <el-step title="已审批"></el-step>
+          <el-step title="待交费"></el-step>
+          <el-step title="待入库"></el-step>
+          <el-step title="完成"></el-step>
+        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="saveEntity()">保存信息</el-button>
           </div>
-          <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
+          <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
-                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
-                    change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
-                    placeholder="请选择推荐单位" style="width: 100%">
-                  </el-cascader>
+                <el-form-item label="推荐单位名称" prop="RecUnitName">
+                  <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                  <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司"
                     style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
@@ -59,19 +63,7 @@
         </el-card>
         <!-- 增项分类列表 -->
         <el-card class="box-card" style="margin-top: 10px;">
-          <div slot="header">
-            <span><i class="icon icon-table2"></i> 增项分类</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="addSortData()">添加</el-button>
-          </div>
           <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
-            <el-table-column label="操作" min-width="100" align="center" fixed>
-              <template slot-scope="scope">
-                <el-button type="text" title="编辑" size="medium" icon="el-icon-edit" @click="editSortData(scope.row)">
-                </el-button>
-                <el-button type="text" title="删除" size="medium" icon="el-icon-delete" @click="deleteData(scope.row.Id)">
-                </el-button>
-              </template>
-            </el-table-column>
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
@@ -84,41 +76,17 @@
         </el-card>
       </div>
     </el-card>
-    <!-- 增项分类添加、修改 -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="800px">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="分类名称" prop="checkSelectedOptList">
-              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="orgtreeprops"
-                change-on-select :show-all-levels="false" v-model="selectedOptList" @change="getCode"
-                placeholder="请选择分类">
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="分类编码" prop="Code">
-              <el-input v-model="dialogFormData.Code" placeholder="请输入分类编码" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="Remark">
-              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注" style="width: 100%">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="cancelOption()">取 消</el-button>
-        <el-button size="mini" type="primary" @click="ensureOption()">确 定</el-button>
-      </span>
-    </el-dialog>
+
     <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-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
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
             <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
@@ -139,12 +107,52 @@
         <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
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
             </el-option>
           </el-select>
         </el-form-item>
@@ -198,19 +206,35 @@
         }
       }
       return {
-        auditbusList: [], // 待审核业务
         auditerOptions: [], // 审核人员
+        secauditerOptions: [],
+        auditerCurOptions: [],
+        orgtreelist: [], //二级单位
+        AuditdialogShow: false, //提交审核弹框
+        organizeOption: [], // 审批部门
+        auditerOption: [], // 审批人
+        majorDept: [],
+        auditbusList: [], // 待审核业务
         dialogMakeSure: false,
         dialogAllocation: false,
+        dialogMakeSure2: false,
         aduitlabel: '审核人',
         auditer: '',
+        auditTitle: '审批',
+        auditBtn: false,
+        auditstepcode: '',
         dictData: null,
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
+        FirstAudit: '',
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
-        optionsList: [], //增项分类层级列表
         selectedOptList: [], //已选择的增项分类列表
-        orgtreeprops: {
+        tytreeprops: {
           value: 'id',
           label: 'Name',
           children: 'children'
@@ -232,22 +256,24 @@
         //增项信息表
         formData: {
           Id: '',
-          SupplierId: 1,
-          SupplierCertId: 1,
+          Step: 1,
+          Status: '',
+          SupplierId: 0,
+          SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
           Remark: '', //备注
         },
         dialogVisible: false, //增项分类dialog
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 1, //供方表ID
-          SupplierCertId: 1, //供方证书表ID
+          SupplierId: 0, //供方表ID
+          SupplierCertId: 0, //供方证书表ID
           SupplierCertAppendId: '', //增项信息表ID
-          SubClassId: 2, //分类表主键（物资类或基建类或技术服务类）
+          SubClassId: 3, //分类表主键（物资类或基建类或技术服务类）
           SortFlag: '', //分类标记
           Code: '', //分类编码
           Name: '', //分类名称
@@ -288,118 +314,51 @@
         shenheForm: {
           SuccessStatus: 1,
           AuditorRemark: '',
-          AppendId: 0
+          AppendId: 0,
+          Auditer: '',
+          MajorDept: '',
         },
         AppendId: '', //传的参数
         serviceId: '',
-        Id: '', //传的参数
         editFlag: '', //编辑操作标记
       }
     },
     created() {
       // this.serviceType = this.$route.params.opera //获取服务类型
-      this.Id = this.$route.query.Id
-      this.editFlag = this.$route.query.editFlag
+      this.serviceId = this.$route.params.opera
+      this.AppendId = this.serviceId
+      this.editFlag = '1'
       this.getEntityById()
-      this.dialogFormData.SupplierCertAppendId = this.Id
+      this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getSortList()
-      this.getOrgTreeList() //获取推荐单位层级列表
-      this.getTechTreeList() //获取技术服务类层级列表
-      this.getSupplierList() //获取供应方公司列表
+      this.getorgtreelist()
+      this.getorgtreelistbydeptid()
     },
     methods: {
-
-      //获取推荐单位列表
-      getOrgTreeList() {
-        let _this = this
-        let params = {
-          IsInnerOrganize: this.organizeform.IsInnerOrganize
-        }
-        _this.$axios.get('organizes/list', {
-            params
-          })
-          .then(res => {
-            _this.organizeTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取供应方公司列表
-      getSupplierList() {
-        let _this = this
-        _this.$axios.get('/suppliercertappend/getsupplier/' + '3', {})
-          .then(res => {
-            _this.supplierList = res.data
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取技术服务类层级列表
-      getTechTreeList() {
-        let _this = this
-        this.$axios.get('technologyservice/businesslist', {})
-          .then(res => {
-            _this.optionsList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取SupplierId和SupplierCertId
-      getInfo(vId) { //这个vId也就是value值
-        let obj = {}
-        obj = this.supplierList.find((item) => {
-          return item.SupplierId === vId; //筛选出匹配数据
-        })
-        this.formData.SupplierId = parseInt(obj.SupplierId)
-        this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
-      },
-
-      //获取分类级联Id
-      getCode(item) {
-        let sortFlagStr = item.toString()
-        this.dialogFormData.SortFlag = sortFlagStr
-        this.getCodeById(item[item.length - 1]) //根据分类Id获取Code
-      },
-
-      //根据分类Id获取Code
-      getCodeById(Id) {
-        let _this = this
-        this.$axios.get('technologyservice/getcode/' + Id, {})
-          .then(res => {
-            _this.dialogFormData.Code = res.data.items[0].Code
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
-      //获取推荐单位级联Id
-      getCode2(item) {
-        let codeStr = item.toString()
-        this.formData.RecUnitFlag = codeStr
-      },
-
       //获取需要修改的增项信息
       getEntityById() {
         let _this = this
-        api2.getEntityById(_this.Id, _this.$axios).then(res => {
+        api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
-          this.getDictOptions()
-          //显示原推荐单位
-          if (_this.formData.RecUnitFlag != null) {
-            let arr = _this.formData.RecUnitFlag.split(',')
-            let arr2 = []
-            for (let i = 0; i < arr.length; i++) {
-              arr2.push(parseInt(arr[i]))
-            }
-            _this.selectedOrgList = arr2
+          if (_this.formData.Status === '1') {
+            this.aduitlabel = '复审人员'
+            this.auditTitle = '初审'
+            this.auditstepcode = 'FIRST_TRIAL'
+          } else if (_this.formData.Status === '2') {
+            this.auditTitle = '复审'
+            this.auditstepcode = 'SECOND_TRIAL'
+          } else if (_this.formData.Status === '3') {
+            this.auditTitle = '提交专业审批'
+            this.auditstepcode = 'PROF_RECE'
+          } else if (_this.formData.Status === '4') {
+            this.auditTitle = '专业审批'
+            this.auditstepcode = 'PROF_AUDIT'
+          } else if (_this.formData.Status === '5') {
+            this.auditTitle = '集中审批'
+            this.auditstepcode = 'PROF_REGULATION'
           }
+          this.getDictOptions()
+          this.isAccess()
           //显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
@@ -407,41 +366,11 @@
         })
       },
 
-      //保存增项信息
-      saveEntity() {
-        let _this = this
-        this.$refs['EntityForm'].validate((valid) => {
-          if (valid) {
-            let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
-            if (_this.editFlag == '1' && _this.Id !== '') {
-              _this.updateData()
-            } else {
-              _this.addAppend()
-            }
-          } else {
-            return false
-          }
-        })
-      },
-
-      //更新增项信息
-      updateData() {
-        let _this = this
-        api2.updateEntity(_this.Id, _this.formData, _this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
-          }
+      isAccess() {
+        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+          this.auditBtn = res.data
         }).catch(err => {
-          console.error(err)
+          console.log(err)
         })
       },
 
@@ -464,195 +393,78 @@
         })
       },
 
-      //添加增项信息
-      addAppend() {
+      AuditEntity() {
+        if (this.formData.Status === '3') {
+          this.dialogAllocation = true
+        } else if (this.formData.Status === '1') {
+          this.dialogMakeSure2 = true
+        } else {
+          this.dialogMakeSure = true
+        }
+      },
+      getDictOptions() {
+        let params = {
+          status: this.formData.Status,
+          majorAduit: this.formData.ThirdAudit
+        }
+        suppapi.getDictListByStatus(params, this.$axios).then(res => {
+          this.dictData = res.data.items
+          this.auditerOptions = res.data.items['Auditer']
+          this.organizeOption = res.data.items['Organizes']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      getorgtreelist() {
         let _this = this
-        _this.formData.AppendType = '3'
-        _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+            params
+          })
           .then(res => {
-            if (res.data.code === 0) {
-              _this.dialogFormData.SupplierCertAppendId = res.data.item //接收插入数据后返回的Id
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
             console.error(err)
           })
       },
-
-      //添加增项分类
-      addSortData() {
-        let _this = this
-        //先判断是否保存了增项信息
-        if (this.checkAppendSave()) {
-          _this.dialogTitle = '添加'
-          _this.dialogVisible = true
-          _this.selectedOptList = [] //置空，防止先修改再添加时的已选分类信息保留
-          _this.dialogFormData.Id = ''
-          _this.dialogFormData.SortFlag = ''
-          _this.dialogFormData.Code = ''
-          _this.dialogFormData.Remark = ''
-        }
-      },
-
-      //编辑增项分类
-      editSortData(row) {
+      getorgtreelistbydeptid() {
         let _this = this
-        _this.dialogTitle = '编辑'
-        _this.dialogVisible = true
-        _this.dialogFormData = row
-        //显示原增项结构
-        if (_this.dialogFormData.SortFlag != null) {
-          let arr = _this.dialogFormData.SortFlag.split(',')
-          let arr2 = []
-          for (let i = 0; i < arr.length; i++) {
-            arr2.push(parseInt(arr[i]))
-          }
-          _this.selectedOptList = arr2
+        let params = {
+          IsInnerOrganize: 1
         }
-      },
-
-      //取消
-      cancelOption() {
-        let _this = this
-        _this.dialogVisible = false
-      },
-
-      //确定
-      ensureOption() {
-        this.$refs['dialogFormData'].validate((valid) => {
-          if (valid) {
-            let _this = this
-            if (_this.dialogTitle == '添加') {
-              let arr = []
-              arr = _this.$refs['cascader'].currentLabels //_this.$refs['cascader'].currentLabels获取当前级联选项的id对应的value
-              _this.dialogFormData.Name = arr[arr.length - 1]
-              _this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
-              _this.addSortAppend()
-            }
-            if (_this.dialogTitle == '编辑') {
-              let arr = []
-              arr = _this.$refs['cascader'].currentLabels
-              _this.dialogFormData.Name = arr[arr.length - 1]
-              api.updateEntity(_this.dialogFormData.Id, _this.dialogFormData, _this.$axios).then(res => {
-                if (res.data.code === 0) {
-                  this.$message({
-                    type: 'success',
-                    message: res.data.message
-                  });
-                  //关闭dialog
-                  _this.dialogVisible = false
-                  //更新列表
-                  this.getSortList()
-                } else {
-                  this.$message({
-                    type: 'warning',
-                    message: res.data.message
-                  });
-                }
-              }).catch(err => {
-                console.error(err)
-              })
-            }
-          } else {
-            return false
-          }
-        })
-      },
-
-      //判断是否保存了增项信息
-      checkAppendSave() {
-        if (this.dialogFormData.SupplierCertAppendId == '' && this.editFlag == null) {
-          this.$message({
-            type: 'error',
-            message: '无法执行该命令，请先保存增项信息！'
+        _this.$axios.get('organizes/listbydeptid', {
+            params
           })
-          return false
-        }
-        return true
-      },
-
-      //添加增项分类信息
-      addSortAppend() {
-        let _this = this
-        _this.$axios.post('/suppliercertappendsub/addappendsub/', _this.dialogFormData)
           .then(res => {
-            if (res.data.code === 0) {
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-              //关闭dialog
-              _this.dialogVisible = false
-              //更新增项分类表
-              _this.getSortList()
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
+            _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
             console.error(err)
           })
       },
-
-      //删除增项分类信息
-      deleteData(Id) {
-        let _this = this
-        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            api.deleteEntity(Id, _this.$axios)
-              .then(res => {
-                // response
-                if (res.data.code === 0) {
-                  _this.$message({
-                    type: 'success',
-                    message: res.data.message
-                  })
-                  // 更新列表
-                  this.getSortList()
-                } else {
-                  _this.$message({
-                    type: 'warning',
-                    message: res.data.message
-                  })
-                }
-              })
-              .catch(() => {})
-          })
-          .catch(() => {})
-      },
-
-      getDictOptions() {
-        console.log("---this.formData----", this.formData)
-        suppapi.getDictListByStatus(this.formData.Status, this.$axios).then(res => {
-          this.dictData = res.data.items
-          this.auditerOptions = res.data.items['Auditer']
-          console.log(this.auditerOptions, 'this.auditerOptions')
+      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 = ''
+        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)
         })
       },
-
-      allocationBtn() {
-        this.dialogAllocation = true
-      },
-      AuditEntity() {
-        this.dialogMakeSure = true
-      },
       // 审核通过
       makeSure() {
         console.log(this.auditer)
@@ -670,13 +482,16 @@
       },
 
       checkstatus() {
+        this.shenheForm.Auditer = this.auditer
+        this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
         let params = this.shenheForm
-        console.log(this.shenheForm, '---this.shenheForm----')
-        api2.auditEntityFir(this.AppendId, this.auditer, params, this.$axios).then(res => {
+        console.log("------shenheform", this.shenheForm)
+        api2.auditEntityFir(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()
             this.dialogMakeSure = false
             this.dialogAllocation = false
+            this.dialogMakeSure2 = false
             this.$message({
               type: 'success',
               message: res.data.message
@@ -687,12 +502,13 @@
               message: res.data.message
             })
           }
-          this.applyLoading = false
         }).catch(err => {
           console.error(err)
         })
       },
 
+
+
       //列表排序功能
       orderby(column) {
         if (column.order == 'ascending') {
@@ -701,17 +517,16 @@
           this.Column.Order = 'desc'
         }
         this.Column.Prop = column.prop
-        this.initData()
       },
       //分页功能
       handleCurrentChange(value) {
         this.currentPage = value
-        this.initData()
+        this.getSortList()
       },
       handleSizeChange(value) {
         this.size = value
         this.currentPage = 1
-        this.initData()
+        this.getSortList()
       },
 
       jstimehandle(val) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/techlist.vue

@@ -26,11 +26,12 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="100" align="center" fixed>
+        <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/addtionaudit/' + scope.row.Id + '/' + (scope.row.AppendType === '1' ? 'goodsdataopera' : (scope.row.AppendType === '2' ? 'basisdataopera' : 'techdataopera'))">
+            <router-link :to="'/oilsupplier/addtionaudit/' + scope.row.Id + '/' + (scope.row.AppendType === '01' ? 'goodsdataopera' : (scope.row.AppendType === '02' ? 'basisdataopera' : 'techdataopera'))">
               <el-button type="primary" plain size="mini" title="审核">审核</el-button>
             </router-link>
+            <el-button style="margin-left:5px" type="primary" title="审批历史" size="mini" plain @click="getvalues(scope.row)">审批历史</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -71,9 +72,6 @@
             <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="专业科室接收" type="success">
             </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核未通过" type="error">
-            </el-alert>
             <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待交费" type="warning">
             </el-alert>
@@ -155,6 +153,9 @@
         <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+    </el-dialog>
 
   </div>
 </template>
@@ -162,9 +163,13 @@
   import {
     mapGetters
   } from 'vuex';
+  import WfHistory from '@/components/workflow/wfhistory.vue'
   import api from '@/api/oilsupplier/supplierappend';
 
   export default {
+    components: {
+      WfHistory,
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -174,6 +179,7 @@
 
     data() {
       return {
+        historyVisible: false,
         dialogVisible: false, //高级查询
         //列表数据
         entityList: [],
@@ -209,6 +215,12 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: '',
+        },
+         //工作流
+        entrydetail: {
+          process: 'oil_append_apply',
+          business: '',
+          instance: ''
         },
         //修改
         optionsList: [], //技术服务类层级选择列表
@@ -329,6 +341,12 @@
         this.Column.Prop = column.prop
         this.initData()
       },
+      getvalues(val) {
+        this.entrydetail.business = val.Id
+        this.entrydetail.instance = val.WorkFlowId
+        console.log("------this.entrydetail---",this.entrydetail)
+        this.historyVisible = true
+      },
       clearSearch() {
         Object.assign(this.searchForm, this.searchFormReset);
         //this.searchForm = this.searchFormReset;
@@ -352,11 +370,11 @@
 
       //判断增项类别，(1 物资类，2 基建类，3 技术服务类)
       checkAppendType(val) {
-        if (val == '1') {
+        if (val == '01') {
           return '物资类'
-        } else if (val == '2') {
+        } else if (val == '02') {
           return '基建类'
-        } else if (val == '3') {
+        } else if (val == '03') {
           return '技术服务类'
         }
       },

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

@@ -531,7 +531,7 @@
 
       getvalues(val) {
         this.entrydetail.business = val.Id
-        this.entrydetail.instance = val.WorkflowId
+        this.entrydetail.instance = val.WorkFlowId
         this.historyVisible = true
       },
 

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

@@ -331,8 +331,10 @@
       transferStr (val) {
         if (val === '1') {
           return '准入缴费'
-        } if (val === '2') {
+        }else if (val === '2') {
           return '年审缴费'
+        }else if (val === '3') {
+          return '增项缴费'
         } else {
           return val
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/paymented.vue

@@ -246,8 +246,10 @@
       transferStr (val) {
         if (val === '1') {
           return '准入缴费'
-        } if (val === '2') {
+        }else if (val === '2') {
           return '年审缴费'
+        }else if (val === '3') {
+          return '增项缴费'
         } else {
           return val
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -11,7 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true" v-if="formData.Id !='' && formData.Status == ''">提交审批
+          <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
+            v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -19,6 +20,14 @@
         </span>
       </div>
       <div>
+        <el-steps :active="formData.Step" simple align-center finish-status="success">
+          <el-step title="填信息"></el-step>
+          <el-step title="待审批"></el-step>
+          <el-step title="已审批"></el-step>
+          <el-step title="待交费"></el-step>
+          <el-step title="待入库"></el-step>
+          <el-step title="完成"></el-step>
+        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
@@ -28,18 +37,17 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
-                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps" change-on-select :show-all-levels="false" 
-                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位" style="width: 100%">
+                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
+                    change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
+                    placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司" style="width: 100%">
-                    <el-option
-                      v-for="item in supplierList"
-                      :key="item.SupplierId"
-                      :label="item.SupplierName"
+                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                    style="width: 100%">
+                    <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                     </el-option>
                   </el-select>
@@ -71,15 +79,16 @@
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-card>
       </div>
     </el-card>
     <!-- 增项分类添加、修改 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData" >
+      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row>
           <el-col :span="12">
             <el-form-item label="分类名称" prop="Name">
@@ -94,8 +103,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注"  prop="Remark">
-              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注"  style="width: 100%"></el-input>
+            <el-form-item label="备注" prop="Remark">
+              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注" style="width: 100%">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -128,24 +138,27 @@
         <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
       </el-table>
-      <el-pagination @size-change="dialogHandleSizeChange" @current-change="dialogHandleCurrentChange" :current-page="dialogCurrentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="dialogSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="dialogCurrentItemCount">
+      <el-pagination @size-change="dialogHandleSizeChange" @current-change="dialogHandleCurrentChange"
+        :current-page="dialogCurrentPage" :page-sizes="[10, 15, 20, 25]" :page-size="dialogSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="dialogCurrentItemCount">
       </el-pagination>
     </el-dialog>
 
-     <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
+    <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
       <el-form ref="searchForm" label-width="110px">
         <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>
-                <el-option
-                  v-for="item in organizeOption"
-                  :key="item.Id"
-                  :label="item.Fullname"
-                  :value="item.Id">
+            <el-form-item label="二级单位">
+              <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">
+            <el-form-item label="审批人">
+              <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -193,18 +206,20 @@
         }
       }
       return {
-        AuditdialogShow: false,//提交审核弹框
+        orgtreelist: [], //二级单位
+        AuditdialogShow: false, //提交审核弹框
         organizeOption: [], // 审批部门
+        auditerOption: [], // 审批人
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         FirstAudit: '',
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
         optionsList: [], //增项分类层级列表
-        orgtreeprops: {
-          value: 'id',
-          label: 'Name',
-          children: 'children'
-        },
         organizeTreeList: [], //推荐单位层级列表
         selectedOrgList: [], //已选择的单位列表
         organizeTreeProps: {
@@ -222,26 +237,28 @@
         //增项信息表
         formData: {
           Id: '',
+          Step: 1,
+          Status: '',
           SupplierId: 0,
           SupplierCertId: 0,
-          RecUnitFlag: '',//推荐单位的级联Id标记
+          RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
-          Remark: '',//备注
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
         },
-        dialogVisible: false,//增项分类dialog
+        dialogVisible: false, //增项分类dialog
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 0,//供方表ID
-          SupplierCertId: 0,//供方证书表ID
-          SupplierCertAppendId: '',//增项信息表ID
-          SubClassId: 2,//分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '',//分类标记
-          Code: '',//分类编码
-          Name: '',//分类名称
-          Remark: '',//备注
+          SupplierId: 0, //供方表ID
+          SupplierCertId: 0, //供方证书表ID
+          SupplierCertAppendId: '', //增项信息表ID
+          SubClassId: 2, //分类表主键（物资类或基建类或技术服务类）
+          SortFlag: '', //分类标记
+          Code: '', //分类编码
+          Name: '', //分类名称
+          Remark: '', //备注
         },
         //列表数据
         entityList: [],
@@ -290,7 +307,7 @@
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.Id = this.$route.query.Id
       this.editFlag = this.$route.query.editFlag
-      if(this.editFlag == '1' && this.Id !== '') {
+      if (this.editFlag == '1' && this.Id !== '') {
         this.getEntityById()
         this.dialogFormData.SupplierCertAppendId = this.Id
         this.getSortList()
@@ -299,6 +316,7 @@
       this.getBasisList() //获取基建类层级列表
       this.getSupplierList() //获取供应方公司列表
       this.getDictOptions()
+      this.getorgtreelist()
     },
     methods: {
 
@@ -366,10 +384,10 @@
       },
 
       //获取SupplierId和SupplierCertId
-      getInfo(vId) {//这个vId也就是value值
+      getInfo(vId) { //这个vId也就是value值
         let obj = {}
-        obj = this.supplierList.find((item)=>{
-          return item.SupplierId === vId;//筛选出匹配数据
+        obj = this.supplierList.find((item) => {
+          return item.SupplierId === vId; //筛选出匹配数据
         })
         this.formData.SupplierId = parseInt(obj.SupplierId)
         this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
@@ -391,7 +409,7 @@
             let arr = _this.formData.RecUnitFlag.split(',')
             let arr2 = []
             for (let i = 0; i < arr.length; i++) {
-               arr2.push(parseInt(arr[i]))
+              arr2.push(parseInt(arr[i]))
             }
             _this.selectedOrgList = arr2
           }
@@ -408,8 +426,8 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1]  //获取推荐单位名
-            if(_this.editFlag == '1' && _this.Id !== '') {
+            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
+            if (_this.editFlag == '1' && _this.Id !== '') {
               _this.updateData()
             } else {
               _this.addAppend()
@@ -462,7 +480,7 @@
       //添加增项信息
       addAppend() {
         let _this = this
-        _this.formData.AppendType = '2'
+        _this.formData.AppendType = '02'
         _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
           .then(res => {
             if (res.data.code === 0) {
@@ -478,16 +496,16 @@
               })
             }
           })
-        .catch(err => {
-          console.error(err)
-        })
+          .catch(err => {
+            console.error(err)
+          })
       },
 
       //添加增项分类
       addSortData() {
         let _this = this
         //先判断是否保存了增项信息
-        if(this.checkAppendSave()) {
+        if (this.checkAppendSave()) {
           _this.dialogTitle = '添加'
           _this.dialogVisible = true
           _this.dialogFormData.Id = ''
@@ -562,7 +580,7 @@
         }
         return true
       },
-      
+
       //添加增项分类信息
       addSortAppend() {
         let _this = this
@@ -593,34 +611,34 @@
       deleteData(Id) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          api.deleteEntity(Id, _this.$axios)
-            .then(res => {
-              // response
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                // 更新列表
-                this.getSortList()
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
-        })
-        .catch(() => {})
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            api.deleteEntity(Id, _this.$axios)
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  // 更新列表
+                  this.getSortList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
+          })
+          .catch(() => {})
       },
 
       //提交审批
-       AuditEntity () {
+      AuditEntity() {
         api2.auditEntity(this.formData.Id, this.FirstAudit, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -641,19 +659,41 @@
         })
       },
 
-      getDictOptions () {
+      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 = []
+        let auditstepcode = 'FIRST_TRIAL'
+        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.auditerOption = res.data.item
+          console.log("---this.auditerOption---", this.auditerOption)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
         suppapi.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
-          this.organizeOption = res.data.items['Organizes']
-          console.log("---this.organizeOption---",this.organizeOption)
-          /* this.UnitRelationOptions = res.data.items['UnitRelation']
-           this.getCityList(res.data.items['GaodeMapChinaAreas'])
-           this.CompanyTypeOptions = res.data.items['CompanyType'] */
         }).catch(err => {
           console.error(err)
         })
       },
-
       //列表排序功能
       orderby(column) {
         if (column.order == 'ascending') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -11,7 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-           <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true" v-if="formData.Id !='' && formData.Status == ''">提交审批
+          <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
+            v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -19,7 +20,15 @@
         </span>
       </div>
       <div>
-        <el-card class="box-card">
+        <el-steps :active="formData.Step" simple align-center finish-status="success">
+          <el-step title="填信息"></el-step>
+          <el-step title="待审批"></el-step>
+          <el-step title="已审批"></el-step>
+          <el-step title="待交费"></el-step>
+          <el-step title="待入库"></el-step>
+          <el-step title="完成"></el-step>
+        </el-steps>
+        <el-card class="box-card" style="margin-top: 20px">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
             <el-button style="float: right; padding: 3px 0" type="text" @click="saveEntity()">保存信息</el-button>
@@ -28,18 +37,17 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
-                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps" change-on-select :show-all-levels="false" 
-                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位" style="width: 100%">
+                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
+                    change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
+                    placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司" style="width: 100%">
-                    <el-option
-                      v-for="item in supplierList"
-                      :key="item.SupplierId"
-                      :label="item.SupplierName"
+                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                    style="width: 100%">
+                    <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                     </el-option>
                   </el-select>
@@ -76,20 +84,22 @@
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-card>
       </div>
     </el-card>
     <!-- 增项分类添加、修改 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData" >
+      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row>
           <el-col :span="12">
             <el-form-item label="分类名称" prop="checkSelectedOptList">
-              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="goodsProps" :show-all-levels="false" 
-                v-model="selectedOptList" @active-item-change="getChildrens" @change="getCode" placeholder="请选择分类">
+              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="goodsProps"
+                :show-all-levels="false" v-model="selectedOptList" @active-item-change="getChildrens" @change="getCode"
+                placeholder="请选择分类">
               </el-cascader>
             </el-form-item>
           </el-col>
@@ -99,8 +109,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注"  prop="Remark">
-              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注"  style="width: 100%"></el-input>
+            <el-form-item label="备注" prop="Remark">
+              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注" style="width: 100%">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -111,18 +122,21 @@
       </span>
     </el-dialog>
 
-     <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
+    <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
       <el-form ref="searchForm" label-width="110px">
         <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>
-                <el-option
-                  v-for="item in organizeOption"
-                  :key="item.Id"
-                  :label="item.Fullname"
-                  :value="item.Id">
+            <el-form-item label="二级单位">
+              <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">
+            <el-form-item label="审批人">
+              <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -176,8 +190,15 @@
         }
       }
       return {
-        AuditdialogShow: false,//提交审核弹框
+        orgtreelist: [], //二级单位
+        AuditdialogShow: false, //提交审核弹框
         organizeOption: [], // 审批部门
+        auditerOption: [], // 审批人
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         FirstAudit: '',
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
@@ -208,26 +229,28 @@
         //增项信息表
         formData: {
           Id: '',
+          Step: 1,
+          Status: '',
           SupplierId: 0,
           SupplierCertId: 0,
-          RecUnitFlag: '',//推荐单位的级联Id标记
+          RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
-          Remark: '',//备注
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
         },
-        dialogVisible: false,//增项分类dialog
+        dialogVisible: false, //增项分类dialog
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 0,//供方表ID
-          SupplierCertId: 0,//供方证书表ID
-          SupplierCertAppendId: '',//增项信息表ID
-          SubClassId: 1,//分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '',//分类标记
-          Code: '',//分类编码
-          Name: '',//分类名称
-          Remark: '',//备注
+          SupplierId: 0, //供方表ID
+          SupplierCertId: 0, //供方证书表ID
+          SupplierCertAppendId: '', //增项信息表ID
+          SubClassId: 1, //分类表主键（物资类或基建类或技术服务类）
+          SortFlag: '', //分类标记
+          Code: '', //分类编码
+          Name: '', //分类名称
+          Remark: '', //备注
         },
         //列表数据
         entityList: [],
@@ -269,7 +292,7 @@
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.Id = this.$route.query.Id
       this.editFlag = this.$route.query.editFlag
-      if(this.editFlag == '1' && this.Id !== '') {
+      if (this.editFlag == '1' && this.Id !== '') {
         this.getEntityById()
         this.dialogFormData.SupplierCertAppendId = this.Id
         this.getSortList()
@@ -278,6 +301,7 @@
       this.getGoodsTreeList(this.ParentId) //获取物资类层级列表
       this.getSupplierList() //获取供应方公司列表
       this.getDictOptions()
+      this.getorgtreelist()
     },
     methods: {
 
@@ -316,7 +340,7 @@
         this.$axios.get('goodsaptitudeclass/getgoodsclasslist/' + Id, {})
           .then(res => {
             _this.optionsList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
-            _this.optionsList.forEach((item,index)=>{
+            _this.optionsList.forEach((item, index) => {
               _this.$set(this.optionsList[index], 'children', [])
             })
           })
@@ -331,33 +355,33 @@
         let Id = val[0]
         if (Id != _this.flagId) { //判断是否是第一次，若不相等则为第一次
           this.$axios.get('goodsaptitudeclass/getchildlist/' + Id, {})
-          .then(res => {
-            //获取下一级所有级联数据
-            if (res.data.items) {//判断是否有数据
-              let tempList = []
-              tempList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
-              //添加到上一级对应的选项中
-              for (let i = 0; i < _this.optionsList.length; i++) {
-                if (_this.optionsList[i].id === Id) {
-                  _this.$set(_this.optionsList[i], 'children', tempList)
-                  break
+            .then(res => {
+              //获取下一级所有级联数据
+              if (res.data.items) { //判断是否有数据
+                let tempList = []
+                tempList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
+                //添加到上一级对应的选项中
+                for (let i = 0; i < _this.optionsList.length; i++) {
+                  if (_this.optionsList[i].id === Id) {
+                    _this.$set(_this.optionsList[i], 'children', tempList)
+                    break
+                  }
                 }
-              }
-            } else {
-              //修改上一级的children属性
-              for (let i = 0; i < _this.optionsList.length; i++) {
-                if (_this.optionsList[i].id === Id) {
-                  _this.$set(_this.optionsList[i], 'children', '')
-                  break
+              } else {
+                //修改上一级的children属性
+                for (let i = 0; i < _this.optionsList.length; i++) {
+                  if (_this.optionsList[i].id === Id) {
+                    _this.$set(_this.optionsList[i], 'children', '')
+                    break
+                  }
                 }
               }
-            }
-            //做标记
-            _this.flagId = Id
-          })
-          .catch(err => {
-            console.error(err)
-          })
+              //做标记
+              _this.flagId = Id
+            })
+            .catch(err => {
+              console.error(err)
+            })
         }
       },
 
@@ -365,7 +389,7 @@
       getCode(item) {
         let sortFlagStr = item.toString()
         this.dialogFormData.SortFlag = sortFlagStr
-        this.getCodeById(item[item.length-1]) //根据分类Id获取Code
+        this.getCodeById(item[item.length - 1]) //根据分类Id获取Code
       },
 
       //根据分类Id获取Code
@@ -381,10 +405,10 @@
       },
 
       //获取SupplierId和SupplierCertId
-      getInfo(vId) {//这个vId也就是value值
+      getInfo(vId) { //这个vId也就是value值
         let obj = {}
-        obj = this.supplierList.find((item)=>{
-          return item.SupplierId === vId;//筛选出匹配数据
+        obj = this.supplierList.find((item) => {
+          return item.SupplierId === vId; //筛选出匹配数据
         })
         this.formData.SupplierId = parseInt(obj.SupplierId)
         this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
@@ -401,13 +425,13 @@
         let _this = this
         api2.getEntityById(_this.Id, _this.$axios).then(res => {
           _this.formData = res.data
-          console.log("---_this.formData ----",_this.formData )
+          console.log("---_this.formData ----", _this.formData)
           //显示原推荐单位
           if (_this.formData.RecUnitFlag != null) {
             let arr = _this.formData.RecUnitFlag.split(',')
             let arr2 = []
             for (let i = 0; i < arr.length; i++) {
-               arr2.push(parseInt(arr[i]))
+              arr2.push(parseInt(arr[i]))
             }
             _this.selectedOrgList = arr2
           }
@@ -424,8 +448,8 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1]  //获取推荐单位名
-            if(_this.editFlag == '1' && _this.Id !== '') {
+            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
+            if (_this.editFlag == '1' && _this.Id !== '') {
               _this.updateData()
             } else {
               _this.addAppend()
@@ -478,7 +502,7 @@
       //添加增项信息
       addAppend() {
         let _this = this
-        _this.formData.AppendType = '1'
+        _this.formData.AppendType = '01'
         _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
           .then(res => {
             if (res.data.code === 0) {
@@ -494,16 +518,16 @@
               })
             }
           })
-        .catch(err => {
-          console.error(err)
-        })
+          .catch(err => {
+            console.error(err)
+          })
       },
 
       //添加增项分类
       addSortData() {
         let _this = this
         //先判断是否保存了增项信息
-        if(this.checkAppendSave()) {
+        if (this.checkAppendSave()) {
           _this.dialogTitle = '添加'
           _this.dialogVisible = true
           _this.selectedOptList = [] //置空，防止先修改再添加时的已选分类信息保留
@@ -525,14 +549,14 @@
           let arr = _this.dialogFormData.SortFlag.split(',')
           let arr2 = []
           for (let i = 0; i < arr.length; i++) {
-              arr2.push(parseInt(arr[i]))
+            arr2.push(parseInt(arr[i]))
           }
           _this.selectedOptList = arr2
         }
         let Id = _this.selectedOptList[0]
         this.$axios.get('goodsaptitudeclass/getchildlist/' + Id, {})
           .then(res => {
-            if (res.data.items) {//判断是否有数据
+            if (res.data.items) { //判断是否有数据
               let tempList = []
               tempList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
               //添加到上一级对应的选项中
@@ -618,7 +642,7 @@
         }
         return true
       },
-      
+
       //添加增项分类信息
       addSortAppend() {
         let _this = this
@@ -649,33 +673,33 @@
       deleteData(Id) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          api.deleteEntity(Id, _this.$axios)
-            .then(res => {
-              // response
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                // 更新列表
-                this.getSortList()
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
-        })
-        .catch(() => {})
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            api.deleteEntity(Id, _this.$axios)
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  // 更新列表
+                  this.getSortList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
+          })
+          .catch(() => {})
       },
       //提交审批
-       AuditEntity () {
+      AuditEntity() {
         api2.auditEntity(this.formData.Id, this.FirstAudit, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -696,14 +720,37 @@
         })
       },
 
-      getDictOptions () {
+      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 = []
+        let auditstepcode = 'FIRST_TRIAL'
+        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.auditerOption = res.data.item
+          console.log("---this.auditerOption---", this.auditerOption)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
         suppapi.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
-          this.organizeOption = res.data.items['Organizes']
-          console.log("---this.organizeOption---",this.organizeOption)
-          /* this.UnitRelationOptions = res.data.items['UnitRelation']
-           this.getCityList(res.data.items['GaodeMapChinaAreas'])
-           this.CompanyTypeOptions = res.data.items['CompanyType'] */
         }).catch(err => {
           console.error(err)
         })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -11,7 +11,8 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-            <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true" v-if="formData.Id !='' && formData.Status == ''">提交审批
+          <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
+            v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -19,6 +20,14 @@
         </span>
       </div>
       <div>
+        <el-steps :active="formData.Step" simple align-center finish-status="success">
+          <el-step title="填信息"></el-step>
+          <el-step title="待审批"></el-step>
+          <el-step title="已审批"></el-step>
+          <el-step title="待交费"></el-step>
+          <el-step title="待入库"></el-step>
+          <el-step title="完成"></el-step>
+        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
@@ -28,18 +37,17 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
-                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps" change-on-select :show-all-levels="false" 
-                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位" style="width: 100%">
+                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
+                    change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
+                    placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司" style="width: 100%">
-                    <el-option
-                      v-for="item in supplierList"
-                      :key="item.SupplierId"
-                      :label="item.SupplierName"
+                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                    style="width: 100%">
+                    <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                     </el-option>
                   </el-select>
@@ -76,20 +84,22 @@
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-card>
       </div>
     </el-card>
     <!-- 增项分类添加、修改 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData" >
+      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row>
           <el-col :span="12">
             <el-form-item label="分类名称" prop="checkSelectedOptList">
-              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="orgtreeprops" change-on-select :show-all-levels="false" 
-                v-model="selectedOptList" @change="getCode" placeholder="请选择分类">
+              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="tytreeprops"
+                change-on-select :show-all-levels="false" v-model="selectedOptList" @change="getCode"
+                placeholder="请选择分类">
               </el-cascader>
             </el-form-item>
           </el-col>
@@ -99,8 +109,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注"  prop="Remark">
-              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注"  style="width: 100%"></el-input>
+            <el-form-item label="备注" prop="Remark">
+              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注" style="width: 100%">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -111,18 +122,21 @@
       </span>
     </el-dialog>
 
-     <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
+    <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
       <el-form ref="searchForm" label-width="110px">
         <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>
-                <el-option
-                  v-for="item in organizeOption"
-                  :key="item.Id"
-                  :label="item.Fullname"
-                  :value="item.Id">
+            <el-form-item label="二级单位">
+              <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">
+            <el-form-item label="审批人">
+              <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -178,15 +192,22 @@
         }
       }
       return {
-        AuditdialogShow: false,//提交审核弹框
+        orgtreelist: [], //二级单位
+        AuditdialogShow: false, //提交审核弹框
         organizeOption: [], // 审批部门
+        auditerOption: [], // 审批人
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         FirstAudit: '',
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
         optionsList: [], //增项分类层级列表
         selectedOptList: [], //已选择的增项分类列表
-        orgtreeprops: {
+        tytreeprops: {
           value: 'id',
           label: 'Name',
           children: 'children'
@@ -208,26 +229,28 @@
         //增项信息表
         formData: {
           Id: '',
+          Step: 1,
+          Status: '',
           SupplierId: 0,
           SupplierCertId: 0,
-          RecUnitFlag: '',//推荐单位的级联Id标记
+          RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
-          Remark: '',//备注
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
         },
-        dialogVisible: false,//增项分类dialog
+        dialogVisible: false, //增项分类dialog
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 0,//供方表ID
-          SupplierCertId: 0,//供方证书表ID
-          SupplierCertAppendId: '',//增项信息表ID
-          SubClassId: 3,//分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '',//分类标记
-          Code: '',//分类编码
-          Name: '',//分类名称
-          Remark: '',//备注
+          SupplierId: 0, //供方表ID
+          SupplierCertId: 0, //供方证书表ID
+          SupplierCertAppendId: '', //增项信息表ID
+          SubClassId: 3, //分类表主键（物资类或基建类或技术服务类）
+          SortFlag: '', //分类标记
+          Code: '', //分类编码
+          Name: '', //分类名称
+          Remark: '', //备注
         },
         //列表数据
         entityList: [],
@@ -269,7 +292,7 @@
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.Id = this.$route.query.Id
       this.editFlag = this.$route.query.editFlag
-      if(this.editFlag == '1' && this.Id !== '') {
+      if (this.editFlag == '1' && this.Id !== '') {
         this.getEntityById()
         this.dialogFormData.SupplierCertAppendId = this.Id
         this.getSortList()
@@ -278,6 +301,7 @@
       this.getTechTreeList() //获取技术服务类层级列表
       this.getSupplierList() //获取供应方公司列表
       this.getDictOptions()
+      this.getorgtreelist()
     },
     methods: {
 
@@ -323,10 +347,10 @@
       },
 
       //获取SupplierId和SupplierCertId
-      getInfo(vId) {//这个vId也就是value值
+      getInfo(vId) { //这个vId也就是value值
         let obj = {}
-        obj = this.supplierList.find((item)=>{
-          return item.SupplierId === vId;//筛选出匹配数据
+        obj = this.supplierList.find((item) => {
+          return item.SupplierId === vId; //筛选出匹配数据
         })
         this.formData.SupplierId = parseInt(obj.SupplierId)
         this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
@@ -336,7 +360,7 @@
       getCode(item) {
         let sortFlagStr = item.toString()
         this.dialogFormData.SortFlag = sortFlagStr
-        this.getCodeById(item[item.length-1]) //根据分类Id获取Code
+        this.getCodeById(item[item.length - 1]) //根据分类Id获取Code
       },
 
       //根据分类Id获取Code
@@ -367,7 +391,7 @@
             let arr = _this.formData.RecUnitFlag.split(',')
             let arr2 = []
             for (let i = 0; i < arr.length; i++) {
-               arr2.push(parseInt(arr[i]))
+              arr2.push(parseInt(arr[i]))
             }
             _this.selectedOrgList = arr2
           }
@@ -383,8 +407,8 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1]  //获取推荐单位名
-            if(_this.editFlag == '1' && _this.Id !== '') {
+            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
+            if (_this.editFlag == '1' && _this.Id !== '') {
               _this.updateData()
             } else {
               _this.addAppend()
@@ -437,7 +461,7 @@
       //添加增项信息
       addAppend() {
         let _this = this
-        _this.formData.AppendType = '3'
+        _this.formData.AppendType = '03'
         _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
           .then(res => {
             if (res.data.code === 0) {
@@ -453,16 +477,16 @@
               })
             }
           })
-        .catch(err => {
-          console.error(err)
-        })
+          .catch(err => {
+            console.error(err)
+          })
       },
 
       //添加增项分类
       addSortData() {
         let _this = this
         //先判断是否保存了增项信息
-        if(this.checkAppendSave()) {
+        if (this.checkAppendSave()) {
           _this.dialogTitle = '添加'
           _this.dialogVisible = true
           _this.selectedOptList = [] //置空，防止先修改再添加时的已选分类信息保留
@@ -484,7 +508,7 @@
           let arr = _this.dialogFormData.SortFlag.split(',')
           let arr2 = []
           for (let i = 0; i < arr.length; i++) {
-              arr2.push(parseInt(arr[i]))
+            arr2.push(parseInt(arr[i]))
           }
           _this.selectedOptList = arr2
         }
@@ -551,7 +575,7 @@
         }
         return true
       },
-      
+
       //添加增项分类信息
       addSortAppend() {
         let _this = this
@@ -582,34 +606,34 @@
       deleteData(Id) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          api.deleteEntity(Id, _this.$axios)
-            .then(res => {
-              // response
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                // 更新列表
-                this.getSortList()
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
-        })
-        .catch(() => {})
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            api.deleteEntity(Id, _this.$axios)
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  // 更新列表
+                  this.getSortList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
+          })
+          .catch(() => {})
       },
 
       //提交审批
-       AuditEntity () {
+      AuditEntity() {
         api2.auditEntity(this.formData.Id, this.FirstAudit, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -630,14 +654,37 @@
         })
       },
 
-      getDictOptions () {
+      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 = []
+        let auditstepcode = 'FIRST_TRIAL'
+        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.auditerOption = res.data.item
+          console.log("---this.auditerOption---", this.auditerOption)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
         suppapi.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
-          this.organizeOption = res.data.items['Organizes']
-          console.log("---this.organizeOption---",this.organizeOption)
-          /* this.UnitRelationOptions = res.data.items['UnitRelation']
-           this.getCityList(res.data.items['GaodeMapChinaAreas'])
-           this.CompanyTypeOptions = res.data.items['CompanyType'] */
         }).catch(err => {
           console.error(err)
         })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -17,7 +17,7 @@
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -34,7 +34,18 @@
         <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" title="编辑" size="mini" plain @click="editData(scope.row)">打开</el-button>
-            <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button>
+            <el-dropdown @command="MoreCmdClick">
+              <el-button size="mini" type="primary" plain style="margin-left:5px;">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('Delete', scope.row.Id)" :disabled="scope.row.Status != 0"
+                  divided>
+                  删除数据</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+            <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
           </template>
         </el-table-column>
         <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -42,14 +53,16 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center"
+          show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ checkAppendType(scope.row.AppendType) }}
           </template>
         </el-table-column>
-        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.AuditDate) }}
@@ -64,7 +77,7 @@
               title="待专业科室审核" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初始" type="info">
+              title="未提交审核" type="info">
             </el-alert>
             <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待二级初审" type="warning">
@@ -75,25 +88,24 @@
             <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="专业科室接收" type="success">
             </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核未通过" type="error">
-            </el-alert>
             <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待交费" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待入库" type="warning">
             </el-alert>
-            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="完成" type="success">
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)" title="完成"
+              type="success">
             </el-alert>
           </template>
         </el-table-column>
-        <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
 
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
       </el-pagination>
     </el-card>
 
@@ -104,7 +116,7 @@
           <el-col :span="24">
             <el-form-item label="时间范围">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
 
@@ -157,14 +169,23 @@
         <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+    </el-dialog>
 
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex';
-  import api from '@/api/oilsupplier/supplierappend';
+  import {
+    mapGetters
+  } from 'vuex';
+  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import api from '@/api/oilsupplier/supplierappend'
 
   export default {
+    components: {
+      WfHistory,
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -174,7 +195,8 @@
 
     data() {
       return {
-        dialogVisible: false,//高级查询
+        historyVisible: false,
+        dialogVisible: false, //高级查询
         //列表数据
         entityList: [],
         //分页参数
@@ -197,7 +219,7 @@
           ApplyDate: '',
           RecUnitId: '',
           RecUnitName: '',
-          AppendType: '2', //增项类别(1 物资类，2 基建类，3 技术服务类)
+          AppendType: '02', //增项类别(1 物资类，2 基建类，3 技术服务类)
           DenyReason: '',
           AuditDate: '',
           Status: '',
@@ -210,6 +232,12 @@
           ModifiedUserId: '',
           ModifiedBy: '',
         },
+        //工作流
+        entrydetail: {
+          process: 'oil_append_apply',
+          business: '',
+          instance: ''
+        },
         //修改
         optionsList: [], //技术服务类层级选择列表
         orgtreeprops: {
@@ -288,22 +316,22 @@
           })
           .then(() => {
             api.deleteEntity(Id, _this.$axios)
-            .then(res => {
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                // 更新
-                this.initData()
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
+              .then(res => {
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  // 更新
+                  this.initData()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
           })
           .catch(() => {})
       },
@@ -316,6 +344,28 @@
         }
       },
 
+      getvalues(val) {
+        this.entrydetail.business = val.Id
+        this.entrydetail.instance = val.WorkFlowId
+        this.historyVisible = true
+      },
+
+      MoreCmdClick(cmd) {
+        if (cmd.Command == 'History') {
+          this.getvalues(cmd.row)
+
+        } else if (cmd.Command == 'Delete') {
+          this.deleteData(cmd.row)
+        }
+      },
+
+      GetCommand(cmdType, row) {
+        let cmd = {}
+        cmd.Command = cmdType
+        cmd.row = row
+        return cmd
+      },
+
       //列表排序功能
       orderby(column) {
         if (column.order == 'ascending') {
@@ -349,11 +399,11 @@
 
       //判断增项类别，(1 物资类，2 基建类，3 技术服务类)
       checkAppendType(val) {
-        if (val == '1') {
+        if (val == '01') {
           return '物资类'
-        } else if (val == '2') {
+        } else if (val == '02') {
           return '基建类'
-        } else if (val == '3') {
+        } else if (val == '03') {
           return '技术服务类'
         }
       },
@@ -394,4 +444,5 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
+
 </style>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -17,7 +17,7 @@
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -34,7 +34,17 @@
         <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" title="编辑" size="mini" plain @click="editData(scope.row)">打开</el-button>
-            <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button>
+            <el-dropdown @command="MoreCmdClick">
+              <el-button size="mini" type="primary" plain style="margin-left:5px;">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('Delete', scope.row.Id)" :disabled="scope.row.Status != 0" divided>
+                  删除数据</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+            <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
           </template>
         </el-table-column>
         <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -42,14 +52,16 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center"
+          show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ checkAppendType(scope.row.AppendType) }}
           </template>
         </el-table-column>
-        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.AuditDate) }}
@@ -64,7 +76,7 @@
               title="待专业科室审核" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初始" type="info">
+              title="未提交审核" type="info">
             </el-alert>
             <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待二级初审" type="warning">
@@ -75,25 +87,24 @@
             <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="专业科室接收" type="success">
             </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核未通过" type="error">
-            </el-alert>
             <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待交费" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待入库" type="warning">
             </el-alert>
-            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="完成" type="success">
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)" title="完成"
+              type="success">
             </el-alert>
           </template>
         </el-table-column>
-        <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
 
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
       </el-pagination>
     </el-card>
 
@@ -104,7 +115,7 @@
           <el-col :span="24">
             <el-form-item label="时间范围">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
 
@@ -157,14 +168,23 @@
         <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+    </el-dialog>
 
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex';
+  import {
+    mapGetters
+  } from 'vuex';
+  import WfHistory from '@/components/workflow/wfhistory.vue'
   import api from '@/api/oilsupplier/supplierappend';
 
   export default {
+    components: {
+      WfHistory,
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -174,7 +194,8 @@
 
     data() {
       return {
-        dialogVisible: false,//高级查询
+        historyVisible: false,
+        dialogVisible: false, //高级查询
         //列表数据
         entityList: [],
         //分页参数
@@ -197,7 +218,7 @@
           ApplyDate: '',
           RecUnitId: '',
           RecUnitName: '',
-          AppendType: '1', //增项类别(1 物资类，2 基建类，3 技术服务类)
+          AppendType: '01', //增项类别(1 物资类，2 基建类，3 技术服务类)
           DenyReason: '',
           AuditDate: '',
           Status: '',
@@ -210,6 +231,12 @@
           ModifiedUserId: '',
           ModifiedBy: '',
         },
+        //工作流
+        entrydetail: {
+          process: 'oil_append_apply',
+          business: '',
+          instance: ''
+        },
         //修改
         optionsList: [], //技术服务类层级选择列表
         orgtreeprops: {
@@ -288,22 +315,22 @@
           })
           .then(() => {
             api.deleteEntity(Id, _this.$axios)
-            .then(res => {
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                // 更新
-                this.initData()
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
+              .then(res => {
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  // 更新
+                  this.initData()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
           })
           .catch(() => {})
       },
@@ -347,13 +374,35 @@
         this.initData()
       },
 
+      getvalues(val) {
+        this.entrydetail.business = val.Id
+        this.entrydetail.instance = val.WorkFlowId
+        this.historyVisible = true
+      },
+
+      MoreCmdClick(cmd) {
+        if (cmd.Command == 'History') {
+          this.getvalues(cmd.row)
+
+        } else if (cmd.Command == 'Delete') {
+          this.deleteData(cmd.row)
+        }
+      },
+
+      GetCommand(cmdType, row) {
+        let cmd = {}
+        cmd.Command = cmdType
+        cmd.row = row
+        return cmd
+      },
+
       //判断增项类别，(1 物资类，2 基建类，3 技术服务类)
       checkAppendType(val) {
-        if (val == '1') {
+        if (val == '01') {
           return '物资类'
-        } else if (val == '2') {
+        } else if (val == '02') {
           return '基建类'
-        } else if (val == '3') {
+        } else if (val == '03') {
           return '技术服务类'
         }
       },
@@ -394,4 +443,5 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
+
 </style>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -17,7 +17,7 @@
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -34,7 +34,18 @@
         <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" title="编辑" size="mini" plain @click="editData(scope.row)">打开</el-button>
-            <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button>
+            <el-dropdown @command="MoreCmdClick">
+              <el-button size="mini" type="primary" plain style="margin-left:5px;">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('Delete', scope.row.Id)" :disabled="scope.row.Status != 0"
+                  divided>
+                  删除数据</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+            <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
           </template>
         </el-table-column>
         <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -42,14 +53,16 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center"
+          show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ checkAppendType(scope.row.AppendType) }}
           </template>
         </el-table-column>
-        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.AuditDate) }}
@@ -64,7 +77,7 @@
               title="待专业科室审核" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初始" type="info">
+              title="未提交审核" type="info">
             </el-alert>
             <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待二级初审" type="warning">
@@ -75,25 +88,24 @@
             <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="专业科室接收" type="success">
             </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核未通过" type="error">
-            </el-alert>
             <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待交费" type="warning">
             </el-alert>
             <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待入库" type="warning">
             </el-alert>
-            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="完成" type="success">
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)" title="完成"
+              type="success">
             </el-alert>
           </template>
         </el-table-column>
-        <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
 
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
       </el-pagination>
     </el-card>
 
@@ -104,7 +116,7 @@
           <el-col :span="24">
             <el-form-item label="时间范围">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
 
@@ -157,14 +169,23 @@
         <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+    </el-dialog>
 
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex';
-  import api from '@/api/oilsupplier/supplierappend';
+  import {
+    mapGetters
+  } from 'vuex';
+  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import api from '@/api/oilsupplier/supplierappend'
 
   export default {
+    components: {
+      WfHistory,
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -174,7 +195,8 @@
 
     data() {
       return {
-        dialogVisible: false,//高级查询
+        historyVisible: false,
+        dialogVisible: false, //高级查询
         //列表数据
         entityList: [],
         //分页参数
@@ -197,7 +219,7 @@
           ApplyDate: '',
           RecUnitId: '',
           RecUnitName: '',
-          AppendType: '3', //增项类别(1 物资类，2 基建类，3 技术服务类)
+          AppendType: '03', //增项类别(1 物资类，2 基建类，3 技术服务类)
           DenyReason: '',
           AuditDate: '',
           Status: '',
@@ -210,6 +232,12 @@
           ModifiedUserId: '',
           ModifiedBy: '',
         },
+        //工作流
+        entrydetail: {
+          process: 'oil_append_apply',
+          business: '',
+          instance: ''
+        },
         //修改
         optionsList: [], //技术服务类层级选择列表
         orgtreeprops: {
@@ -288,26 +316,48 @@
           })
           .then(() => {
             api.deleteEntity(Id, _this.$axios)
-            .then(res => {
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                // 更新
-                this.initData()
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
+              .then(res => {
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  // 更新
+                  this.initData()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
           })
           .catch(() => {})
       },
 
+      getvalues(val) {
+        this.entrydetail.business = val.Id
+        this.entrydetail.instance = val.WorkFlowId
+        this.historyVisible = true
+      },
+
+      MoreCmdClick(cmd) {
+        if (cmd.Command == 'History') {
+          this.getvalues(cmd.row)
+
+        } else if (cmd.Command == 'Delete') {
+          this.deleteData(cmd.row)
+        }
+      },
+
+      GetCommand(cmdType, row) {
+        let cmd = {}
+        cmd.Command = cmdType
+        cmd.row = row
+        return cmd
+      },
+
       searchCommand(command) {
         if (command == 'search') {
           this.dialogVisible = true
@@ -349,11 +399,11 @@
 
       //判断增项类别，(1 物资类，2 基建类，3 技术服务类)
       checkAppendType(val) {
-        if (val == '1') {
+        if (val == '01') {
           return '物资类'
-        } else if (val == '2') {
+        } else if (val == '02') {
           return '基建类'
-        } else if (val == '3') {
+        } else if (val == '03') {
           return '技术服务类'
         }
       },
@@ -394,4 +444,5 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
+
 </style>