新增年审申请

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

@@ -0,0 +1,44 @@
+package annualaudit
+
+import (
+	"time"
+)
+
+type OilAnnualAudit struct {
+	Id               int       `xorm:"not null pk autoincr INT(10)"`
+	RecUnitId        string    `xorm:"comment('推荐单位编码') VARCHAR(10)"`
+	AccessCardNo     string    `xorm:"comment('准入证号') VARCHAR(50)"`
+	SupplierTypeName string    `xorm:"comment('准入类别') VARCHAR(50)"`
+	SupplierName     string    `xorm:"comment('企业名称') VARCHAR(50)"`
+	SupplierId       int       `xorm:"comment('企业Id') INT(10)"`
+	Num              string    `xorm:"comment('序号') VARCHAR(50)"`
+	ProjectName      string    `xorm:"comment('工程项目名称') VARCHAR(50)"`
+	Performance      string    `xorm:"comment('履约执行情况') VARCHAR(50)"`
+	WorkRange        string    `xorm:"comment('准入范围') VARCHAR(50)"`
+	Status           string    `xorm:"comment('状态标识') VARCHAR(50)"`
+	BackReason       string    `xorm:"comment('退回原因') VARCHAR(255)"`
+	ApplyTime        time.Time `xorm:"comment('年审日期') DATETIME"`
+	AuditDate        time.Time `xorm:"comment('审核日期') DATETIME"`
+	EnterUserId      int       `xorm:"comment('录入员ID') INT(10)"`
+	EnterUserName    string    `xorm:"comment('录入员') VARCHAR(50)"`
+	EnterUserTel     string    `xorm:"comment('录入员电话') VARCHAR(50)"`
+	SCR              string    `xorm:"comment('SCR') VARCHAR(50)"`
+	SCRQ             string    `xorm:"comment('SCRQ') VARCHAR(50)"`
+	SCYJ             string    `xorm:"comment('SCYJ') VARCHAR(50)"`
+	SCJG             string    `xorm:"comment('SCJG') VARCHAR(50)"`
+	SPR              string    `xorm:"comment('SPR') VARCHAR(50)"`
+	SPRQ             string    `xorm:"comment('SPRQ') VARCHAR(50)"`
+	SPYJ             string    `xorm:"comment('SPYJ') VARCHAR(50)"`
+	SPJG             string    `xorm:"comment('SPJG') VARCHAR(50)"`
+	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)"`
+}
+
+type Suppliername struct {
+	Id           int
+	SupplierName string
+}

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

@@ -0,0 +1,27 @@
+package annualaudit
+
+import (
+	"dashoo.cn/utils"
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+
+type OilAnnualAuditService struct {
+	MyServiceBase
+}
+
+func GetOilAnnualAuditService(xormEngine *xorm.Engine) *OilAnnualAuditService {
+	s := new(OilAnnualAuditService)
+	s.DBE = xormEngine
+	return s
+}
+
+func (s *OilAnnualAuditService) GetSupplierList(supname, auditname string) []Suppliername {
+	var sql string
+	//sql = `select * from  `+ supname +` where Id not in ( select SupplierId  from `+ auditname +` where  YEAR(CreateOn)=YEAR(NOW()))`
+	sql = `select * from  `+ supname
+	//sql = `select c.id,c.value from ( select a.*, b.SupplierId as tempcolum from `+ supname +` a left join `+ auditname +` b on a.Id = b.SupplierId where YEAR(b.CreateOn)=YEAR(NOW())) as c where c.tempcolum is null`
+	List := make([]Suppliername, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	return List
+}

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

@@ -84,4 +84,30 @@ type OilSupplierView struct {
 	SkillerTotal      int `xorm:"default 0 comment('技术工人总数') INT(10)"`
 	Status            string    `xorm:"not null default '0' comment('状态标识(0未申请，1办理完毕)') VARCHAR(10)"`
 	WorkflowId        string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
+	RecUnitReason     string    `xorm:"comment('推荐单位的推荐意见') VARCHAR(800)"`
+	RecUnitPerson     string    `xorm:"comment('推荐单位负责人') VARCHAR(20)"`
+	RecDate           time.Time `xorm:"comment('推荐日期') DATETIME"`
+	RecUnitId         string    `xorm:"comment('推荐单位编码') VARCHAR(10)"`
+	RecUnitName       string    `xorm:"comment('推荐单位名称') VARCHAR(50)"`
+	BackReason        string    `xorm:"comment('退回原因') VARCHAR(50)"`
+	InFlag            string    `xorm:"default '0' comment('准入标识') VARCHAR(10)"`
+	EffectStartTime   time.Time `xorm:"comment('有效期起') DATETIME"`
+	EffectEndTime     time.Time `xorm:"comment('有效期止') DATETIME"`
+	AuditProcessNote  string    `xorm:"comment('办理过程备注') VARCHAR(100)"`
+	AuditDate         time.Time `xorm:"comment('审核日期') DATETIME"`
+	PayNotice         string    `xorm:"default '0' comment('交费通知') VARCHAR(2)"`
+	SupplierStatus    string    `xorm:"comment('供应商状态（null:正常，1中止，2终止）') VARCHAR(255)"`
+	MgrType           string    `xorm:"comment('供应商管理类型') VARCHAR(255)"`
+	Type              string    `xorm:"comment('供应商类型') VARCHAR(255)"`
+	MgrUnit           string    `xorm:"comment('管理单位') VARCHAR(255)"`
+	AddinTime         string    `xorm:"comment('准入日期') VARCHAR(255)"`
+	EffectTime        string    `xorm:"comment('生效日期') VARCHAR(255)"`
+	ApplyTime         time.Time `xorm:"comment('年审日期') DATETIME"`
+	SupplierNo        string    `xorm:"comment('供应商准入证编号') VARCHAR(255)"`
+	MdmFlag           string    `xorm:"default '0' comment('MDM标志') VARCHAR(2)"`
+	InternalFlag      string    `xorm:"comment('国内采购') VARCHAR(255)"`
+	ImportFlag        string    `xorm:"comment('进口采购') VARCHAR(255)"`
+	OutsideFlog       string    `xorm:"comment('境外项目') VARCHAR(255)"`
+	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 }

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

@@ -68,4 +68,7 @@ const (
 
 	//业务步骤编码
 	FIRST_TRIAL string = "FIRST_TRIAL"
+
+	//年审流程图
+	OIL_AUDIT_APPLY string = "oil_audit_apply"
 )

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

@@ -242,6 +242,7 @@ var (
 	OilTechsrvDetailViewName                 string = "oil_techsrv_detail_view"     //技术服务类视图
 	OilGoodsAptDetailViewName                string = "oil_goodsapt_detail_view"    //物資类视图
 	OilClassOrgSettingName                   string = "OilClassOrgSetting"          //分类部门审批配置表
+	OilAnnualAuditName              string = "OilAnnualAudit"               // 年审表
 )
 
 //分页信息及数据

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

@@ -0,0 +1,340 @@
+package oilsupplier
+
+import (
+	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
+	"dashoo.cn/backend/api/business/oilsupplier/supplier"
+	"encoding/json"
+	"time"
+
+	"dashoo.cn/backend/api/business/baseUser"
+	"dashoo.cn/business/userRole"
+
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+)
+
+type AnnualAuditController struct {
+	BaseController
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []annualaudit.OilAnnualAudit
+// @router /list [get]
+func (this *AnnualAuditController) GetEntityList() {
+
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	var list []annualaudit.OilAnnualAudit
+	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取年审企业名称
+// @Description 获取实体
+// @Success 200 {object} annualaudit.OilAnnualAudit
+// @router /supplierlist [get]
+func (this *AnnualAuditController) GetSupplierList() {
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	var supplierlist []annualaudit.Suppliername
+	supplierlist = svc.GetSupplierList(""+OilSupplierName, ""+OilAnnualAuditName)
+	var datainfo DataInfo
+	datainfo.Items = supplierlist
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取字典列表
+// @Description get user by token
+// @Success 200 {object} map[string]interface{}
+// @router /dictlist [get]
+func (this *AnnualAuditController) GetDictList() {
+	dictList := make(map[string]interface{})
+	//dictSvc := items.GetItemsService(utils.DBE)
+	userSvc := baseUser.GetBaseUserService(utils.DBE)
+	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
+	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", "")
+	var userEntity userRole.Base_User
+	userSvc.GetEntityById(this.User.Id, &userEntity)
+	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId("", userEntity.Departmentid)
+
+	//var dictCustomer []svccustomer.Customer
+	//customerSvc.GetEntitysByWhere("" + CustomerName, "", &dictCustomer)
+	//dictList["EntrustCorp"] = &dictCustomer
+
+	var datainfo DataInfo
+	datainfo.Items = dictList
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} annualaudit.OilAnnualAudit
+// @router /get/:id [get]
+func (this *AnnualAuditController) GetEntity() {
+	Id := this.Ctx.Input.Param(":id")
+
+	var model annualaudit.OilAnnualAudit
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	svc.GetEntityByIdBytbl(""+OilAnnualAuditName, Id, &model)
+
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
+// @Title 添加
+// @Description 新增
+// @Param 	body body annualaudit.OilAnnualAudit
+// @Success	200	{object} controllers.Request
+// @router /add [post]
+func (this *AnnualAuditController) AddEntity() {
+	var model annualaudit.OilAnnualAudit
+	var errinfo ErrorDataInfo
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	json.Unmarshal(jsonBlob, &model)
+	where := "SupplierId = "+ utils.ToStr(model.SupplierId) + " and SupplierTypeName = "+model.SupplierTypeName
+	var auditentity []annualaudit.OilAnnualAudit
+	svc.GetEntitysByWhere(""+OilAnnualAuditName, where, &auditentity)
+	if len(auditentity) == 1{
+		errinfo.Message = "已提交年审，请勿重复提交！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	supwhere := "a.Id = "+ utils.ToStr(model.SupplierId) + " and b.SupplierTypeCode = "+model.SupplierTypeName
+	supsvc := supplier.GetOilSupplierService(utils.DBE)
+	var list []supplier.OilSupplierView
+	total := supsvc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, 1, 1, "a.Id", true, &list, supwhere)
+	if total == 0{
+		errinfo.Message = "请先提交准入申请再提交年审！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	var suppliermodel supplier.OilSupplierView
+	suppliermodel = list[0]
+	model.RecUnitId = suppliermodel.RecUnitId
+	model.Status = suppliermodel.Status
+	model.BackReason = suppliermodel.BackReason
+	//svc.GetEntitysByWhere(""+OilSupplierName, supwhere, &supplierlist)
+	model.CreateOn = time.Now()
+	model.CreateBy = this.User.Realname
+	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
+
+	_, err := svc.InsertEntityBytbl(""+OilAnnualAuditName, &model)
+
+	if err == nil {
+		//新增
+		errinfo.Message = "添加成功！"
+		errinfo.Code = 0
+		errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 修改实体
+// @Description 修改实体
+// @Param 	body body annualaudit.OilAnnualAudit
+// @Success	200	{object} controllers.Request
+// @router /update/:id [post]
+func (this *AnnualAuditController) UpdateEntity() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model annualaudit.OilAnnualAudit
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols := []string{
+
+		"Id",
+
+		"Code",
+
+		"Name",
+
+		"F01",
+
+		"F02",
+
+		"F03",
+
+		"F04",
+
+		"F05",
+
+		"F06",
+
+		"F07",
+
+		"F08",
+
+		"F09",
+
+		"F10",
+
+		"F11",
+
+		"F12",
+
+		"F13",
+
+		"F14",
+
+		"F15",
+
+		"F16",
+
+		"F17",
+
+		"F18",
+
+		"F19",
+
+		"F20",
+
+		"F21",
+
+		"F22",
+
+		"F23",
+
+		"F24",
+
+		"F25",
+
+		"Remark",
+
+		"DeletionStateCode",
+
+		"CreateOn",
+
+		"CreateUserId",
+
+		"CreateBy",
+
+		"ModifiedOn",
+
+		"ModifiedUserId",
+
+		"ModifiedBy",
+	}
+	err := svc.UpdateEntityBytbl(""+OilAnnualAuditName, id, &model, cols)
+	if err == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 删除单条信息
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /delete/:Id [delete]
+func (this *AnnualAuditController) DeleteEntity() {
+	Id := this.Ctx.Input.Param(":Id")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	var model annualaudit.OilAnnualAudit
+	var entityempty annualaudit.OilAnnualAudit
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	opdesc := "删除-" + Id
+	err := svc.DeleteOperationAndWriteLogBytbl(""+OilAnnualAuditName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, "", "钻井日报")
+	if err == nil {
+		errinfo.Message = "删除成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 基建类业务
+// @Description get user by token
+// @Success 200 {object} models.Userblood
+// @router /basiclist [get]
+func (this *AnnualAuditController) BasicList() {
+	page := this.GetPageInfoForm()
+	var list []annualaudit.OilAnnualAudit
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	where := " 1=1"
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	keyword := this.GetString("keyword")
+	if keyword != "" {
+		where = where + " and Name like '%" + keyword + "%'"
+	}
+	total := svc.GetPagingEntitiesWithoutAccCode(page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}

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

@@ -294,6 +294,12 @@ func init() {
 				&oilsupplier.OilClassOrgSettingController{},
 			),
 		),
+		//年审申请
+		beego.NSNamespace("/annualaudit",
+			beego.NSInclude(
+				&oilsupplier.AnnualAuditController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

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

@@ -0,0 +1,80 @@
+export default {
+  getList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/annualaudit/list?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
+  getCertList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/annualaudit/certlist?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
+  getMyTasks (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/annualaudit/mytasks?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
+  getSupList (myAxios) {
+    return myAxios({
+      url: '/annualaudit/supplierlist/',
+      method: 'GET'
+    })
+  }, 
+  getDictList (myAxios) {
+    return myAxios({
+      url: '/annualaudit/dictlist/',
+      method: 'GET'
+    })
+  },
+  getEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/annualaudit/get/' + entityId,
+      method: 'GET'
+    })
+  },
+  getEntityAndCert (certId, myAxios) {
+    return myAxios({
+      url: '/annualaudit/getandcert/' + certId,
+      method: 'GET'
+    })
+  },
+  addEntity (formData, myAxios) {
+    return myAxios({
+      url: '/annualaudit/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  updateEntity (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/annualaudit/update/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  updateNumberEntity (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/annualaudit/updatenumber/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  deleteEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/annualaudit/delete/' + entityId,
+      method: 'delete'
+    })
+  },
+  isCanApply (typeCode, myAxios) {
+    return myAxios({
+      url: '/annualaudit/iscanapply/' + typeCode,
+      method: 'get'
+    })
+  }
+}

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

@@ -0,0 +1,576 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/annuaudit' }">年审申请表</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 年审申请表
+        </span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+          </el-button>
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="年审日期">
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="准入类别">
+            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
+              <el-option label="物资类" value="01"></el-option>
+              <el-option label="技术服务类" value="03"></el-option>
+              <el-option label="基建类" value="02"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" min-width="100" align="center" fixed>
+          <template slot-scope="scope">
+            <router-link :to="'/annuaudit/' + scope.row.Id + '/operation'">
+              <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
+            </router-link>
+
+            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
+              <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 slot="reference" type="text" title="删除" style="margin-left:3px" size="small"
+                @click="scope.row.deleteConfirmFlag = true">
+                <i class="el-icon-delete"></i>
+              </el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+
+        <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
+          :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
+        </el-table-column>
+
+        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </el-table-column>-->
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <!-- <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col> -->
+          <!-- 
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col> -->
+
+          <el-col :span="12">
+            <el-form-item label="推荐单位编码">
+              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入证号">
+              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入类别">
+              <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="企业名称">
+              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="工程项目名称">
+              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="履约执行情况">
+              <el-input size="mini" v-model="searchForm.Performance" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入范围">
+              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="施工队伍名称">
+              <el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="状态标识">
+              <el-input size="mini" v-model="searchForm.Status" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="录入员">
+              <el-input size="mini" v-model="searchForm.EnterUserName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="年审日期">
+              <el-input size="mini" v-model="searchForm.ApplyTime" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="审核日期">
+              <el-input size="mini" v-model="searchForm.AuditDate" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="退回原因">
+              <el-input size="mini" v-model="searchForm.BackReason" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
+      <el-form label-width="90px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业名称">
+              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId"
+                placeholder="请选择" @change="supplierchange" style="width: 100%">
+                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="准入类别">
+              <el-select filterable default-first-option v-model="entityForm.SupplierTypeName" placeholder="请选择"
+                style="width: 100%">
+                <el-option label="物资类" value="01"></el-option>
+                <el-option label="技术服务类" value="03"></el-option>
+                <el-option label="基建类" value="02"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span style="float: right;margin-top:-10px;">
+        <el-button size="small" @click="addUserShow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
+      </span>
+      <br>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import {
+    mapGetters
+  } from 'vuex';
+  import supplierapi from '@/api/oilsupplier/supplier';
+  import api from '@/api/oilsupplier/annualaudit';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'annualaudit',
+
+    data() {
+      return {
+        addshow: false,
+        dialogVisible: false,
+        //列表数据
+        selectsupplierlist: [],
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        entityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '',
+        },
+        searchForm: {
+          Id: '',
+          RecUnitId: '',
+          AccessCardNo: '',
+          SupplierTypeName: '',
+          SupplierName: '',
+          Num: '',
+          ProjectName: '',
+          Performance: '',
+          WorkRange: '',
+          Status: '',
+          BackReason: '',
+          ApplyTime: '',
+          AuditDate: '',
+          EnterUserId: '',
+          EnterUserName: '',
+          EnterUserTel: '',
+          SCR: '',
+          SCRQ: '',
+          SCYJ: '',
+          SCJG: '',
+          SPR: '',
+          SPRQ: '',
+          SPYJ: '',
+          SPJG: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+        tableColumns: [
+
+          {
+            prop: "RecUnitId",
+            label: '推荐单位编码',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "AccessCardNo",
+            label: '准入证号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierTypeName",
+            label: '准入类别',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierName",
+            label: '企业名称',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ProjectName",
+            label: '工程项目名称',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Performance",
+            label: '履约执行情况',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "WorkRange",
+            label: '准入范围',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Status",
+            label: '状态标识',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "OrganCode",
+            label: '组织机构代码',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ApplyTime",
+            label: '年审日期',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "AuditDate",
+            label: '审核日期',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "EnterUserName",
+            label: '录入员',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "EnterUserTel",
+            label: '录入员电话',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "BackReason",
+            label: '退回原因',
+            width: 100,
+            sort: true
+          }
+
+        ]
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      //查询列表
+      this.initDatas()
+      this.getselectsupplier()
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      supplierchange(value) {
+        let obj = {};
+        obj = this.selectsupplierlist.find((item) => {
+          return item.Id === value;
+        });
+        this.entityForm.SupplierName = obj.Realname
+      },
+      addAnnualAudit() {
+        console.log("----this.entityForm--", this.entityForm)
+        api.addEntity(this.entityForm, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log("--------res.data----",res.data)
+            //保存成功后，初始化数据，变成修改
+            this.entityForm.Id = res.data.item;
+            this.initDatas();
+            this.addshow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      addaudit() {
+        this.addshow = true
+      },
+
+      getselectsupplier() {
+        api.getSupList(this.$axios).then(res => {
+          if (res.data.items.length != 0) {
+            for (var i = 0; i < res.data.items.length; i++) {
+              this.selectsupplierlist.push({
+                Id: res.data.items[i].Id,
+                Realname: res.data.items[i].SupplierName
+              })
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false;
+        api.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -1,5 +1,3 @@
-
-
 <template>
   <div>
     <el-breadcrumb class="heading">
@@ -19,7 +17,7 @@
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
 
           <el-form-item>
@@ -41,25 +39,26 @@
             </router-link>
 
             <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-              <el-alert
-                title=""
-                description="确认要删除吗？"
-                type="warning"
-                :closable="false">
+              <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
               </el-alert>
-              <br/>
+              <br />
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
+              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small"
+                @click="scope.row.deleteConfirmFlag = true">
                 <i class="el-icon-delete"></i>
               </el-button>
             </el-popover>
           </template>
         </el-table-column>
 
-        <el-table-column v-for="column in tableColumns"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :min-width="column.width" :label="column.label" :key="column.Id" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column v-for="column in tableColumns" v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable
+          :min-width="column.width" :label="column.label" :key="column.Id" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ transferStr(scope.row[column.prop]) }}
+          </template>
+        </el-table-column>
 
         <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -68,7 +67,8 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
       </el-pagination>
     </el-card>
 
@@ -79,7 +79,7 @@
           <el-col :span="12">
             <el-form-item label="生成时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
 
@@ -250,75 +250,77 @@
               <el-input size="mini" v-model="searchForm.F25" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
- <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F26" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F27" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F28" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F29" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F30" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
-          </el-col> <el-col :span="12">
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F31" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F32" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F33" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F34" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F35" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F36" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F37" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
-          </el-col> <el-col :span="12">
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F38" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F39" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.F40" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
@@ -331,7 +333,8 @@
 
           <el-col :span="12">
             <el-form-item label="删除状态，0正常，1已删除">
-              <el-input size="mini" v-model="searchForm.DeletionStateCode" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.DeletionStateCode" style="width:100%" placeholder="请输入">
+              </el-input>
             </el-form-item>
           </el-col>
 
@@ -382,7 +385,9 @@
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex';
+  import {
+    mapGetters
+  } from 'vuex';
   import api from '@/api/oilsupplier/basisbuild';
 
   export default {
@@ -440,7 +445,7 @@
           F23: '',
           F24: '',
           F25: '',
-           F26: '',
+          F26: '',
           F27: '',
           F28: '',
           F29: '',
@@ -474,7 +479,7 @@
             sort: true
           },
 
-           {
+          {
             prop: "F01",
             label: '营业执照',
             width: 180,
@@ -888,6 +893,17 @@
         });
       },
 
+      transferStr(val) {
+        if (val === '1') {
+          return '是'
+        }
+        if (val === '0') {
+          return ''
+        } else {
+          return val
+        }
+      },
+
       jstimehandle(val) {
         if (val === '') {
           return '----'
@@ -914,6 +930,5 @@
       }
     }
   }
-</script>
-
 
+</script>

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

@@ -18,7 +18,7 @@
         </span>
       </div>
       <el-form label-width="240px" ref="EntityForm" :model="formData">
-        <el-row>
+        <!-- <el-row>
 
           <el-col :span="8">
             <el-form-item label="编码" label-width="110px">
@@ -83,11 +83,11 @@
               <el-input v-model="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="6">
             <el-form-item label="营业执照">
-              <el-switch v-model="formData.F01">
+              <el-switch v-model="formData.F01" active-value="1" inactive-value="0">
               </el-switch>
               <!-- <el-input v-model="formData.F01" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
@@ -96,273 +96,273 @@
           <el-col :span="6">
             <el-form-item label="组织机构代码证">
               <!-- <el-radio v-model="formData.F02" label="1">是</el-radio> -->
-              <el-switch v-model="formData.F02">
+              <el-switch v-model="formData.F02" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="税务登记证">
-              <el-switch v-model="formData.F03">
+              <el-switch v-model="formData.F03" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="银行开户许可证">
-              <el-switch v-model="formData.F04">
+              <el-switch v-model="formData.F04" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="质量管理体系认证证书">
-              <el-switch v-model="formData.F05">
+              <el-switch v-model="formData.F05" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="环境管理体系认证证书">
-              <el-switch v-model="formData.F06">
+              <el-switch v-model="formData.F06" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="职业健康安全管理体系认证证书">
-              <el-switch v-model="formData.F07">
+              <el-switch v-model="formData.F07" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="软件企业认定证书">
-              <el-switch v-model="formData.F08">
+              <el-switch v-model="formData.F08" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="安全生产许可证">
-              <el-switch v-model="formData.F09">
+              <el-switch v-model="formData.F09" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="陆上石油天然气安全生产许可证">
-              <el-switch v-model="formData.F10">
+              <el-switch v-model="formData.F10" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="海洋石油作业安全生产许可证">
-              <el-switch v-model="formData.F11">
+              <el-switch v-model="formData.F11" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="辐射安全许可证">
-              <el-switch v-model="formData.F12">
+              <el-switch v-model="formData.F12" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="石油工程技术服务企业资质证书">
-              <el-switch v-model="formData.F13">
+              <el-switch v-model="formData.F13" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="物业服务企业资质证书">
-              <el-switch v-model="formData.F14">
+              <el-switch v-model="formData.F14" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="工业清洗企业资质证书">
-              <el-switch v-model="formData.F15">
+              <el-switch v-model="formData.F15" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="建设项目环境影响评价资格证书">
-              <el-switch v-model="formData.F16">
+              <el-switch v-model="formData.F16" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="消防设施维护保养资质证书">
-              <el-switch v-model="formData.F17">
+              <el-switch v-model="formData.F17" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="安全评价机构资质证书">
-              <el-switch v-model="formData.F18">
+              <el-switch v-model="formData.F18" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="工程咨询招标代理机构资质证书">
-              <el-switch v-model="formData.F19">
+              <el-switch v-model="formData.F19" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="工程监督资质证书">
-              <el-switch v-model="formData.F20">
+              <el-switch v-model="formData.F20" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="土地开发资格证">
-              <el-switch v-model="formData.F21">
+              <el-switch v-model="formData.F21" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="房屋预售资格证">
-              <el-switch v-model="formData.F22">
+              <el-switch v-model="formData.F22" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="保安服务许可证">
-              <el-switch v-model="formData.F23">
+              <el-switch v-model="formData.F23" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="道路运输经营许可证">
-              <el-switch v-model="formData.F24">
+              <el-switch v-model="formData.F24" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="机动车维修经营许可证">
-              <el-switch v-model="formData.F25">
+              <el-switch v-model="formData.F25" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="道路危险货物运输许可证">
-              <el-switch v-model="formData.F26">
+              <el-switch v-model="formData.F26" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="特种设备安装改造维修许可证">
-              <el-switch v-model="formData.F27">
+              <el-switch v-model="formData.F27" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="建筑安全许可证">
-              <el-switch v-model="formData.F28">
+              <el-switch v-model="formData.F28" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="防火许可证">
-              <el-switch v-model="formData.F29">
+              <el-switch v-model="formData.F29" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="印刷经营许可证">
-              <el-switch v-model="formData.F30">
+              <el-switch v-model="formData.F30" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="餐饮服务许可证">
-              <el-switch v-model="formData.F31">
+              <el-switch v-model="formData.F31" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="劳务派遣经营许可证">
-              <el-switch v-model="formData.F32">
+              <el-switch v-model="formData.F32" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="人力资源服务许可证">
-              <el-switch v-model="formData.F33">
+              <el-switch v-model="formData.F33" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="国家实验室认可证书">
-              <el-switch v-model="formData.F34">
+              <el-switch v-model="formData.F34" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="海洋石油专业设备检验检测机构证书">
-              <el-switch v-model="formData.F35">
+              <el-switch v-model="formData.F35" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="安全生产检验检测证书">
-              <el-switch v-model="formData.F36">
+              <el-switch v-model="formData.F36" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="液化气钢瓶检验证书">
-              <el-switch v-model="formData.F37">
+              <el-switch v-model="formData.F37" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="国家电网承试承装承修许可证">
-              <el-switch v-model="formData.F38">
+              <el-switch v-model="formData.F38" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="建筑企业资质证书">
-              <el-switch v-model="formData.F39">
+              <el-switch v-model="formData.F39" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="中油集团监造许可">
-              <el-switch v-model="formData.F40">
+              <el-switch v-model="formData.F40" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
@@ -523,6 +523,7 @@
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             this.formData = res.data;
+            console.log("---this.formData ----",this.formData )
           }).catch(err => {
             console.error(err)
           });

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

@@ -17,7 +17,7 @@
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
 
           <el-form-item>
@@ -39,25 +39,26 @@
             </router-link>
 
             <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-              <el-alert
-                title=""
-                description="确认要删除吗？"
-                type="warning"
-                :closable="false">
+              <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
               </el-alert>
-              <br/>
+              <br />
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
+              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small"
+                @click="scope.row.deleteConfirmFlag = true">
                 <i class="el-icon-delete"></i>
               </el-button>
             </el-popover>
           </template>
         </el-table-column>
 
-        <el-table-column v-for="column in tableColumns"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :key="column.Id" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column v-for="column in tableColumns" v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable
+          :width="column.width" :key="column.Id" :label="column.label" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ transferStr(scope.row[column.prop]) }}
+          </template>
+        </el-table-column>
 
         <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -66,7 +67,8 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
       </el-pagination>
     </el-card>
 
@@ -77,7 +79,7 @@
           <el-col :span="12">
             <el-form-item label="生成时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
 
@@ -107,7 +109,8 @@
 
           <el-col :span="12">
             <el-form-item label="中类名称">
-              <el-input size="mini" v-model="searchForm.MiddleClassName" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.MiddleClassName" style="width:100%" placeholder="请输入">
+              </el-input>
             </el-form-item>
           </el-col>
 
@@ -431,7 +434,8 @@
 
           <el-col :span="12">
             <el-form-item label="删除状态，0正常，1已删除">
-              <el-input size="mini" v-model="searchForm.DeletionStateCode" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.DeletionStateCode" style="width:100%" placeholder="请输入">
+              </el-input>
             </el-form-item>
           </el-col>
 
@@ -482,7 +486,9 @@
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex';
+  import {
+    mapGetters
+  } from 'vuex';
   import api from '@/api/oilsupplier/goodsaptitude';
 
   export default {
@@ -678,7 +684,7 @@
             sort: true
           },
 
-            {
+          {
             prop: "F01",
             label: '营业执照',
             width: 150,
@@ -1070,6 +1076,16 @@
           console.error(err)
         });
       },
+      
+      transferStr (val) {
+        if (val === '1') {
+          return '是'
+        } if (val === '0') {
+          return ''
+        } else {
+          return val
+        }
+      },
 
       jstimehandle(val) {
         if (val === '') {
@@ -1099,4 +1115,3 @@
   }
 
 </script>
-