Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

# Conflicts:
#	src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

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

@@ -5,81 +5,83 @@ import (
 )
 
 type OilInfoChange struct {
-	Id                 int       `xorm:"not null pk default 0 INT(10)"`
-	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)"`
-	OilCertificateNo   string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
-	Grade              string    `xorm:"comment('级别') VARCHAR(2)"`
-	MgrUnit            string    `xorm:"comment('管理单位') VARCHAR(50)"`
-	OperType           string    `xorm:"comment('经营方式') CHAR(1)"`
-	Country            string    `xorm:"comment('国家') VARCHAR(20)"`
-	MaunAgent          string    `xorm:"comment('所代理制造商名称') VARCHAR(100)"`
-	ConstructTeam      string    `xorm:"comment('施工队伍名称') VARCHAR(100)"`
-	CommercialNo       string    `xorm:"comment('工商注册号') VARCHAR(50)"`
-	OrganCode          string    `xorm:"comment('组织机构代码') VARCHAR(50)"`
-	CountryTaxNo       string    `xorm:"comment('税务登记证国税编号') VARCHAR(50)"`
-	LocalTaxNo         string    `xorm:"comment('税务登记证地税编号') VARCHAR(50)"`
-	Address            string    `xorm:"comment('单位地址') VARCHAR(500)"`
-	Province           string    `xorm:"comment('省直辖市') VARCHAR(20)"`
-	City               string    `xorm:"comment('地市区县') VARCHAR(20)"`
-	Street             string    `xorm:"comment('街道') VARCHAR(20)"`
-	HouseNo            string    `xorm:"comment('门牌号') VARCHAR(10)"`
-	ZipCode            string    `xorm:"comment('邮编') VARCHAR(20)"`
-	QualitySystemCert  string    `xorm:"comment('质量管理体系认证情况及认证机构') VARCHAR(200)"`
-	ProductQualityCert string    `xorm:"comment('产品质量认证情况及认证机构') VARCHAR(200)"`
-	MaunLicense        string    `xorm:"comment('生产制造许可证获证情况及编号') VARCHAR(200)"`
-	QualifCert         string    `xorm:"comment('企业资质证书编号') VARCHAR(200)"`
-	QualifCertLevel    string    `xorm:"comment('企业资质证书级别') VARCHAR(10)"`
-	SafetyLicense      string    `xorm:"comment('安全生产许可证') VARCHAR(200)"`
-	TechServiceLic     string    `xorm:"comment('技术服务类准入许可证') VARCHAR(200)"`
-	TJInNotify         string    `xorm:"comment('外地企业进津备案通知书') VARCHAR(50)"`
-	SpecIndustryCert   string    `xorm:"comment('行业特殊要求的认证证书') VARCHAR(200)"`
-	LegalPerson        string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
-	CategoryCode       string    `xorm:"comment('行业类别代码') VARCHAR(10)"`
-	CategoryName       string    `xorm:"comment('行业类别名称') VARCHAR(20)"`
-	RegCapital         float32   `xorm:"default 0 comment('注册资本') FLOAT"`
-	Currency           string    `xorm:"comment('币种') VARCHAR(10)"`
-	ContactName        string    `xorm:"comment('联系人姓名') VARCHAR(20)"`
-	CompanyType        string    `xorm:"comment('公司类型') VARCHAR(20)"`
-	DepositBank        string    `xorm:"comment('开户银行') VARCHAR(50)"`
-	BankAccount        string    `xorm:"comment('银行账号') VARCHAR(50)"`
-	SetupTime          time.Time `xorm:"comment(' 成立时间') DATE"`
-	Email              string    `xorm:"comment('电子邮箱') VARCHAR(50)"`
-	BankCreditRating   string    `xorm:"comment('银行信用等级') VARCHAR(10)"`
-	Mobile             string    `xorm:"comment('移动电话') VARCHAR(20)"`
-	Telphone           string    `xorm:"comment('固定电话') VARCHAR(20)"`
-	Fax                string    `xorm:"comment('传真') VARCHAR(20)"`
-	CompanyTel         string    `xorm:"comment('公司电话') VARCHAR(20)"`
-	Qq                 string    `xorm:"comment('QQ号码') VARCHAR(20)"`
-	CompanyUrl         string    `xorm:"comment('公司网址') VARCHAR(20)"`
-	SpecSupplier       string    `xorm:"default '0' comment('是否特殊业务供应商(可不招标)') VARCHAR(2)"`
-	SpecTypeCode       string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(200)"`
-	SpecTypeName       string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(500)"`
-	Remark             string    `xorm:"comment('备注') VARCHAR(500)"`
-	IsDelete           int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
-	CreateOn           time.Time `xorm:"DATETIME"`
-	CreateUserId       int       `xorm:"INT(10)"`
-	CreateBy           string    `xorm:"VARCHAR(50)"`
-	ModifiedOn         time.Time `xorm:"DATETIME"`
-	ModifiedUserId     int       `xorm:"INT(10)"`
-	ModifiedBy         string    `xorm:"VARCHAR(50)"`
-	LinkAddress        string    `xorm:"comment('通信地址-单位地址') VARCHAR(500)"`
-	LinkProvince       string    `xorm:"comment('通信地址-省直辖市') VARCHAR(20)"`
-	LinkCity           string    `xorm:"comment('通信地址-地市区县') VARCHAR(20)"`
-	LinkStreet         string    `xorm:"comment('通信地址-街道') VARCHAR(20)"`
-	LinkHouseNo        string    `xorm:"comment('通信地址-门牌号') VARCHAR(10)"`
-	LinkZipCode        string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
-	HseTraining        string    `xorm:"default '0' comment('是否需要进行HSE审查培训') VARCHAR(2)"`
+	Id                  int       `xorm:"<- not null pk autoincr INT(10)"`
+	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)"`
+	OilCertificateNo    string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
+	OldOilCertificateNo string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
+	Grade               string    `xorm:"comment('级别') VARCHAR(2)"`
+	MgrUnit             string    `xorm:"comment('管理单位') VARCHAR(50)"`
+	OperType            string    `xorm:"comment('经营方式') CHAR(1)"`
+	Country             string    `xorm:"comment('国家') VARCHAR(20)"`
+	MaunAgent           string    `xorm:"comment('所代理制造商名称') VARCHAR(100)"`
+	ConstructTeam       string    `xorm:"comment('施工队伍名称') VARCHAR(100)"`
+	CommercialNo        string    `xorm:"comment('工商注册号') VARCHAR(50)"`
+	OrganCode           string    `xorm:"comment('组织机构代码') VARCHAR(50)"`
+	CountryTaxNo        string    `xorm:"comment('税务登记证国税编号') VARCHAR(50)"`
+	LocalTaxNo          string    `xorm:"comment('税务登记证地税编号') VARCHAR(50)"`
+	Address             string    `xorm:"comment('单位地址') VARCHAR(500)"`
+	Province            string    `xorm:"comment('省直辖市') VARCHAR(20)"`
+	City                string    `xorm:"comment('地市区县') VARCHAR(20)"`
+	Street              string    `xorm:"comment('街道') VARCHAR(20)"`
+	HouseNo             string    `xorm:"comment('门牌号') VARCHAR(10)"`
+	ZipCode             string    `xorm:"comment('邮编') VARCHAR(20)"`
+	QualitySystemCert   string    `xorm:"comment('质量管理体系认证情况及认证机构') VARCHAR(200)"`
+	ProductQualityCert  string    `xorm:"comment('产品质量认证情况及认证机构') VARCHAR(200)"`
+	MaunLicense         string    `xorm:"comment('生产制造许可证获证情况及编号') VARCHAR(200)"`
+	QualifCert          string    `xorm:"comment('企业资质证书编号') VARCHAR(200)"`
+	QualifCertLevel     string    `xorm:"comment('企业资质证书级别') VARCHAR(10)"`
+	SafetyLicense       string    `xorm:"comment('安全生产许可证') VARCHAR(200)"`
+	TechServiceLic      string    `xorm:"comment('技术服务类准入许可证') VARCHAR(200)"`
+	TJInNotify          string    `xorm:"comment('外地企业进津备案通知书') VARCHAR(50)"`
+	SpecIndustryCert    string    `xorm:"comment('行业特殊要求的认证证书') VARCHAR(200)"`
+	LegalPerson         string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
+	CategoryCode        string    `xorm:"comment('行业类别代码') VARCHAR(10)"`
+	CategoryName        string    `xorm:"comment('行业类别名称') VARCHAR(20)"`
+	RegCapital          float32   `xorm:"default 0 comment('注册资本') FLOAT"`
+	Currency            string    `xorm:"comment('币种') VARCHAR(10)"`
+	ContactName         string    `xorm:"comment('联系人姓名') VARCHAR(20)"`
+	CompanyType         string    `xorm:"comment('公司类型') VARCHAR(20)"`
+	DepositBank         string    `xorm:"comment('开户银行') VARCHAR(50)"`
+	BankAccount         string    `xorm:"comment('银行账号') VARCHAR(50)"`
+	SetupTime           time.Time `xorm:"comment(' 成立时间') DATE"`
+	Email               string    `xorm:"comment('电子邮箱') VARCHAR(50)"`
+	BankCreditRating    string    `xorm:"comment('银行信用等级') VARCHAR(10)"`
+	Mobile              string    `xorm:"comment('移动电话') VARCHAR(20)"`
+	Telphone            string    `xorm:"comment('固定电话') VARCHAR(20)"`
+	Fax                 string    `xorm:"comment('传真') VARCHAR(20)"`
+	CompanyTel          string    `xorm:"comment('公司电话') VARCHAR(20)"`
+	Qq                  string    `xorm:"comment('QQ号码') VARCHAR(20)"`
+	CompanyUrl          string    `xorm:"comment('公司网址') VARCHAR(20)"`
+	SpecSupplier        string    `xorm:"default '0' comment('是否特殊业务供应商(可不招标)') VARCHAR(2)"`
+	SpecTypeCode        string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(200)"`
+	SpecTypeName        string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(500)"`
+	Remark              string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete            int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn            time.Time `xorm:"DATETIME"`
+	CreateUserId        int       `xorm:"INT(10)"`
+	CreateBy            string    `xorm:"VARCHAR(50)"`
+	ModifiedOn          time.Time `xorm:"DATETIME"`
+	ModifiedUserId      int       `xorm:"INT(10)"`
+	ModifiedBy          string    `xorm:"VARCHAR(50)"`
+	LinkAddress         string    `xorm:"comment('通信地址-单位地址') VARCHAR(500)"`
+	LinkProvince        string    `xorm:"comment('通信地址-省直辖市') VARCHAR(20)"`
+	LinkCity            string    `xorm:"comment('通信地址-地市区县') VARCHAR(20)"`
+	LinkStreet          string    `xorm:"comment('通信地址-街道') VARCHAR(20)"`
+	LinkHouseNo         string    `xorm:"comment('通信地址-门牌号') VARCHAR(10)"`
+	LinkZipCode         string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
+	HseTraining         string    `xorm:"default '0' comment('是否需要进行HSE审查培训') VARCHAR(2)"`
 }
 
 type OilInfoChangeItem struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
+	InfoId         int       `xorm:"comment('信息变更主表Id') INT(10)"`
 	SupplierId     int       `xorm:"comment('供方Id') INT(10)"`
 	SelectItem     string    `xorm:"comment('变更字段名') VARCHAR(50)"`
 	SelectItemName string    `xorm:"comment('变更字段名') VARCHAR(255)"`

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

@@ -1,6 +1,7 @@
 package infochange
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -128,3 +129,22 @@ func (s *InfoChangeService) SubmitOrgAudit(workflowid, certId, annualId, wfName,
 	svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId
 }
+
+func (s *InfoChangeService) Insertentityinfo(infoname string, items string) (int64, error){
+	allitem := strings.Split(items, ";")
+	var selectitem string
+	var selectiteval string
+	for i:=0; i<len(allitem); i++ {
+		infoitem := strings.Split(allitem[i],",")
+		selectitem = fmt.Sprintf("%s %s %s",selectitem, strings.Trim(infoitem[0]," ") +",", "Old"+strings.Trim(infoitem[0], " ")+"," )
+		selectiteval = fmt.Sprintf("%s %s %s",selectiteval, `"`+ strings.Trim(infoitem[1], " ") +`",`, `"`+ strings.Trim(infoitem[2], " ") +`",` )
+	}
+	selectitem = strings.Trim(selectitem, ",")
+	selectiteval = strings.Trim(selectiteval, ",")
+	var sql string
+	sql = `INSERT INTO ` + infoname + `(` + selectitem + `) VALUES (` + selectiteval +`)`
+	res, err := s.DBE.Exec(sql)
+	fmt.Println(res.LastInsertId())
+	infoid,_ := res.LastInsertId()
+	return infoid, err
+}

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

@@ -87,4 +87,6 @@ const (
 	OIL_AUDIT_APPLY string = "oil_audit_apply"
 	//供方增项流程图
 	OIL_APPEND_APPLY string = "oil_append_apply"
+	//信息变更流程图
+	OIL_INFO_CHANGE string = "oil_info_change"
 )

src/dashoo.cn/backend/api/controllers/base.go

@@ -246,6 +246,7 @@ var (
 	OilAnnualAuditName                       string = "OilAnnualAudit"              //年审表
 	OilSupplierOpinionName                   string = "OilSupplierOpinion"          //追加意见表
 	OilInfoChangeItemName                    string = "OilInfoChangeItem"           //信息变更表
+	OilInfoChangeName                        string = "OilInfoChange"               //信息变更表
 )
 
 //分页信息及数据

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

@@ -2,10 +2,12 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/baseUser"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/paymentinfo"
 	"dashoo.cn/business2/areajson"
 	"dashoo.cn/business2/items"
+	"dashoo.cn/business2/permission"
 
 	"dashoo.cn/backend/api/business/auditsetting"
 	"encoding/json"
@@ -83,6 +85,17 @@ func (this *AnnualAuditController) GetEntityList() {
 			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
 		}
 	}
+	//企业用户必须加创建人条件
+	if this.User.IsCompanyUser == 1 {
+		where = where + " and CreateUserId = '" + this.User.Id + "'"
+	} else {
+		//超级管理员和有查看所有数据权限的用户不加条件
+		svcPerm := permission.GetPermissionService(utils.DBE)
+		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
+			where = where + " and CreateUserId = '" + this.User.Id + "'"
+		}
+	}
 
 	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	var list []annualaudit.OilAnnualAudit
@@ -420,13 +433,18 @@ func (this *AnnualAuditController) AnnualAudit() {
 	//审核状态判断进行的操作
 	if dataother.SuccessStatus == 1 {
 		var errinfo ErrorInfo
-		//提交审核工作流
-		//processInstanceId, res := svc.SubmitOrgAudit(utils.ToStr(dataother.SuccessStatus), 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)
+		var users []suppliercert.UserList
+		where := "OrganizeId=" + ProfAudit + " and AuditStepCode='" + workflow.PROF_RECE + "'"
+		svc.GetEntitysByWhere(OilAuditSettingName,where, &users)
+		var userIds string
+		for _, tmpUser := range users {
+			userIds += strconv.FormatInt(tmpUser.UserId, 10) + ","
+		}
+		userIds = strings.Trim(userIds, ",")
 		var ActiComplete workflow.ActiCompleteVM
 		ActiComplete.ProcessKey = workflow.OIL_AUDIT_APPLY
 		ActiComplete.BusinessKey = strconv.Itoa(dataother.AnnualId)
-		ActiComplete.UserNames = ProfAudit
+		ActiComplete.UserNames = userIds
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Result = "1"
 		ActiComplete.Remarks = "提交给业务处接收人"

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

@@ -1,8 +1,13 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
+	"dashoo.cn/business2/userRole"
 	"encoding/json"
+	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -81,6 +86,10 @@ func (this *InfoChangeController) GetEntityList() {
 			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
 		}
 	}
+	//找出待办任务
+	actisvc := workflow.GetActivitiService(utils.DBE)
+	certIdList := actisvc.GetMyTasks(workflow.OIL_INFO_CHANGE, this.User.Id)
+	where += " and Id in (" + certIdList + ")"
 
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var list []infochange.OilInfoChange
@@ -240,3 +249,115 @@ func (this *InfoChangeController) AddInfoChangeItem() {
 		this.ServeJSON()
 	}
 }
+
+// @Title 获取二级初审人员
+// @Description 获取二级初审人员
+// @router /getauditerbydept/:deptId [get]
+func (this *InfoChangeController) GetAuditerByDept() {
+	Id := this.Ctx.Input.Param(":deptId")
+
+	//var auditWorkflow auditsetting.Base_OilAuditSetting
+	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, Id, workflow.FIRST_TRIAL, &auditWorkflow)
+	var userlist []userRole.Base_User
+	where := " CompanyId = "+ Id
+	rsvc.GetEntities(&userlist, where)
+
+	var datainfo ErrorDataInfo
+	datainfo.Item = userlist
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 提交审批
+// @Description 提交审批
+// @Success	200	{object} controllers.Request
+// @router /audit/:id [post]
+func (this *InfoChangeController) AuditEntity() {
+	suppId := this.Ctx.Input.Param(":id")
+	firstAudit := this.GetString("firstAudit")
+
+	//取出审批列表
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	var infoitems [] infochange.OilInfoChangeItem
+	where := " SupplierId = "+ suppId
+	svc.GetEntities(&infoitems, where)
+	var infochangeentity infochange.OilInfoChange
+	var infomodel infochange.OilInfoChangeItem
+	var errinfo ErrorDataInfo
+	defer func() { //finally处理失败的异常
+		if err := recover(); err != nil {
+			errinfo.Message = "提交失败，" + err.(string)
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			//返回正确结果
+			errinfo.Message = "审核提交成功"
+			errinfo.Code = 0
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	}()
+	var items string
+	for i:=0 ;i<len(infoitems); i++ {
+		items = fmt.Sprintf("%s %s %s %s",items, infoitems[i].SelectItem , ","+ infoitems[i].BeChangeInfo , ","+ infoitems[i].ChangeInfo +";")
+	}
+	items = strings.Trim(items, ";")
+	infoid,_ := svc.Insertentityinfo(OilInfoChangeName, items)
+
+	for i:=0; i<len(infoitems); i++ {
+		infomodel.InfoId,_ = strconv.Atoi(strconv.FormatInt(infoid,10))
+		err := svc.UpdateEntityBytbl(OilInfoChangeItemName, infoitems[i].Id, &infomodel, []string{"InfoId"} )
+		fmt.Println(err)
+	}
+
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+	processInstanceId := ""
+	if infochangeentity.WorkFlowId == "0" || len(infochangeentity.WorkFlowId) <= 0 {
+		//启动工作流
+		processInstanceId = svcActiviti.StartProcess(workflow.OIL_INFO_CHANGE, utils.ToStr(infoid), this.User.Id)
+	}
+
+	var ActiComplete workflow.ActiCompleteVM
+	ActiComplete.ProcessKey = workflow.OIL_INFO_CHANGE
+	ActiComplete.BusinessKey = utils.ToStr(infoid)
+	ActiComplete.UserNames = firstAudit
+	ActiComplete.UserId = this.User.Id
+	ActiComplete.Result = "1"
+	ActiComplete.Remarks = "信息变更二级单位初审"
+	ActiComplete.CallbackUrl = ""
+	receiveVal := svcActiviti.TaskComplete(ActiComplete)
+
+	if receiveVal == "true" {
+		errinfo.Message = "提交成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "工作流异常，请联系管理员！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	//记下workflowID(首次提交时才会记录，中间状态请忽略) 及审批状态
+
+	infochangeentity.WorkFlowId = processInstanceId
+	infochangeentity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
+	infochangeentity.CreateOn = time.Now()
+	infochangeentity.CreateBy = this.User.Realname
+	infochangeentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	cols := []string{
+		"Id",
+		"WorkflowId",
+		"Status",
+		"Step",
+		"FirstAudit",
+		"CreateOn",
+		"CreateBy",
+		"CreateUserId",
+	}
+	svc.UpdateEntityByIdCols(infoid, infochangeentity, cols)
+}
+

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

@@ -337,6 +337,17 @@ func (this *OilSupplierController) GetEntityList() {
 			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
 		}
 	}
+	//企业用户必须加创建人条件
+	if this.User.IsCompanyUser == 1 {
+		where = where + " and CreateUserId = '" + this.User.Id + "'"
+	} else {
+		//超级管理员和有查看所有数据权限的用户不加条件
+		svcPerm := permission.GetPermissionService(utils.DBE)
+		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
+			where = where + " and CreateUserId = '" + this.User.Id + "'"
+		}
+	}
 
 	svc := supplier.GetOilSupplierService(utils.DBE)
 	var list []supplier.OilSupplier
@@ -995,6 +1006,7 @@ func (this *OilSupplierController) GetDictList() {
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
 	dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
+	dictList["CountryList"] = areaJsonSvc.GetCountryList()
 	//获取我创建的所有公司
 	var list []supplier.OilSupplier
 	if this.User.IsCompanyUser == 1 {
@@ -1047,6 +1059,7 @@ func (this *OilSupplierController) GetDictListByStatus() {
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
 	dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
+	dictList["CountryList"] = areaJsonSvc.GetCountryList()
 	//获取我创建的所有公司
 	var list []supplier.OilSupplier
 	if this.User.IsCompanyUser == 1 {

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

@@ -98,7 +98,6 @@ func (this *OilSupplierCertAppendController) GetList() {
 		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
 			where = where + " and a.CreateUserId = '" + this.User.Id + "'"
 		}
-
 	}
 
 	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)

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

@@ -31,24 +31,16 @@ export default {
       method: 'delete'
     })
   },
-  auditEntity (entityId, myAxios) {
+  auditEntity (entityId, FirstAudit, myAxios) {
     return myAxios({
-      url: '/infochange/audit/' + entityId,
+      url: '/infochange/audit/' + entityId + '?firstAudit=' + FirstAudit,
       method: 'post'
     })
   },
-  // 专业审批
-  auditEntityadmission (entityId, myAxios) {
+  getAuditerByDept(deptId, myAxios) {
     return myAxios({
-      url: '/infochange/admission/' + entityId,
-      method: 'post'
-    })
-  },
-  // 增项审批
-  auditEntityappend (entityId, myAxios) {
-    return myAxios({
-      url: '/infochange/auditappend/' + entityId,
-      method: 'post'
+      url: '/infochange/getauditerbydept/' + deptId,
+      method: 'GET'
     })
   }
 }

src/dashoo.cn/frontend_web/src/components/Headbar.vue

@@ -1,11 +1,11 @@
 <template>
-  <header class="header" style="background-color:#004EA2;">
+  <header class="header" style="background-color:#34393D;">
     <!-- <h1 class="brand" style="text-align:center;margin-left:10px;margin-right:1px;">
       <router-link to="/">
         <img src="~/assets/img/logo.png" style="height:32px;">
       </router-link>
     </h1> -->
-    <div v-if="!isMenuHidden" class="brand" style="background-color:#004EA2;padding-top:7px;padding-left:20px;width:180px;">
+    <div v-if="!isMenuHidden" class="brand" style="background-color:#34393D;padding-top:7px;padding-left:20px;width:180px;">
       <router-link to="/">
         <img src="../assets/img/logo_dagang2.png" style="height:35px;" />
       </router-link>
@@ -15,29 +15,29 @@
         <img src="../assets/img/title.png" style="height:35px;" />
       </router-link>
     </div>
-    <nav class="toolbar" style="margin-top: 3px;background-color:#004EA2;">
+    <nav class="toolbar" style="margin-top: 3px;background-color:#34393D;">
       <img src="../assets/img/gongfang_right.png" style="height:35px;padding-top:5px;" />
       <div style="margin: 10px 0px 0px 20px;"></div>
       <el-tag type="text" size="mini" style="margin-top:12px">{{department}}</el-tag>
 
       <ul class="list" style="background: #004EA2;color: blue">
-        <li class="item" style="background: #004EA2">
-          <a style="font-size: 90%;background: #004EA2;color: #1D8CE0; font-weight: bold" href="#" v-if="authUser">
+        <li class="item" style="background: #34393D">
+          <a style="font-size: 90%;background: #34393D;color: white; font-weight: bold" href="#" v-if="authUser">
             <span style="margin-right: 20px;">
               <el-button type="text" icon="icon icon-shrink" v-if="fullscreen" @click="handleFullScreen"></el-button>
               <el-button type="text" icon="icon icon-enlarge" v-if="!fullscreen" @click="handleFullScreen"></el-button>
             </span>
             您好, {{ authUser.Profile.Realname }}
             <img v-if="authUser.Profile.Photo" style="background: #FFF; border: hidden" :src="'http://'+authUser.Profile.Host+authUser.Profile.Photo" class="avatar">
-            <img v-else class="avatar" style="background: #FFF; border: hidden" src="~/assets/img/avatar.svg" :alt="authUser.name">
+            <img v-else class="avatar" style="background: white; border: hidden" src="~/assets/img/avatar.svg" :alt="authUser.name">
           </a>
-          <ul class="list" style="text-align: center;background: #004EA2;">
+          <ul class="list" style="text-align: center;background: #34393D;">
             <li class="item">
-              <router-link to="/system/usersetting" style="color: #004EA2; font-weight: bold">账户设置</router-link>
+              <router-link to="/system/usersetting" style="color: white; font-weight: bold">账户设置</router-link>
             </li>
             <li class="divider" style="color: ActiveBorder;"></li>
             <li class="item">
-              <a href="#" style="color: #1F2D3D; font-weight: bold" @click.prevent="logout">注销登录</a>
+              <a href="#" style="color: white; font-weight: bold" @click.prevent="logout">注销登录</a>
             </li>
           </ul>
         </li>

src/dashoo.cn/frontend_web/src/components/Sticky/index.vue

@@ -125,7 +125,7 @@ export default {
     width: 100%;
     margin:0px auto;
     transition: 600ms ease position;
-    background-color: #004EA2; /*#EEF1F6*/
+    background-color: #34393D; /*#EEF1F6*/
 
     .subtitle {
       font-size: 20px;

src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -30,7 +30,7 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" multiple v-model="formData.SpecTypeCode" :disabled="!canUpdateSupplier"
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode" :disabled="!canUpdateSupplier"
                placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
               </el-option>
@@ -404,10 +404,10 @@
         CityAry: [],
         LinkCityAry: [],
         HSEOptions: [{
-          value: '1',
+          value: 1,
           label: '是'
         }, {
-          value: '0',
+          value: 0,
           label: '否'
         }],
 

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -4,13 +4,11 @@
       <div slot="header" class="clearfix">
         <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-right: 3px" @click="nextStep()" v-if="canadd">提交审批
-          </el-button>
-          <el-button type="primary" size="mini" style="margin-right: 3px" @click="showDialog" v-if="canadd">添加
+          <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="canadd">添加
           </el-button>
         </span>
       </div>
-      <el-table :data="businessList" border>
+      <el-table :data="businessList" border style="height: calc(100vh - 435px);">
         <el-table-column label="操作" width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)" :disabled="!canadd">编辑
@@ -29,17 +27,6 @@
       </el-pagination>
     </el-card>
 
-    <el-card class="box-card" style="margin-top: 10px;">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold">资质列表</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="subfiledialog" v-if="canadd">添加</el-button>
-      </div>
-      <subfile-list ref="subfileList" :data.sync="subfileList" :SupplierId="SupplierId" :SupplierCertId="SupplierCertId"
-        :SupplierTypeCode="SupplierTypeCode" :businessList="businessList" :BusinessForm="BusinessForm" :canadd="canadd"
-        height="360px" style="margin-top: 20px">
-      </subfile-list>
-    </el-card>
-
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">
       <el-form ref="BusinessForm" :rules="formRules" :model="BusinessForm" label-width="100px">
         <el-row>
@@ -126,26 +113,12 @@
   import {
     mapGetters
   } from 'vuex'
-  import SubfileList from '../../components/oilsupplier/subfilelist'
 
   export default {
     name: 'EquipmentList',
     components: {
-      SubfileList // 文档
     },
     props: {
-      SupplierCertId: {
-        type: String,
-        default: '0'
-      },
-      SupplierId: {
-        type: String,
-        default: '0'
-      },
-      SupplierTypeCode: {
-        type: String,
-        default: '0'
-      },
       canadd: {
         type: Boolean,
         default: false
@@ -168,6 +141,10 @@
         }
       };
       return {
+        SupplierId: 0,
+        SupplierTypeCode: '',
+        SupplierCertId: 0,
+
         oneList: [],
         OneCode: '',
         businessList: [],
@@ -203,9 +180,7 @@
         CurrentPage: 1, // 分页
         Size: 10,
         CurrentItemCount: 0,
-
-        subfileList: [], // 文档
-        //物资类懒加载
+        subfileList: [] // 文档		//物资类懒加载
         optionsList: [], //物资类层级列表
         selectedOptList: [], //已选择的物资类列表
         goodsProps: {
@@ -222,8 +197,7 @@
           }],
         },
         // ParentId: 0, //物资类初始父类Id值：0
-        flagId: 0 //标记是否第一次点击
-      }
+        flagId: 0 //标记是否第一次点击      }
     },
     methods: {
 
@@ -300,11 +274,9 @@
         })
           .then(res => {
             _this.businessList = res.data.items
-            _this.currentItemCount = res.data.currentItemCount
-            _this.$refs['subfileList'].getvalue(this.SupplierId, this.SupplierTypeCode, this.SupplierCertId)
+            _this.currentItemCount = res.data.currentItemCount                  
           })
           .catch(err => {
-            // handle error
             console.error(err)
           })
       },
@@ -533,27 +505,27 @@
         this.BusinessForm.Name = val.Name
         this.basicDialog = false
       },
-      nextStep () {
-        this.subfileList = this.$refs['subfileList'].subfileList
-        if (this.subfileList && this.subfileList.length > 0) {
-          for (var i = 0; i < this.subfileList.length; i++) {
-            if (this.subfileList[i].FileType === '1' && this.subfileList[i].FileUrl === '') {
-              this.$message({
-                type: 'warning',
-                message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-              })
-              return
-            }
-          }
-          this.$emit('close')
-        } else {
-          this.$emit('close')
-        }
-      },
+      // nextStep () {
+      //   this.subfileList = this.$refs['subfileList'].subfileList
+      //   if (this.subfileList && this.subfileList.length > 0) {
+      //     for (var i = 0; i < this.subfileList.length; i++) {
+      //       if (this.subfileList[i].FileType === '1' && this.subfileList[i].FileUrl === '') {
+      //         this.$message({
+      //           type: 'warning',
+      //           message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+      //         })
+      //         return
+      //       }
+      //     }
+      //     this.$emit('close')
+      //   } else {
+      //     this.$emit('close')
+      //   }
+      // },
 
-      subfiledialog () {
-        this.$refs['subfileList'].showDialog()
-      },
+      // subfiledialog () {
+      //   this.$refs['subfileList'].showDialog()
+      // },
 
       handleSizeChange (value) {
         this.size = value

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -39,8 +39,18 @@
 
         <el-col :span="12">
           <el-form-item label="国家" prop="Country" >
-            <el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
-            </el-input>
+            <!--<el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            </el-input>-->
+            <el-select v-model="formData.Country" filterable placeholder="请选择" :disabled="!canUpdateSupplier" style="width: 100%">
+              <el-option
+                v-for="item in countryListOptions"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value">
+                <span style="float: left">{{ item.value }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
 
@@ -412,6 +422,7 @@
         CompanyTypeOptions: [],
         UnitRelationAry: [],
         countryoptions: [],
+        countryListOptions: [],
         countryprops: {
           value: 'adcode',
           label: 'name',
@@ -420,10 +431,10 @@
         CityAry: [],
         LinkCityAry: [],
         HSEOptions: [{
-          value: '1',
+          value: 1,
           label: '是'
         }, {
-          value: '0',
+          value: 0,
           label: '否'
         }],
 
@@ -486,10 +497,10 @@
             message: '请输入邮箱地址',
             trigger: 'change'
           },
-            {
-              validator: this.checkemail,
-              trigger: 'change'
-            }],
+          {
+            validator: this.checkemail,
+            trigger: 'change'
+          }],
           OrganCode: [{
             required: true,
             message: '请输入组织机构代码',
@@ -579,8 +590,9 @@
       getDictOptions () {
         if (this.dictData) {
           this.UnitRelationOptions = this.dictData['UnitRelation']
-          this.getCityList(this.dictData['GaodeMapChinaAreas'])
           this.CompanyTypeOptions = this.dictData['CompanyType']
+          this.getCityList(this.dictData['GaodeMapChinaAreas'])
+          this.getCountryList(this.dictData['CountryList'])
           let suppliers = this.dictData['CompanyNames']
           for (let idx in suppliers) {
             suppliers[idx]['value'] = suppliers[idx].SupplierName
@@ -600,6 +612,17 @@
         countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
         this.countryoptions = JSON.parse(countstr)
       },
+      getCountryList (val) {
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2]
+          })
+        }
+      },
       unitRelationChange(value) {
         this.formData.SpecTypeCode = value.join(',')
       },

src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist.vue

@@ -1,25 +1,42 @@
 <template>
   <div>
-    <el-table :data="subfileList" border>
-      <el-table-column label="操作" width="150" align="center" fixed>
-        <template slot-scope="scope">
-          <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)" :disabled="!canadd">编辑
-          </el-button>
-          <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px"
-            :disabled="scope.row.FileType == '1' || !canadd" @click="deletedata(scope.row)">删除</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>
-      <!--<el-table-column prop="NeedFileCode" label="分类编码" show-overflow-tooltip></el-table-column>-->
-      <el-table-column prop="FileName" label="资质文件" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ jstimehandle(scope.row.EffectDate+'') }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
-      <!-- <el-table-column prop="Remark" label="备注信息" show-overflow-tooltip></el-table-column> -->
-    </el-table>
+    <el-card class="box-card" style="margin-top: 10px;">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold">准入范围</span>
+        <el-button type="primary" size="mini" style="margin-right: 3px" @click="nextStep()" v-if="canadd">提交审批
+        </el-button>
+      </div>
+      <el-table :data="businessList" border bordertooltip-effect="dark" style="height: calc(100vh - 500px);">
+        <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-card class="box-card" style="margin-top: 10px;">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold"> 企业资质</span>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="canadd">添加</el-button>
+      </div>
+      <el-table :data="subfileList" border>
+        <el-table-column label="操作" width="150" align="center" fixed>
+          <template slot-scope="scope">
+            <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)" :disabled="!canadd">编辑
+            </el-button>
+            <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px"
+              :disabled="scope.row.FileType == '1' || !canadd" @click="deletedata(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="FileName" label="资质文件" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.EffectDate+'') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </el-card>
 
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">
       <el-form :model="SubfileForm" label-width="100px">
@@ -38,11 +55,6 @@
               <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型"></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="分类编码" required>
-              <el-input v-model="SubfileForm.NeedFileCode" placeholder="请输入编码"></el-input>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="有效日期" required>
               <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
@@ -97,26 +109,18 @@
   } from 'vuex'
   import axios from 'axios'
   import uploadajax from '../../assets/js/uploadajax.js'
+  import BusinessList from '../../components/oilsupplier/businesslist'
+
   export default {
     name: 'SubfileList',
+    components: {
+      BusinessList // 准入范围
+    },
     props: {
-      SupplierId: {
-        type: String,
-        default: '0'
-      },
-      SupplierCertId: {
-        type: String,
-        default: '0'
-      },
-      SupplierTypeCode: {
-        type: String,
-        default: '0'
-      },
       canadd: {
         type: Boolean,
         default: false
       },
-      BusinessForm: {}
     },
     created() {},
     computed: {
@@ -126,6 +130,11 @@
     },
     data() {
       return {
+        SupplierId: 0,
+        SupplierTypeCode: '',
+        SupplierCertId: 0,
+
+        businessList: [],
         subfileList: [],
         techList: [],
         techTreeList: [],
@@ -165,7 +174,9 @@
       getvalue(SupplierId, SupplierTypeCode, certId) {
         this.SupplierId = SupplierId
         this.SupplierTypeCode = SupplierTypeCode
+        this.SupplierCertId = certId
         this.initData()
+        this.getbusList()
       },
       initData() {
         let _this = this
@@ -181,6 +192,25 @@
           .then(res => {
             _this.subfileList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
+
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      getbusList() {
+        let _this = this
+        const params = {
+          SupplierCertId: this.SupplierCertId,
+          SupplierTypeCode: this.SupplierTypeCode,
+          _currentPage: 1,
+          _size: 1000
+        }
+        this.$axios.get('suppliercertsub/list', {
+            params
+          })
+          .then(res => {
+            _this.businessList = res.data.items
           })
           .catch(err => {
             console.error(err)
@@ -188,7 +218,7 @@
       },
       makesure() {
         if (this.Title == '新增文件') {
-          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {           
+          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
             // 上传附件是否完成判断
             if (!this.attachissuccess()) {
               this.$message.error('有附件未成功上传！不能保存数据')
@@ -296,6 +326,22 @@
           })
           .catch(() => {});
       },
+      nextStep() {
+        if (this.subfileList && this.subfileList.length > 0) {
+          for (var i = 0; i < this.subfileList.length; i++) {
+            if (this.subfileList[i].FileType === '1' && this.subfileList[i].FileUrl === '') {
+              this.$message({
+                type: 'warning',
+                message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+              })
+              return
+            }
+          }
+          this.$emit('close')
+        } else {
+          this.$emit('close')
+        }
+      },
       showDialog() {
         this.Title = '新增文件'
         this.SubfileForm.Id = ''

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -1,89 +1,305 @@
 <template>
+  <div style="width: 100%; overflow-y: auto; background-color: white" >
+    <sticky class-name="sub-navbar2" v-if="activeIndex==1 || activeIndex==2">
+      <div class="top-wrapper">
+        <div style="margin-top: 5px; float: left;">
+          <router-link to="/">
+            <img src="../assets/img/logo_dagang2.png" style="height:35px;" />
+          </router-link>
+        </div>
+
+        <div style="float: right;">
+          <router-link :to="'/signup'">
+            <el-button type="text" round>没有账户？请注册</el-button>
+          </router-link>
+
+          <el-button type="info" size="small" round @click="activeIndex=0">登录供方管理系统</el-button>
+
+        </div>
+      </div>
+    </sticky>
+
+    <!--<div class="back-width1" style="margin-top: 10px" v-if="activeIndex==0">
+      <el-carousel>
+        <el-carousel-item key="1">
+          <img src="../assets/img/carousel/a.jpg" style="height: 100%; width: 100%">
+        </el-carousel-item>
+        <el-carousel-item key="2">
+          <img src="../assets/img/carousel/b.jpg" style="height: 100%; width: 100%">
+        </el-carousel-item>
+        <el-carousel-item key="3">
+          <img src="../assets/img/carousel/c.jpg" style="height: 100%; width: 100%">
+        </el-carousel-item>
+      </el-carousel>
+    </div>
 
-  <div style="height: calc(100vh); width: 100%; background-color:#FFFFFF" >
-    <img src="../assets/img/title_gongfang.png" style="height:60px; margin-top: 20px;margin-left: 100px;"  >
-    <div class="back-width">
-      <div class="login-body">
-        <section class="fileList">
-          <el-tabs v-model="activeName" tab-position="left">
-            <el-tab-pane label="通知中心" name="first">
-              <el-table :data="noticeList"  style="width: 600px; height: 530px;" @row-click="DownloadFile">
-                <el-table-column prop="Name" label="通知标题">
-                  <template slot-scope="scope">
-                    <i class="el-icon-caret-right"></i>
-                    <a style="margin-left: 5px">{{ scope.row.Name }}</a>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="CreateOn" label="时间" width="141">
-                  <template slot-scope="scope">
-                    {{ jstimehandle(scope.row.CreateOn+'') }}
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-tab-pane>
-            <el-tab-pane label="文档下载" name="second">
-              <el-table :data="fileList" style="width: 600px; height: 530px;" @row-click="DownloadFile">
-                <el-table-column prop="Name" label="文件名">
-                  <template slot-scope="scope">
-                    <i class="el-icon-caret-right"></i>
-                    <a style="margin-left: 5px">{{ scope.row.Name }}</a>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="CreateOn" label="时间" width="141">
-                  <template slot-scope="scope">
-                    {{ jstimehandle(scope.row.CreateOn+'') }}
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-tab-pane>
-          </el-tabs>
-
-        </section>
-        <section class="login">
-          <!--<header class="login-header">
-            <h1 style="text-align:center;margin-top:70px;margin-bottom:40px;"><router-link to="/"><img src="../assets/img/logo.png" style="height:80px;"></router-link></h1>
-            <el-alert v-if="error" :title="error.title" type="warning" :description="error.message" show-icon/>
-          </header>-->
-
-            <el-card class="box-card">
-              <div slot="header" class="clearfix">
-                <span style="font-weight: bold;">用户登录</span>
+    <div class="components-container home-wrapper" v-if="activeIndex==0">
+      <el-row>
+        <el-col :span="24">
+          <span style="color: black; font-size: large; font-weight: bold; padding-top: 20px">| 功能介绍</span>
+        </el-col>
+        <el-col :span="24">
+          <span style="color: black; font-size: x-small; padding-top: 20px">| 大港油田供方管理信息系统功能介绍</span>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20" style="margin-top: 0px">
+        <el-col :span="12">
+          <el-card :body-style="{ padding: '0px' }" style="margin-top: 0px">
+            <img style="height: 200px" src="../assets/img/zhunrushenqing.jpg" class="image">
+            <div style="padding: 14px;">
+              <span style="font-weight: bold">准入申请</span>
+              <div class="bottom clearfix">
+                <span>物资类、技术服务类和基建类的准入申请</span>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card :body-style="{ padding: '0px' }"  style="margin-top: 0px">
+            <img style="height: 200px" src="../assets/img/zengxiangshenqing.jpg" class="image">
+            <div style="padding: 14px;">
+              <span style="font-weight: bold">增项申请</span>
+              <div class="bottom clearfix">
+                <span>物资类、技术服务类和基建类的增项申请</span>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card :body-style="{ padding: '0px' }">
+            <img style="height: 200px" src="../assets/img/nianshen.jpg" class="image">
+            <div style="padding: 14px;">
+              <span style="font-weight: bold">年审</span>
+              <div class="bottom clearfix">
+                <span>物资类、技术服务类和基建类的年审</span>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card :body-style="{ padding: '0px' }" >
+            <img style="height: 200px" src="../assets/img/zizhibiangeng.jpg" class="image">
+            <div style="padding: 14px;">
+              <span style="font-weight: bold">资质变更</span>
+              <div class="bottom clearfix">
+                <span>已入网企业的资质变更</span>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card :body-style="{ padding: '0px' }" >
+            <img style="height: 200px" src="../assets/img/xinxibiangeng.jpg" class="image">
+            <div style="padding: 14px;">
+              <span style="font-weight: bold">信息变更</span>
+              <div class="bottom clearfix">
+                <span>已入网企业的信息变更</span>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card :body-style="{ padding: '0px' }" >
+            <img style="height: 200px" src="../assets/img/zaixianjiaofei.jpg" class="image">
+            <div style="padding: 14px;">
+              <span style="font-weight: bold">在线缴费</span>
+              <div class="bottom clearfix">
+                <span>通过此信息可在线缴费</span>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card :body-style="{ padding: '0px' }" style="margin-bottom: 20px">
+            <img style="height: 200px" src="../assets/img/zaixianchaxun.jpg" class="image">
+            <div style="padding: 14px;">
+              <span style="font-weight: bold">业务查询</span>
+              <div class="bottom clearfix">
+                <span>报表及图表的查询功能</span>
               </div>
-              <el-form class="login-form" auto-complete="off" :model="model" :rules="rules" ref="user" label-position="top">
-              <el-form-item label="用户名" prop="username">
-                <el-input type="text" v-model="model.username" placeholder="请输入用户名">
-                  <el-select v-model="loginMode" slot="append" placeholder="登录类型" style="width: 110px;">
-                    <el-option label="普通账户" :value="1"></el-option>
-                    <el-option label="PTR认证" :value="2"></el-option>
-                  </el-select>
-                </el-input>
-              </el-form-item>
-              <el-form-item label="密码" prop="password">
-                <el-input type="password" v-model="model.password" placeholder="请输入密码" @keyup.enter.native="login()" />
-              </el-form-item>
-              <el-button type="primary" :loading="loading" @click="login()">{{ loading ? '登录中...' : '登录' }}</el-button>
-              <router-link :to="'/signup'">
-                <el-button type="text" round>没有账户？请注册</el-button>
-              </router-link>
-
-              </el-form>
-            </el-card>
-
-
-        </section>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card :body-style="{ padding: '0px' }" style="margin-bottom: 20px">
+            <img style="height: 200px" src="../assets/img/zizhi.jpg" class="image">
+            <div style="padding: 14px;">
+              <span style="font-weight: bold">资质管理</span>
+              <div class="bottom clearfix">
+                <span>资质管理的统一管理功能</span>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>-->
+
+    <div style="background-color: white">
+      <div class="top-wrapper">
+        <img src="../assets/img/dagang.png" style="height:60px; margin-top: 5px;" v-if="activeIndex==0">
+        <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
+          <el-menu-item index="0">
+            <i class="el-icon-tickets"></i>
+            <span>登录</span>
+          </el-menu-item>
+          <el-menu-item index="1">
+            <i class="el-icon-bell"></i>
+            <span>通知中心</span>
+          </el-menu-item>
+          <el-menu-item index="2">
+            <i class="el-icon-document"></i>
+            <span>文件下载中心</span>
+          </el-menu-item>
+        </el-menu>
       </div>
+
+
+
+      <div style="background-color: white;" v-if="activeIndex==0">
+        <div class="back-width" >
+          <div class="login-body">
+            <section class="login">
+              <!--<header class="login-header">
+                <h1 style="text-align:center;margin-top:70px;margin-bottom:40px;"><router-link to="/"><img src="../assets/img/logo.png" style="height:80px;"></router-link></h1>
+                <el-alert v-if="error" :title="error.title" type="warning" :description="error.message" show-icon/>
+              </header>-->
+
+              <el-card class="box-card">
+                <!--<div slot="header" class="clearfix">
+                  <span style="font-weight: bold;">用户登录</span>
+                </div>-->
+                <el-form class="login-form" auto-complete="off" :model="model" :rules="rules" ref="user" label-position="top">
+                  <el-form-item label="用户名" prop="username">
+                    <el-input type="text" v-model="model.username" placeholder="请输入用户名">
+                      <el-select v-model="loginMode" slot="append" placeholder="登录类型" style="width: 110px;">
+                        <el-option label="普通账户" :value="1"></el-option>
+                        <el-option label="PTR认证" :value="2"></el-option>
+                      </el-select>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item label="密码" prop="password">
+                    <el-input type="password" v-model="model.password" placeholder="请输入密码" @keyup.enter.native="login()" />
+                  </el-form-item>
+                  <el-button type="primary" :loading="loading" @click="login()">{{ loading ? '登录中...' : '登录' }}</el-button>
+                  <router-link :to="'/signup'">
+                    <el-button type="text" round>没有账户？请注册</el-button>
+                  </router-link>
+
+                </el-form>
+              </el-card>
+
+
+            </section>
+          </div>
+        </div>
+      </div>
+
+
+      <div class="components-container home-wrapper" style="background-color: white" v-if="activeIndex==1">
+        <el-table :data="noticeList"  style="width: 100%; height: 100vh;" @row-click="DownloadFile">
+          <el-table-column prop="Name" label="通知标题">
+            <template slot-scope="scope">
+              <i class="el-icon-caret-right"></i>
+              <a style="margin-left: 5px">{{ scope.row.Name }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column prop="CreateOn" label="时间" width="141">
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.CreateOn+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <div class="components-container home-wrapper" style="background-color: white" v-if="activeIndex==2">
+        <el-table :data="fileList" style="width: 100%;  height: 100vh;" @row-click="DownloadFile">
+          <el-table-column prop="Name" label="文件名">
+            <template slot-scope="scope">
+              <i class="el-icon-caret-right"></i>
+              <a style="margin-left: 5px">{{ scope.row.Name }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column prop="CreateOn" label="时间" width="141">
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.CreateOn+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+    </div>
+
+
+
+    <!--<div>
+      <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
+        <el-menu-item index="1">通知中心</el-menu-item>
+        <el-menu-item index="2">文件下载中心</el-menu-item>
+        &lt;!&ndash;<el-menu-item index="3">登录供方管理系统</el-menu-item>
+        <el-menu-item index="4">账户注册</el-menu-item>&ndash;&gt;
+      </el-menu>
     </div>
-    <div >
-      <footer class="login-footer" style="color:#A9A9A9">
-        ©大港油田信息中心 版权所有
+
+    <div class="components-container home-wrapper">
+
+      <el-card style="width: 1004px;" class="box-card" v-if="activeIndex == 1">
+        <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 通知中心
+          </span>
+        </div>
+        <el-table fit :data="noticeList"  style="width: 100%; height: 100vh;" @row-click="DownloadFile">
+          <el-table-column prop="Name" label="通知标题">
+            <template slot-scope="scope">
+              <i class="el-icon-caret-right"></i>
+              <a style="margin-left: 5px">{{ scope.row.Name }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column prop="CreateOn" label="时间" width="141">
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.CreateOn+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+
+      <el-card style="width: 1004px" class="box-card" v-if="activeIndex == 2">
+        <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 文件下载中心
+          </span>
+        </div>
+        <el-table fit :data="fileList" style="width: 100%;  height: 100vh;" @row-click="DownloadFile">
+          <el-table-column prop="Name" label="文件名">
+            <template slot-scope="scope">
+              <i class="el-icon-caret-right"></i>
+              <a style="margin-left: 5px">{{ scope.row.Name }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column prop="CreateOn" label="时间" width="141">
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.CreateOn+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+      <div>-->
+
+    <div>
+      <footer class="login-footer1">
+        <div class="foot-wrapper" style="height: 30px; background-color: transparent; color:#A9A9A9; padding-top: 10px; text-align: right">
+          ©大港油田信息中心 版权所有
+        </div>
       </footer>
     </div>
+
   </div>
 </template>
 
 <script>
   import Vue from 'vue'
   import Component from 'class-component'
+  import Sticky from '@/components/Sticky'
   @Component({
     data () {
       // form model
@@ -113,7 +329,8 @@
         loading: false,
         noticeList: [], //通知列表
         fileList: [], //文档列表
-        activeName: 'first'
+        activeName: 'first',
+        activeIndex: '0',
       }
     },
 
@@ -121,7 +338,9 @@
       this.initNoticeListData()
       this.initFileListData()
     },
-
+    components: {
+      Sticky
+    },
     methods: {
       //获取通知列表
       initNoticeListData() {
@@ -171,6 +390,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
+      },
+      handleSelect (key, keyPath) {
+        this.activeIndex = key
       }
     }
 
@@ -213,23 +435,243 @@
 
 </script>
 
+<!--<script>
+import Sticky from '@/components/Sticky'
+
+export default {
+  layout () {
+    return 'site'
+  },
+  login() {
+    this.logging = true
+    this.$refs.user.validate(async (valid) => {
+      try {
+        if (valid) {
+          await this.$store.dispatch('auth/login', {
+            fields: {
+              username: this.model.username.replace(/(^\s*)|(\s*$)/g, ""),
+              password: this.model.password.replace(/(^\s*)|(\s*$)/g, "")
+            }
+          })
+          if (process.env.appclient == 'lims') {
+            this.$router.push(this.$route.query.page || '/')
+          } else if (process.env.appclient == 'cellbank') {
+            this.$router.push(this.$route.query.page || '/indexdqm')
+          } else {
+            this.$router.push(this.$route.query.page || '/')
+          }
+        }
+      } catch (e) {
+        // this.$message.warning(e.message)
+        this.$message.warning('账号或密码错误')
+      } finally {
+        this.logging = false
+      }
+    })
+  },
+  logout() {
+    this.$store.dispatch('logout')
+  },
+
+  name: 'StickyDemo',
+  components: {
+    Sticky
+  },
+  data () {
+    const model = {
+      username: '',
+      password: ''
+    }
+
+    // form validate rules
+    const rules = {
+      username: [{
+        required: true,
+        message: '请输入用户名'
+      }],
+      password: [{
+        required: true,
+        message: '请输入密码'
+      }]
+    }
+
+    return {
+      loginMode: 1,
+      model: model,
+      rules: rules,
+      error: null,
+      loading: false,
+      noticeList: [], //通知列表
+      fileList: [], //文档列表
+      activeIndex: '0',
+      activeName: 'first',
+    }
+  },
+
+  created () {
+    this.initNoticeListData()
+    this.initFileListData()
+  },
+
+  methods: {
+    handleSelect (key, keyPath) {
+      if (key === '0' || key === '1' || key === '2') {
+        this.activeIndex = key
+      }
+    },
+    //获取通知列表
+    initNoticeListData() {
+      let _this = this
+      //传递列名
+      const params = {
+        colName: "NoticeTab"
+      }
+      _this.$axios.get("/document/getdocumentnameandtime", {params})
+        .then(function (response) {
+          _this.noticeList = response.data
+        })
+        .catch(function (error) {
+          console.log(error);
+        });
+    },
+    //获取文件列表
+    initFileListData() {
+      let _this = this
+      //传递列名
+      const params = {
+        colName: "DocTab"
+      }
+      _this.$axios.get("/document/getdocumentnameandtime", {params})
+        .then(function (response) {
+          _this.fileList = response.data
+        })
+        .catch(function (error) {
+          console.log(error);
+        });
+    },
+    //下载文件
+    DownloadFile(row){
+      let val = row.FileURL
+      let urlArr = val.split('|')
+      location.href = "http://" + urlArr[0]
+    },
+    //格式化时间
+    jstimehandle(val) {
+      if (val === '') {
+        return '&#45;&#45;&#45;&#45;'
+      } else if (val === '0001-01-01T08:00:00+08:00') {
+        return '&#45;&#45;&#45;&#45;'
+      } else if (val === '5000-01-01T23:59:59+08:00') {
+        return '永久'
+      } else {
+        val = val.replace('T', ' ')
+        return val.substring(0, 10)
+      }
+    }
+  }
+
+}
+</script>-->
+
 <style lang="scss" scoped>
   @import '../assets/styles/base/variables';
 
-  .back-width {
+  .components-container div {
+    margin-top: 20px;
+  }
+
+  .top-wrapper {
+    margin: 0px auto;
+    width: 1004px;
+    /*text-align: right;
+    alignment: right;*/
+    flex-direction: row;
+  }
+  .home-wrapper{
+    margin:0px auto;
+    width: 1004px;
+    flex-direction: column;
+    margin-bottom: 45px;
+  }
+
+  .foot-wrapper{
+    margin:0px auto;
+    width: 1004px;
+    display: flex;
+    alignment: center;
+    align-items: center;
+    flex-direction: column;
+  }
+
+  .back-width1 {
     background-color: #2F79F6;
+    margin: 0px auto;
+    left: 0;
+    right: 0;
+    top: 20px;
+    width: 1004px;
+  }
+
+
+  .login-footer1 {
+    position: fixed;
+    background-color: #34393D;
+    font-size: 10px;
+    clear: both;
+    display: block;
+    text-align: center;
+    margin: 0px auto;
+    bottom: 0px;
+    width: 100%;
+  }
+
+
+  /*-----------*/
+  .time {
+    font-size: 13px;
+    color: #999;
+  }
+
+  .bottom {
+    margin-top: 13px;
+    line-height: 12px;
+  }
+
+  .button {
+    padding: 0;
+    float: right;
+  }
+
+  .image {
+    width: 100%;
+    display: block;
+  }
+
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+
+  .clearfix:after {
+    clear: both
+  }
+
+  .back-width {
+    background-color: #CBD1D1;
     position: fixed;
     margin: auto;
     left: 0;
     right: 0;
-    top: 88px;
+    top: 130px;
     width: 100%;
     height: 550px;
+    margin-bottom: 40px;
   }
 
   .login-body {
 
-    background: url("../assets/img/tian.png") no-repeat left 50%;
+    background: url("../assets/img/gflogin.jpg") no-repeat left 50%;
     font-family: 'Open Sans', sans-serif;
     background-color: #2469E8;
     background-size: cover;
@@ -246,7 +688,7 @@
     left: -400px;
     right: 0;
     bottom: 0;
-    width: 899px;
+    width: 800px;
     height: 550px;
     /*
     top: 0;
@@ -255,21 +697,6 @@
     left: 0;*/
   }
 
-  .login-footer {
-    font-size: 10px;
-    clear: both;
-    display: block;
-    text-align: center;
-    margin: 0px auto;
-    position: absolute;
-    bottom: 10px;
-    width: 100%;
-
-    a {
-      color: $brand-color;
-    }
-  }
-
   .login {
     /*flex: 1;
     width: 100%;*/
@@ -321,20 +748,5 @@
 
 
   }
-
-  .fileList {
-    /*flex: 1;
-    width: 100%;*/
-    position: fixed;
-    top: 95px;
-    left: 30px;
-    font-size: 0.875rem;
-    opacity: 0.8;
-
-  }
-
-  /*.nuxt-progress {
-    display: none;
-  }*/
-
 </style>
+

src/dashoo.cn/frontend_web/src/pages/login_gf.vue

@@ -1,411 +0,0 @@
-<template>
-  <div style="width: 100%; overflow-y: auto" >
-    <sticky class-name="sub-navbar2">
-      <div class="top-wrapper">
-        <div style="margin-top: 5px; float: left;">
-          <router-link to="/">
-            <img src="../assets/img/logo_dagang2.png" style="height:35px;" />
-          </router-link>
-        </div>
-
-        <div style="float: right;">
-          <router-link :to="'/signup'">
-            <el-button type="text" round>没有账户？请注册</el-button>
-          </router-link>
-
-          <router-link :to="'/logingf'">
-            <el-button type="info" size="small" round>登录供方管理系统</el-button>
-          </router-link>
-
-        </div>
-      </div>
-
-    </sticky>
-
-    <div>
-      <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
-        <el-menu-item index="0">首页</el-menu-item>
-        <el-menu-item index="1">通知中心</el-menu-item>
-        <el-menu-item index="2">文件下载中心</el-menu-item>
-      </el-menu>
-    </div>
-
-    <div class="back-width1" style="margin-top: 10px" v-if="activeIndex==0">
-      <el-carousel>
-        <el-carousel-item key="1">
-          <img src="../assets/img/carousel/a.jpg" style="height: 100%; width: 100%">
-        </el-carousel-item>
-        <el-carousel-item key="2">
-          <img src="../assets/img/carousel/b.jpg" style="height: 100%; width: 100%">
-        </el-carousel-item>
-        <el-carousel-item key="3">
-          <img src="../assets/img/carousel/c.jpg" style="height: 100%; width: 100%">
-        </el-carousel-item>
-      </el-carousel>
-    </div>
-
-    <div class="components-container home-wrapper" v-if="activeIndex==0">
-      <el-row>
-        <el-col :span="24">
-          <span style="color: black; font-size: large; font-weight: bold; padding-top: 20px">| 功能介绍</span>
-        </el-col>
-        <el-col :span="24">
-          <span style="color: black; font-size: x-small; padding-top: 20px">| 大港油田供方管理信息系统功能介绍</span>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" style="margin-top: 0px">
-        <el-col :span="12">
-          <el-card :body-style="{ padding: '0px' }" style="margin-top: 0px">
-            <img style="height: 200px" src="../assets/img/zhunrushenqing.jpg" class="image">
-            <div style="padding: 14px;">
-              <span style="font-weight: bold">准入申请</span>
-              <div class="bottom clearfix">
-                <span>物资类、技术服务类和基建类的准入申请</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="12">
-          <el-card :body-style="{ padding: '0px' }"  style="margin-top: 0px">
-            <img style="height: 200px" src="../assets/img/zengxiangshenqing.jpg" class="image">
-            <div style="padding: 14px;">
-              <span style="font-weight: bold">增项申请</span>
-              <div class="bottom clearfix">
-                <span>物资类、技术服务类和基建类的增项申请</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="12">
-          <el-card :body-style="{ padding: '0px' }">
-            <img style="height: 200px" src="../assets/img/nianshen.jpg" class="image">
-            <div style="padding: 14px;">
-              <span style="font-weight: bold">年审</span>
-              <div class="bottom clearfix">
-                <span>物资类、技术服务类和基建类的年审</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="12">
-          <el-card :body-style="{ padding: '0px' }" >
-            <img style="height: 200px" src="../assets/img/zizhibiangeng.jpg" class="image">
-            <div style="padding: 14px;">
-              <span style="font-weight: bold">资质变更</span>
-              <div class="bottom clearfix">
-                <span>已入网企业的资质变更</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="12">
-          <el-card :body-style="{ padding: '0px' }" >
-            <img style="height: 200px" src="../assets/img/xinxibiangeng.jpg" class="image">
-            <div style="padding: 14px;">
-              <span style="font-weight: bold">信息变更</span>
-              <div class="bottom clearfix">
-                <span>已入网企业的信息变更</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="12">
-          <el-card :body-style="{ padding: '0px' }" >
-            <img style="height: 200px" src="../assets/img/zaixianjiaofei.jpg" class="image">
-            <div style="padding: 14px;">
-              <span style="font-weight: bold">在线缴费</span>
-              <div class="bottom clearfix">
-                <span>通过此信息可在线缴费</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="12">
-          <el-card :body-style="{ padding: '0px' }" style="margin-bottom: 20px">
-            <img style="height: 200px" src="../assets/img/zaixianchaxun.jpg" class="image">
-            <div style="padding: 14px;">
-              <span style="font-weight: bold">业务查询</span>
-              <div class="bottom clearfix">
-                <span>报表及图表的查询功能</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="12">
-          <el-card :body-style="{ padding: '0px' }" style="margin-bottom: 20px">
-            <img style="height: 200px" src="../assets/img/zizhi.jpg" class="image">
-            <div style="padding: 14px;">
-              <span style="font-weight: bold">资质管理</span>
-              <div class="bottom clearfix">
-                <span>资质管理的统一管理功能</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
-    </div>
-
-    <div class="components-container home-wrapper" v-if="activeIndex==1">
-      <el-table :data="noticeList"  style="width: 100%; height: 100vh;" @row-click="DownloadFile">
-        <el-table-column prop="Name" label="通知标题">
-          <template slot-scope="scope">
-            <i class="el-icon-caret-right"></i>
-            <a style="margin-left: 5px">{{ scope.row.Name }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column prop="CreateOn" label="时间" width="141">
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="components-container home-wrapper" v-if="activeIndex==2">
-      <el-table :data="fileList" style="width: 100%;  height: 100vh;" @row-click="DownloadFile">
-        <el-table-column prop="Name" label="文件名">
-          <template slot-scope="scope">
-            <i class="el-icon-caret-right"></i>
-            <a style="margin-left: 5px">{{ scope.row.Name }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column prop="CreateOn" label="时间" width="141">
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--<div>
-      <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
-        <el-menu-item index="1">通知中心</el-menu-item>
-        <el-menu-item index="2">文件下载中心</el-menu-item>
-        &lt;!&ndash;<el-menu-item index="3">登录供方管理系统</el-menu-item>
-        <el-menu-item index="4">账户注册</el-menu-item>&ndash;&gt;
-      </el-menu>
-    </div>
-
-    <div class="components-container home-wrapper">
-
-      <el-card style="width: 1004px;" class="box-card" v-if="activeIndex == 1">
-        <div slot="header">
-          <span>
-            <i class="icon icon-table2"></i> 通知中心
-          </span>
-        </div>
-        <el-table fit :data="noticeList"  style="width: 100%; height: 100vh;" @row-click="DownloadFile">
-          <el-table-column prop="Name" label="通知标题">
-            <template slot-scope="scope">
-              <i class="el-icon-caret-right"></i>
-              <a style="margin-left: 5px">{{ scope.row.Name }}</a>
-            </template>
-          </el-table-column>
-          <el-table-column prop="CreateOn" label="时间" width="141">
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.CreateOn+'') }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-card>
-
-      <el-card style="width: 1004px" class="box-card" v-if="activeIndex == 2">
-        <div slot="header">
-          <span>
-            <i class="icon icon-table2"></i> 文件下载中心
-          </span>
-        </div>
-        <el-table fit :data="fileList" style="width: 100%;  height: 100vh;" @row-click="DownloadFile">
-          <el-table-column prop="Name" label="文件名">
-            <template slot-scope="scope">
-              <i class="el-icon-caret-right"></i>
-              <a style="margin-left: 5px">{{ scope.row.Name }}</a>
-            </template>
-          </el-table-column>
-          <el-table-column prop="CreateOn" label="时间" width="141">
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.CreateOn+'') }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-card>
-      <div>-->
-
-    <div>
-      <footer class="login-footer1" style="margin-top: 10px;">
-        <div class="foot-wrapper" style="height: 30px; background-color: transparent; color:#A9A9A9; padding-top: 10px; text-align: right">
-          ©大港油田信息中心 版权所有
-        </div>
-      </footer>
-    </div>
-
-  </div>
-</template>
-
-<script>
-import Sticky from '@/components/Sticky'
-
-export default {
-  layout () {
-    return 'site'
-  },
-  name: 'StickyDemo',
-  components: {
-    Sticky
-  },
-  data () {
-    return {
-      noticeList: [], //通知列表
-      fileList: [], //文档列表
-      activeIndex: '0',
-      activeName: 'first',
-    }
-  },
-
-  created () {
-    this.initNoticeListData()
-    this.initFileListData()
-  },
-
-  methods: {
-    handleSelect (key, keyPath) {
-      if (key === '0' || key === '1' || key === '2') {
-        this.activeIndex = key
-      }
-    },
-    //获取通知列表
-    initNoticeListData() {
-      let _this = this
-      //传递列名
-      const params = {
-        colName: "NoticeTab"
-      }
-      _this.$axios.get("/document/getdocumentnameandtime", {params})
-        .then(function (response) {
-          _this.noticeList = response.data
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    },
-    //获取文件列表
-    initFileListData() {
-      let _this = this
-      //传递列名
-      const params = {
-        colName: "DocTab"
-      }
-      _this.$axios.get("/document/getdocumentnameandtime", {params})
-        .then(function (response) {
-          _this.fileList = response.data
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    },
-    //下载文件
-    DownloadFile(row){
-      let val = row.FileURL
-      let urlArr = val.split('|')
-      location.href = "http://" + urlArr[0]
-    },
-    //格式化时间
-    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)
-      }
-    }
-  }
-
-}
-</script>
-
-<style lang="scss" scoped>
-  @import '../assets/styles/base/variables';
-
-  .components-container div {
-    margin-top: 20px;
-  }
-
-  .top-wrapper {
-    margin: 0px auto;
-    width: 1004px;
-    /*text-align: right;
-    alignment: right;*/
-    flex-direction: row;
-  }
-  .home-wrapper{
-    margin:0px auto;
-    width: 1004px;
-    flex-direction: column;
-  }
-
-  .foot-wrapper{
-    margin:0px auto;
-    width: 1004px;
-    display: flex;
-    alignment: center;
-    align-items: center;
-    flex-direction: column;
-  }
-
-  .back-width1 {
-    background-color: #2F79F6;
-    margin: 0px auto;
-    left: 0;
-    right: 0;
-    top: 20px;
-    width: 1004px;
-  }
-
-
-  .login-footer1 {
-    background-color: #34393D;
-    font-size: 10px;
-    clear: both;
-    display: block;
-    text-align: center;
-    margin: 0px auto;
-    bottom: 10px;
-    width: 100%;
-  }
-
-
-  /*-----------*/
-  .time {
-    font-size: 13px;
-    color: #999;
-  }
-
-  .bottom {
-    margin-top: 13px;
-    line-height: 12px;
-  }
-
-  .button {
-    padding: 0;
-    float: right;
-  }
-
-  .image {
-    width: 100%;
-    display: block;
-  }
-
-  .clearfix:before,
-  .clearfix:after {
-    display: table;
-    content: "";
-  }
-
-  .clearfix:after {
-    clear: both
-  }
-</style>
-

src/dashoo.cn/frontend_web/src/pages/logingf.vue

@@ -0,0 +1,340 @@
+<template>
+
+  <div style="height: calc(100vh); width: 100%; background-color:#FFFFFF" >
+    <img src="../assets/img/title_gongfang.png" style="height:60px; margin-top: 20px;margin-left: 100px;"  >
+    <div class="back-width">
+      <div class="login-body">
+        <section class="fileList">
+          <el-tabs v-model="activeName" tab-position="left">
+            <el-tab-pane label="通知中心" name="first">
+              <el-table :data="noticeList"  style="width: 600px; height: 530px;" @row-click="DownloadFile">
+                <el-table-column prop="Name" label="通知标题">
+                  <template slot-scope="scope">
+                    <i class="el-icon-caret-right"></i>
+                    <a style="margin-left: 5px">{{ scope.row.Name }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="CreateOn" label="时间" width="141">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.CreateOn+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="文档下载" name="second">
+              <el-table :data="fileList" style="width: 600px; height: 530px;" @row-click="DownloadFile">
+                <el-table-column prop="Name" label="文件名">
+                  <template slot-scope="scope">
+                    <i class="el-icon-caret-right"></i>
+                    <a style="margin-left: 5px">{{ scope.row.Name }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="CreateOn" label="时间" width="141">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.CreateOn+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
+
+        </section>
+        <section class="login">
+          <!--<header class="login-header">
+            <h1 style="text-align:center;margin-top:70px;margin-bottom:40px;"><router-link to="/"><img src="../assets/img/logo.png" style="height:80px;"></router-link></h1>
+            <el-alert v-if="error" :title="error.title" type="warning" :description="error.message" show-icon/>
+          </header>-->
+
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span style="font-weight: bold;">用户登录</span>
+              </div>
+              <el-form class="login-form" auto-complete="off" :model="model" :rules="rules" ref="user" label-position="top">
+              <el-form-item label="用户名" prop="username">
+                <el-input type="text" v-model="model.username" placeholder="请输入用户名">
+                  <el-select v-model="loginMode" slot="append" placeholder="登录类型" style="width: 110px;">
+                    <el-option label="普通账户" :value="1"></el-option>
+                    <el-option label="PTR认证" :value="2"></el-option>
+                  </el-select>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="密码" prop="password">
+                <el-input type="password" v-model="model.password" placeholder="请输入密码" @keyup.enter.native="login()" />
+              </el-form-item>
+              <el-button type="primary" :loading="loading" @click="login()">{{ loading ? '登录中...' : '登录' }}</el-button>
+              <router-link :to="'/signup'">
+                <el-button type="text" round>没有账户？请注册</el-button>
+              </router-link>
+
+              </el-form>
+            </el-card>
+
+
+        </section>
+      </div>
+    </div>
+    <div >
+      <footer class="login-footer" style="color:#A9A9A9">
+        ©大港油田信息中心 版权所有
+      </footer>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import Component from 'class-component'
+  @Component({
+    data () {
+      // form model
+      // TODO: remove default values
+      const model = {
+        username: '',
+        password: ''
+      }
+
+      // form validate rules
+      const rules = {
+        username: [{
+          required: true,
+          message: '请输入用户名'
+        }],
+        password: [{
+          required: true,
+          message: '请输入密码'
+        }]
+      }
+
+      return {
+        loginMode: 1,
+        model: model,
+        rules: rules,
+        error: null,
+        loading: false,
+        noticeList: [], //通知列表
+        fileList: [], //文档列表
+        activeName: 'first'
+      }
+    },
+
+    created () {
+      this.initNoticeListData()
+      this.initFileListData()
+    },
+
+    methods: {
+      //获取通知列表
+      initNoticeListData() {
+        let _this = this
+        //传递列名
+        const params = {
+          colName: "NoticeTab"
+        }
+        _this.$axios.get("/document/getdocumentnameandtime", {params})
+          .then(function (response) {
+            _this.noticeList = response.data
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
+      },
+      //获取文件列表
+      initFileListData() {
+        let _this = this
+        //传递列名
+        const params = {
+          colName: "DocTab"
+        }
+        _this.$axios.get("/document/getdocumentnameandtime", {params})
+          .then(function (response) {
+            _this.fileList = response.data
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
+      },
+      //下载文件
+      DownloadFile(row){
+        let val = row.FileURL
+        let urlArr = val.split('|')
+        location.href = "http://" + urlArr[0]
+      },
+      //格式化时间
+      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)
+        }
+      }
+    }
+
+  })
+  export default class Logingf extends Vue {
+    layout() {
+      return 'empty'
+    }
+    login() {
+      this.logging = true
+      this.$refs.user.validate(async (valid) => {
+        try {
+          if (valid) {
+            await this.$store.dispatch('auth/login', {
+              fields: {
+                username: this.model.username.replace(/(^\s*)|(\s*$)/g, ""),
+                password: this.model.password.replace(/(^\s*)|(\s*$)/g, "")
+              }
+            })
+            if (process.env.appclient == 'lims') {
+              this.$router.push(this.$route.query.page || '/')
+            } else if (process.env.appclient == 'cellbank') {
+              this.$router.push(this.$route.query.page || '/indexdqm')
+            } else {
+              this.$router.push(this.$route.query.page || '/')
+            }
+          }
+        } catch (e) {
+          // this.$message.warning(e.message)
+          this.$message.warning('账号或密码错误')
+        } finally {
+          this.logging = false
+        }
+      })
+    }
+    logout() {
+      this.$store.dispatch('logout')
+    }
+  }
+
+</script>
+
+<style lang="scss" scoped>
+  @import '../assets/styles/base/variables';
+
+  .back-width {
+    background-color: #2F79F6;
+    position: fixed;
+    margin: auto;
+    left: 0;
+    right: 0;
+    top: 88px;
+    width: 100%;
+    height: 550px;
+  }
+
+  .login-body {
+
+    background: url("../assets/img/tian.png") no-repeat left 50%;
+    font-family: 'Open Sans', sans-serif;
+    background-color: #2469E8;
+    background-size: cover;
+
+    /*background-size: cover;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;*/
+    /*min-height: 1050px;*/
+
+    position: absolute;
+
+    margin: auto;
+    left: -400px;
+    right: 0;
+    bottom: 0;
+    width: 899px;
+    height: 550px;
+    /*
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;*/
+  }
+
+  .login-footer {
+    font-size: 10px;
+    clear: both;
+    display: block;
+    text-align: center;
+    margin: 0px auto;
+    position: absolute;
+    bottom: 10px;
+    width: 100%;
+
+    a {
+      color: $brand-color;
+    }
+  }
+
+  .login {
+    /*flex: 1;
+    width: 100%;*/
+    position: relative;
+    max-width: 22rem;
+    top: 60px;
+    left: 850px;
+    font-size: 0.875rem;
+    opacity: 0.9;
+
+    &-header {
+      margin-bottom: 1rem;
+
+      .brand {
+        margin: 4.5rem 0 3.5rem;
+        text-align: center;
+        letter-spacing: 0.125rem;
+
+        a {
+          margin: 0;
+          color: $brand-color;
+          font: 300 3rem sans-serif;
+
+          &:hover {
+            color: $brand-hover-color;
+            text-shadow: 0 0 1rem $brand-hover-color;
+          }
+        }
+      }
+    }
+
+    &-form {
+      /*margin-bottom: 2.5rem;
+      padding: 1.875rem 1.25rem;
+      background: $login-form-background;*/
+      color: $login-form-color;
+
+      /*.heading {
+        margin: 0 0 1rem;
+        font-weight: 400;
+        font-size: 1.5rem;
+      }*/
+
+      .el-button {
+        margin-top: 0.5rem;
+        width: 100%;
+      }
+    }
+
+
+  }
+
+  .fileList {
+    /*flex: 1;
+    width: 100%;*/
+    position: fixed;
+    top: 95px;
+    left: 30px;
+    font-size: 0.875rem;
+    opacity: 0.8;
+
+  }
+
+  /*.nuxt-progress {
+    display: none;
+  }*/
+
+</style>

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

@@ -175,6 +175,11 @@
     </el-card>
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="专业科室" v-if="this.AnnualStatus == '0'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="审核状态">
           <template>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
@@ -190,39 +195,21 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="确认审核通过请选择专业审核接收人" :visible.sync="selectAuditShow" width="420px">
-      <el-form ref="searchForm" label-width="110px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="接收人">
-              <el-select ref="selectProfAudit" v-model="ProfAudit" placeholder="请选择" style="width: 90%" filterable
-                allow-create default-first-option>
-                <el-option v-for="item in profAuditOption" :key="item.id" :label="item.realname" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="selectAuditShow = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="checkstatus()">确定</el-button>
-      </span>
-    </el-dialog>
 
-    <el-dialog title="选择业务处专业审核人" :visible.sync="dialogProfAudit" width="420px">
+    <el-dialog title="提交专业审批" :visible.sync="dialogProfAudit" width="420px">
       <el-form ref="searchForm" label-width="110px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="审核人">
-              <el-select ref="selectProfAuditThen" v-model="ProfAuditThen" placeholder="请选择" style="width: 90%"
-                filterable allow-create default-first-option>
-                <el-option v-for="item in profAuditThenOption" :key="item.id" :label="item.realname" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item label="审批人部门">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="审批人">
+          <el-select ref="selectAuditer" v-model="ProfAuditThen" placeholder="请选择" style="width: 100%" filterable
+            allow-create default-first-option>
+            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogProfAudit = false">取 消</el-button>
@@ -274,23 +261,23 @@
     data() {
       return {
         dialogProfAudit: false,
-        selectAuditShow: false,
         canUpdateSupplier: true,
         dictData: null,
         applyLoading: false,
+        majorDept: [],
+        secauditerOptions: [], //专业审批人
+        secorgtreelist: [], //专业审核人部门
+        orgtreelist: [], //专业审核部门
         equipmentList: [], //企业主要装备情况
         performanceList: [], //近三年主要工程业绩
         patentList: [], //拥有专利、专有技术及工法
         winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
         businessList: [], //准入业务
-        profAuditOption: [], //专业审核接收人
-        profAuditThenOption: [], //专业审核人
         serviceId: '',
         certId: '',
         classId: '',
         annualId: '',
         WorkflowId: '',
-        ProfAudit: '',
         ProfAuditThen: '',
         formData: {
           Id: '',
@@ -379,6 +366,11 @@
           AuditorRemark: '',
           AnnualId: 0
         },
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
         formDataCert: {
           WorkerTotal: 0,
           ContractNum: 0,
@@ -396,7 +388,9 @@
         entrydetail: {
           process: 'oil_audit_apply',
           business: '',
-          instance: ''
+          instance: '',
+          AnnualStatus:''
+
         },
       }
     },
@@ -410,7 +404,9 @@
       this.annualId = this.$route.query.annualId
       this.getDictOptions()
       this.formData.Id = this.serviceId
-      this.initDatas();
+      this.initDatas()
+      this.getorgtreelist()
+      this.getorgtreelistbydeptid()
       console.log("---this.AnnualStatusa---", this.AnnualStatus)
     },
     methods: {
@@ -559,9 +555,55 @@
       getDictOptions() {
         annualapi.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
-          this.profAuditOption = res.data.items['Receive']
-          this.profAuditThenOption = res.data.items['ProfAudit']
-          console.log("--- this.selectProfAudit--", this.profAuditOption)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getorgtreelist() {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/orgalllist', {
+            params
+          })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
+      getorgtreelistbydeptid() {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/listbydeptid', {
+            params
+          })
+          .then(res => {
+            _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      auditOrgChange(val) {
+        console.log(this.formData.Status, 'status')
+        let auditstepcode = ''
+        if (this.AnnualStatus === '1') {
+          auditstepcode = 'PROF_AUDIT'
+        } else {
+          return
+        }
+        let deptid = val[val.length - 1]
+        console.log(deptid)
+        this.auditerOptions = []
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)
         })
@@ -579,20 +621,15 @@
       makeSure() {
         //审核通过的具体操作(未编写)
         console.log("----this.shenheForm---", this.shenheForm)
-        if (this.shenheForm.SuccessStatus === 1) {
-          this.selectAuditShow = true
-        } else {
-          this.$confirm("确认审核结果！", "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
-            })
-            .then(() => {
-              this.dialogMakeSure = false
-              this.checkstatus()
-            })
-            .catch(() => {})
-        }
+        this.$confirm("确认审核结果！", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            this.checkstatus()
+          })
+          .catch(() => {})
       },
       checkstatus() {
         var ProfAuditUserId = ""
@@ -601,9 +638,9 @@
           ProfAuditUserId = this.ProfAuditThen
         } else if (this.AnnualStatus === '3') {
           this.shenheForm.SuccessStatus = parseInt(this.shenheForm.SuccessStatus) + 3
-          this.ProfAudit = ""
+          ProfAuditUserId = ""
         } else if (this.AnnualStatus === '0') {
-          ProfAuditUserId = this.ProfAudit
+          ProfAuditUserId = this.majorDept[this.majorDept.length - 1]
         }
         let params = this.shenheForm
         console.log("---this.shenheForm----", this.shenheForm)
@@ -615,7 +652,6 @@
                 type: 'success',
                 message: res.data.message,
               })
-              this.selectAuditShow = false
               this.dialogMakeSure = false
               this.dialogProfAudit = false
               this.AnnualStatus = -1

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

@@ -167,11 +167,11 @@
           <el-card class="box-card" style="height: 800px">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
-              <span style="float: right;">
+              <!-- <span style="float: right;">
                 <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" :loading="applyLoading"
                   @click="AuditEntity">提交审批
                 </el-button>
-              </span>
+              </span> -->
             </div>
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
@@ -182,7 +182,7 @@
       <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="初审单位" prop="FirstAudit" required>
+            <el-form-item label="审批单位" prop="FirstAudit" required>
               <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
                 filterable @change="auditOrgChang" style="width: 100%" v-model="entityForm.FirstAudit"
                 placeholder="请选择组织"></el-cascader>
@@ -566,38 +566,31 @@
       },
 
       auditOrgChang(val) {
-        console.log("------val----", val)
+        let deptid = val[val.length - 1]
+        console.log(deptid)
         this.auditerOption = []
-        this.entityForm.auditer = ''
-        api.getAuditerByDept(val[val.length - 1], this.$axios).then(res => {
-          if (res.data.item.length === 0) {
-            this.$message({
-              type: 'warning',
-              message: '该单位未设置审批人员！'
-            })
-            return
-          }
+        this.auditer = ''
+        let auditstepcode = 'FIRST_TRIAL'
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.auditerOption = res.data.item
-          console.log("---this.auditerOption--", this.auditerOption)
+          console.log("------this.auditerOption----",this.auditerOption)
         }).catch(err => {
           console.error(err)
         })
       },
 
-      getorgtreelist() {
+      getorgtreelist () {
         let _this = this
-        // request
         let params = {
           IsInnerOrganize: 1
         }
-        _this.$axios.get('organizes/list', {
-            params
-          })
+        _this.$axios.get('organizes/orgalllist', {
+          params
+        })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
-            // handle error
             console.error(err)
           })
       },

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

@@ -186,10 +186,14 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="审批人" prop="auditer" required>
-              <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
-                filterable allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
+            <el-form-item label="审批人" required>
+              <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择"
+                         style="width: 100%" filterable allow-create default-first-option>
+                <el-option
+                  v-for="item in auditerOption"
+                  :key="item.userid"
+                  :label="item.username"
+                  :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -421,19 +425,14 @@
       },
 
       auditOrgChang(val) {
-        console.log("------val----", val)
+        let deptid = val[val.length - 1]
+        console.log(deptid)
         this.auditerOption = []
-        this.entityForm.auditer = ''
-        supplierapi.getAuditerByDept(val[val.length - 1], this.$axios).then(res => {
-          if (res.data.item.length === 0) {
-            this.$message({
-              type: 'warning',
-              message: '该单位未设置审批人员！'
-            })
-            return
-          }
+        this.auditer = ''
+        let auditstepcode = 'FIRST_TRIAL'
+        supplierapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.auditerOption = res.data.item
-          console.log("---this.auditerOption--", this.auditerOption)
+          console.log("----this.auditerOption--",this.auditerOption )
         }).catch(err => {
           console.error(err)
         })
@@ -441,18 +440,16 @@
 
       getorgtreelist() {
         let _this = this
-        // request
         let params = {
           IsInnerOrganize: 1
         }
-        _this.$axios.get('organizes/list', {
-            params
-          })
+        _this.$axios.get('organizes/orgalllist', {
+          params
+        })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
-            // handle error
             console.error(err)
           })
       },

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

@@ -0,0 +1,292 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/infochange' }">供方基本信息表</el-breadcrumb-item>
+      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 编辑
+        </span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" @click="submitInfoChange">审核</el-button>
+          <router-link :to="'/oilsupplier/infochange'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
+      </div>
+      <el-card>
+        <div slot="header" class="clearfix" style="height:10px">
+          <span style="font-weight:bold;">信息变更</span>
+        </div>
+        <el-table :data="InfoData" border style="width: 100%">
+          <el-table-column align="center" prop="SelectItemName" label="变更项目">
+          </el-table-column>
+          <el-table-column align="center" prop="BeChangeInfo" label="变更前内容">
+          </el-table-column>
+          <el-table-column prop="ChangeInfo" align="center" label="变更后内容">
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-card>
+    <el-dialog title="提交申请" :visible.sync="commitshow" width="360px">
+      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="审批单位" prop="FirstAudit" required>
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                filterable @change="auditOrgChang" style="width: 100%" v-model="entityForm.FirstAudit"
+                placeholder="请选择组织"></el-cascader>
+              <!-- <el-select ref="selectauditOrg" v-model="entityForm.FirstAudit" placeholder="请选择" style="width: 100%"
+                @change="auditOrgChang" filterable allow-create default-first-option>
+                <el-option v-for="item in organizeOption" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="审批人" prop="auditer" required>
+              <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
+                filterable allow-create default-first-option>
+                <el-option v-for="item in auditerOption" :key="item.Id" :label="item.Realname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span style="float: right;margin-top:-10px;">
+        <el-button size="small" @click="commitshow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="addInfoChangeAudit()">确 定</el-button>
+      </span>
+      <br>
+    </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: 'oilinfochangeEdit',
+
+    data() {
+      return {
+        infoitemsoptions: [{
+          value: 'SupplierName',
+          label: '企业名称'
+        }, {
+          value: 'OilCertificateNo',
+          label: '中石油供应商证书号'
+        }, {
+          value: 'Grade',
+          label: '级别'
+        }, {
+          value: 'MgrUnit',
+          label: '管理单位'
+        }, {
+          value: 'OperType',
+          label: '经营方式'
+        }],
+        orgtreelist: [],
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
+        supplierId:'',
+        auditerOption: [],
+        commitshow: false,
+        InfoData: [],
+        UnitRelationOptions: [],
+        UnitRelationAry: [],
+        countryoptions: [],
+        selectuserlist: [],
+        countryprops: {
+          value: 'adcode',
+          label: 'name',
+          children: 'districts'
+        },
+        infochangeForm: {
+          Id: '',
+          SupplierId: '',
+          SelectItem: '',
+          SelectItemName: '',
+          BeChangeInfo: '',
+          ChangeInfo: '',
+          ChangeStatus: '',
+        },
+        serviceId: '',
+        certId: '',
+        entityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '',
+          FirstAudit: '',
+          auditer: '',
+        },
+        rules: {
+          FirstAudit: [{
+            required: true,
+            message: '请选择初审单位',
+            trigger: 'blur'
+          }],
+          auditer: [{
+            required: true,
+            message: '请选择审批人',
+            trigger: 'blur'
+          }]
+        }
+      }
+    },
+    created() {
+      this.serviceId = this.$route.params.opera
+      this.supplierId = this.serviceId
+      this.initDatas()
+    },
+    methods: {
+      initDatas() {
+        console.log("----this.formData.Id---", this.serviceId)
+        if (this.serviceId) {
+          api.getEntity(this.serviceId, this.$axios).then(res => {
+            this.InfoData = res.data.items
+            this.itemsfilter()
+            console.log("---res.data.items---", res.data.items)
+          }).catch(err => {
+            console.error(err)
+          });
+        }
+      },
+      itemsfilter() {
+        try {
+          let entityArray = this.InfoData
+          let arr = this.infoitemsoptions
+          if (entityArray == null) {
+            this.selectuserlist = arr
+            return false
+          }
+          this.selectuserlist = []
+          for (var i = 0; i < entityArray.length; i++) {
+            for (var j = 0; j < arr.length; j++) {
+              if (entityArray[i].SelectItem === arr[j].value) {
+                this.selectuserlist.push(arr[j])
+                arr.splice(j, 1)
+                j--
+              }
+            }
+          }
+          this.selectuserlist = arr
+        } catch (e) {
+          console.log(e)
+        }
+      },
+     
+      getorgtreelist() {
+        let _this = this
+        // request
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/list', {
+            params
+          })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      auditOrgChang(val) {
+        console.log("------val----", val)
+        this.auditerOption = []
+        this.entityForm.auditer = ''
+        api.getAuditerByDept(val[val.length - 2], this.$axios).then(res => {
+          // if (res.data.item.length === 0) {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '该单位未设置审批人员！'
+          //   })
+          //   return
+          // }
+          console.log("---res.data.item--", res.data.item)
+          this.auditerOption = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      //提交信息变更审核
+      submitInfoChange() {
+        this.getorgtreelist()
+        this.commitshow = true
+      },
+      addInfoChangeAudit() {
+        console.log("==this.supplierId====",this.supplierId)
+        api.auditEntity(this.supplierId, this.entityForm.auditer, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.initDatas()
+            this.commitshow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      getCityList(val) {
+        let resultData = JSON.parse(val)
+        let countstr = JSON.stringify(resultData.districts[0].districts)
+        countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+        this.countryoptions = JSON.parse(countstr)
+      },
+      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/infochange/_opera/operation.vue

@@ -463,7 +463,7 @@
       <el-card>
         <div slot="header" class="clearfix" style="height:10px">
           <span style="font-weight:bold;">信息变更</span>
-          <el-button style="float: right;" size="mini" type="primary" @click="AddChangeShow = true">添加变更</el-button>
+          <el-button style="float: right;" size="mini" type="primary" @click="addchange">添加变更</el-button>
         </div>
         <el-table :data="InfoData" border style="width: 100%">
           <el-table-column label="操作" min-width="90" align="center" fixed>
@@ -511,6 +511,40 @@
         <el-button type="primary" size="small" @click="saveitemschange()">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="提交申请" :visible.sync="commitshow" width="360px">
+      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="审批单位" prop="FirstAudit" required>
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                filterable @change="auditOrgChang" style="width: 100%" v-model="entityForm.FirstAudit"
+                placeholder="请选择组织"></el-cascader>
+              <!-- <el-select ref="selectauditOrg" v-model="entityForm.FirstAudit" placeholder="请选择" style="width: 100%"
+                @change="auditOrgChang" filterable allow-create default-first-option>
+                <el-option v-for="item in organizeOption" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="审批人" prop="auditer" required>
+              <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
+                filterable allow-create default-first-option>
+                <el-option v-for="item in auditerOption" :key="item.Id" :label="item.Realname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span style="float: right;margin-top:-10px;">
+        <el-button size="small" @click="commitshow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="addInfoChangeAudit()">确 定</el-button>
+      </span>
+      <br>
+    </el-dialog>
 
   </div>
 </template>
@@ -547,6 +581,15 @@
           value: 'OperType',
           label: '经营方式'
         }],
+        orgtreelist: [],
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
+        supplierId:'',
+        auditerOption: [],
+        commitshow: false,
         InfoData: [],
         AddChangeShow: false,
         UnitRelationOptions: [],
@@ -569,10 +612,31 @@
         },
         serviceId: '',
         certId: '',
+        entityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '',
+          FirstAudit: '',
+          auditer: '',
+        },
+        rules: {
+          FirstAudit: [{
+            required: true,
+            message: '请选择初审单位',
+            trigger: 'blur'
+          }],
+          auditer: [{
+            required: true,
+            message: '请选择审批人',
+            trigger: 'blur'
+          }]
+        }
       }
     },
     created() {
       this.serviceId = this.$route.params.opera
+      this.supplierId = this.serviceId
       this.initDatas()
     },
     methods: {
@@ -588,6 +652,16 @@
           });
         }
       },
+      addchange() {
+        this.AddChangeShow = true
+        this.infochangeForm.Id = ''
+        this.infochangeForm.SupplierId = ''
+        this.infochangeForm.SelectItem = ''
+        this.infochangeForm.SelectItemName = ''
+        this.infochangeForm.BeChangeInfo = ''
+        this.infochangeForm.ChangeInfo = ''
+        this.infochangeForm.ChangeStatus = ''
+      },
       itemsfilter() {
         try {
           let entityArray = this.InfoData
@@ -615,12 +689,6 @@
       additems() {
         console.log(this.$refs.infochangeCorp.selectedLabel)
         api.getinfoforitem(this.serviceId, this.infochangeForm.Selectitem, this.$axios).then(res => {
-          // var selectvalue = res.data
-          // var list = {
-          //   Value: selectvalue,
-          //   ChangeItem: this.$refs.infochangeCorp.selectedLabel + ''
-          // }
-          // this.InfoData.unshift(list)
           this.infochangeForm.BeChangeInfo = res.data
           this.infochangeForm.SelectItemName = this.$refs.infochangeCorp.selectedLabel + ''
           //this.AddChangeShow = false
@@ -638,6 +706,7 @@
             //保存成功后，初始化数据，变成修改
             this.infochangeForm.Id = res.data.item;
             this.initDatas();
+            this.AddChangeShow = false
             this.$message({
               type: 'success',
               message: res.data.message
@@ -653,9 +722,66 @@
           console.error(err)
         });
       },
+      getorgtreelist() {
+        let _this = this
+        // request
+        let params = {
+          IsInnerOrganize: 1
+        }
+        _this.$axios.get('organizes/list', {
+            params
+          })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      auditOrgChang(val) {
+        console.log("------val----", val)
+        this.auditerOption = []
+        this.entityForm.auditer = ''
+        api.getAuditerByDept(val[val.length - 2], this.$axios).then(res => {
+          // if (res.data.item.length === 0) {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '该单位未设置审批人员！'
+          //   })
+          //   return
+          // }
+          console.log("---res.data.item--", res.data.item)
+          this.auditerOption = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //提交信息变更审核
       submitInfoChange() {
-
+        this.getorgtreelist()
+        this.commitshow = true
+      },
+      addInfoChangeAudit() {
+        console.log("==this.supplierId====",this.supplierId)
+        api.auditEntity(this.supplierId, this.entityForm.auditer, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.initDatas()
+            this.commitshow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
       },
       //删除信息变更项
       deleteEntity(row) {

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

@@ -38,24 +38,11 @@
       </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'"> -->
+          <template slot-scope="scope">
+            <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/auditoperation'">
               <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> -->
+            </router-link>
+          </template>
         </el-table-column>
 
         <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"

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

@@ -19,7 +19,7 @@
           <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">增项申请</el-button>
           </router-link>
           <router-link :to="'/oilsupplier/supplier/basislist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="authUser.Profile.IsCompanyUser != 1">返回
+            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
           </router-link>
         </span>
@@ -177,16 +177,16 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
+          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
+            style="margin-top: 20px"></business-list>
         </el-tab-pane>
-
         <el-tab-pane label="企业资质" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :SupplierCertId="certId" :SupplierId="formData.Id+''"
-            :SupplierTypeCode="classId" :canadd="add_flat" @close="selectAuditOrg" height="360px" style="margin-top: 20px">
-          </business-list>
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg"
+            height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
-          <el-card class="box-card" style="height: 800px">
+          <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <!-- <span style="float: right;">
@@ -252,6 +252,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
+  import SubfileList from '@/components/oilsupplier/subfilelist'
   import BasisInfo from '@/components/oilsupplier/basisinfo'
 
   export default {
@@ -266,6 +267,7 @@
       PatentList, // 拥有专利、专有技术及工法列表
       WinningList, // 近三年获得省部级及以上主要技术、管理成果、获奖项目列表
       BusinessList, // 选择准入范围
+      SubfileList, // 选择企业资质
       BasisInfo
     },
     computed: {
@@ -277,6 +279,8 @@
 
     data () {
       return {
+        showReturn: 1,
+        IsCompanyUser: 0,
         dialogVisible: false,
         canUpdateSupplier: true,
         dictData: null,
@@ -354,7 +358,7 @@
           QQ: '',
           CompanyUrl: '',
           SpecSupplier: '',
-          SpecTypeCode: '',
+          SpecTypeCode: '1',
           SpecTypeName: '',
           WorkerTotal: 0,
           ContractNum: 0,
@@ -403,14 +407,12 @@
         }
       }
     },
-    mounted () {
-      this.serviceId = this.$route.params.opera + ''
-      if (this.$route.query.certid) {
-        this.certId = this.$route.query.certid + ''
-      }
-    },
+
     created () {
       this.serviceId = this.$route.params.opera + ''
+      if (this.$route.query.rtn) {
+        this.showReturn = 0
+      }
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
@@ -420,8 +422,20 @@
         this.formData.Id = 0
       }
       this.getDictOptions()
-      this.initDatas()
       this.getorgtreelist()
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+      if (this.IsCompanyUser && this.serviceId === 'add') {
+        apiCert.getEntityByCreatorAndType('02', this.$axios).then(res => {
+          this.certId = res.data.Id
+          this.serviceId = res.data.SupplierId
+          this.formData.Id = res.data.SupplierId
+          this.initDatas()
+        }).catch(err => {
+          console.error(err)
+        })
+      } else {
+        this.initDatas()
+      }
     },
     methods: {
       inputCompany (val) {
@@ -555,13 +569,14 @@
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {
-              this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
+              //this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
+            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
           }).catch(err => {
             console.error(err)
           })

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

@@ -19,7 +19,7 @@
           <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">增项申请</el-button>
           </router-link>
           <router-link :to="'/oilsupplier/supplier/goodslist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="authUser.Profile.IsCompanyUser != 1">返回
+            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
           </router-link>
         </span>
@@ -178,16 +178,16 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
+          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
+            style="margin-top: 20px"></business-list>
         </el-tab-pane>
-
         <el-tab-pane label="企业资质" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :SupplierCertId="certId+''" :SupplierId="formData.Id+''"
-            :SupplierTypeCode="classId" :canadd="add_flat" @close="selectAuditOrg" height="360px" style="margin-top: 20px">
-          </business-list>
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg"
+            height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
-          <el-card class="box-card" style="height: 800px">
+          <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <!-- <span style="float: right;">
@@ -262,6 +262,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
+  import SubfileList from '@/components/oilsupplier/subfilelist'
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
 
   export default {
@@ -276,6 +277,7 @@
       PatentList, // 拥有专利、专有技术及工法列表
       WinningList, // 近三年获得省部级及以上主要技术、管理成果、获奖项目列表
       BusinessList, // 选择准入范围
+      SubfileList, // 选择企业资质
       GoodsInfo
     },
     computed: {
@@ -287,6 +289,8 @@
 
     data () {
       return {
+        showReturn: 1,
+        IsCompanyUser: 0,
         dialogVisible: false,
         canUpdateSupplier: true,
         dictData: null,
@@ -316,7 +320,7 @@
           Grade: '',
           MgrUnit: '',
           OperType: '',
-          Country: '',
+          Country: '中国',
           MaunAgent: '',
           ConstructTeam: '',
           CommercialNo: '',
@@ -364,7 +368,7 @@
           QQ: '',
           CompanyUrl: '',
           SpecSupplier: '',
-          SpecTypeCode: '',
+          SpecTypeCode: '1',
           SpecTypeName: '',
           WorkerTotal: 0,
           ContractNum: 0,
@@ -412,14 +416,12 @@
         }
       }
     },
-    mounted () {
-      this.serviceId = this.$route.params.opera + ''
-      if (this.$route.query.certid) {
-        this.certId = this.$route.query.certid
-      }
-    },
+
     created () {
       this.serviceId = this.$route.params.opera + ''
+      if (this.$route.query.rtn) {
+        this.showReturn = 0
+      }
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
@@ -430,7 +432,20 @@
       }
       this.getDictOptions()
       this.getorgtreelist()
-      this.initDatas()
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+
+      if (this.IsCompanyUser && this.serviceId === 'add') {
+        apiCert.getEntityByCreatorAndType('01', this.$axios).then(res => {
+          this.certId = res.data.Id
+          this.serviceId = res.data.SupplierId
+          this.formData.Id = res.data.SupplierId
+          this.initDatas()
+        }).catch(err => {
+          console.error(err)
+        })
+      } else {
+        this.initDatas()
+      }
     },
     methods: {
       inputCompany (val) {
@@ -564,13 +579,14 @@
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {
-              this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
+              //this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
+            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
           }).catch(err => {
             console.error(err)
           })

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

@@ -12,14 +12,15 @@
         </span>
         <span style="float: right;">
           <router-link :to="'/oilsupplier/annualaudit'">
-          <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">年审申请</el-button>
+            <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0">
+              年审申请</el-button>
           </router-link>
           <!--v-if="formData.Step>=5"-->
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
-          <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">增项申请</el-button>
+            <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">增项申请</el-button>
           </router-link>
           <router-link :to="'/oilsupplier/supplier/techlist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="authUser.Profile.IsCompanyUser != 1">返回
+            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
           </router-link>
         </span>
@@ -170,21 +171,22 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
                 v-if="formDataCert.Status == 0">添加</el-button>
             </div>
-            <winning-list ref="winningList" :data.sync="winningList" :SupplierCertId="certId" :SupplierTypeCode="classId"
-              :canadd="add_flat" height="360px" style="margin-top: 20px">
+            <winning-list ref="winningList" :data.sync="winningList" :SupplierCertId="certId"
+              :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px">
             </winning-list>
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="准入范围" :disabled="!certId">
+          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
+            style="margin-top: 20px"></business-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :SupplierCertId="certId" :SupplierId="formData.Id+''"
-            :SupplierTypeCode="classId" :canadd="add_flat" @close="selectAuditOrg" height="360px" style="margin-top: 20px">
-          </business-list>
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg"
+            height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
-          <el-card class="box-card" style="height: 800px">
+          <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <!-- <span style="float: right;">
@@ -206,20 +208,15 @@
           <el-col :span="24">
             <el-form-item label="二级单位">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                           filterable style="width: 100%" @change="auditOrgChang"
-                           placeholder="请选择组织">
+                filterable style="width: 100%" @change="auditOrgChang" placeholder="请选择组织">
               </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="审批人">
-              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                         style="width: 90%" filterable allow-create default-first-option>
-                <el-option
-                  v-for="item in auditerOption"
-                  :key="item.userid"
-                  :label="item.username"
-                  :value="item.userid">
+              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -249,6 +246,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
+  import SubfileList from '@/components/oilsupplier/subfilelist'
   import TechInfo from '@/components/oilsupplier/techinfo'
 
   export default {
@@ -263,6 +261,7 @@
       PatentList, // 拥有专利、专有技术及工法列表
       WinningList, // 近三年获得省部级及以上主要技术、管理成果、获奖项目列表
       BusinessList, // 选择准入范围
+      SubfileList, // 选择企业资质
       TechInfo
     },
     computed: {
@@ -272,8 +271,10 @@
     },
     name: 'oilsupplierEdit',
 
-    data () {
+    data() {
       return {
+        showReturn: 1,
+        IsCompanyUser: 0,
         dialogVisible: false,
         canUpdateSupplier: true,
         dictData: null,
@@ -283,6 +284,7 @@
         patentList: [], // 拥有专利、专有技术及工法
         winningList: [], // 近三年获得省部级及以上主要技术、管理成果、获奖项目
         businessList: [], // 准入业务
+        subfileList: [], // 准入业务
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
         orgtreelist: [],
@@ -351,7 +353,7 @@
           QQ: '',
           CompanyUrl: '',
           SpecSupplier: '',
-          SpecTypeCode: '',
+          SpecTypeCode: '1',
           SpecTypeName: '',
           WorkerTotal: 0,
           ContractNum: 0,
@@ -400,14 +402,17 @@
         }
       }
     },
-    mounted () {
+    mounted() {
       this.serviceId = this.$route.params.opera + ''
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
     },
-    created () {
+    created() {
       this.serviceId = this.$route.params.opera + ''
+      if (this.$route.query.rtn) {
+        this.showReturn = 0
+      }
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
@@ -417,11 +422,24 @@
         this.formData.Id = 0
       }
       this.getDictOptions()
-      this.initDatas()
       this.getorgtreelist()
+
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+      if (this.IsCompanyUser && this.serviceId === 'add') {
+        apiCert.getEntityByCreatorAndType('03', this.$axios).then(res => {
+          this.certId = res.data.Id
+          this.serviceId = res.data.SupplierId
+          this.formData.Id = res.data.SupplierId
+          this.initDatas()
+        }).catch(err => {
+          console.error(err)
+        })
+      } else {
+        this.initDatas()
+      }
     },
     methods: {
-      inputCompany (val) {
+      inputCompany(val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -432,12 +450,12 @@
           })
         }
       },
-      changeFormData (fdata) {
+      changeFormData(fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
       },
-      SetFormData (fdata) {
+      SetFormData(fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
@@ -499,27 +517,27 @@
         }*/
       },
 
-      isCanUpdateSupplier (supplierId) {
+      isCanUpdateSupplier(supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
-      equipmentdialog () {
+      equipmentdialog() {
         this.$refs['equipmentList'].showDialog()
       },
-      performancedialog () {
+      performancedialog() {
         this.$refs['performanceList'].showDialog()
       },
-      patentdialog () {
+      patentdialog() {
         this.$refs['patentList'].showDialog()
       },
-      winningdialog () {
+      winningdialog() {
         this.$refs['winningList'].showDialog()
       },
 
-      initDatas () {
+      initDatas() {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -563,13 +581,14 @@
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
+            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
           }).catch(err => {
             console.error(err)
           })
         }
       },
 
-      getDictOptions () {
+      getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
           this.organizeOption = res.data.items['Organizes']
@@ -580,14 +599,14 @@
           console.error(err)
         })
       },
-      getorgtreelist () {
+      getorgtreelist() {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/orgalllist', {
-          params
-        })
+            params
+          })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -595,7 +614,7 @@
             console.error(err)
           })
       },
-      auditOrgChang (val) {
+      auditOrgChang(val) {
         let deptid = val[val.length - 1]
         console.log(deptid)
         this.auditerOption = []
@@ -615,7 +634,7 @@
       }, */
 
       // 保存信息
-      saveEntity () {
+      saveEntity() {
         this.$refs['TechInfo'].$refs['EntityForm'].validate((valid) => {
           if (valid) {
             if (!this.formData.SetupTime) {
@@ -636,11 +655,11 @@
       },
 
       // 保存信息
-      saveCertEntity () {
+      saveCertEntity() {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
-      addEntity () {
+      addEntity() {
         this.formData.SupplierTypeCode = '03'
         this.formData.SupplierTypeName = '技术服务类'
         api.addEntity(this.formData, this.$axios).then(res => {
@@ -664,7 +683,7 @@
         })
       },
 
-      updateEntity () {
+      updateEntity() {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -684,7 +703,7 @@
         })
       },
 
-      CheckCompanyBase () {
+      CheckCompanyBase() {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -702,7 +721,7 @@
         return true
       },
       // 企业人员结构情况
-      updateNumberEntity () {
+      updateNumberEntity() {
         if (!this.CheckCompanyBase()) {
           return false
         }
@@ -724,10 +743,10 @@
           console.error(err)
         })
       },
-      selectAuditOrg () {
+      selectAuditOrg() {
         this.dialogVisible = true
       },
-      AuditEntity () {
+      AuditEntity() {
         this.applyLoading = true
         this.firstAudit = this.auditer
         apiCert.auditEntity(this.certId, this.firstAudit, this.$axios).then(res => {
@@ -751,7 +770,7 @@
         })
       },
 
-      jstimehandle (val) {
+      jstimehandle(val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -764,7 +783,7 @@
         }
       },
 
-      formatDateTime (date) {
+      formatDateTime(date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -777,6 +796,7 @@
       }
     }
   }
+
 </script>
 
 <style lang="scss">

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!IsCompanyUser">
+  <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/supplier' }">基建类类列表</el-breadcrumb-item>
@@ -891,37 +891,11 @@
       }
     },
     created () {
-      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-      if (this.IsCompanyUser) {
-        certApi.getEntityByCreatorAndType('02', this.$axios).then(res => {
-          const CertId = res.data.Id
-          const SupplierId = res.data.SupplierId
-          if (CertId) {
-            this.$router.push({
-              path: '/oilsupplier/supplier/' + SupplierId + '/basisedit',
-              query: {
-                certid: CertId
-              }
-            })
-          } else {
-            this.$router.push({
-              path: '/oilsupplier/supplier/add/basisedit',
-              query: {}
-            })
-          }
-
-        }).catch(err => {
-          console.error(err)
-        })
-
-      } else {
-        //查询条件初始值备份
-        Object.assign(this.searchFormReset, this.searchForm);
-        //查询列表
-        this.initDatas();
-        //this.getDictOptions()
-      }
-
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm);
+      //查询列表
+      this.initDatas();
+      //this.getDictOptions()
     },
     methods: {
       initDatas() {

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!IsCompanyUser">
+  <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/supplier' }">物资类列表</el-breadcrumb-item>
@@ -446,7 +446,6 @@
 
     data () {
       return {
-        IsCompanyUser: 0,
         dialogVisible: false,
         //列表数据
         entityList: [],
@@ -893,36 +892,11 @@
       }
     },
     created () {
-      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-      if (this.IsCompanyUser) {
-        certApi.getEntityByCreatorAndType('01', this.$axios).then(res => {
-          const CertId = res.data.Id
-          const SupplierId = res.data.SupplierId
-          if (CertId) {
-            this.$router.push({
-              path: '/oilsupplier/supplier/' + SupplierId + '/goodsedit',
-              query: {
-                certid: CertId
-              }
-            })
-          } else {
-            this.$router.push({
-              path: '/oilsupplier/supplier/add/goodsedit',
-              query: {}
-            })
-          }
-
-        }).catch(err => {
-          console.error(err)
-        })
-
-      } else {
-        //查询条件初始值备份
-        Object.assign(this.searchFormReset, this.searchForm);
-        //查询列表
-        this.initDatas();
-        //this.getDictOptions()
-      }
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm);
+      //查询列表
+      this.initDatas();
+      //this.getDictOptions()
     },
     methods: {
       initDatas() {

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!IsCompanyUser">
+  <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/supplier' }">技术服务类列表</el-breadcrumb-item>
@@ -446,7 +446,6 @@
 
     data() {
       return {
-        IsCompanyUser: 0,
         canApply: false,
         dialogVisible: false,
         //列表数据
@@ -898,38 +897,12 @@
       }
     },
     created () {
-      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-      if (this.IsCompanyUser) {
-        certApi.getEntityByCreatorAndType('03', this.$axios).then(res => {
-          this.CompanyApprovedData.CertId = res.data.Id
-          this.CompanyApprovedData.SupplierId = res.data.SupplierId
-          if (this.CompanyApprovedData.CertId) {
-            this.$router.push({
-              path: '/oilsupplier/supplier/' + this.CompanyApprovedData.SupplierId + '/techedit',
-              query: {
-                certid: this.CompanyApprovedData.CertId
-              }
-            })
-          } else {
-            this.$router.push({
-              path: '/oilsupplier/supplier/add/techedit',
-              query: {}
-            })
-          }
-
-        }).catch(err => {
-          console.error(err)
-        })
-
-      } else {
-        this.isCanApply()
-        //查询条件初始值备份
-        Object.assign(this.searchFormReset, this.searchForm)
-        //查询列表
-        this.initDatas()
-        //this.getDictOptions()
-      }
-
+      this.isCanApply()
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      //查询列表
+      this.initDatas()
+      //this.getDictOptions()
     },
     methods: {
       initDatas() {

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index.vue

@@ -38,9 +38,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" width="160" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/system/auditsetting/' + scope.row.Id + '/operation'">
-              <el-button type="primary" title="编辑" size="mini">编辑</el-button>
-            </router-link>
+              <el-button type="primary" title="编辑" size="mini" onclick="window.history.go(-1)">编辑</el-button>
 
             <el-popover placement="top" title="提示">
               <el-alert title="" description="确认要删除吗？" trigger="click" type="warning" :closable="false">