技术类保存问题

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

@@ -54,6 +54,16 @@ type OilSupplier struct {
 	SpecSupplier       string    `xorm:"default '0' comment('是否特殊业务供应商(可不招标)') VARCHAR(2)"`
 	SpecTypeCode       string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(2)"`
 	SpecTypeName       string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(20)"`
+	WorkerTotal        int       `xorm:"default 0 comment('企业员工总数') INT(10)"`
+	ContractNum        int       `xorm:"default 0 comment('合同化用工数量') INT(10)"`
+	UniversityNum      int       `xorm:"default 0 comment('大学及以上学历人员数量') INT(10)"`
+	TechnicalNum       int       `xorm:"default 0 comment('技术、管理人员数量') INT(10)"`
+	AboveProfNum       int       `xorm:"default 0 comment('高级及以上职称人员数量') INT(10)"`
+	MiddleProfNum      int       `xorm:"default 0 comment('中级职称人员数量') INT(10)"`
+	NationalRegNum     int       `xorm:"default 0 comment('具有国家注册执业资格人员数量') INT(10)"`
+	NationalCertTotal  int       `xorm:"default 0 comment('具有国家注册执业资格证书总数') INT(10)"`
+	DesignerTotal      int       `xorm:"default 0 comment('设计人员总数') INT(10)"`
+	SkillerTotal       int       `xorm:"default 0 comment('技术工人总数') INT(10)"`
 	Remark             string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete           int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	CreateOn           time.Time `xorm:"DATETIME"`
@@ -62,4 +72,13 @@ type OilSupplier struct {
 	ModifiedOn         time.Time `xorm:"DATETIME"`
 	ModifiedUserId     int       `xorm:"INT(10)"`
 	ModifiedBy         string    `xorm:"VARCHAR(50)"`
+}
+
+type OilSupplierView struct {
+	OilSupplier		 `xorm:"extends"`
+	CertId           string
+	AccessCardNo     string
+	SupplierTypeCode string
+	SupplierTypeName string
+	Step			 int
 }

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

@@ -35,6 +35,7 @@ type OilSupplierCert struct {
 	InternalFlag     string    `xorm:"comment('国内采购') VARCHAR(255)"`
 	ImportFlag       string    `xorm:"comment('进口采购') VARCHAR(255)"`
 	OutsideFlog      string    `xorm:"comment('境外项目') VARCHAR(255)"`
+	Step		     int       `xorm:"comment('页面上第几步') INT(10)"`
 	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	CreateOn         time.Time `xorm:"DATETIME"`

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

@@ -9,6 +9,7 @@ import (
 	"dashoo.cn/utils"
 	"encoding/json"
 	"github.com/go-xorm/xorm"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -395,6 +396,385 @@ func (this *OilSupplierController) GetEntityList() {
 	this.ServeJSON()
 }
 
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []supplier.OilSupplier
+// @router /certlist [get]
+func (this *OilSupplierController) GetJoinCertEntityList() {
+
+	//获取分页信息
+	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
+		}
+	}
+	Id := this.GetString("Id")
+	SupplierName := this.GetString("SupplierName")
+	OilCertificateNo := this.GetString("OilCertificateNo")
+	Grade := this.GetString("Grade")
+	MgrUnit := this.GetString("MgrUnit")
+	OperType := this.GetString("OperType")
+	Country := this.GetString("Country")
+	MaunAgent := this.GetString("MaunAgent")
+	ConstructTeam := this.GetString("ConstructTeam")
+	CommercialNo := this.GetString("CommercialNo")
+	OrganCode := this.GetString("OrganCode")
+	CountryTaxNo := this.GetString("CountryTaxNo")
+	LocalTaxNo := this.GetString("LocalTaxNo")
+	Address := this.GetString("Address")
+	Province := this.GetString("Province")
+	City := this.GetString("City")
+	Street := this.GetString("Street")
+	HouseNo := this.GetString("HouseNo")
+	ZipCode := this.GetString("ZipCode")
+	QualitySystemCert := this.GetString("QualitySystemCert")
+	ProductQualityCert := this.GetString("ProductQualityCert")
+	MaunLicense := this.GetString("MaunLicense")
+	QualifCert := this.GetString("QualifCert")
+	QualifCertLevel := this.GetString("QualifCertLevel")
+	SafetyLicense := this.GetString("SafetyLicense")
+	TechServiceLic := this.GetString("TechServiceLic")
+	TJInNotify := this.GetString("TJInNotify")
+	SpecIndustryCert := this.GetString("SpecIndustryCert")
+	LegalPerson := this.GetString("LegalPerson")
+	CategoryCode := this.GetString("CategoryCode")
+	CategoryName := this.GetString("CategoryName")
+	RegCapital := this.GetString("RegCapital")
+	Currency := this.GetString("Currency")
+	ContactName := this.GetString("ContactName")
+	CompanyType := this.GetString("CompanyType")
+	SetupTime := this.GetString("SetupTime")
+	DepositBank := this.GetString("DepositBank")
+	BankAccount := this.GetString("BankAccount")
+	EMail := this.GetString("EMail")
+	BankCreditRating := this.GetString("BankCreditRating")
+	Mobile := this.GetString("Mobile")
+	Telphone := this.GetString("Telphone")
+	Fax := this.GetString("Fax")
+	CompanyTel := this.GetString("CompanyTel")
+	QQ := this.GetString("QQ")
+	CompanyUrl := this.GetString("CompanyUrl")
+	SpecSupplier := this.GetString("SpecSupplier")
+	SpecTypeCode := this.GetString("SpecTypeCode")
+	SpecTypeName := this.GetString("SpecTypeName")
+	Remark := this.GetString("Remark")
+	CreateOn := this.GetString("CreateOn")
+	SupplierTypeCode := this.GetString("SupplierTypeCode")
+
+
+	if Id != "" {
+		where = where + " and a.Id like '%" + Id + "%'"
+	}
+
+
+	if SupplierName != "" {
+		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
+	}
+
+
+	if OilCertificateNo != "" {
+		where = where + " and a.OilCertificateNo like '%" + OilCertificateNo + "%'"
+	}
+
+
+	if Grade != "" {
+		where = where + " and a.Grade like '%" + Grade + "%'"
+	}
+
+
+	if MgrUnit != "" {
+		where = where + " and a.MgrUnit like '%" + MgrUnit + "%'"
+	}
+
+
+	if OperType != "" {
+		where = where + " and a.OperType like '%" + OperType + "%'"
+	}
+
+
+	if Country != "" {
+		where = where + " and a.Country like '%" + Country + "%'"
+	}
+
+
+	if MaunAgent != "" {
+		where = where + " and a.MaunAgent like '%" + MaunAgent + "%'"
+	}
+
+
+	if ConstructTeam != "" {
+		where = where + " and a.ConstructTeam like '%" + ConstructTeam + "%'"
+	}
+
+
+	if CommercialNo != "" {
+		where = where + " and a.CommercialNo like '%" + CommercialNo + "%'"
+	}
+
+
+	if OrganCode != "" {
+		where = where + " and a.OrganCode like '%" + OrganCode + "%'"
+	}
+
+
+	if CountryTaxNo != "" {
+		where = where + " and a.CountryTaxNo like '%" + CountryTaxNo + "%'"
+	}
+
+
+	if LocalTaxNo != "" {
+		where = where + " and a.LocalTaxNo like '%" + LocalTaxNo + "%'"
+	}
+
+
+	if Address != "" {
+		where = where + " and a.Address like '%" + Address + "%'"
+	}
+
+
+	if Province != "" {
+		where = where + " and a.Province like '%" + Province + "%'"
+	}
+
+
+	if City != "" {
+		where = where + " and a.City like '%" + City + "%'"
+	}
+
+
+	if Street != "" {
+		where = where + " and a.Street like '%" + Street + "%'"
+	}
+
+
+	if HouseNo != "" {
+		where = where + " and a.HouseNo like '%" + HouseNo + "%'"
+	}
+
+
+	if ZipCode != "" {
+		where = where + " and a.ZipCode like '%" + ZipCode + "%'"
+	}
+
+
+	if QualitySystemCert != "" {
+		where = where + " and a.QualitySystemCert like '%" + QualitySystemCert + "%'"
+	}
+
+
+	if ProductQualityCert != "" {
+		where = where + " and a.ProductQualityCert like '%" + ProductQualityCert + "%'"
+	}
+
+
+	if MaunLicense != "" {
+		where = where + " and a.MaunLicense like '%" + MaunLicense + "%'"
+	}
+
+
+	if QualifCert != "" {
+		where = where + " and a.QualifCert like '%" + QualifCert + "%'"
+	}
+
+
+	if QualifCertLevel != "" {
+		where = where + " and a.QualifCertLevel like '%" + QualifCertLevel + "%'"
+	}
+
+
+	if SafetyLicense != "" {
+		where = where + " and a.SafetyLicense like '%" + SafetyLicense + "%'"
+	}
+
+
+	if TechServiceLic != "" {
+		where = where + " and a.TechServiceLic like '%" + TechServiceLic + "%'"
+	}
+
+
+	if TJInNotify != "" {
+		where = where + " and a.TJInNotify like '%" + TJInNotify + "%'"
+	}
+
+
+	if SpecIndustryCert != "" {
+		where = where + " and a.SpecIndustryCert like '%" + SpecIndustryCert + "%'"
+	}
+
+
+	if LegalPerson != "" {
+		where = where + " and a.LegalPerson like '%" + LegalPerson + "%'"
+	}
+
+
+	if CategoryCode != "" {
+		where = where + " and a.CategoryCode like '%" + CategoryCode + "%'"
+	}
+
+
+	if CategoryName != "" {
+		where = where + " and a.CategoryName like '%" + CategoryName + "%'"
+	}
+
+
+	if RegCapital != "" {
+		where = where + " and a.RegCapital like '%" + RegCapital + "%'"
+	}
+
+
+	if Currency != "" {
+		where = where + " and a.Currency like '%" + Currency + "%'"
+	}
+
+
+	if ContactName != "" {
+		where = where + " and a.ContactName like '%" + ContactName + "%'"
+	}
+
+
+	if CompanyType != "" {
+		where = where + " and a.CompanyType like '%" + CompanyType + "%'"
+	}
+
+
+	if SetupTime != "" {
+		where = where + " and a.SetupTime like '%" + SetupTime + "%'"
+	}
+
+
+	if DepositBank != "" {
+		where = where + " and a.DepositBank like '%" + DepositBank + "%'"
+	}
+
+
+	if BankAccount != "" {
+		where = where + " and a.BankAccount like '%" + BankAccount + "%'"
+	}
+
+
+	if EMail != "" {
+		where = where + " and a.EMail like '%" + EMail + "%'"
+	}
+
+
+	if BankCreditRating != "" {
+		where = where + " and a.BankCreditRating like '%" + BankCreditRating + "%'"
+	}
+
+
+	if Mobile != "" {
+		where = where + " and a.Mobile like '%" + Mobile + "%'"
+	}
+
+
+	if Telphone != "" {
+		where = where + " and a.Telphone like '%" + Telphone + "%'"
+	}
+
+
+	if Fax != "" {
+		where = where + " and a.Fax like '%" + Fax + "%'"
+	}
+
+
+	if CompanyTel != "" {
+		where = where + " and a.CompanyTel like '%" + CompanyTel + "%'"
+	}
+
+
+	if QQ != "" {
+		where = where + " and a.QQ like '%" + QQ + "%'"
+	}
+
+
+	if CompanyUrl != "" {
+		where = where + " and a.CompanyUrl like '%" + CompanyUrl + "%'"
+	}
+
+
+	if SpecSupplier != "" {
+		where = where + " and a.SpecSupplier like '%" + SpecSupplier + "%'"
+	}
+
+
+	if SpecTypeCode != "" {
+		where = where + " and a.SpecTypeCode like '%" + SpecTypeCode + "%'"
+	}
+
+
+	if SpecTypeName != "" {
+		where = where + " and a.SpecTypeName like '%" + SpecTypeName + "%'"
+	}
+
+
+	if Remark != "" {
+		where = where + " and a.Remark like '%" + Remark + "%'"
+	}
+
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and a.CreateOn>='" + minDate + "' and a.CreateOn<='" + maxDate + "'"
+		}
+	}
+
+	if SupplierTypeCode != "" {
+		where = where + " and b.SupplierTypeCode = '" + SupplierTypeCode + "'"
+	}
+
+	svc := supplier.GetOilSupplierService(utils.DBE)
+	var list []supplier.OilSupplierView
+
+	var total int64
+	if where == "" {
+		where = " 1=1 "
+	}
+
+	//获取总记录数
+	sqlCount := `select count(*) from ` + OilSupplierName + ` a `
+	sqlCount += ` left join ` + OilSupplierCertName + " b on b.SupplierId = a.Id"
+	sqlCount += ` where ` + where
+
+	var sql string
+	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName from ` + OilSupplierName + ` a `
+	sql += ` left join ` + OilSupplierCertName + " b on b.SupplierId = a.Id"
+	sql += ` where ` + where
+	if asc {
+		sql += ` order by ` + orderby + ` ASC `
+	} else {
+		sql += ` order by ` + orderby + ` DESC `
+	}
+	sql += ` limit ` + utils.ToStr((page.CurrentPage-1)*page.Size) + "," + utils.ToStr(page.Size)
+	utils.DBE.SQL(sql).Find(&list)
+
+	resultsSlice, _ := svc.DBE.Query(sqlCount)
+
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, _ = strconv.ParseInt(string(value), 10, 64)
+			break
+		}
+	}
+
+	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 get user by token
 // @Success 200 {object} map[string]interface{}
@@ -434,6 +814,27 @@ func (this *OilSupplierController) GetEntity() {
 	this.ServeJSON()
 }
 
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} supplier.OilSupplier
+// @router /getandcert/:certId [get]
+func (this *OilSupplierController) GetEntityAndCert() {
+	Id := this.Ctx.Input.Param(":certId")
+
+	var model supplier.OilSupplierView
+	svc := supplier.GetOilSupplierService(utils.DBE)
+	svc.GetEntityByIdBytbl(OilSupplierName, Id, &model)
+
+	var sql string
+	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.Step from ` + OilSupplierName + ` a `
+	sql += ` left join ` + OilSupplierCertName + " b on b.SupplierId = a.Id"
+	sql += ` where b.Id ='` + Id + `'`
+	utils.DBE.SQL(sql).Get(&model)
+
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
 // @Title 添加
 // @Description 新增
 // @Param 	body body supplier.OilSupplier
@@ -467,6 +868,7 @@ func (this *OilSupplierController) AddEntity() {
 	json.Unmarshal(jsonBlob, &modelCertVM)
 	modelCert.SupplierTypeCode = modelCertVM.SupplierTypeCode
 	modelCert.SupplierTypeName = modelCertVM.SupplierTypeName
+	modelCert.Step = 1 //企业信息保存完成
 	modelCert.CreateOn = time.Now()
 	modelCert.CreateBy = this.User.Realname
 	modelCert.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -483,7 +885,7 @@ func (this *OilSupplierController) AddEntity() {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = model.Id
+		errinfo.Item = strconv.Itoa(model.Id) + "_" + strconv.Itoa(modelCert.Id)
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -619,6 +1021,17 @@ func (this *OilSupplierController) UpdateEntity() {
 
 		"SpecTypeName",
 
+		"WorkerTotal",
+		"ContractNum ",
+		"UniversityNum",
+		"TechnicalNum",
+		"AboveProfNum",
+		"MiddleProfNum",
+		"NationalRegNum",
+		"NationalCertTotal",
+		"DesignerTotal",
+		"SkillerTotal",
+
 		"Remark",
 
 		"IsDelete",
@@ -651,6 +1064,85 @@ func (this *OilSupplierController) UpdateEntity() {
 	}
 }
 
+// @Title 修改企业人员情况实体
+// @Description 修改实体
+// @Param 	body body supplier.OilSupplier
+// @Success	200	{object} controllers.Request
+// @router /updatenumber/:id [post]
+func (this *OilSupplierController) UpdateNumberEntity() {
+	idGroup := this.Ctx.Input.Param(":id")
+	id := strings.Split(idGroup, "_")[0]
+	certId := strings.Split(idGroup, "_")[1]
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model supplier.OilSupplier
+	svc := supplier.GetOilSupplierService(utils.DBE)
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols := []string{
+
+		"Id",
+
+		"WorkerTotal",
+		"ContractNum ",
+		"UniversityNum",
+		"TechnicalNum",
+		"AboveProfNum",
+		"MiddleProfNum",
+		"NationalRegNum",
+		"NationalCertTotal",
+		"DesignerTotal",
+		"SkillerTotal",
+
+		"ModifiedOn",
+
+		"ModifiedUserId",
+
+		"ModifiedBy",
+
+
+	}
+	err := svc.UpdateEntityBytbl(OilSupplierName, id, &model, cols)
+	//增加页面步骤
+
+	svcCert := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var modelCert suppliercert.OilSupplierCert
+	svcCert.GetEntityById(certId, &modelCert)
+	if modelCert.Step <= 2 {
+		modelCert.Step = 2 //完成企业基本信息
+		colcerts := []string{
+			"Id",
+			"Step",
+		}
+		svcCert.UpdateEntityByIdCols(certId, modelCert, colcerts)
+	}
+
+
+	if err == nil {
+		errinfo.Message = "保存成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "保存失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 // @Title 删除单条信息
 // @Description
 // @Success 200 {object} ErrorInfo

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

@@ -6,6 +6,13 @@ export default {
       params: params
     })
   },
+  getCertList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/supplier/certlist?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
   getDictList (myAxios) {
     return myAxios({
       url: '/supplier/dictlist/',
@@ -18,6 +25,12 @@ export default {
       method: 'GET'
     })
   },
+  getEntityAndCert (certId, myAxios) {
+    return myAxios({
+      url: '/supplier/getandcert/' + certId,
+      method: 'GET'
+    })
+  },
   addEntity (formData, myAxios) {
     return myAxios({
       url: '/supplier/add',
@@ -32,6 +45,13 @@ export default {
       data: formData
     })
   },
+  updateEntityNumber (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/supplier/updatenumber/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
   deleteEntity (entityId, myAxios) {
     return myAxios({
       url: '/supplier/delete/' + entityId,

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

@@ -633,6 +633,16 @@
           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: '',
@@ -733,6 +743,8 @@
       },
 
       addEntity() {
+        this.formData.SupplierTypeCode = '02'
+        this.formData.SupplierTypeName = '基建类'
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

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

@@ -612,6 +612,16 @@
           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: '',
@@ -713,6 +723,8 @@
       },
 
       addEntity() {
+        this.formData.SupplierTypeCode = '01'
+        this.formData.SupplierTypeName = '物资类'
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

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

@@ -6,21 +6,18 @@
       <el-breadcrumb-item>技术服务类供方准入评审表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
-      <div slot="header">
+      <!--<div slot="header">
         <span>
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-
-          <!--<el-button type="primary" size="mini" @click="saveCertEntity">保存推荐信息</el-button>-->
-          <el-button type="primary" size="mini" @click="saveEntity">保存企业信息</el-button>
           <router-link :to="'/oilsupplier/supplier/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
-      </div>
+      </div>-->
 
-      <el-steps :active="stepActive" simple align-center finish-status="success">
+      <el-steps :active="formData.Step" simple align-center finish-status="success">
         <el-step title="企业基本信息"></el-step>
         <el-step title="企业情况"></el-step>
         <el-step title="选择准入范围"></el-step>
@@ -30,382 +27,391 @@
 
       <el-tabs tab-position="right" style="margin-top: 20px">
         <el-tab-pane label="企业基本信息">
-          <el-form label-width="120px" ref="EntityForm" :model="formData">
-            <el-row>
-              <!--<el-col :span="8">
-                <el-form-item label="DEMO">
-                  <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
-                    <el-option
-                      v-for="item in wellNoOptions"
-                      :key="item.Id"
-                      :label="item.Value"
-                      :value="item.Id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>-->
-
-              <el-col :span="8">
-                <el-form-item label="供方名称">
-                  <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <!--<el-col :span="8">
-                <el-form-item label="中石油供应商证书号">
-                  <el-input v-model="formData.OilCertificateNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="级别">
-                  <el-input v-model="formData.Grade" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>-->
-
-              <!--<el-col :span="8">
-                <el-form-item label="管理单位">
-                  <el-input v-model="formData.MgrUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="经营方式">
-                  <el-input v-model="formData.OperType" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="国家">
-                  <el-input v-model="formData.Country" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="所代理制造商名称">
-                  <el-input v-model="formData.MaunAgent" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="施工队伍名称">
-                  <el-input v-model="formData.ConstructTeam" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>-->
-
-              <el-col :span="8">
-                <el-form-item label="工商注册号">
-                  <el-input v-model="formData.CommercialNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="组织机构代码">
-                  <el-input v-model="formData.OrganCode" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="税务登记证编号">
-                  <el-input v-model="formData.CountryTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <!--<el-col :span="8">
-                <el-form-item label="税务登记证地税编号">
-                  <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>-->
-
-              <el-col :span="8">
-                <el-form-item label="省直辖市">
-                  <el-input v-model="formData.Province" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="地市区县">
-                  <el-input v-model="formData.City" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="街道">
-                  <el-input v-model="formData.Street" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="门牌号">
-                  <el-input v-model="formData.HouseNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="邮编">
-                  <el-input v-model="formData.ZipCode" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="16">
-                <el-form-item label="单位地址">
-                  <el-input v-model="formData.Address" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-
-          <el-form label-width="120px" ref="EntityFormLic" :model="formData">
-            <el-row>
-              <!--<el-col :span="8">
-                <el-form-item label="产品质量认证情况及认证机构">
-                  <el-input v-model="formData.ProductQualityCert" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="生产制造许可证获证情况及编号">
-                  <el-input v-model="formData.MaunLicense" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>-->
-              <!--<el-col :span="8">
-                <el-form-item label="外地企业进津备案通知书">
-                  <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>-->
-
-              <el-col :span="8">
-                <el-form-item label="法定代表人姓名">
-                  <el-input v-model="formData.LegalPerson" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="行业类别">
-                  <el-input v-model="formData.CategoryCode" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <!--<el-col :span="8">
-                <el-form-item label="行业类别名称">
-                  <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>-->
-
-              <el-col :span="8">
-                <el-form-item label="注册资本">
-                  <el-input v-model="formData.RegCapital" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="联系人姓名">
-                  <el-input v-model="formData.ContactName" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="币种">
-                  <el-input v-model="formData.Currency" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="公司类型">
-                  <el-input v-model="formData.CompanyType" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="成立时间">
-                  <el-input v-model="formData.SetupTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="开户银行">
-                  <el-input v-model="formData.DepositBank" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="银行账号">
-                  <el-input v-model="formData.BankAccount" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="移动电话">
-                  <el-input v-model="formData.Mobile" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="固定电话">
-                  <el-input v-model="formData.Telphone" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="传真">
-                  <el-input v-model="formData.Fax" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="公司电话">
-                  <el-input v-model="formData.CompanyTel" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="电子邮箱">
-                  <el-input v-model="formData.EMail" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="QQ号码">
-                  <el-input v-model="formData.QQ" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="银行信用等级">
-                  <el-input v-model="formData.BankCreditRating" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="公司网址">
-                  <el-input v-model="formData.CompanyUrl" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="HSE审查培训">
-                  <el-input v-model="formData.CompanyUrl" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-          </el-form>
-
-          <el-form label-position="top" ref="EntityFormCert" :model="formData">
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item  label="质量管理体系认证情况及认证机构">
-                  <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="企业资质证书">
-                  <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <!--<el-col :span="12">
-                <el-form-item label="企业资质证书级别">
-                  <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>-->
-              <el-col :span="8">
-                <el-form-item label="安全生产许可证">
-                  <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="中石油勘探与生产工程技术服务市场准入许可证或监督服务市场准入证"> <!--技术服务类准入许可证-->
-                  <el-input v-model="formData.TechServiceLic" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="行业特殊要求的认证证书">
-                  <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item  label="企业简介（成立时间、人数、经营规模、信誉、主要生产设备及保障能力等情况）">
-                  <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="备注">
-                  <el-input v-model="formData.Remark" placeholder="请输入"  type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-          </el-form>
+          <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>
+            <el-form label-width="120px" ref="EntityForm" :model="formData">
+              <el-row>
+                <!--<el-col :span="8">
+                  <el-form-item label="DEMO">
+                    <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
+                      <el-option
+                        v-for="item in wellNoOptions"
+                        :key="item.Id"
+                        :label="item.Value"
+                        :value="item.Id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="供方名称">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="中石油供应商证书号">
+                    <el-input v-model="formData.OilCertificateNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="级别">
+                    <el-input v-model="formData.Grade" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <!--<el-col :span="8">
+                  <el-form-item label="管理单位">
+                    <el-input v-model="formData.MgrUnit" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="经营方式">
+                    <el-input v-model="formData.OperType" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="国家">
+                    <el-input v-model="formData.Country" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="所代理制造商名称">
+                    <el-input v-model="formData.MaunAgent" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="施工队伍名称">
+                    <el-input v-model="formData.ConstructTeam" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="工商注册号">
+                    <el-input v-model="formData.CommercialNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="组织机构代码">
+                    <el-input v-model="formData.OrganCode" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="税务登记证编号">
+                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="税务登记证地税编号">
+                    <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="省直辖市">
+                    <el-input v-model="formData.Province" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="地市区县">
+                    <el-input v-model="formData.City" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="街道">
+                    <el-input v-model="formData.Street" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="门牌号">
+                    <el-input v-model="formData.HouseNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="邮编">
+                    <el-input v-model="formData.ZipCode" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="16">
+                  <el-form-item label="单位地址">
+                    <el-input v-model="formData.Address" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+
+            <el-form label-width="120px" ref="EntityFormLic" :model="formData">
+              <el-row>
+                <!--<el-col :span="8">
+                  <el-form-item label="产品质量认证情况及认证机构">
+                    <el-input v-model="formData.ProductQualityCert" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="生产制造许可证获证情况及编号">
+                    <el-input v-model="formData.MaunLicense" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+                <!--<el-col :span="8">
+                  <el-form-item label="外地企业进津备案通知书">
+                    <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="法定代表人姓名">
+                    <el-input v-model="formData.LegalPerson" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="行业类别">
+                    <el-input v-model="formData.CategoryCode" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="行业类别名称">
+                    <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="注册资本">
+                    <el-input v-model="formData.RegCapital" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="联系人姓名">
+                    <el-input v-model="formData.ContactName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="币种">
+                    <el-input v-model="formData.Currency" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司类型">
+                    <el-input v-model="formData.CompanyType" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="成立时间">
+                    <el-input v-model="formData.SetupTime" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="开户银行">
+                    <el-input v-model="formData.DepositBank" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="银行账号">
+                    <el-input v-model="formData.BankAccount" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="移动电话">
+                    <el-input v-model="formData.Mobile" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="固定电话">
+                    <el-input v-model="formData.Telphone" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="传真">
+                    <el-input v-model="formData.Fax" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司电话">
+                    <el-input v-model="formData.CompanyTel" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="电子邮箱">
+                    <el-input v-model="formData.EMail" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="QQ号码">
+                    <el-input v-model="formData.QQ" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="银行信用等级">
+                    <el-input v-model="formData.BankCreditRating" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司网址">
+                    <el-input v-model="formData.CompanyUrl" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="HSE审查培训">
+                    <el-input v-model="formData.CompanyUrl" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+              </el-row>
+            </el-form>
+
+            <el-form label-position="top" ref="EntityFormCert" :model="formData">
+              <el-row :gutter="20">
+                <el-col :span="8">
+                  <el-form-item  label="质量管理体系认证情况及认证机构">
+                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="企业资质证书">
+                    <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <!--<el-col :span="12">
+                  <el-form-item label="企业资质证书级别">
+                    <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+                <el-col :span="8">
+                  <el-form-item label="安全生产许可证">
+                    <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="中石油勘探与生产工程技术服务市场准入许可证或监督服务市场准入证"> <!--技术服务类准入许可证-->
+                    <el-input v-model="formData.TechServiceLic" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="行业特殊要求的认证证书">
+                    <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item  label="企业简介（成立时间、人数、经营规模、信誉、主要生产设备及保障能力等情况）">
+                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="备注">
+                    <el-input v-model="formData.Remark" placeholder="请输入"  type="textarea" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+            </el-form>
+          </el-card>
+
         </el-tab-pane>
 
         <!--<el-tab-pane label="推荐信息" >
           <SupplierCertEdit ref="SupplierCertEditCompoment" :EntityId="1"></SupplierCertEdit>
         </el-tab-pane>-->
-        <el-tab-pane label="企业情况">
+        <el-tab-pane label="企业情况" :disabled="formData.Step < 1">
           <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>
+                <el-button type="primary" size="mini" @click="updateEntityNumber">保存人员结构情况</el-button>
               </span>
             </div>
 
-            <el-form label-width="220px" ref="EntityForm" :model="formData">
+            <el-form label-width="220px" ref="EntityFormNumber" :model="formData">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="企业员工总数">
-                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.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 v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number v-model="formData.SkillerTotal" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -446,7 +452,7 @@
 
         </el-tab-pane>
 
-        <el-tab-pane label="选择准入范围">
+        <el-tab-pane label="选择准入范围" :disabled="formData.Step < 2">
 
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -500,8 +506,16 @@
 
         </el-tab-pane>
 
-        <el-tab-pane label="审批流程" :disabled="true">
-          <wf-history :entryinfo="entrydetail"></wf-history>
+        <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">提交审批</el-button>
+              </span>
+            </div>
+            <wf-history :entryinfo="entrydetail"></wf-history>
+          </el-card>
         </el-tab-pane>
       </el-tabs>
 
@@ -535,7 +549,7 @@
     data () {
       return {
         serviceId: '',
-        stepActive: 0,
+        certId: '',
         formData: {
           Id: '',
           SupplierName: '',
@@ -586,6 +600,16 @@
           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: '',
@@ -594,8 +618,10 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: '',
+          CertId: 0,
           SupplierTypeCode: '03',
-          SupplierTypeName: '技术服务类'
+          SupplierTypeName: '技术服务类',
+          Step: 0
 
         },
         entrydetail: {
@@ -641,29 +667,29 @@
 
       }
     },
-    created() {
-      this.serviceId = this.$route.params.opera;
-      this.getDictOptions();
-      console.log(this.serviceId);
+    created () {
+      this.serviceId = this.$route.params.opera
+      this.certId = this.$route.query.certid
+      this.getDictOptions()
       if(this.serviceId != 'add' && this.serviceId>0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
+        this.formData.Id = this.serviceId
+        this.initDatas()
       } else {
-        this.formData.Id = 0;
+        this.formData.Id = 0
       }
     },
     methods: {
-      initDatas() {
+      initDatas () {
         if(this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
-            this.formData = res.data;
+          api.getEntityAndCert(this.certId, this.$axios).then(res => {
+            this.formData = res.data
           }).catch(err => {
             console.error(err)
           });
         }
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           //this.wellNoOptions = res.data.items['WellNo']
           //this.supervisersOptions = res.data.items['Supervisers']
@@ -679,7 +705,6 @@
             //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
             if (!this.formData.Id) {
               this.addEntity()
-              this.next()
             } else {
               this.updateEntity()
             }
@@ -696,13 +721,14 @@
       },
 
       addEntity() {
-        this.formData.SupplierTypeCode = '02'
+        this.formData.SupplierTypeCode = '03'
         this.formData.SupplierTypeName = '技术服务类'
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
-            this.formData.Id = res.data.item;
-            this.initDatas();
+            this.formData.Id = res.data.item.split('_')[0]
+            this.certId = res.data.item.split('_')[1]
+            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
@@ -723,7 +749,7 @@
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
-            this.initDatas();
+            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
@@ -740,8 +766,46 @@
         });
       },
 
-      next() {
-        if (this.stepActive++ > 5) this.stepActive = 5;
+      CheckCompanyBase () {
+        if (!this.formData.Id) {
+          this.$message({
+            type: 'error',
+            message: '无法保存，请先填写企业基本信息'
+          })
+          return false
+        }
+        if (!this.certId) {
+          this.$message({
+            type: 'error',
+            message: '准入类别不清晰，无法保存！'
+          })
+          return false
+        }
+        return true
+      },
+
+      updateEntityNumber () {
+        if( !this.CheckCompanyBase() ) {
+            return false
+        }
+        api.updateEntityNumber(this.formData.Id + '_' + this.certId, this.formData, 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) {

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

@@ -531,6 +531,19 @@
            width: 100,
            sort: true
            },*/
+          {
+            prop: "AccessCardNo",
+            label: '准入证编号',
+            width: 260,
+            sort: true
+          },
+
+          {
+            prop: "SupplierTypeName",
+            label: '准入类别',
+            width: 260,
+            sort: true
+          },
 
           {
             prop: "SupplierName",
@@ -893,6 +906,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          SupplierTypeCode: '02'
         }
         let myCreateOn = []
         // 解析时间
@@ -906,7 +920,7 @@
         //查询条件
         Object.assign(params, this.searchForm)
         //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getCertList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {

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

@@ -532,6 +532,20 @@
            sort: true
            },*/
 
+          {
+            prop: "AccessCardNo",
+            label: '准入证编号',
+            width: 260,
+            sort: true
+          },
+
+          {
+            prop: "SupplierTypeName",
+            label: '准入类别',
+            width: 260,
+            sort: true
+          },
+
           {
             prop: "SupplierName",
             label: '企业名称',
@@ -893,6 +907,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          SupplierTypeCode: '01'
         }
         let myCreateOn = []
         // 解析时间
@@ -906,7 +921,7 @@
         //查询条件
         Object.assign(params, this.searchForm)
         //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getCertList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {

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

@@ -34,7 +34,7 @@
       <el-table :data="entityList" border height="calc(100vh - 246px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="100" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/techedit'">
+            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/techedit?certid=' + scope.row.CertId">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
             </router-link>
 
@@ -532,6 +532,20 @@
             sort: true
           },*/
 
+          {
+            prop: "AccessCardNo",
+            label: '准入证编号',
+            width: 260,
+            sort: true
+          },
+
+          {
+            prop: "SupplierTypeName",
+            label: '准入类别',
+            width: 260,
+            sort: true
+          },
+
           {
             prop: "SupplierName",
             label: '企业名称',
@@ -893,6 +907,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          SupplierTypeCode: '03'
         }
         let myCreateOn = []
         // 解析时间
@@ -906,7 +921,7 @@
         //查询条件
         Object.assign(params, this.searchForm)
         //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getCertList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {