ソースを参照

ljq 表头动态添加 20190429

lijq 6 年 前
コミット
1c1963e2c6

+ 21 - 0
src/dashoo.cn/backend/api/business/oilsupplier/tableheader/tableheader.go

@@ -0,0 +1,21 @@
+package tableheader
+
+import (
+	"time"
+)
+
+type BaseTableheader struct {
+	Id             int       `xorm:"not null pk autoincr comment('主键编号') INT(10)"`
+	Name           string    `xorm:"not null comment('名称') VARCHAR(70)"`
+	Code           string    `xorm:"not null comment('名称号') VARCHAR(10)"`
+	Categorycode   string    `xorm:"not null comment('类别编码') VARCHAR(10)"`
+	Categoryname   string    `xorm:"not null comment('类别名称') VARCHAR(20)"`
+	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
+	Isdelete       int       `xorm:"default 0 comment('是否以删除(0正常,1已删除)') INT(10)"`
+	Createon       time.Time `xorm:"comment('创建时间') DATETIME"`
+	Createuserid   int       `xorm:"comment('创建者编号 ') INT(10)"`
+	Createby       string    `xorm:"comment('创建者') VARCHAR(50)"`
+	Modifiedon     time.Time `xorm:"comment('修改时间') DATETIME"`
+	Modifieduserid int       `xorm:"comment('修改者编号') INT(10)"`
+	Modifiedby     string    `xorm:"comment('修改者') VARCHAR(50)"`
+}

+ 80 - 0
src/dashoo.cn/backend/api/business/oilsupplier/tableheader/tableheaderservice.go

@@ -0,0 +1,80 @@
+package tableheader
+
+import (
+	"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
+	"github.com/go-xorm/xorm"
+)
+
+type TableHeaderService struct {
+	MyServiceBase
+}
+
+func GetTableHeaderService(xormEngine *xorm.Engine) *TableHeaderService {
+	s := new(TableHeaderService)
+	s.DBE = xormEngine
+	return s
+}
+
+func (s *TableHeaderService) GetMyPagingEntitiesWithOrderBytbl(tableName string, pageIndex, itemsPerPage int64, order string, asc bool, entitiesPtr interface{}, where ...string) (total int64) {
+	var err error
+	var resultsSlice []map[string][]byte
+	//获取表名
+	if len(where) == 0 {
+		if asc {
+			err = s.DBE.Table(tableName).Limit(int(itemsPerPage), (int(pageIndex)-1)*int(itemsPerPage)).Asc(order).Find(entitiesPtr)
+		} else {
+			err = s.DBE.Table(tableName).Limit(int(itemsPerPage), (int(pageIndex)-1)*int(itemsPerPage)).Desc(order).Find(entitiesPtr)
+		}
+		//获取总记录数
+		sql := "SELECT COUNT(*) AS total FROM " + tableName
+		resultsSlice, err = s.DBE.Query(sql)
+
+	} else {
+		if asc {
+			err = s.DBE.Table(tableName).Where(where[0]).Limit(int(itemsPerPage), (int(pageIndex)-1)*int(itemsPerPage)).Asc(order).Find(entitiesPtr)
+		} else {
+			err = s.DBE.Table(tableName).Where(where[0]).Limit(int(itemsPerPage), (int(pageIndex)-1)*int(itemsPerPage)).Desc(order).Find(entitiesPtr)
+		}
+		sql := "SELECT COUNT(*) AS total FROM " + tableName + " where " + where[0]
+		resultsSlice, err = s.DBE.Query(sql)
+	}
+	//LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total
+}
+
+func (s *TableHeaderService) GetName(tableName string, where ...string) (total int64) {
+	var err error
+	var resultsSlice []map[string][]byte
+
+	sql := "SELECT COUNT(*) AS total FROM " + tableName + " where " + where[0]
+	resultsSlice, err = s.DBE.Query(sql)
+
+	//LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total
+}
+
+func (s *TableHeaderService) DeleteById(tableName string, id string) (err error) {
+
+	where := "id=" + id
+	error := s.DeleteEntityBytbl(tableName, where)
+	return error
+}

+ 1 - 0
src/dashoo.cn/backend/api/controllers/base.go

@@ -250,6 +250,7 @@ var (
 	OilInfoChangeName                        string = "OilInfoChange"               //信息变更表
 	OilQualChangeMainName                    string = "OilQualChangeMain"           //资质变更表
 	OilQualChangeDetailName                  string = "OilQualChangeDetail"         //资质变更表
+	BaseTableHeader                          string = "Base_TableHeader"            //资质配置字典信息表
 )
 
 //分页信息及数据

+ 295 - 0
src/dashoo.cn/backend/api/controllers/oilsupplier/tableheader.go

@@ -0,0 +1,295 @@
+package oilsupplier
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"time"
+
+	"dashoo.cn/backend/api/business/oilsupplier/tableheader"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+)
+
+type TableHeaderController struct {
+	BaseController
+}
+
+type SeBaseTableheader struct {
+	SearchName             string
+	SearchSupplierTypeName string
+}
+
+// @Title 获取表头数据
+// @Description get tableheaders
+// @Success 200 {object} []tableheader.BaseTableheader
+// @router /gettableheaderlist [post]
+func (this *TableHeaderController) GetTableHeaderList() {
+
+	fmt.Println("进入TableHeaderController")
+	var model2 SeBaseTableheader
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model2)
+	fmt.Println(model2.SearchName)
+	fmt.Println(model2.SearchSupplierTypeName)
+	//获取分页信息
+	page := this.GetPageInfoForm() //包括当前页、每页书数量
+
+	var where string = " 1=1"
+
+	if model2.SearchName != "" {
+		where = where + " and Name like '%" + model2.SearchName + "%'"
+	}
+	if model2.SearchSupplierTypeName != "" {
+		where = where + " and CategoryCode = '" + model2.SearchSupplierTypeName + "'"
+	}
+	orderby := "Id"
+	asc := true
+
+	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
+	var list []tableheader.BaseTableheader
+	total := svc.GetMyPagingEntitiesWithOrderBytbl(BaseTableHeader, 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}
+// @router /add [post]
+func (this *TableHeaderController) AddEntity() {
+	var model tableheader.BaseTableheader
+	var jsonBlob = this.Ctx.Input.RequestBody
+	var errinfo ErrorDataInfo
+	svc := tableheader.GetTableHeaderService(utils.DBE)
+	json.Unmarshal(jsonBlob, &model)
+
+	//判断名称是否已拥有
+	var Name = model.Name
+
+	where := "1=1 and name='" + Name + "'"
+	total := svc.GetName(BaseTableHeader, where)
+	if total != 0 {
+		errinfo.Message = "已有重复数据"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		var Categorycode = model.Categorycode
+
+		if Categorycode == "01" {
+			model.Categoryname = "物资类"
+		} else if Categorycode == "02" {
+			model.Categoryname = "基建类"
+		} else {
+			model.Categoryname = "技术服务类"
+		}
+		model.Createon = time.Now()
+		model.Createby = this.User.Realname
+		model.Createuserid, _ = utils.StrTo(this.User.Id).Int()
+
+		_, err := svc.InsertEntityBytbl(BaseTableHeader, &model)
+
+		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 locations
+// @Success 200 {object}
+// @router /getlocations [get]
+func (this *TableHeaderController) Getlocations() {
+
+	var val = this.GetString("val")
+	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
+	var results []map[string]string
+	var dbName = utils.Cfg.MustValue("db", "name")
+	var sql string = ""
+	if val == "01" {
+		sql = "select column_name from information_schema.COLUMNS where table_name='" + OilGoodsAptitudeName + "'" +
+			"and TABLE_SCHEMA='" + dbName + "'and column_name like 'F%'" +
+			"and column_name not in (select code from " + BaseTableHeader + " where categorycode='" + val + "')"
+	} else if val == "02" {
+		sql = "select column_name from information_schema.COLUMNS where table_name='" + OilBasisBuildName + "'" +
+			"and TABLE_SCHEMA='" + dbName + "'and column_name like 'F%'" +
+			"and column_name not in (select code from " + BaseTableHeader + " where categorycode='" + val + "')"
+	} else {
+		sql = "select column_name from information_schema.COLUMNS where table_name='" + OilTechnologyServiceName + "'" +
+			"and TABLE_SCHEMA='" + dbName + "'and column_name like 'F%'" +
+			"and column_name not in (select code from " + BaseTableHeader + " where categorycode='" + val + "')"
+	}
+
+	results, _ = svc.DBE.QueryString(sql)
+
+	var datainfo DataInfo
+	datainfo.Items = results
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
+}
+
+type SBaseTableheader struct {
+	EditName string
+}
+
+// @Title 通过id更新
+// @Description update by id
+// @Success 200 {object}
+// @router /updatebyid/:id [post]
+func (this *TableHeaderController) UpdateById() {
+	id := this.Ctx.Input.Param(":id")
+
+	var errinfo ErrorInfo
+	var cols []string
+	if id == "" {
+		errinfo.Message = "操作失败!请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
+
+	var model tableheader.BaseTableheader
+	var model1 SBaseTableheader
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model1)
+	model.Modifiedon = time.Now()
+	model.Modifiedby = this.User.Realname
+	model.Modifieduserid, _ = utils.StrTo(this.User.Id).Int()
+
+	model.Name = model1.EditName
+
+	var Name = model.Name
+
+	where := "1=1 and name='" + Name + "'"
+	total := svc.GetName(BaseTableHeader, where)
+	if total != 0 {
+		errinfo.Message = "已有重复数据"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		cols = []string{"Name", "Modifiedon", "Modifieduserid", "Modifiedby"}
+
+		err := svc.UpdateEntityBytbl(BaseTableHeader, 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 /deletebyid [get]
+func (this *TableHeaderController) Deletebyid() {
+	id := this.GetString("id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败!请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	svc := tableheader.GetTableHeaderService(utils.DBE)
+
+	err := svc.DeleteById(BaseTableHeader, id)
+	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 tableheaders
+// @Success 200 {object}
+// @router /listgoodtableheader [get]
+func (this *TableHeaderController) ListGoodTableHeader() {
+
+	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
+	var list []map[string]string
+	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='01'"
+	list, _ = svc.DBE.QueryString(sql)
+	fmt.Println(list)
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
+}
+
+// @Title 获取技术服务类表头数据
+// @Description get tableheaders
+// @Success 200 {object}
+// @router /listtstableheader [get]
+func (this *TableHeaderController) ListTsTableHeader() {
+
+	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
+	var list []map[string]string
+	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='03'"
+	list, _ = svc.DBE.QueryString(sql)
+	fmt.Println(list)
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
+}
+
+// @Title 获取技术服务类表头数据
+// @Description get tableheaders
+// @Success 200 {object}
+// @router /listbbtableheader [get]
+func (this *TableHeaderController) ListBbTableHeader() {
+
+	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
+	var list []map[string]string
+	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='02'"
+	list, _ = svc.DBE.QueryString(sql)
+	fmt.Println(list)
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
+}

+ 6 - 0
src/dashoo.cn/backend/api/routers/router.go

@@ -340,6 +340,12 @@ func init() {
 				&register.OilCorporateInfoController{},
 			),
 		),
+		//表头列表
+		beego.NSNamespace("/tableheader",
+			beego.NSInclude(
+				&oilsupplier.TableHeaderController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

+ 59 - 0
src/dashoo.cn/frontend_web/src/api/oilsupplier/oilclassorgset.js

@@ -5,5 +5,64 @@ export default {
       method: 'post',
       params: params
     })
+  },
+  getTableHeaderList (params, myAxios) {
+    return myAxios({
+      url: '/tableheader/gettableheaderlist',
+      method: 'post',
+      params: params
+    })
+  },
+  getTableHeaderListBySearch (params, formdata, myAxios) {
+    return myAxios({
+      url: '/tableheader/gettableheaderlist',
+      method: 'post',
+      params: params,
+      data: formdata
+    })
+  },
+  addEntity (formData, myAxios) {
+    return myAxios({
+      url: '/tableheader/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  getlocations (val, myAxios) {
+    return myAxios({
+      url: '/tableheader/getlocations?val=' + val,
+      method: 'get'
+    })
+  },
+  deletebyid (id, myAxios) {
+    return myAxios({
+      url: '/tableheader/deletebyid?id=' + id,
+      method: 'get'
+    })
+  },
+  updatebyid (id, formData, myAxios) {
+    return myAxios({
+      url: '/tableheader/updatebyid/' + id,
+      method: 'post',
+      data: formData
+    })
+  },
+  initGoodTableHeader (myAxios) {
+    return myAxios({
+      url: '/tableheader/listgoodtableheader',
+      method: 'get'
+    })
+  },
+  initTsTableHeader (myAxios) {
+    return myAxios({
+      url: '/tableheader/listtstableheader',
+      method: 'get'
+    })
+  },
+  initBbTableHeader (myAxios) {
+    return myAxios({
+      url: '/tableheader/listbbtableheader',
+      method: 'get'
+    })
   }
 }

+ 18 - 280
src/dashoo.cn/frontend_web/src/pages/oilsupplier/basisbuild/_opera/operation.vue

@@ -32,287 +32,15 @@
           </el-col>
         </el-row>
         <el-row>
-         <el-col :span="6">
-            <el-form-item label="营业执照">
-              <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>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="组织机构代码证">
-              <!-- <el-radio v-model="formData.F02" label="1">是</el-radio> -->
-              <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" active-value="1" inactive-value="0">-->
-              <!--</el-switch>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
+         <el-row>
+            <el-col :span="6" v-for="(item,i) in dynamicTableColumns" :key="i" >
+              <el-form-item :label="item.label">
+                <el-switch v-model="formData[item.prop]" active-value="1" inactive-value="0"></el-switch>
+              </el-form-item>
+            </el-col>
+        </el-row>
 
-          <!--<el-col :span="6">-->
-            <!--<el-form-item label="建筑企业资质证书">-->
-              <!--<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" active-value="1" inactive-value="0">-->
-              <!--</el-switch>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
 
         </el-row>
       </el-form>
@@ -325,6 +53,7 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/basisbuild';
+  import setapi from '@/api/oilsupplier/oilclassorgset'
   export default {
     computed: {
       ...mapGetters({
@@ -375,7 +104,7 @@
           ModifiedBy: '',
 
         },
-
+        dynamicTableColumns:[]
         //下拉选择项
         //wellNoOptions: [],
         //supervisersOptions: [],
@@ -393,8 +122,17 @@
       } else {
         this.formData.Id = 0;
       }
+       this.initTableHeader();
     },
     methods: {
+       initTableHeader(){
+        
+        setapi.initBbTableHeader(this.$axios).then(res => {
+          
+          this.dynamicTableColumns=res.data.items
+          console.log(res.data.items)
+        })
+      },
       initDatas() {
         if(this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {

+ 15 - 308
src/dashoo.cn/frontend_web/src/pages/oilsupplier/basisbuild/index.vue

@@ -68,7 +68,13 @@
             {{ transferStr(scope.row[column.prop]) }}
           </template>
         </el-table-column>
-
+        <!--动态显示的表头-->
+        <el-table-column v-for="column in dynamicTableColumns" :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">
             {{ jstimehandle(scope.row.CreateOn+'') }}
@@ -504,6 +510,7 @@
           AuditStepCode: '',
           AuditStepName: ''
         },
+        dynamicTableColumns:[],
         tableColumns: [
 
           {
@@ -518,313 +525,6 @@
             label: '名称',
             width: 100,
             sort: true
-          },
-
-          {
-            prop: 'F01',
-            label: '营业执照',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F02',
-            label: '组织机构代码证',
-            width: 200,
-            sort: true
-          },
-
-          {
-            prop: 'F03',
-            label: '税务登记证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F04 ',
-            label: '银行开户许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F05',
-            label: '建筑业企业资质证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F06',
-            label: '安全生产许可证',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'F07',
-            label: '质量管理体系认证证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F08',
-            label: '环境管理体系认证证书',
-            width: 200,
-            sort: true
-          },
-
-          {
-            prop: 'F09',
-            label: '职业健康安全管理体系认证证书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F10',
-            label: '监理资质证书',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F11',
-            label: '海洋石油作业安全生产许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F12',
-            label: '设计勘查资质证书',
-            width: 170,
-            sort: true
-          },
-
-          {
-            prop: 'F13',
-            label: '外地建筑业企业进津备案通知书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F14',
-            label: '外地建筑业企业进津备案通知书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F15',
-            label: '承装(修、试)电力设备许可证',
-            width: 250,
-            sort: true
-          },
-
-          // {
-          //   prop: 'F16',
-          //   label: '建设项目环境影响评价资格证书',
-          //   width: 250,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F17',
-          //   label: '消防设施维护保养资质证书',
-          //   width: 250,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F18',
-          //   label: '安全评价机构资质证书',
-          //   width: 190,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F19',
-          //   label: '工程咨询招标代理机构资质证书',
-          //   width: 250,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F20',
-          //   label: '工程监督资质证书',
-          //   width: 160,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F21',
-          //   label: '土地开发资格证',
-          //   width: 150,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F22',
-          //   label: '房屋预售资格证',
-          //   width: 150,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F23',
-          //   label: '保安服务许可证',
-          //   width: 150,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F24',
-          //   label: '道路运输经营许可证',
-          //   width: 180,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F25',
-          //   label: '机动车维修经营许可证',
-          //   width: 190,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F26',
-          //   label: '道路危险货物运输许可证',
-          //   width: 200,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F27',
-          //   label: '特种设备安装改造维修许可证',
-          //   width: 250,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F28',
-          //   label: '建筑安全许可证',
-          //   width: 150,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F29',
-          //   label: '防火许可证',
-          //   width: 150,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F30',
-          //   label: '印刷经营许可证',
-          //   width: 150,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F31',
-          //   label: '餐饮服务许可证',
-          //   width: 150,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F32',
-          //   label: '劳务派遣经营许可证',
-          //   width: 190,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F33',
-          //   label: '人力资源服务许可证',
-          //   width: 180,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F34',
-          //   label: '国家实验室认可证书',
-          //   width: 180,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F35',
-          //   label: '海洋石油专业设备检验检测机构证书',
-          //   width: 270,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F36',
-          //   label: '安全生产检验检测证书',
-          //   width: 190,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F37',
-          //   label: '液化气钢瓶检验证书',
-          //   width: 180,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F38',
-          //   label: '国家电网承试承装承修许可证',
-          //   width: 250,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F39',
-          //   label: '建筑企业资质证书',
-          //   width: 170,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'F40',
-          //   label: '中油集团监造许可',
-          //   width: 170,
-          //   sort: true
-          // },
-          // {
-          //   prop: 'Remark',
-          //   label: '备注',
-          //   width: 100,
-          //   sort: true
-          // },
-          //
-          // {
-          //   prop: 'ModifiedOn',
-          //   label: '添加时间',
-          //   width: 150,
-          //   sort: true
-          // },
-
-          {
-            prop: 'Remark',
-            label: '备注',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: 'CreateOn',
-            label: '创建时间',
-            width: 100,
-            sort: true
           }
         ],
         organizeProps: {
@@ -839,11 +539,18 @@
     created () {
       // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
+      this.initTableHeader()
       // 查询列表
       this.initDatas()
       this.getDictOptions()
     },
     methods: {
+       initTableHeader(){ 
+        setapi.initBbTableHeader(this.$axios).then(res => {
+          console.log(res)
+          this.dynamicTableColumns=res.data.items
+        })
+      },
       saveApprovalDept () {
         let organizeids = []
         let organize = this.$refs.operationOriganizeTree.getCheckedNodes()

+ 19 - 361
src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/_opera/operation.vue

@@ -18,73 +18,6 @@
         </span>
       </div>
       <el-form label-width="240px" ref="EntityForm" :model="formData">
-
-        <!-- <el-row>
-
-          <el-col :span="8">
-            <el-form-item label="编码" label-width="110px">
-              <el-input v-model="formData.Code" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="名称" label-width="110px">
-              <el-input v-model="formData.Name" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="大类名称" label-width="110px">
-              <el-input v-model="formData.BigClassName" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="中类名称" label-width="110px">
-              <el-input v-model="formData.MiddleClassName" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="小类名称" label-width="110px">
-              <el-input v-model="formData.SmallClassName" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="品名" label-width="110px">
-              <el-input v-model="formData.GoodsName" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="物资级别" label-width="110px">
-              <el-input v-model="formData.GoodsLevel" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="产品说明" label-width="110px">
-              <el-input v-model="formData.GoodsDesc" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="标准备案" label-width="110px">
-              <el-input v-model="formData.Standard" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="供应商类型" label-width="110px">
-              <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="16" label-width="110px">
-            <el-form-item label="备注">
-              <el-input v-model="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row>
           <el-col :span="8">
             <el-form-item v-if="serviceId == 'add'" label="编码" label-width="110px">
@@ -149,297 +82,11 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="营业执照">
-              <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>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="组织代码">
-              <!-- <el-radio v-model="formData.F02" label="1">是</el-radio> -->
-              <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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.F41">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="">
-              <el-switch v-model="formData.F42">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="">
-              <el-switch v-model="formData.F43">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="">
-              <el-switch v-model="formData.F44">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="">
-              <el-switch v-model="formData.F45">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="">
-              <el-switch v-model="formData.F46">
-              </el-switch>
-            </el-form-item>
-          </el-col> -->
-
-
+            <el-col :span="6" v-for="(item,i) in dynamicTableColumns" :key="i" >
+              <el-form-item :label="item.label">
+                <el-switch v-model="formData[item.prop]" active-value="1" inactive-value="0"></el-switch>
+              </el-form-item>
+            </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -451,6 +98,7 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/goodsaptitude';
+  import setapi from '@/api/oilsupplier/oilclassorgset'
   export default {
     computed: {
       ...mapGetters({
@@ -528,8 +176,8 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: '',
-
         },
+        dynamicTableColumns:[]
 
         //下拉选择项
         //wellNoOptions: [],
@@ -541,14 +189,24 @@
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
       console.log(this.serviceId);
+     
       if (this.serviceId != 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId;
-        ;
-      } else {this.initDatas()
+        this.initDatas()
+      } else {
         this.formData.Id = 0;
       }
+       this.initTableHeader();
     },
     methods: {
+       initTableHeader(){
+        
+        setapi.initGoodTableHeader(this.$axios).then(res => {
+          
+          this.dynamicTableColumns=res.data.items
+          console.log(res.data.items)
+        })
+      },
       initDatas() {
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {

+ 21 - 246
src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/index.vue

@@ -72,6 +72,14 @@
           </template>
         </el-table-column>
 
+        <!--动态显示的表头-->
+        <el-table-column v-for="column in dynamicTableColumns" :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">
             {{ jstimehandle(scope.row.CreateOn+'') }}
@@ -724,254 +732,10 @@
             label: '供应商类型',
             width: 100,
             sort: true
-          },
-
-          {
-            prop: 'F01',
-            label: '营业执照',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F02',
-            label: '组织代码',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F03',
-            label: '税务登记',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F04 ',
-            label: '开户许可',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F05',
-            label: '质量管理体系认证证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F06',
-            label: '环境管理体系认证证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F07',
-            label: '职业健康安全管理体系认证证书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F08',
-            label: '代理授权证书(代理商)',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'F09',
-            label: '安全生产许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F10',
-            label: '特种劳动防护用品生产经营许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F11',
-            label: '辐射安全许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F12',
-            label: '危险化学品经营许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F13',
-            label: '成品油批发经营批准证书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F14',
-            label: '食品流通许可证',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F15',
-            label: '医疗器械经营企业许可证',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F16',
-            label: '安全生产许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F17',
-            label: '特种设备制造许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F18',
-            label: '全国工业产品生产许可证',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F19',
-            label: '危险化学品使用许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F20',
-            label: '危险化学品登记证',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'F21',
-            label: '危险化学品经营许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F22',
-            label: '化学品危险性鉴别与分类报告',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F23',
-            label: '中国国家强制性产品认证证书',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F24',
-            label: '产品型式认可证书',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'F25',
-            label: '食品生产许可证',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F26',
-            label: '制造计量器具许可证',
-            width: 200,
-            sort: true
-          },
-
-          {
-            prop: 'F27',
-            label: '特种设备安装改造维修许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F28',
-            label: '中油集团公司产品质量认可证书',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F29',
-            label: '辐射安全许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F30',
-            label: '中国船级社型式认可证书',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F31',
-            label: '涉及饮用水卫生安全产品卫生许可批件',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F32',
-            label: '成品油批发经营批准证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F33',
-            label: '医疗器械经营许可证',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'F34',
-            label: '节能产品认证证书',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'F35',
-            label: '预应力件生产许可证',
-            width: 270,
-            sort: true
-          },
+          }
 
         ],
+        dynamicTableColumns:[],
         organizeProps: {
           value: 'id',
           label: 'name',
@@ -984,11 +748,22 @@
     created () {
       // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
+       //初始化部分表头
+      this.initTableHeader()
+      
       // 查询列表
       this.initDatas()
+       
       this.getDictOptions()
     },
     methods: {
+      initTableHeader(){
+        
+        setapi.initGoodTableHeader(this.$axios).then(res => {
+          console.log(res)
+          this.dynamicTableColumns=res.data.items
+        })
+      },
       saveApprovalDept () {
         let organizeids = []
         let organize = this.$refs.operationOriganizeTree.getCheckedNodes()

+ 17 - 282
src/dashoo.cn/frontend_web/src/pages/oilsupplier/technologyservice/_opera/operation.vue

@@ -83,287 +83,12 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="营业执照">
-              <el-switch v-model="formData.F01" 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.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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" active-value="1" inactive-value="0">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
+       <el-row>
+            <el-col :span="6" v-for="(item,i) in dynamicTableColumns" :key="i" >
+              <el-form-item :label="item.label">
+                <el-switch v-model="formData[item.prop]" active-value="1" inactive-value="0"></el-switch>
+              </el-form-item>
+            </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -375,6 +100,7 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/technologyservice';
+  import setapi from '@/api/oilsupplier/oilclassorgset'
   export default {
     computed: {
       ...mapGetters({
@@ -462,7 +188,7 @@
           ModifiedBy: '',
 
         },
-
+        dynamicTableColumns:[]
         //下拉选择项
         //wellNoOptions: [],
         //supervisersOptions: [],
@@ -479,8 +205,17 @@
       } else {
         this.formData.Id = 0;
       }
+        this.initTableHeader();
     },
     methods: {
+       initTableHeader(){
+        
+        setapi.initTsTableHeader(this.$axios).then(res => {
+          
+          this.dynamicTableColumns=res.data.items
+          console.log(res.data.items)
+        })
+      },
       initDatas() {
         if(this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {

+ 17 - 293
src/dashoo.cn/frontend_web/src/pages/oilsupplier/technologyservice/index.vue

@@ -69,6 +69,15 @@
           </template>
         </el-table-column>
 
+
+        <!--动态显示的表头-->
+        <el-table-column v-for="column in dynamicTableColumns" :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">
             {{ jstimehandle(scope.row.CreateOn+'') }}
@@ -291,6 +300,7 @@
           AuditStepCode: '',
           AuditStepName: ''
         },
+        dynamicTableColumns:[],
         tableColumns: [
           {
             prop: 'Code',
@@ -374,299 +384,6 @@
             label: '部门名称',
             width: 150,
             sort: true
-          },
-
-          {
-            prop: 'F01',
-            label: '营业执照',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F02',
-            label: '组织机构代码证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F03',
-            label: '税务登记证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F04 ',
-            label: '银行开户许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F05',
-            label: '质量管理体系认证证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F06',
-            label: '环境管理体系认证证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F07',
-            label: '职业健康安全管理体系认证证书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F08',
-            label: '软件企业认定证书',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'F09',
-            label: '安全生产许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F10',
-            label: '陆上石油天然气安全生产许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F11',
-            label: '海洋石油作业安全生产许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F12',
-            label: '辐射安全许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F13',
-            label: '石油工程技术服务企业资质证书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F14',
-            label: '物业服务企业资质证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F15',
-            label: '工业清洗企业资质证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F16',
-            label: '建设项目环境影响评价资格证书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F17',
-            label: '消防设施维护保养资质证书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F18',
-            label: '安全评价机构资质证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F19',
-            label: '工程咨询招标代理机构资质证书',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F20',
-            label: '工程监督资质证书',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'F21',
-            label: '土地开发资格证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F22',
-            label: '房屋预售资格证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F23',
-            label: '保安服务许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F24',
-            label: '道路运输经营许可证',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'F25',
-            label: '机动车维修经营许可证',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F26',
-            label: '道路危险货物运输许可证',
-            width: 200,
-            sort: true
-          },
-
-          {
-            prop: 'F27',
-            label: '特种设备安装改造维修许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F28',
-            label: '建筑安全许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F29',
-            label: '防火许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F30',
-            label: '印刷经营许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F31',
-            label: '餐饮服务许可证',
-            width: 150,
-            sort: true
-          },
-
-          {
-            prop: 'F32',
-            label: '劳务派遣经营许可证',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F33',
-            label: '人力资源服务许可证',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'F34',
-            label: '国家实验室认可证书',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'F35',
-            label: '海洋石油专业设备检验检测机构证书',
-            width: 270,
-            sort: true
-          },
-
-          {
-            prop: 'F36',
-            label: '安全生产检验检测证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F37',
-            label: '液化气钢瓶检验证书',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'F38',
-            label: '国家电网承试承装承修许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F39',
-            label: '建筑企业资质证书',
-            width: 170,
-            sort: true
-          },
-
-          {
-            prop: 'F40',
-            label: '中油集团监造许可',
-            width: 170,
-            sort: true
-          },
-          {
-            prop: 'Remark',
-            label: '备注',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: 'ModifiedOn',
-            label: '添加时间',
-            width: 150,
-            sort: true
           }
         ],
         organizeProps: {
@@ -681,11 +398,18 @@
     created () {
       // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
+      this.initTableHeader()
       // 查询列表
       this.initDatas()
       this.getDictOptions()
     },
     methods: {
+        initTableHeader(){ 
+        setapi.initTsTableHeader(this.$axios).then(res => {
+          console.log(res)
+          this.dynamicTableColumns=res.data.items
+        })
+      },
       saveApprovalDept () {
         let organizeids = []
         let organize = this.$refs.operationOriganizeTree.getCheckedNodes()

+ 407 - 0
src/dashoo.cn/frontend_web/src/pages/setting/qcdSettings.vue

@@ -0,0 +1,407 @@
+<template>
+  <div>
+    <!--顶部显示-->
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item>资质配置字典设置</el-breadcrumb-item>
+    </el-breadcrumb>
+
+    <!--内框顶部显示-->
+    <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 资质配置字典设置
+        </span>
+
+
+        <el-form :model="searchForm" ref="searchformRef" :inline="true" style="float: right;position:absolute;right:110px;top:10px">
+            <el-form-item label="名称">
+                <el-input size="mini"  v-model="searchForm.SearchName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          
+            <el-form-item label="准入类别">
+              <el-select size="mini" style="width:150px" v-model="searchForm.SearchSupplierTypeName" placeholder="请选择">
+                <el-option label="物资类" value="01"></el-option>
+                <el-option label="基建类" value="02"></el-option>
+                <el-option label="技术服务类" value="03"></el-option>
+              </el-select>
+            </el-form-item>
+          
+            <el-form-item>
+              <el-dropdown split-button type="primary" size="mini" @click="initDatas($event)" @command="searchCommand">查询
+                <el-dropdown-menu slot="dropdown"> 
+                  <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+              </el-dropdown>
+            </el-form-item>
+        </el-form>
+        <span style="float: right;position:relative" >
+          <el-button type="primary" size="mini" @click="addaudit" style="float: right;position:absolute;right:0px">添加</el-button>
+        </span>
+       
+      
+      </div>
+
+      <!--内框表格显示-->
+      <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%">
+        <!--内框表格操作栏显示-->
+        <el-table-column label="操作" min-width="25" align="center" fixed>
+          <template slot-scope="scope">
+            <el-button type="primary" plain title="编辑" size="mini" @click="edit(scope.row)">编辑</el-button>
+
+            <el-button type="primary" plain title="删除" size="mini" @click="deleterow(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+
+        <!--内框表格剩余栏显示-->
+        <el-table-column label="名称" prop="Name"></el-table-column>
+        <el-table-column label="类别名称" prop="Categoryname"></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="addshow" width="360px">
+      <el-form :model="entityForm" :rules="rules" ref="EntityFormref">
+        <!-- 第一行 -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="名称" required prop="Name">
+              <el-input v-model="entityForm.Name" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 第二行 -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="准入类别" required prop="Categorycode">
+              <el-select
+                default-first-option
+                placeholder="请选择"
+                style="width: 100%"
+                v-model="entityForm.Categorycode"
+                @change="onchange">
+                <el-option label="物资类" value="01"></el-option>
+                <el-option label="基建类" value="02"></el-option>
+                <el-option label="技术服务类" value="03"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="一个位置" required prop="Code">
+              <el-select
+                default-first-option
+                placeholder="请选择"
+                style="width: 100%"
+                v-model="entityForm.Code"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.column_name"
+                  :label="item.column_name"
+                  :value="item.column_name"
+                ></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="addshow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+
+
+     <!-- 编辑框(默认隐藏) -->
+    <el-dialog title="表头字典编辑" :visible.sync="editshow" width="360px">
+      <el-form :model="editForm" :rules="rules" ref="EditFormref">
+        <!-- 第一行 -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="名称" required prop="EditName">
+              <el-input v-model="editForm.EditName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+     
+        <!-- 第二行 -->
+        <el-row>
+            <el-col :span="24">
+              <el-form-item label="准入类别" required prop="EditCategorycode">
+                <el-select  style="width: 100%" v-model="editForm.EditCategorycode" disabled>
+                  <el-option label="物资类" value="01"></el-option>
+                  <el-option label="基建类" value="02"></el-option>
+                  <el-option label="技术服务类" value="03"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+        </el-row>
+
+        <!-- 第三行 -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="一个位置" required prop="EditCode">
+              <el-input  style="width: 100%" v-model="editForm.EditCode"  disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span style="float: right;margin-top:-10px;">
+        <el-button size="small" @click="editshow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="EditSubmit()">编 辑</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+
+
+
+
+<script>
+import setapi from "@/api/oilsupplier/oilclassorgset";
+export default {
+  created() {
+    // 执行初始化方法
+    this.initDatas();
+  },
+  data() {
+    return {
+      // 定义列表数据
+      entityList: [],
+      // 分页参数
+      size: 10,
+      currentPage: 1,
+      currentItemCount: 0,
+      addshow: false,
+      editshow: false,
+      entityForm: {
+        Name: "",
+        Categorycode: "",
+        Code:""
+      },
+      editForm: {
+        EditName: "",
+        EditCategorycode: "",
+        EditCode:""
+      },
+      searchForm:{
+       SearchSupplierTypeName:""
+      },
+
+      rules: {
+        Name: [
+          {
+            required: true,
+            message: "请输入名称",
+            trigger: "blur"
+          }
+        ],
+        Categorycode: [
+          {
+            required: true,
+            message: "请选择准入类别",
+            trigger: "blur"
+          }
+        ],
+        Code: [
+          {
+            required: true,
+            message: "请选择一个位置",
+            trigger: "blur"
+          }
+        ],
+        EditName: [
+          {
+            required: true,
+            message: "请输入名称",
+            trigger: "blur"
+          }
+        ],
+         EditCategorycode: [
+          {
+            required: true,
+            message: "请选择准入类别",
+            trigger: "blur"
+          }
+        ],
+        EditCode: [
+          {
+            required: true,
+            message: "请选择一个位置",
+            trigger: "blur"
+          }
+        ]
+      },
+      options: [],
+      editOptions: [],
+      editId:'',
+    };
+  },
+
+  methods: {
+    //初始化列表方法
+    initDatas(event) {
+      console.log(event);
+      if(event!=null){
+        this.currentPage=1
+      }
+      let params = {
+        _size: this.size,
+        _currentPage: this.currentPage
+      };
+    
+      setapi.getTableHeaderListBySearch(params,this.searchForm,this.$axios).then(res => {
+          console.log(res.data.items);
+          this.entityList = res.data.items;
+          this.currentItemCount = res.data.currentItemCount;
+        }).catch(err => {
+          console.error(err);
+        });
+    },
+
+    //分页方法
+    handleCurrentChange(value) {
+      this.currentPage = value;
+      this.initDatas();
+    },
+    handleSizeChange(value) {
+      this.size = value;
+      this.currentPage = 1;
+      this.initDatas();
+    },
+
+    //点击添加方法
+    addaudit() {
+      this.addshow = true;
+    },
+
+    //增加方法
+    addAnnualAudit() {
+      this.$refs["EntityFormref"].validate(valid => {
+        if (valid) {setapi.addEntity(this.entityForm, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                //刷新列表
+                this.initDatas();
+
+                this.addshow = false;
+                this.$message({
+                  type: "success",
+                  message: res.data.message
+                });
+                this.$refs["EntityFormref"].resetFields();
+              } else {
+                this.$message({
+                  type: "warning",
+                  message: res.data.message
+                });
+              }
+            })
+            .catch(err => {
+              console.error(err);
+            });
+        }
+      });
+    },
+    onchange(val) {
+      
+      setapi.getlocations(val, this.$axios).then(res => {
+          console.log(res.data.items);
+          this.options = res.data.items;
+          console.log(this.options);
+          this.entityForm.Code="";
+        })
+        .catch(err => {
+          console.error(err);
+        });
+    },
+    deleterow(row) {
+      console.log(row.Id);
+      var id = row.Id;
+      this.$confirm("确定删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+          setapi.deletebyid(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);
+            });
+        }).catch(() => {
+        });
+    },
+    edit(row){
+        console.log(row)
+        this.editId=row.Id//记录将更新的id
+        this.editshow=true//显示界面
+        this.editForm.EditName=row.Name//反显名称
+        this.editForm.EditCategorycode=row.Categorycode//返现类别名称根据value值
+        this.editForm.EditCode=row.Code//返现类别名称根据value值
+    },
+    EditSubmit(){
+        this.$refs["EditFormref"].validate(valid => {
+        if (valid) {
+          setapi.updatebyid(this.editId,this.editForm, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas();
+            this.editshow = false;
+            this.$message({
+                  type: "success",
+                  message: res.data.message
+                });
+            this.$refs["EditFormref"].resetFields();
+            } else {
+              this.$message({
+                  type: "warning",
+                  message: res.data.message
+                });
+            }
+            }).catch(err => {
+              console.error(err);
+            });
+        }
+      });
+    },
+    searchCommand(command) {
+       if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+    clearSearch() {
+        this.searchForm.SearchSupplierTypeName="";
+        this.searchForm.SearchName="";
+        this.initDatas()
+      },
+  }
+};
+</script>
+