增项不通过审核处理

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

@@ -17,6 +17,8 @@ type OilSupplierCertAppend struct {
 	AuditDate      time.Time `xorm:"comment('审核日期') DATETIME"`
 	Status         string    `xorm:"comment('状态标识') VARCHAR(50)"`
 	WorkFlowId     string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
+	AuditIndex     int       `xorm:"default 0 comment('审批次数') INT(11)"`
+	BusinessKey    string    `xorm:"VARCHAR(255)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	Step           int       `xorm:"comment('页面上第几步') INT(10)"`

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

@@ -15,7 +15,6 @@ import (
 
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
-	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
@@ -697,49 +696,6 @@ func (this *OilSupplierCertController) AuditEntityadmission() {
 	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 }
 
-// @Title 增项审批
-// @Description 提交审批
-// @Success	200	{object} controllers.Request
-// @router /auditappend/:id [post]
-func (this *OilSupplierCertController) AuditEntityappend() {
-	certId := this.Ctx.Input.Param(":id")
-	var errinfo ErrorDataInfo
-	defer func() { //finally处理失败的异常
-		if err := recover(); err != nil {
-			errinfo.Message = "提交失败，" + err.(string)
-			errinfo.Code = -1
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
-		} else {
-			//返回正确结果
-			errinfo.Message = "审核提交成功"
-			errinfo.Code = 0
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
-		}
-	}()
-	var IsCompanyU string
-	if this.User.IsCompanyUser == 1 {
-		IsCompanyU = "0"
-	} else if this.User.IsCompanyUser == 0 {
-		IsCompanyU = "1"
-	}
-	//取出审批列表
-	certSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
-	processInstanceId := certSrv.SubmitOrgAudit(certId, workflow.OIL_SUPPLIER_APPEND, workflow.FIRST_TRIAL, this.User.Id, IsCompanyU, "提交增项初审", OilSupplierCertAppendSubName, OilClassOrgSettingName)
-	fmt.Println("--------processInstanceId--------", processInstanceId)
-	//记下workflowID(首次提交时才会记录，中间状态请忽略) 及审批状态
-	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
-	certSrv.GetEntityById(certId, supplierCertAppendEntity)
-	supplierCertAppendEntity.WorkFlowId = processInstanceId + ""
-	supplierCertAppendEntity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
-	cols := []string{
-		"Id",
-		"WorkflowId",
-		"Status",
-	}
-	certSrv.UpdateEntityByIdCols(certId, supplierCertAppendEntity, cols)
-}
 
 // @Title 审批
 // @Description 审批

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/business2/userRole"
 	"encoding/json"
 	"strconv"
@@ -382,6 +383,14 @@ func (this *OilSupplierCertAppendController) GetMyTaskEntityList() {
 	//找出待办任务
 	actisvc := workflow.GetActivitiService(utils.DBE)
 	appendIdList := actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+	appendIdarr := strings.Split(appendIdList, ",")
+	for i, item := range appendIdarr {
+		idx := strings.Index(item,"-")
+		if (idx >= 0 ) {
+			appendIdarr[i] = strings.Split(item, "-")[0]
+		}
+	}
+	appendIdList = strings.Join(appendIdarr, ",")
 	where += " and Id in (" + appendIdList + ")"
 	//根据部门查询待办任务
 
@@ -412,7 +421,8 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	certSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
 	certSrv.GetEntityById(certappendId, &supplierCertAppendEntity)
-
+	var historworkflowid string
+	historworkflowid = supplierCertAppendEntity.WorkFlowId
 	var errinfo ErrorDataInfo
 	defer func() { //finally处理失败的异常
 		if err := recover(); err != nil {
@@ -428,23 +438,49 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 			this.ServeJSON()
 		}
 	}()
+	var suppappend suppliercertappend.OilSupplierCertAppend
+	//第二次提交先清空工作流
+	if supplierCertAppendEntity.AuditIndex > 0 {
+		suppappend.WorkFlowId = ""
+		cols := []string{
+			"WorkflowId",
+		}
+		certSrv.UpdateEntityByIdCols(certappendId, suppappend, cols)
+		supplierCertAppendEntity.WorkFlowId = ""
+	}
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	processInstanceId := ""
+	businessKey := ""
 	if supplierCertAppendEntity.WorkFlowId == "0" || len(supplierCertAppendEntity.WorkFlowId) <= 0 {
 		//启动工作流
-		processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, certappendId, this.User.Id)
+		businessKey = certappendId + "-" +  strconv.Itoa(supplierCertAppendEntity.AuditIndex)
+		processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, businessKey, this.User.Id)
 	}
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
-	ActiComplete.BusinessKey = certappendId
+	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
-
 	if receiveVal == "true" {
+		if supplierCertAppendEntity.AuditIndex > 0 {
+			// 审批历史
+			var audithistoryentity audithistory.Base_AuditHistory
+			audithistoryentity.EntityId, _ = strconv.Atoi(certappendId)
+			audithistoryentity.WorkflowId = historworkflowid
+			audithistoryentity.Process = workflow.OIL_APPEND_APPLY
+			audithistoryentity.BusinessKey = businessKey
+			audithistoryentity.Type = supplierCertAppendEntity.AppendType
+			audithistoryentity.BackStep = supplierCertAppendEntity.Status
+			audithistoryentity.Index = supplierCertAppendEntity.AuditIndex
+			audithistoryentity.CreateOn = time.Now()
+			audithistoryentity.CreateBy = this.User.Realname
+			audithistoryentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			certSrv.InsertEntity(audithistoryentity)
+		}
 		errinfo.Message = "提交成功！"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo
@@ -461,11 +497,15 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	model.WorkFlowId = processInstanceId
 	model.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
 	model.FirstAudit, _ = strconv.Atoi(firstAudit)
+	model.AuditIndex = supplierCertAppendEntity.AuditIndex
+	model.BusinessKey = businessKey
 	cols := []string{
 		"Id",
 		"WorkFlowId",
 		"Status",
 		"FirstAudit",
+		"AuditIndex",
+		"BusinessKey",
 	}
 	certSrv.UpdateEntityByIdCols(certappendId, model, cols)
 }
@@ -553,7 +593,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
-	ActiComplete.BusinessKey = appendId
+	ActiComplete.BusinessKey = supplierCertAppendEntity.BusinessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Remarks = dataother.AuditorRemark
@@ -596,19 +636,34 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	} else {
 		ActiComplete.Result = "0"
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
-
 		if receiveVal == "true" {
-			supplierCertAppendEntity.Status = "0"
-			supplierCertAppendEntity.Step = step
+			if supplierCertAppendEntity.Status == "5" {
+				supplierCertAppendEntity.Status = "-1"
+				supplierCertAppendEntity.Step = step
+				supplierCertAppendEntity.AuditIndex = supplierCertAppendEntity.AuditIndex + 1
+			}else {
+				supplierCertAppendEntity.Status = "0"
+				supplierCertAppendEntity.Step = 1
+				supplierCertAppendEntity.AuditIndex = supplierCertAppendEntity.AuditIndex + 1
+			}
 			cols := []string{
 				"Status",
 				"Step",
+				"AuditIndex",
 			}
-			certSrv.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
-			errinfo.Message = "提交成功！"
-			errinfo.Code = 0
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
+			_,err := certSrv.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
+			if err == nil {
+				errinfo.Message = "提交成功！"
+				errinfo.Code = 0
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+			}else {
+				errinfo.Message = "提交失败！"
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+			}
+
 		} else {
 			errinfo.Message = "工作流异常，请联系管理员！"
 			errinfo.Code = -1

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</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'">
@@ -71,6 +72,10 @@
       </div>
     </el-card>
 
+    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </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'">
@@ -172,8 +177,12 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
 
   export default {
+    components: {
+      WfBackHistory,
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -204,6 +213,7 @@
         }
       }
       return {
+        audithistoryshow: false,
         auditerOptions: [], // 审核人员
         secauditerOptions: [],
         auditerCurOptions: [],
@@ -245,6 +255,11 @@
           AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
           Remark: '', //备注
         },
+        backhistroy: {
+          certId: '',
+          classId: '02',
+          workflowId: ''
+        },
         dialogVisible: false, //增项分类dialog
         dialogTitle: '',
         dialogFormData: {
@@ -321,7 +336,8 @@
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
-          console.log("-=-_this.formData ---",_this.formData )
+          this.backhistroy.certId = _this.AppendId
+          this.backhistroy.workflowId = _this.formData.WorkFlowId
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -397,6 +413,10 @@
           this.dialogMakeSure = true
         }
       },
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
       getDictOptions() {
         let params = {
           status: this.formData.Status,

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</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'">
@@ -78,6 +79,11 @@
         </el-card>
       </div>
     </el-card>
+
+    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </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'">
@@ -180,8 +186,12 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
 
   export default {
+    components: {
+      WfBackHistory,
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -212,6 +222,7 @@
         }
       }
       return {
+        audithistoryshow: false,
         auditerOptions: [], // 审核人员
         secauditerOptions: [],
         auditerCurOptions: [],
@@ -253,6 +264,11 @@
           AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
           Remark: '', //备注
         },
+        backhistroy: {
+          certId: '',
+          classId: '01',
+          workflowId: ''
+        },
         dialogVisible: false, //增项分类dialog
         dialogTitle: '',
         dialogFormData: {
@@ -329,6 +345,8 @@
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
+          this.backhistroy.certId = _this.AppendId
+          this.backhistroy.workflowId = _this.formData.WorkFlowId
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -374,6 +392,10 @@
             console.error(err)
           })
       },
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
 
       //获取增项分类表
       getSortList() {

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</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/supplierappend/techlist'">
@@ -40,8 +41,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable 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>
@@ -77,6 +77,10 @@
       </div>
     </el-card>
 
+    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </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'">
@@ -136,7 +140,7 @@
             style="width: 100%" v-model="majorDept" placeholder="请选择组织">
           </el-cascader>
         </el-form-item>
-        
+
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
@@ -178,8 +182,12 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
 
   export default {
+    components: {
+      WfBackHistory,
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -210,6 +218,7 @@
         }
       }
       return {
+        audithistoryshow: false,
         auditerOptions: [], // 审核人员
         secauditerOptions: [],
         auditerCurOptions: [],
@@ -229,7 +238,7 @@
         auditBtn: false,
         auditstepcode: '',
         dictData: null,
-        companyid:'',
+        companyid: '',
         orgtreeprops: {
           value: 'id',
           label: 'name',
@@ -252,6 +261,11 @@
           label: 'Fullname',
           children: 'children'
         },
+        backhistroy: {
+          certId: '',
+          classId: '03',
+          workflowId: ''
+        },
         organizeform: {
           IsInnerOrganize: 1,
           parentid: 0,
@@ -348,6 +362,8 @@
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
+          this.backhistroy.certId = _this.AppendId
+          this.backhistroy.workflowId = _this.formData.WorkFlowId
           if (_this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -394,6 +410,11 @@
           })
       },
 
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
+
       //获取增项分类表
       getSortList() {
         //分页及列表条件
@@ -468,7 +489,7 @@
           })
       },
       auditOrgChange(val) {
-         console.log(this.formData.Status, 'status')
+        console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
           auditstepcode = 'SECOND_TRIAL'

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

@@ -31,7 +31,7 @@
             <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>
+            <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>
@@ -54,6 +54,18 @@
         </el-table-column> -->
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
+            <el-alert v-if="scope.row.AuditIndex=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.AuditIndex=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="复审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.AuditIndex=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
             <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待二级复审" type="warning">
             </el-alert>

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
@@ -144,6 +145,10 @@
       </el-pagination>
     </el-dialog>
 
+     <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </el-dialog>
+
    <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
       <el-form ref="searchForm" label-width="70px">
         <el-row>
@@ -193,9 +198,11 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
 
   export default {
     components: {
+      WfBackHistory,
       ChooseAuditor
     },
     computed: {
@@ -221,6 +228,7 @@
         }
       }
       return {
+        audithistoryshow: false,
         chooseAuditorVisible: false,
         orgtreelist: [], //二级单位
         AuditdialogShow: false, //提交审核弹框
@@ -231,6 +239,11 @@
           label: 'Fullname',
           children: 'children'
         },
+        backhistroy: {
+          certId: '',
+          classId: '02',
+          workflowId: ''
+        },
         auditform: {
           FirstAuditName: '',
           CertId: '',
@@ -422,11 +435,18 @@
         this.formData.RecUnitFlag = codeStr
       },
 
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
+
       //获取需要修改的增项信息
       getEntityById() {
         let _this = this
         api2.getEntityById(_this.Id, _this.$axios).then(res => {
           _this.formData = res.data
+          this.backhistroy.certId = _this.Id
+          this.backhistroy.workflowId = _this.formData.WorkFlowId
           //显示原推荐单位
           if (_this.formData.RecUnitFlag != null) {
             let arr = _this.formData.RecUnitFlag.split(',')

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
@@ -122,6 +123,10 @@
       </span>
     </el-dialog>
 
+     <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </el-dialog>
+
    <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
       <el-form ref="searchForm" label-width="70px">
         <el-row>
@@ -171,9 +176,11 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
 
   export default {
     components: {
+      WfBackHistory,
       ChooseAuditor
     },
     computed: {
@@ -206,6 +213,7 @@
         }
       }
       return {
+        audithistoryshow: false,
         chooseAuditorVisible: false,
         orgtreelist: [], //二级单位
         AuditdialogShow: false, //提交审核弹框
@@ -216,6 +224,11 @@
           label: 'Fullname',
           children: 'children'
         },
+        backhistroy: {
+          certId: '',
+          classId: '01',
+          workflowId: ''
+        },
         auditform: {
           FirstAuditName: '',
           CertId: '',
@@ -444,12 +457,18 @@
         this.formData.RecUnitFlag = codeStr
       },
 
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
+
       //获取需要修改的增项信息
       getEntityById() {
         let _this = this
         api2.getEntityById(_this.Id, _this.$axios).then(res => {
           _this.formData = res.data
-          console.log("---_this.formData ----", _this.formData)
+          this.backhistroy.certId = _this.Id
+          this.backhistroy.workflowId = _this.formData.WorkFlowId
           //显示原推荐单位
           if (_this.formData.RecUnitFlag != null) {
             let arr = _this.formData.RecUnitFlag.split(',')

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
@@ -122,6 +123,10 @@
       </span>
     </el-dialog>
 
+     <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </el-dialog>
+
     <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
       <el-form ref="searchForm" label-width="70px">
         <el-row>
@@ -173,9 +178,11 @@
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
 
   export default {
     components: {
+      WfBackHistory,
       ChooseAuditor
     },
     computed: {
@@ -208,6 +215,7 @@
         }
       }
       return {
+        audithistoryshow: false,
         chooseAuditorVisible: false,
         orgtreelist: [], //二级单位
         AuditdialogShow: false, //提交审核弹框
@@ -218,6 +226,11 @@
           label: 'Fullname',
           children: 'children'
         },
+        backhistroy: {
+          certId: '',
+          classId: '03',
+          workflowId: ''
+        },
         auditform: {
           FirstAuditName: '',
           CertId: '',
@@ -405,11 +418,18 @@
         this.formData.RecUnitFlag = codeStr
       },
 
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
+
       //获取需要修改的增项信息
       getEntityById() {
         let _this = this
         api2.getEntityById(_this.Id, _this.$axios).then(res => {
           _this.formData = res.data
+          this.backhistroy.certId = _this.Id
+          this.backhistroy.workflowId = _this.formData.WorkFlowId
           //显示原推荐单位
           if (_this.formData.RecUnitFlag != null) {
             let arr = _this.formData.RecUnitFlag.split(',')

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

@@ -39,7 +39,7 @@
                 更多<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('History', scope.row)">审批流程</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('Delete', scope.row.Id)" :disabled="scope.row.Status != 0"
                   divided>
                   删除数据</el-dropdown-item>
@@ -70,6 +70,18 @@
         </el-table-column>
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
+            <el-alert v-if="scope.row.AuditIndex=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.AuditIndex=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="复审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.AuditIndex=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
             <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待二级复审" type="warning">
             </el-alert>

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

@@ -39,7 +39,7 @@
                 更多<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('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>
@@ -69,6 +69,18 @@
         </el-table-column>
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
+            <el-alert v-if="scope.row.AuditIndex=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.AuditIndex=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="复审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.AuditIndex=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
             <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待二级复审" type="warning">
             </el-alert>

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

@@ -39,7 +39,7 @@
                 更多<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('History', scope.row)">审批流程</el-dropdown-item>
                 <el-dropdown-item :command="GetCommand('Delete', scope.row.Id)" :disabled="scope.row.Status != 0"
                   divided>
                   删除数据</el-dropdown-item>
@@ -70,6 +70,18 @@
         </el-table-column>
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
+            <el-alert v-if="scope.row.AuditIndex=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.AuditIndex=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="复审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.AuditIndex=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
             <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待二级复审" type="warning">
             </el-alert>