信息变更审批，资质变更审批页面

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

@@ -32,6 +32,7 @@ type OilAnnualAudit struct {
 	SPRQ             string    `xorm:"comment('SPRQ') VARCHAR(50)"`
 	SPYJ             string    `xorm:"comment('SPYJ') VARCHAR(50)"`
 	SPJG             string    `xorm:"comment('SPJG') VARCHAR(50)"`
+	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
 	CreateOn         time.Time `xorm:"DATETIME"`
 	CreateUserId     int       `xorm:"INT(10)"`
 	CreateBy         string    `xorm:"VARCHAR(50)"`

src/dashoo.cn/backend/api/business/oilsupplier/annualaudit/annualauditService.go

@@ -35,7 +35,7 @@ func (s *OilAnnualAuditService) GetSupplierList(supname, auditname string) []Sup
 }
 
 //通用多部门多实例审核方法
-func (s *OilAnnualAuditService) SubmitOrgAudit(workflowid, certId, annualId, wfName, wfNodeCode, userId, result, remarks, OilSupplierCertSubName, OilClassOrgSettingName string) (processInstanceId string) {
+func (s *OilAnnualAuditService) SubmitOrgAudit(workflowid, certId, annualId, wfName, wfNodeCode, userId, result, remarks, OilSupplierCertSubName, OilClassOrgSettingName string) (processInstanceId, res string) {
 	//取出审批列表
 	var supplierCert suppliercert.OilSupplierCert
 	s.GetEntityById(certId, &supplierCert)
@@ -107,6 +107,6 @@ func (s *OilAnnualAuditService) SubmitOrgAudit(workflowid, certId, annualId, wfN
 		processInstanceId = svcActiviti.StartProcess(wfName, annualId, userId)
 	}
 	//多实例提交给下一步
-	svcActiviti.MultiTaskComplete(wfName, annualId, "", orgAudits, userId, result, remarks)
-	return processInstanceId
+	res = svcActiviti.MultiTaskComplete(wfName, annualId, "", orgAudits, userId, result, remarks)
+	return processInstanceId, res
 }

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

@@ -9,6 +9,8 @@ type OilInfoChange struct {
 	AccessCardNo       int       `xorm:"not null default 0 comment('准入证号') INT(10)"`
 	OldAccessCardNo    int       `xorm:"not null default 0 comment('曾用准入证号') INT(10)"`
 	SupplierName       string    `xorm:"comment('企业名称') VARCHAR(255)"`
+	Status             string    `xorm:"comment('状态标识') VARCHAR(10)"`
+	WorkFlowId         string    `xorm:"comment('工作流的ID') VARCHAR(50)"`
 	OldSupplierName    string    `xorm:"comment('曾用名') VARCHAR(255)"`
 	SupplierTypecode   string    `xorm:"comment('准入类别代码（1 物资类，2 基建类，3 技术服务类）') VARCHAR(5)"`
 	Suppliertypename   string    `xorm:"comment('准入类别名称（1 物资类，2 基建类，3 技术服务类）') VARCHAR(50)"`
@@ -75,4 +77,3 @@ type OilInfoChange struct {
 	LinkZipCode        string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
 	HseTraining        string    `xorm:"default '0' comment('是否需要进行HSE审查培训') VARCHAR(2)"`
 }
-

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

@@ -36,6 +36,7 @@ type OilQualChangeMain struct {
 	SupplierName   string    `xorm:"comment('企业名称') VARCHAR(255)"`
 	AccesscardNo   string    `xorm:"comment('准入证号') VARCHAR(20)"`
 	CommercialNo   string    `xorm:"comment('工商注册号') VARCHAR(20)"`
+	Status         string    `xorm:"comment('状态标识') VARCHAR(10)"`
 	WorkFlowId     string    `xorm:"comment('工作流的ID') VARCHAR(50)"`
 	CreateOn       time.Time `xorm:"DATETIME"`
 	CreateUserId   int       `xorm:"INT(10)"`
@@ -43,4 +44,4 @@ type OilQualChangeMain struct {
 	ModifiedOn     time.Time `xorm:"DATETIME"`
 	ModifiedUserId int       `xorm:"INT(10)"`
 	ModifiedBy     string    `xorm:"VARCHAR(50)"`
-}
+}

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

@@ -2,6 +2,8 @@ package oilsupplier
 
 import (
 	"encoding/json"
+	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -20,6 +22,12 @@ type AnnualAuditController struct {
 	BaseController
 }
 
+type ShenHeModel struct {
+	AnnualId      int
+	SuccessStatus int
+	AuditorRemark string
+}
+
 // @Title 获取列表
 // @Description get user by token
 // @Success 200 {object} []annualaudit.OilAnnualAudit
@@ -82,7 +90,7 @@ func (this *AnnualAuditController) GetEntityList() {
 	this.ServeJSON()
 }
 
-// @Title 获取列表
+// @Title 获取审批列表
 // @Description get user by token
 // @Success 200 {object} []annualaudit.OilAnnualAudit
 // @router /mytasks [get]
@@ -152,6 +160,8 @@ func (this *AnnualAuditController) GetMyTaskEntityList() {
 	this.ServeJSON()
 }
 
+
+
 // @Title 获取年审企业名称
 // @Description 获取实体
 // @Success 200 {object} annualaudit.OilAnnualAudit
@@ -250,27 +260,35 @@ func (this *AnnualAuditController) AddEntity() {
 	_, err := svc.InsertEntityBytbl(""+OilAnnualAuditName, &model)
 	annualId := model.Id
 	//工作流开始
-	processInstanceId := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
+	processInstanceId, res := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
 	var auditmodel annualaudit.OilAnnualAudit
 	auditmodel.WorkflowId = processInstanceId
 	cols := []string{
 		"Id",
 		"WorkflowId",
 	}
-	svc.UpdateEntityByIdCols(annualId, auditmodel, cols)
-	if err == nil {
-		//新增
-		errinfo.Message = "添加成功！"
-		errinfo.Code = 0
-		errinfo.Item = model.Id
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+	if res == "true" {
+		_,err = svc.UpdateEntityByIdCols(annualId, auditmodel, cols)
+		if err == nil {
+			//新增
+			errinfo.Message = "添加成功！"
+			errinfo.Code = 0
+			errinfo.Item = model.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	}else {
+		errinfo.Message = "工作流异常，请联系管理员！"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	}
+
 }
 
 // @Title 修改实体
@@ -414,3 +432,76 @@ func (this *AnnualAuditController) BasicList() {
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
+
+// @Title 审核
+// @Description 审核
+// @Success	200	{object} controllers.Request
+// @router /auditfirst/ [put]
+func (this *AnnualAuditController) QianfaReport() {
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	var jsonblob = this.Ctx.Input.RequestBody
+	var dataother ShenHeModel
+	json.Unmarshal(jsonblob, &dataother)
+	var list annualaudit.OilAnnualAudit
+	where := " Id = '" + strconv.Itoa(dataother.AnnualId) + "'"
+	svc.GetEntityByWhere(""+OilAnnualAuditName, where, &list)
+	//审核状态判断进行的操作
+	if dataother.SuccessStatus == 1 {
+		var entityempty annualaudit.OilAnnualAudit
+		var errinfo ErrorInfo
+		var cols []string = []string{"Status", "Remark"}
+		entityempty.Status = dataother.SuccessStatus
+		entityempty.Remark = dataother.AuditorRemark
+		//提交审核工作流
+		processInstanceId, res := svc.SubmitOrgAudit(list.WorkflowId, utils.ToStr(list.CerId), utils.ToStr(list.Id), workflow.OIL_AUDIT_APPLY, workflow.PROF_AUDIT, this.User.Id, "1", "提交给业务处室专业审核", OilSupplierCertSubName, OilClassOrgSettingName)
+		fmt.Println(processInstanceId)
+		if res == "true" {
+			err := svc.UpdateEntityBytbl(""+OilAnnualAuditName, list.Id, entityempty, 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
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+
+	} else if dataother.SuccessStatus == 2{
+		var entityempty annualaudit.OilAnnualAudit
+		var errinfo ErrorInfo
+		var cols []string = []string{"Status", "Remark"}
+		entityempty.Status = dataother.SuccessStatus
+		entityempty.Remark = dataother.AuditorRemark
+		//提交审核工作流
+		processInstanceId,res := svc.SubmitOrgAudit(list.WorkflowId, utils.ToStr(list.CerId), utils.ToStr(list.Id), workflow.OIL_AUDIT_APPLY, workflow.PROF_AUDIT, this.User.Id, "0", "提交给业务处室专业审核", OilSupplierCertSubName, OilClassOrgSettingName)
+		fmt.Println(processInstanceId)
+		if res == "true" {
+			err := svc.UpdateEntityBytbl(""+OilAnnualAuditName, list.Id, entityempty, 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
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	}
+}

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"encoding/json"
 	"strings"
 	"time"
@@ -22,7 +23,7 @@ type InfoChangeController struct {
 
 // @Title 获取列表
 // @Description get user by token
-// @Success 200 {object} []annualaudit.OilAnnualAudit
+// @Success 200 {object} []infochange.OilInfoChange
 // @router /list [get]
 func (this *InfoChangeController) GetEntityList() {
 
@@ -70,8 +71,8 @@ func (this *InfoChangeController) GetEntityList() {
 		}
 	}
 
-	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
-	var list []annualaudit.OilAnnualAudit
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	var list []infochange.OilInfoChange
 	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
@@ -250,7 +251,7 @@ func (this *InfoChangeController) AddEntity() {
 	_, err := svc.InsertEntityBytbl(""+OilAnnualAuditName, &model)
 	annualId := model.Id
 	//工作流开始
-	processInstanceId := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
+	processInstanceId,_ := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
 	var auditmodel annualaudit.OilAnnualAudit
 	auditmodel.WorkflowId = processInstanceId
 	cols := []string{

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

@@ -77,7 +77,7 @@ func (this *QualChangeController) GetEntityList() {
 
 // @Title 获取列表
 // @Description get user by token
-// @Success 200 {object} []annualaudit.OilAnnualAudit
+// @Success 200 {object} []supplier.OilSupplierView
 // @router /mytasks [get]
 func (this *QualChangeController) GetMyTaskEntityList() {
 
@@ -125,17 +125,9 @@ func (this *QualChangeController) GetMyTaskEntityList() {
 		}
 	}
 
-	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
-	var list []annualaudit.OilAnnualAudit
-	//找出待办任务
-	actisvc := workflow.GetActivitiService(utils.DBE)
-	certIdList := actisvc.GetMyTasks(workflow.OIL_AUDIT_APPLY, this.User.Id)
-	where += " and Id in (" + certIdList + ")"
-	//根据部门查询待办任务
-
-	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size,orderby,asc, &list, where)
-	//total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
-
+	svc := qualchange.GetQualChangeService(utils.DBE)
+	var list []qualchange.OilQualChangeMain
+	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
@@ -145,6 +137,76 @@ func (this *QualChangeController) GetMyTaskEntityList() {
 	this.ServeJSON()
 }
 
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []annualaudit.OilAnnualAudit
+// @router /mytasks [get]
+//func (this *QualChangeController) GetMyTaskEntityList() {
+//
+//	//获取分页信息
+//	page := this.GetPageInfoForm()
+//	where := " 1=1 "
+//	orderby := "Id"
+//	asc := false
+//	Order := this.GetString("Order")
+//	Prop := this.GetString("Prop")
+//	if Order != "" && Prop != "" {
+//		orderby = Prop
+//		if Order == "asc" {
+//			asc = true
+//		}
+//	}
+//	SupplierTypeName := this.GetString("SupplierTypeName")
+//	RecUnitId := this.GetString("RecUnitId")
+//	AccessCardNo := this.GetString("AccessCardNo")
+//	SupplierName := this.GetString("SupplierName")
+//	CreateOn := this.GetString("CreateOn")
+//
+//	if SupplierTypeName != "" {
+//		where = where + " and SupplierTypeName like '%" + SupplierTypeName + "%'"
+//	}
+//
+//	if RecUnitId != "" {
+//		where = where + " and RecUnitId like '%" + RecUnitId + "%'"
+//	}
+//
+//	if AccessCardNo != "" {
+//		where = where + " and AccessCardNo like '%" + AccessCardNo + "%'"
+//	}
+//
+//	if SupplierName != "" {
+//		where = where + " and SupplierName like '%" + SupplierName + "%'"
+//	}
+//
+//	if CreateOn != "" {
+//		dates := strings.Split(CreateOn, ",")
+//		if len(dates) == 2 {
+//			minDate := dates[0]
+//			maxDate := dates[1]
+//			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+//		}
+//	}
+//
+//	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+//	var list []annualaudit.OilAnnualAudit
+//	//找出待办任务
+//	actisvc := workflow.GetActivitiService(utils.DBE)
+//	certIdList := actisvc.GetMyTasks(workflow.OIL_AUDIT_APPLY, this.User.Id)
+//	where += " and Id in (" + certIdList + ")"
+//	//根据部门查询待办任务
+//
+//	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size,orderby,asc, &list, where)
+//	//total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+//
+//	var datainfo DataInfo
+//	datainfo.Items = list
+//	datainfo.CurrentItemCount = total
+//	datainfo.PageIndex = page.CurrentPage
+//	datainfo.ItemsPerPage = page.Size
+//	this.Data["json"] = &datainfo
+//	this.ServeJSON()
+//}
+
 // @Title 获取年审企业名称
 // @Description 获取实体
 // @Success 200 {object} annualaudit.OilAnnualAudit
@@ -243,7 +305,7 @@ func (this *QualChangeController) AddEntity() {
 	_, err := svc.InsertEntityBytbl(""+OilAnnualAuditName, &model)
 	annualId := model.Id
 	//工作流开始
-	processInstanceId := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
+	processInstanceId,_ := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
 	var auditmodel annualaudit.OilAnnualAudit
 	auditmodel.WorkflowId = processInstanceId
 	cols := []string{

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -0,0 +1,591 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审基本信息表</el-breadcrumb-item>
+      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+              <span>年审基本信息表</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" @click="annualAudit()"  v-if="AnnualStatus == 0 ||AnnualStatus == 1">审核</el-button>
+              </span>
+            </div>
+      <el-tabs tab-position="right" style="margin-top: 10px">
+        <el-tab-pane label="企业信息">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>供方基本信息表</span>
+              <!-- <span style="float: right;">
+                <el-button type="primary" size="mini" @click="saveEntity">保存基本信息</el-button>
+              </span> -->
+            </div>
+            <tech-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser" :disabled ="true"
+              :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData" @inputcompany="inputCompany">
+            </tech-info>
+          </el-card>
+        </el-tab-pane>
+
+        <el-tab-pane label="企业情况" >
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>企业人员结构情况</span>
+              <!-- <span style="float: right;">
+                <el-button type="primary" size="mini" @click="updateNumberEntity">保存人员结构情况</el-button>
+              </span> -->
+            </div>
+
+            <el-form label-width="220px" ref="EntityFormNumber" :model="formDataCert" :disabled ="true" >
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="企业员工总数">
+                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="合同化用工数量">
+                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="大学及以上学历人员数量">
+                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="技术、管理人员数量">
+                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="高级及以上职称人员数量">
+                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="中级职称人员数量">
+                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="具有国家注册执业资格人员数量">
+                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="具有国家注册执业资格证书总数">
+                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="设计人员总数">
+                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="技术工人总数">
+                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>企业主要装备情况</span>
+              <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog">添加</el-button> -->
+            </div>
+            <equipment-list ref="equipmentList" :data="equipmentList" :SupplierCertId="certId"
+              :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></equipment-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年主要工程业绩</span>
+              <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog">添加</el-button> -->
+            </div>
+            <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" :disabled ="true"
+              :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></performance-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>拥有专利、专有技术及工法</span>
+              <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog">添加</el-button> -->
+            </div>
+            <patent-list ref="patentList" :data="patentList" :SupplierCertId="certId" :SupplierTypeCode="classId"
+              height="360px" style="margin-top: 20px">
+            </patent-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
+              <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog">添加</el-button> -->
+            </div>
+            <winning-list ref="winningList" :data="winningList" :SupplierCertId="certId" :SupplierTypeCode="classId"
+              height="360px" style="margin-top: 20px">
+            </winning-list>
+          </el-card>
+        </el-tab-pane>
+
+        <el-tab-pane label="企业资质">
+          <business-list ref="businessList" :data="businessList" :SupplierCertId="certId" :SupplierId="serviceId"
+            :SupplierTypeCode="classId" height="360px" style="margin-top: 10px"></business-list>
+        </el-tab-pane>
+
+        <el-tab-pane label="提交审批">
+          <el-card class="box-card" style="height: 800px">
+            <div slot="header" class="clearfix">
+              <span>审批流程</span>
+              <!-- <span style="float: right;">
+                <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" :loading="applyLoading"
+                  @click="AuditEntity">提交审批
+                </el-button>
+              </span> -->
+            </div>
+            <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+          </el-card>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+    <el-dialog title="审核" :visible.sync="dialogMakeSure">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <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>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilsupplier/supplier'
+  import apiCert from '@/api/oilsupplier/suppliercert'
+  import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
+  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
+
+  import EquipmentList from '@/components/oilsupplier/equipmentlist'
+  import PerformanceList from '@/components/oilsupplier/performancelist'
+  import PatentList from '@/components/oilsupplier/patentlist'
+  import WinningList from '@/components/oilsupplier/winninglist'
+  import BusinessList from '@/components/oilsupplier/businesslist'
+  import TechInfo from '@/components/oilsupplier/techinfo'
+
+   
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    components: {
+      SupplierFileTable,
+      WfHistory,
+      SupplierCertEdit,
+
+      EquipmentList, //企业主要装备情况
+      PerformanceList, //近三年主要工程业绩列表
+      PatentList, //拥有专利、专有技术及工法列表
+      WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
+      BusinessList, //选择准入范围
+      TechInfo,
+    },
+    name: 'oiltechnologyserviceEdit',
+
+    data() {
+      return {
+        canUpdateSupplier: true,
+        dictData: null,
+        applyLoading: false,
+        equipmentList: [], //企业主要装备情况
+        performanceList: [], //近三年主要工程业绩
+        patentList: [], //拥有专利、专有技术及工法
+        winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
+        businessList: [], //准入业务
+        serviceId: '',
+        certId: '',
+        classId: '',
+        annualId:'',
+        WorkflowId: '',
+        formData: {
+          Id: '',
+          SupplierName: '',
+          OilCertificateNo: '',
+          Grade: '',
+          MgrUnit: '',
+          OperType: '',
+          Country: '',
+          MaunAgent: '',
+          ConstructTeam: '',
+          CommercialNo: '',
+          OrganCode: '',
+          CountryTaxNo: '',
+          LocalTaxNo: '',
+          Address: '',
+          Province: '',
+          City: '',
+          Street: '',
+          HouseNo: '',
+          ZipCode: '',
+          LinkAddress: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkHouseNo: '',
+          LinkZipCode: '',
+          QualitySystemCert: '',
+          ProductQualityCert: '',
+          MaunLicense: '',
+          QualifCert: '',
+          QualifCertLevel: '',
+          SafetyLicense: '',
+          TechServiceLic: '',
+          TJInNotify: '',
+          SpecIndustryCert: '',
+          LegalPerson: '',
+          CategoryCode: '',
+          CategoryName: '',
+          RegCapital: '',
+          Currency: '',
+          ContactName: '',
+          CompanyType: '',
+          SetupTime: null,
+          DepositBank: '',
+          BankAccount: '',
+          EMail: '',
+          BankCreditRating: '',
+          Mobile: '',
+          Telphone: '',
+          Fax: '',
+          CompanyTel: '',
+          QQ: '',
+          CompanyUrl: '',
+          SpecSupplier: '',
+          SpecTypeCode: '',
+          SpecTypeName: '',
+          WorkerTotal: 0,
+          ContractNum: 0,
+          UniversityNum: 0,
+          TechnicalNum: 0,
+          AboveProfNum: 0,
+          MiddleProfNum: 0,
+          NationalRegNum: 0,
+          NationalCertTotal: 0,
+          DesignerTotal: 0,
+          SkillerTotal: 0,
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+          CertId: 0,
+          SupplierTypeCode: '',
+          SupplierTypeName: '',
+          Step: 0,
+          HseTraining: 0,
+        },
+        AnnualStatus: '',
+        dialogMakeSure: false,
+        shenheForm:  {
+          SuccessStatus: 3,
+          AuditorRemark: '',
+          AnnualId: 0
+        },
+        formDataCert: {
+          WorkerTotal: 0,
+          ContractNum: 0,
+          UniversityNum: 0,
+          TechnicalNum: 0,
+          AboveProfNum: 0,
+          MiddleProfNum: 0,
+          NationalRegNum: 0,
+          NationalCertTotal: 0,
+          DesignerTotal: 0,
+          SkillerTotal: 0,
+          Status: 0,
+          WorkflowId: ''
+        },
+        entrydetail: {
+          process: 'oil_audit_apply',
+          business: '',
+          instance: ''
+        },
+      }
+    },
+    created() {
+      this.serviceId = this.$route.params.opera;
+      if (this.$route.query.certid) {
+        this.certId = this.$route.query.certid + ''
+      }
+      this.AnnualStatus = this.$route.query.AnnualStatus
+      this.WorkflowId = this.$route.query.WorkflowId + ''
+      this.annualId = this.$route.query.annualId
+      this.getDictOptions()
+      this.formData.Id = this.serviceId
+      this.initDatas();
+      console.log("---this.AnnualStatusa---",this.AnnualStatus)
+    },
+    methods: {
+      inputCompany(val) {
+        if (!this.certId) {
+          api.getEntityByName(val, this.$axios).then(res => {
+            if (res.data && res.data.Id) {
+              this.SetFormData(res.data)
+            }
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      changeFormData(fdata) {
+        if (!this.certId) {
+          this.SetFormData(fdata)
+        }
+      },
+      SetFormData(fdata) {
+        this.isCanUpdateSupplier(fdata.Id)
+        this.formData.Id = fdata.Id
+        this.formData.SupplierName = fdata.SupplierName
+        this.formData.OilCertificateNo = fdata.OilCertificateNo
+        this.formData.Grade = fdata.Grade
+        this.formData.MgrUnit = fdata.MgrUnit
+        this.formData.OperType = fdata.OperType
+        this.formData.Country = fdata.Country
+        this.formData.MaunAgent = fdata.MaunAgent
+        this.formData.ConstructTeam = fdata.ConstructTeam
+        this.formData.CommercialNo = fdata.CommercialNo
+        this.formData.OrganCode = fdata.OrganCode
+        this.formData.CountryTaxNo = fdata.CountryTaxNo
+        this.formData.LocalTaxNo = fdata.LocalTaxNo
+        this.formData.Address = fdata.Address
+        this.formData.Province = fdata.Province
+        this.formData.City = fdata.City
+        this.formData.Street = fdata.Street
+        this.formData.HouseNo = fdata.HouseNo
+        this.formData.ZipCode = fdata.ZipCode
+        this.formData.LinkAddress = fdata.LinkAddress
+        this.formData.LinkProvince = fdata.LinkProvince
+        this.formData.LinkCity = fdata.LinkCity
+        this.formData.LinkStreet = fdata.LinkStreet
+        this.formData.LinkHouseNo = fdata.LinkHouseNo
+        this.formData.LinkZipCode = fdata.LinkZipCode
+        this.formData.LegalPerson = fdata.LegalPerson
+        this.formData.CategoryCode = fdata.CategoryCode
+        this.formData.CategoryName = fdata.CategoryName
+        this.formData.RegCapital = fdata.RegCapital
+        this.formData.Currency = fdata.Currency
+        this.formData.ContactName = fdata.ContactName
+        this.formData.CompanyType = fdata.CompanyType
+        this.formData.SetupTime = fdata.SetupTime
+        this.formData.DepositBank = fdata.DepositBank
+        this.formData.BankAccount = fdata.BankAccount
+        this.formData.EMail = fdata.EMail
+        this.formData.BankCreditRating = fdata.BankCreditRating
+        this.formData.Mobile = fdata.Mobile
+        this.formData.Telphone = fdata.Telphone
+        this.formData.Fax = fdata.Fax
+        this.formData.CompanyTel = fdata.CompanyTel
+        this.formData.QQ = fdata.QQ
+        this.formData.CompanyUrl = fdata.CompanyUrl
+        this.formData.HseTraining = fdata.HseTraining
+        this.formData.SpecTypeCode = fdata.SpecTypeCode
+
+        this.$refs["TechInfo"].CityAry = []
+        this.$refs["TechInfo"].CityAry.push(this.formData.Province)
+        this.$refs["TechInfo"].CityAry.push(this.formData.City)
+        this.$refs["TechInfo"].CityAry.push(this.formData.Street)
+        this.$refs["TechInfo"].LinkCityAry = []
+        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs["TechInfo"].UnitRelationAry = []
+        if (this.formData.SpecTypeCode.length > 0) {
+          this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+        }
+      },
+
+      isCanUpdateSupplier(supplierId) {
+        api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
+          this.canUpdateSupplier = (res.data.code === 0)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      equipmentdialog() {
+        this.$refs["equipmentList"].showDialog()
+      },
+      performancedialog() {
+        this.$refs["performanceList"].showDialog()
+      },
+      patentdialog() {
+        this.$refs["patentList"].showDialog()
+      },
+      winningdialog() {
+        this.$refs["winningList"].showDialog()
+      },
+       initDatas() {
+        this.isCanUpdateSupplier(this.formData.Id)
+        if (this.formData.Id) {
+          console.log("---this.certId----",this.certId)
+          api.getEntityAndCert(this.certId, this.$axios).then(res => {
+            this.formData = res.data
+            console.log("---res.data----",res.data)
+            this.formDataCert.WorkerTotal = this.formData.WorkerTotal
+            this.formDataCert.ContractNum = this.formData.ContractNum
+            this.formDataCert.UniversityNum = this.formData.UniversityNum
+            this.formDataCert.TechnicalNum = this.formData.TechnicalNum
+            this.formDataCert.AboveProfNum = this.formData.AboveProfNum
+            this.formDataCert.MiddleProfNum = this.formData.MiddleProfNum
+            this.formDataCert.NationalRegNum = this.formData.NationalRegNum
+            this.formDataCert.NationalCertTotal = this.formData.NationalCertTotal
+            this.formDataCert.DesignerTotal = this.formData.DesignerTotal
+            this.formDataCert.SkillerTotal = this.formData.SkillerTotal
+            this.formDataCert.Status = this.formData.Status
+            this.formDataCert.WorkflowId = this.formData.WorkflowId
+            this.$refs["TechInfo"].CityAry = []
+            this.$refs["TechInfo"].CityAry.push(this.formData.Province)
+            this.$refs["TechInfo"].CityAry.push(this.formData.City)
+            this.$refs["TechInfo"].CityAry.push(this.formData.Street)
+            this.$refs["TechInfo"].LinkCityAry = []
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
+            this.$refs["TechInfo"].UnitRelationAry = []
+            if (this.formData.SpecTypeCode.length > 0) {
+              this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+            }
+            //this.$refs["businessList"].getvalue(this.formData.Id,this.formData.SupplierTypeCode,this.certId)
+            this.entrydetail.business = this.certId
+            this.entrydetail.instance = this.WorkflowId
+            if (this.certId && this.WorkflowId) {
+              this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
+            }
+            console.log("---this.entrydetail----",this.entrydetail)
+
+          }).catch(err => {
+            console.error(err)
+          });
+        }
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          this.dictData = res.data.items
+          /*this.UnitRelationOptions = res.data.items['UnitRelation']
+          this.getCityList(res.data.items['GaodeMapChinaAreas'])
+          this.CompanyTypeOptions = res.data.items['CompanyType']*/
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      annualAudit(){
+        this.shenheForm.AnnualId = parseInt(this.annualId)
+        this.dialogMakeSure = true
+      },
+      //审核通过
+      makeSure() {        
+        //审核通过的具体操作(未编写)
+         this.$confirm("确认审核结果！", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            this.dialogMakeSure = false
+            this.checkstatus()
+          })
+          .catch(() => {})
+      },
+      checkstatus() {
+        let params = this.shenheForm
+        console.log("---this.shenheForm----",this.shenheForm)
+        this.$axios.put('/annualaudit/auditfirst/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              this.AnnualStatus = this.shenheForm.SuccessStatus
+            } else {
+              this.$message({
+                type: 'warning',
+                message: "签发错误"
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+
+      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 {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+</script>
+

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

@@ -35,7 +35,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="180" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/operation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId">
+            <router-link :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/auditoperation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&AnnualStatus='+scope.row.Status+'&annualId='+scope.row.Id">
               <el-button type="primary" plain title="审核" size="mini">审核</el-button>
             </router-link>
           </template>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/infoaudit.vue

@@ -0,0 +1,434 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/infoaudit' }">信息变更审核表</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 信息变更审核表
+        </span>
+        <!-- <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+          </el-button>
+        </span> -->
+        <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>
+          </el-form-item>
+          <el-form-item label="准入类别">
+            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
+              <el-option label="物资类" value="01"></el-option>
+              <el-option label="技术服务类" value="03"></el-option>
+              <el-option label="基建类" value="02"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" min-width="90" align="center" fixed>
+          <!-- <template slot-scope="scope"> -->
+            <!-- <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/operation'"> -->
+              <el-button type="primary" plain title="审核" size="mini">审核</el-button>
+            <!-- </router-link> -->
+            <!-- <el-popover placement="top" title="提示">
+              <el-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
+              </el-alert>
+              <br/>
+              <div style="text-align: right; margin: 0">
+                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+              </div>
+              <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
+            </el-popover> -->
+          <!-- </template> -->
+        </el-table-column>
+
+        <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
+          :label="column.label" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              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="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="已交费" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核通过" type="success">
+            </el-alert>
+          </template>
+        </el-table-column>
+        <el-table-column prop="CreateOn" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </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>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="searchForm" label-width="110px">
+        <el-row>
+
+          <!-- <el-col :span="12">
+            <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>
+            </el-form-item>
+          </el-col> -->
+          <!-- 
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col> -->
+
+          <el-col :span="12">
+            <el-form-item label="推荐单位编码">
+              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入证号">
+              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入类别">
+              <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="企业名称">
+              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+   
+  </div>
+</template>
+<script>
+  import {
+    mapGetters
+  } from 'vuex';
+  import supplierapi from '@/api/oilsupplier/supplier';
+  import api from '@/api/oilsupplier/infochange';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'annualaudit',
+
+    data() {
+      return {
+        addshow: false,
+        dialogVisible: false,
+        delevisble:false,
+        //列表数据
+        selectsupplierlist: [],
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        entityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '',
+        },
+        searchForm: {
+          Id: '',
+          RecUnitId: '',
+          AccessCardNo: '',
+          SupplierTypeName: '',
+          SupplierName: '',
+          Num: '',
+          ProjectName: '',
+          Performance: '',
+          WorkRange: '',
+          Status: '',
+          BackReason: '',
+          ApplyTime: '',
+          AuditDate: '',
+          EnterUserId: '',
+          EnterUserName: '',
+          EnterUserTel: '',
+          SCR: '',
+          SCRQ: '',
+          SCYJ: '',
+          SCJG: '',
+          SPR: '',
+          SPRQ: '',
+          SPYJ: '',
+          SPJG: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+        tableColumns: [
+
+          // {
+          //   prop: "RecUnitId",
+          //   label: '推荐单位编码',
+          //   width: 100,
+          //   sort: true
+          // },
+          {
+            prop: "SupplierName",
+            label: '企业名称',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "OilCertificateNo",
+            label: '中石油供应商证书号',
+            width: 200,
+            sort: true
+          },
+
+          // {
+          //   prop: "Grade",
+          //   label: '级别',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          
+          // {
+          //   prop: "MgrUnit",
+          //   label: '管理单位',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "OperType",
+          //   label: '经营方式',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "Country",
+          //   label: '国家',
+          //   width: 100,
+          //   sort: true
+          // },
+          // {
+          //   prop: "MaunAgent",
+          //   label: '所代理制造商名称',
+          //   width: 200,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "ConstructTeam",
+          //   label: '施工队伍名称',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          {
+            prop: "CommercialNo",
+            label: '工商注册号',
+            width: 100,
+            sort: true
+          },
+
+        ],
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      //查询列表
+      this.initDatas()
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        api.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      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 {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/qualaudit.vue

@@ -0,0 +1,355 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/qualaudit' }">资质变更审核表</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 资质变更审核表
+        </span>
+        <!-- <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+          </el-button>
+        </span> -->
+        <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>
+          </el-form-item>
+          <el-form-item label="准入类别">
+            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
+              <el-option label="物资类" value="01"></el-option>
+              <el-option label="技术服务类" value="03"></el-option>
+              <el-option label="基建类" value="02"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" min-width="90" align="center" fixed>
+          <!-- <template slot-scope="scope"> -->
+            <!-- <router-link :to="'/oilsupplier/qualchange/' + scope.row.Id + '/operation?certid=' + scope.row.CertId +'&classId='+ scope.row.SupplierTypeCode"> -->
+              <el-button type="primary" plain title="审核" size="mini">审核</el-button>
+            <!-- </router-link> -->
+          <!-- </template> -->
+        </el-table-column>
+        <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="110" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="CommercialNo" label="工商注册号" sortable min-width="110" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              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">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级复审 " type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待交费 " type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title=" 待专业科室审核" type="warning">
+            </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="success">
+            </el-alert>
+          </template>
+        </el-table-column>
+        <el-table-column prop="CreateOn" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </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>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="searchForm" label-width="110px">
+        <el-row>
+
+
+          <el-col :span="12">
+            <el-form-item label="推荐单位编码">
+              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入证号">
+              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入类别">
+              <el-input size="mini" v-model="searchForm.SupplierTypeCode" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="企业名称">
+              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import {
+    mapGetters
+  } from 'vuex';
+  import supplierapi from '@/api/oilsupplier/supplier';
+  import api from '@/api/oilsupplier/qualchange';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'qualchange',
+
+    data() {
+      return {
+        addshow: false,
+        dialogVisible: false,
+        delevisble: false,
+        //列表数据
+        selectsupplierlist: [],
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        entityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeCode: '',
+        },
+        searchForm: {
+          Id: '',
+          RecUnitId: '',
+          AccessCardNo: '',
+          SupplierTypeCode: '',
+          SupplierName: '',
+          Num: '',
+          ProjectName: '',
+          Performance: '',
+          WorkRange: '',
+          Status: '',
+          BackReason: '',
+          ApplyTime: '',
+          AuditDate: '',
+          EnterUserId: '',
+          EnterUserName: '',
+          EnterUserTel: '',
+          SCR: '',
+          SCRQ: '',
+          SCYJ: '',
+          SCJG: '',
+          SPR: '',
+          SPRQ: '',
+          SPYJ: '',
+          SPJG: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      //查询列表
+      this.initDatas()
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        this.$axios.get('qualchange/mytasks?CreateOn=' + myCreateOn.join(','), {
+          params
+        }).then(res => {
+          console.log("----res.data---", res.data)
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        api.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      checkSupplierTypeName(val) {
+        if (val == '01') {
+          return '物资类'
+        } else if (val == '02') {
+          return '基建类'
+        } else if (val == '03') {
+          return '技术服务类'
+        }
+      },
+      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 {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>