审批历史

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

@@ -0,0 +1,20 @@
+package audithistory
+
+import (
+	"time"
+)
+
+type Base_AuditHistory struct {
+	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	EntityId     int       `xorm:"INT(11)"`
+	WorkflowId   string    `xorm:"VARCHAR(50)"`
+	Process      string    `xorm:"comment('工作流') VARCHAR(50)"`
+	BusinessKey  string    `xorm:"VARCHAR(50)"`
+	Type         string    `xorm:"comment('（01 物资类，02 基建类，03 技术服务类）') VARCHAR(10)"`
+	Index        int       `xorm:"comment('序号') INT(11)"`
+	BackStep     string    `xorm:"comment('退回步骤') VARCHAR(20)"`
+	Remark       string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId int       `xorm:"INT(11)"`
+	CreateOn     time.Time `xorm:"DATETIME"`
+	CreateBy     string    `xorm:"VARCHAR(50)"`
+}

src/dashoo.cn/backend/api/business/audithistory/audithistoryService.go

@@ -0,0 +1,16 @@
+package audithistory
+
+import (
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+
+type BaseAuditHistoryService struct {
+	MyServiceBase
+}
+
+func GetBaseAuditHistoryService(xormEngine *xorm.Engine) *BaseAuditHistoryService {
+	s := new(BaseAuditHistoryService)
+	s.DBE = xormEngine
+	return s
+}

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

@@ -119,4 +119,6 @@ type OilSupplierView struct {
 	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
 	ThirdAudit        string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	BusinessKey       string    `xorm:"VARCHAR(255)"`
+	AuditIndex        int       `xorm:"INT(10)"`
 }

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

@@ -49,10 +49,12 @@ type OilSupplierCert struct {
 	DesignerTotal     int       `xorm:"default 0 comment('设计人员总数') INT(10)"`
 	SkillerTotal      int       `xorm:"default 0 comment('技术工人总数') INT(10)"`
 	WorkflowId        string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
-	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)"`
+	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)"`
+	AuditIndex        int       `xorm:"default 0 comment('审批次数') INT(11)"`
+	BusinessKey       string     `xorm:"VARCHAR(255)"`
 	CreateOn          time.Time `xorm:"DATETIME"`
 	CreateUserId      int       `xorm:"INT(10)"`
 	CreateBy          string    `xorm:"VARCHAR(50)"`
@@ -68,13 +70,12 @@ type OilSupplierVM struct {
 }
 
 const (
-	DRAFT_STATUS string = "0" //草稿状态
-	FIRST_TRIAL_STATUS string = "1" //二级单位初审
+	DRAFT_STATUS        string = "0" //草稿状态
+	FIRST_TRIAL_STATUS  string = "1" //二级单位初审
 	SECOND_TRIAL_STATUS string = "2" //二级单位复审
-	THIRD_TRIAL_STATUS string = "3" //专业处接收
-	PROF_AUDIT_STATUS string = "4" //专业科室审核
-	CENT_AUDIT_STATUS string = "5" // 集中审批
+	THIRD_TRIAL_STATUS  string = "3" //专业处接收
+	PROF_AUDIT_STATUS   string = "4" //专业科室审核
+	CENT_AUDIT_STATUS   string = "5" // 集中审批
 	PAYING_AUDIT_STATUS string = "6" //待缴费
-	STOREING_STATUS string = "7" //待入库
+	STOREING_STATUS     string = "7" //待入库
 )
-

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

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

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

@@ -973,6 +973,14 @@ func (this *OilSupplierController) GetMyTaskEntityList() {
 	//找出待办任务
 	actisvc := workflow.GetActivitiService(utils.DBE)
 	certIdList := actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+	certIdarr := strings.Split(certIdList, ",")
+	for i, item := range certIdarr {
+		idx := strings.Index(item,"-")
+		if (idx >= 0 ) {
+			certIdarr[i] = strings.Split(item, "-")[0]
+		}
+	}
+	certIdList = strings.Join(certIdarr, ",")
 	where += " and b.Id in (" + certIdList + ")"
 	//根据部门查询待办任务
 
@@ -1148,7 +1156,7 @@ func (this *OilSupplierController) GetEntityAndCert() {
 
 	var sql string
 	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.Step, b.WorkerTotal, b.ContractNum, b.UniversityNum, b.TechnicalNum, b.AboveProfNum, 
-         b.MiddleProfNum, b.NationalRegNum, b.NationalCertTotal, b.DesignerTotal, b.SkillerTotal, b.WorkflowId, b.Status, b.ThirdAudit from ` + OilSupplierName + ` a `
+         b.MiddleProfNum, b.NationalRegNum, b.NationalCertTotal, b.DesignerTotal, b.SkillerTotal, b.WorkflowId, b.Status, b.ThirdAudit, b.BusinessKey, b.AuditIndex from ` + OilSupplierName + ` a `
 	sql += ` left join ` + OilSupplierCertName + " b on b.SupplierId = a.Id"
 	sql += ` where b.Id ='` + Id + `'`
 	utils.DBE.SQL(sql).Get(&model)

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/paymentinfo"
 	"encoding/json"
 	"fmt"
@@ -540,9 +541,11 @@ func (this *OilSupplierCertController) AuditEntity() {
 	//users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
 
 	processInstanceId := ""
+	businessKey := ""
 	if supplierCertEntity.WorkflowId == "0" || len(supplierCertEntity.WorkflowId) <= 0 {
 		//启动工作流
-		processInstanceId = svcActiviti.StartProcess(workflow.OIL_SUPPLIER_APPLY, certId, this.User.Id)
+		businessKey = certId + "-" +  strconv.Itoa(supplierCertEntity.AuditIndex)
+		processInstanceId = svcActiviti.StartProcess(workflow.OIL_SUPPLIER_APPLY, businessKey, this.User.Id)
 	} else {
 		processInstanceId = supplierCertEntity.WorkflowId
 	}
@@ -554,7 +557,7 @@ func (this *OilSupplierCertController) AuditEntity() {
 	//userIds = strings.Trim(userIds, ",")
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
-	ActiComplete.BusinessKey = certId
+	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
@@ -582,12 +585,16 @@ func (this *OilSupplierCertController) AuditEntity() {
 	supplierCertEntity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
 	supplierCertEntity.Step = 2
 	supplierCertEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
+	supplierCertEntity.AuditIndex = supplierCertEntity.AuditIndex + 1
+	supplierCertEntity.BusinessKey = ActiComplete.BusinessKey
 	cols := []string{
 		"Id",
 		"WorkflowId",
 		"Status",
 		"Step",
 		"FirstAudit",
+		"AuditIndex",
+		"BusinessKey",
 	}
 	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 
@@ -785,7 +792,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
-	ActiComplete.BusinessKey = certId
+	ActiComplete.BusinessKey = supplierCertEntity.BusinessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Remarks = dataother.AuditorRemark
@@ -830,11 +837,28 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 		if receiveVal == "true" {
+
+			// 审批历史
+			var audithistoryentity audithistory.Base_AuditHistory
+			audithistoryentity.EntityId = supplierCertEntity.Id
+			audithistoryentity.WorkflowId = supplierCertEntity.WorkflowId
+			audithistoryentity.Process = ActiComplete.ProcessKey
+			audithistoryentity.BusinessKey = ActiComplete.BusinessKey
+			audithistoryentity.Type = supplierCertEntity.SupplierTypeCode
+			audithistoryentity.BackStep = supplierCertEntity.Status
+			audithistoryentity.Index = supplierCertEntity.AuditIndex
+			audithistoryentity.CreateOn = time.Now()
+			audithistoryentity.CreateBy = this.User.Realname
+			audithistoryentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			certSrv.InsertEntity(audithistoryentity)
+
 			supplierCertEntity.Status = "0"
 			supplierCertEntity.Step = 1
+			supplierCertEntity.WorkflowId = ""
 			cols := []string{
 				"Status",
 				"Step",
+				"WorkflowId",
 			}
 			certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 			errinfo.Message = "提交成功！"

src/dashoo.cn/backend/api/controllers/workflow/audithistory.go

@@ -0,0 +1,32 @@
+package workflow
+
+import (
+	"dashoo.cn/backend/api/business/audithistory"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+)
+
+// 动作接口说明
+type AuditHistoryController struct {
+	BaseController
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []audithistory.Base_AuditHistory
+// @router /list [get]
+func (this *AuditHistoryController) GetEntityList() {
+
+	cretId := this.GetString("id")
+	var historylist []audithistory.Base_AuditHistory
+	svc := audithistory.GetBaseAuditHistoryService(utils.DBE)
+	where := "EntityId=" + cretId
+	svc.GetEntities(&historylist, where)
+
+	var errinfo ErrorDataInfo
+
+	errinfo.Item = historylist
+	this.Data["json"] = &errinfo
+	this.ServeJSON()
+
+}

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

@@ -213,6 +213,12 @@ func init() {
 				&workflow.WorkflowController{},
 			),
 		),
+		//审批历史 工作流
+		beego.NSNamespace("/audithistory",
+			beego.NSInclude(
+				&workflow.AuditHistoryController{},
+			),
+		),
 		//以下是供方管理信息系统
 		beego.NSNamespace("/basisbuild",
 			beego.NSInclude(

src/dashoo.cn/frontend_web/src/components/workflow/wfbackhistory.vue

@@ -0,0 +1,168 @@
+<template>
+  <div style="overflow: auto">
+    <el-row>
+      <el-col :span="6">
+        <el-card class="box-card">
+          <el-table :data="historyList" border @row-click="rowclick">
+            <el-table-column prop="BusinessKey" sortable min-width="130" label="审核记录" align="center" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+      <el-col :span="18">
+        <el-card class="box-card">
+          <wf-history :entryinfo="entrydetail"></wf-history>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import WfHistory from '@/components/workflow/wfhistory.vue'
+
+  export default {
+    components: {
+      WfHistory
+    },
+    name: 'wfbackhistory',
+    props: {
+      visible: {
+        type: Boolean,
+        default: false
+      },
+      entryinfo: {}
+    },
+    created () {
+      this.getuserlist()
+    },
+    watch: {
+      entryinfo: {
+        handler: function (newVal, oldVal) {
+          this.getuserlist()
+        },
+        deep: true
+      }
+    },
+    computed: {
+      ...mapGetters({
+        session: 'session'
+      })
+    },
+    data () {
+      return {
+        baseurl: process.env.baseURL,
+        process: '',
+        business: '',
+        instance: '',
+        selfVisible: this.visible, // 避免vue双向绑定警告
+        historyTask: [],
+        historyList: [],
+        userlist: [],
+        entrydetail: {
+          process: '',
+          business: '',
+          instance: '',
+          status: ''
+        }
+      }
+    },
+    methods: {
+      rowclick (val) {
+        this.entrydetail.process = val.Process
+        this.entrydetail.business = val.BusinessKey
+        this.entrydetail.instance = val.WorkflowId
+      },
+      getHistoryList () {
+        console.log(this.entryinfo, 'entryinfo')
+        this.$axios.get('audithistory/list?id=' + this.entryinfo.certId)
+          .then(res => {
+            console.log(res.data.item, 'historyList')
+            this.historyList = res.data.item
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      assigneeToAssignee (val) {
+        for (let i = 0; i < this.userlist.length; i++) {
+          if (val === this.userlist[i].Id) {
+            return this.userlist[i].Realname
+          }
+        }
+      },
+      assigneeToUsers (users) {
+        let userNames = ''
+        let userArr = users.split(',')
+        for (let idx = 0; idx < userArr.length; idx++) {
+          let val = userArr[idx]
+          for (let i = 0; i < this.userlist.length; i++) {
+            if (parseInt(val) === parseInt(this.userlist[i].Id)) {
+              userNames += this.userlist[i].Realname + ', '
+            }
+          }
+        }
+        if (userNames.length > 0) {
+          userNames = userNames.substring(0, userNames.length - 2)
+        }
+        return userNames
+      },
+      getuserlist () {
+        console.log('getuserlist')
+        let _this = this
+        _this.$axios.get('workflow/userlist', {})
+          .then(res => {
+            // response
+            _this.userlist = res.data.items
+            this.getHistoryList()
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      timestampToTime (val) {
+        var date = new Date(val) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '-'
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+        var D = date.getDate() + ' '
+        var h = date.getHours() + ':'
+        var m = date.getMinutes() + ':'
+        var s = date.getSeconds()
+        return Y + M + D + h + m + s
+      },
+      jstimehandle (val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else if (val === '1970-01-01 8:0:0') {
+          return '----'
+        } else if (val === '1970-01-1 8:0:0') {
+          return '----'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 19)
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+  .samplerecoveope .el-radio {
+    padding: 8px 15px 0 0;
+    margin-left: -2px;
+  }
+  .dialog-footer img{
+    position: relative;
+    width: 100%;
+    height: 100%;
+  }
+
+</style>

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

@@ -213,6 +213,15 @@
           </el-card>
         </el-tab-pane>
 
+        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
+          <el-card class="box-card" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+              <span>审批历史</span>
+            </div>
+            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+          </el-card>
+        </el-tab-pane>
+
         <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
@@ -266,6 +275,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -283,6 +293,7 @@
     components: {
       SupplierFileTable,
       WfHistory,
+      WfBackHistory,
       SupplierCertEdit,
 
       EquipmentList, // 企业主要装备情况
@@ -416,7 +427,8 @@
           SupplierTypeCode: '02',
           SupplierTypeName: '基建类',
           Step: 0,
-          HseTraining: 0
+          HseTraining: 0,
+          AuditIndex: 0
         },
 
         formDataCert: {
@@ -438,6 +450,11 @@
           process: 'oil_supplier_apply_1',
           business: '',
           instance: ''
+        },
+        backhistroy: {
+          certId: '',
+          classId: '03',
+          workflowId: ''
         }
       }
     },
@@ -605,6 +622,8 @@
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
+            this.backhistroy.certId = this.certId
+            this.backhistroy.workflowId = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {
               //this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
             }

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

@@ -213,6 +213,15 @@
           </el-card>
         </el-tab-pane>
 
+        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
+          <el-card class="box-card" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+              <span>审批历史</span>
+            </div>
+            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+          </el-card>
+        </el-tab-pane>
+
         <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
@@ -266,6 +275,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -284,6 +294,7 @@
       chooseAuditorVisible: false,
       SupplierFileTable,
       WfHistory,
+      WfBackHistory,
       SupplierCertEdit,
 
       EquipmentList, // 企业主要装备情况
@@ -417,7 +428,8 @@
           SupplierTypeCode: '01',
           SupplierTypeName: '物资类',
           Step: 0,
-          HseTraining: 0
+          HseTraining: 0,
+          AuditIndex: 0
         },
 
         formDataCert: {
@@ -438,6 +450,11 @@
           process: 'oil_supplier_apply_1',
           business: '',
           instance: ''
+        },
+        backhistroy: {
+          certId: '',
+          classId: '03',
+          workflowId: ''
         }
       }
     },
@@ -484,7 +501,7 @@
           })
         }
       },
-      
+
       changeFormData(fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
@@ -608,6 +625,8 @@
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
+            this.backhistroy.certId = this.certId
+            this.backhistroy.workflowId = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {
               //this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
             }
@@ -666,7 +685,7 @@
             console.error(err)
           })
       },
-      
+
       auditOrgChang(val) {
         let deptid = val[val.length - 1]
         console.log(deptid)

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

@@ -212,7 +212,15 @@
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane name="6" label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane name="6" label="审批历史" v-if="this.formData.AuditIndex > 0 ">
+          <el-card class="box-card" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+              <span>审批历史</span>
+            </div>
+            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+          </el-card>
+        </el-tab-pane>
+        <el-tab-pane name="7" label="供方缴费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>
@@ -267,6 +275,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -284,6 +293,7 @@
     components: {
       SupplierFileTable,
       WfHistory,
+      WfBackHistory,
       SupplierCertEdit,
 
       EquipmentList, // 企业主要装备情况
@@ -418,7 +428,8 @@
           SupplierTypeCode: '03',
           SupplierTypeName: '技术服务类',
           Step: 0,
-          HseTraining: 0
+          HseTraining: 0,
+          AuditIndex: 0
         },
 
         formDataCert: {
@@ -440,6 +451,11 @@
           process: 'oil_supplier_apply_1',
           business: '',
           instance: ''
+        },
+        backhistroy: {
+          certId: '',
+          classId: '03',
+          workflowId: ''
         }
       }
     },
@@ -592,6 +608,7 @@
               this.add_flat = false
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId
+            console.log(this.formData)
             this.$refs["TechInfo"].CityAry = []
             this.$refs["TechInfo"].CityAry.push(this.formData.Province)
             this.$refs["TechInfo"].CityAry.push(this.formData.City)
@@ -608,6 +625,8 @@
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
+            this.backhistroy.certId = this.certId
+            this.backhistroy.workflowId = this.formDataCert.WorkflowId
             /*if (this.certId && this.formDataCert.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /!* 刷新工作流 *!/
             }*/

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

@@ -164,7 +164,7 @@
           </auditbus-list>
         </el-tab-pane>
 
-        <el-tab-pane label="流程查看">
+        <el-tab-pane label="流程查看" v-if="this.formData.Status != 0">
           <el-card class="box-card" style="margin-top: 20px">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
@@ -172,6 +172,16 @@
             <wf-history :entryinfo="entrydetail"></wf-history>
           </el-card>
         </el-tab-pane>
+
+        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
+          <el-card class="box-card" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+              <span>审批历史</span>
+            </div>
+            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+          </el-card>
+        </el-tab-pane>
+
       </el-tabs>
     </el-card>
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
@@ -271,6 +281,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -285,6 +296,7 @@
     components: {
       SupplierFileTable,
       WfHistory,
+      WfBackHistory,
       SupplierCertEdit,
 
       EquipmentList, // 企业主要装备情况
@@ -412,7 +424,9 @@
           CertId: 0,
           SupplierTypeCode: '02',
           SupplierTypeName: '基建类',
-          Step: 0
+          Step: 0,
+          BusinessKey: '',
+          AuditIndex: 0
         },
 
         formDataCert: {
@@ -434,6 +448,11 @@
           business: '',
           instance: '',
           status: ''
+        },
+        backhistroy: {
+          certId: '',
+          classId: '03',
+          workflowId: ''
         }
       }
     },
@@ -481,9 +500,13 @@
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
 
-            this.entrydetail.business = this.certId
+            this.entrydetail.business = this.formData.BusinessKey
             this.entrydetail.instance = this.formDataCert.WorkflowId
             this.entrydetail.status = this.formData.Status
+
+            this.backhistroy.certId = this.certId
+            this.backhistroy.workflowId = this.formDataCert.WorkflowId
+
             if (this.formData.Status === '1') {
               this.aduitlabel = '复审人员'
               this.auditTitle = '初审'

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

@@ -169,6 +169,16 @@
             <wf-history :entryinfo="entrydetail"></wf-history>
           </el-card>
         </el-tab-pane>
+
+        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
+          <el-card class="box-card" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+              <span>审批历史</span>
+            </div>
+            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+          </el-card>
+        </el-tab-pane>
+
       </el-tabs>
     </el-card>
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
@@ -316,6 +326,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -332,6 +343,7 @@
       ChooseAuditor,
       SupplierFileTable,
       WfHistory,
+      WfBackHistory,
       SupplierCertEdit,
 
       EquipmentList, // 企业主要装备情况
@@ -376,7 +388,6 @@
         dialogAllocation: false,
         add_flat: false,
         aduitlabel: '审核人',
-        auditer: '',
         auditTitle: '审批',
         auditBtn: false,
         orgtreeprops: {
@@ -462,7 +473,9 @@
           CertId: 0,
           SupplierTypeCode: '01',
           SupplierTypeName: '物资类',
-          Step: 0
+          Step: 0,
+          BusinessKey: '',
+          AuditIndex: 0
         },
 
         formDataCert: {
@@ -484,6 +497,11 @@
           business: '',
           instance: '',
           status: ''
+        },
+        backhistroy: {
+          certId: '',
+          classId: '03',
+          workflowId: ''
         }
       }
     },
@@ -542,9 +560,13 @@
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
 
-            this.entrydetail.business = this.certId
+            this.entrydetail.business = this.formData.BusinessKey
             this.entrydetail.instance = this.formDataCert.WorkflowId
             this.entrydetail.status = this.formData.Status
+
+            this.backhistroy.certId = this.certId
+            this.backhistroy.workflowId = this.formDataCert.WorkflowId
+
             if (this.formData.Status === '1') {
               this.aduitlabel = '复审人员'
               this.auditTitle = '初审'

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

@@ -167,7 +167,7 @@
           </auditbus-list>
         </el-tab-pane>
 
-        <el-tab-pane label="流程查看">
+        <el-tab-pane label="流程查看" v-if="this.formData.Status != 0">
           <el-card class="box-card" style="margin-top: 20px">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
@@ -175,6 +175,14 @@
             <wf-history :entryinfo="entrydetail"></wf-history>
           </el-card>
         </el-tab-pane>
+        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
+          <el-card class="box-card" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+              <span>审批历史</span>
+            </div>
+            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+          </el-card>
+        </el-tab-pane>
       </el-tabs>
     </el-card>
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
@@ -285,6 +293,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -299,6 +308,7 @@
     components: {
       SupplierFileTable,
       WfHistory,
+      WfBackHistory,
       SupplierCertEdit,
 
       EquipmentList, // 企业主要装备情况
@@ -420,7 +430,9 @@
           CertId: 0,
           SupplierTypeCode: '03',
           SupplierTypeName: '技术服务类',
-          Step: 0
+          Step: 0,
+          BusinessKey: '',
+          AuditIndex: 0
         },
 
         formDataCert: {
@@ -447,6 +459,11 @@
           business: '',
           instance: '',
           status: ''
+        },
+        backhistroy: {
+          certId: '',
+          classId: '03',
+          workflowId: ''
         }
       }
     },
@@ -496,9 +513,13 @@
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
 
-            this.entrydetail.business = this.certId
+            this.entrydetail.business = this.formData.BusinessKey
             this.entrydetail.instance = this.formDataCert.WorkflowId
             this.entrydetail.status = this.formData.Status
+
+            this.backhistroy.certId = this.certId
+            this.backhistroy.workflowId = this.formDataCert.WorkflowId
+
             if (this.formData.Status === '1') {
               this.aduitlabel = '复审人员'
               this.auditTitle = '初审'