物资和基建类的维护

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitude.go

@@ -7,10 +7,6 @@ import (
 type OilGoodsAptitude struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
 	ClassId           int	    `xorm:"not null default '' comment('编码') INT(11)"`
-	ClassLevelId1     int    	`xorm:"not null default '0' comment('大类名称') INT(11)"`
-	ClassLevelId2     int    	`xorm:"not null default '0' comment('中类名称') INT(11)"`
-	ClassLevelId3     int    	`xorm:"not null default '0' comment('小类名称') INT(11)"`
-	GoodsName         string    `xorm:"default '' comment('品名') VARCHAR(50)"`
 	GoodsLevel        string    `xorm:"default '' comment('物资级别') VARCHAR(8)"`
 	GoodsDesc         string    `xorm:"default '' comment('产品说明') VARCHAR(50)"`
 	Standard          string    `xorm:"default '' comment('标准备案') VARCHAR(8)"`
@@ -70,3 +66,18 @@ type OilGoodsAptitude struct {
 	ModifiedUserId    int       `xorm:"INT(10)"`
 	ModifiedBy        string    `xorm:"VARCHAR(50)"`
 }
+
+type OilGoodsAptitudeView struct {
+	Code         string    `xorm:"default '' VARCHAR(50) 'code'"`
+	Name         string    `xorm:"default '' VARCHAR(50) 'name'"`
+	Code1         string    `xorm:"default '' VARCHAR(50) 'code1'"`
+	Name1         string    `xorm:"default '' VARCHAR(50) 'name1'"`
+	Code2         string    `xorm:"default '' VARCHAR(50) 'code2'"`
+	Name2         string    `xorm:"default '' VARCHAR(50) 'name2'"`
+	Code3         string    `xorm:"default '' VARCHAR(50) 'code3'"`
+	Name3         string    `xorm:"default '' VARCHAR(50) 'name3'"`
+	Code4         string    `xorm:"default '' VARCHAR(50) 'code4'"`
+	Name4         string    `xorm:"default '' VARCHAR(50) 'name4'"`
+	OilGoodsAptitude `xorm:"extends"`
+}
+

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitudeService.go

@@ -2,7 +2,9 @@ package goodsaptitude
 
 import (
 	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
+	"strconv"
 )
 
 type OilGoodsAptitudeService struct {
@@ -14,3 +16,38 @@ func GetOilGoodsAptitudeService(xormEngine *xorm.Engine) *OilGoodsAptitudeServic
 	s.DBE = xormEngine
 	return s
 }
+
+func (s *OilGoodsAptitudeService) 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
+}

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

@@ -239,6 +239,7 @@ var (
 	OilPatentStatisticalName        string = "OilPatentStatistical"        //拥有专利、专有技术及工法
 	OilWinningProjectName           string = "OilWinningProject"           //近三年获得省部级及以上主要技术、管理成果、获奖项目
 	OilTechsrvDetailViewName        string = "oil_techsrv_detail_view"      //技术服务类视图
+	OilGoodsAptDetailViewName       string = "oil_goodsapt_detail_view"      //物資类视图
 )
 
 //分页信息及数据

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

@@ -2,11 +2,10 @@ package oilsupplier
 
 import (
 	"encoding/json"
-	"strings"
 	"time"
 
-	"dashoo.cn/business/userRole"
 	"dashoo.cn/backend/api/business/baseUser"
+	"dashoo.cn/business/userRole"
 	//"dashoo.cn/backend/api/business/items"
 	"dashoo.cn/backend/api/business/oilsupplier/basisbuild"
 	. "dashoo.cn/backend/api/controllers"
@@ -36,195 +35,6 @@ func (this *OilBasisBuildController) GetEntityList() {
 			asc = true
 		}
 	}
-	Id := this.GetString("Id")
-	Code := this.GetString("Code")
-	Name := this.GetString("Name")
-	F01 := this.GetString("F01")
-	F02 := this.GetString("F02")
-	F03 := this.GetString("F03")
-	F04 := this.GetString("F04")
-	F05 := this.GetString("F05")
-	F06 := this.GetString("F06")
-	F07 := this.GetString("F07")
-	F08 := this.GetString("F08")
-	F09 := this.GetString("F09")
-	F10 := this.GetString("F10")
-	F11 := this.GetString("F11")
-	F12 := this.GetString("F12")
-	F13 := this.GetString("F13")
-	F14 := this.GetString("F14")
-	F15 := this.GetString("F15")
-	F16 := this.GetString("F16")
-	F17 := this.GetString("F17")
-	F18 := this.GetString("F18")
-	F19 := this.GetString("F19")
-	F20 := this.GetString("F20")
-	F21 := this.GetString("F21")
-	F22 := this.GetString("F22")
-	F23 := this.GetString("F23")
-	F24 := this.GetString("F24")
-	F25 := this.GetString("F25")
-	Remark := this.GetString("Remark")
-	DeletionStateCode := this.GetString("DeletionStateCode")
-	CreateOn := this.GetString("CreateOn")
-	CreateUserId := this.GetString("CreateUserId")
-	CreateBy := this.GetString("CreateBy")
-	ModifiedOn := this.GetString("ModifiedOn")
-	ModifiedUserId := this.GetString("ModifiedUserId")
-	ModifiedBy := this.GetString("ModifiedBy")
-
-	if Id != "" {
-		where = where + " and Id like '%" + Id + "%'"
-	}
-
-	if Code != "" {
-		where = where + " and Code like '%" + Code + "%'"
-	}
-
-	if Name != "" {
-		where = where + " and Name like '%" + Name + "%'"
-	}
-
-	if F01 != "" {
-		where = where + " and F01 like '%" + F01 + "%'"
-	}
-
-	if F02 != "" {
-		where = where + " and F02 like '%" + F02 + "%'"
-	}
-
-	if F03 != "" {
-		where = where + " and F03 like '%" + F03 + "%'"
-	}
-
-	if F04 != "" {
-		where = where + " and F04 like '%" + F04 + "%'"
-	}
-
-	if F05 != "" {
-		where = where + " and F05 like '%" + F05 + "%'"
-	}
-
-	if F06 != "" {
-		where = where + " and F06 like '%" + F06 + "%'"
-	}
-
-	if F07 != "" {
-		where = where + " and F07 like '%" + F07 + "%'"
-	}
-
-	if F08 != "" {
-		where = where + " and F08 like '%" + F08 + "%'"
-	}
-
-	if F09 != "" {
-		where = where + " and F09 like '%" + F09 + "%'"
-	}
-
-	if F10 != "" {
-		where = where + " and F10 like '%" + F10 + "%'"
-	}
-
-	if F11 != "" {
-		where = where + " and F11 like '%" + F11 + "%'"
-	}
-
-	if F12 != "" {
-		where = where + " and F12 like '%" + F12 + "%'"
-	}
-
-	if F13 != "" {
-		where = where + " and F13 like '%" + F13 + "%'"
-	}
-
-	if F14 != "" {
-		where = where + " and F14 like '%" + F14 + "%'"
-	}
-
-	if F15 != "" {
-		where = where + " and F15 like '%" + F15 + "%'"
-	}
-
-	if F16 != "" {
-		where = where + " and F16 like '%" + F16 + "%'"
-	}
-
-	if F17 != "" {
-		where = where + " and F17 like '%" + F17 + "%'"
-	}
-
-	if F18 != "" {
-		where = where + " and F18 like '%" + F18 + "%'"
-	}
-
-	if F19 != "" {
-		where = where + " and F19 like '%" + F19 + "%'"
-	}
-
-	if F20 != "" {
-		where = where + " and F20 like '%" + F20 + "%'"
-	}
-
-	if F21 != "" {
-		where = where + " and F21 like '%" + F21 + "%'"
-	}
-
-	if F22 != "" {
-		where = where + " and F22 like '%" + F22 + "%'"
-	}
-
-	if F23 != "" {
-		where = where + " and F23 like '%" + F23 + "%'"
-	}
-
-	if F24 != "" {
-		where = where + " and F24 like '%" + F24 + "%'"
-	}
-
-	if F25 != "" {
-		where = where + " and F25 like '%" + F25 + "%'"
-	}
-
-	if Remark != "" {
-		where = where + " and Remark like '%" + Remark + "%'"
-	}
-
-	if DeletionStateCode != "" {
-		where = where + " and DeletionStateCode like '%" + DeletionStateCode + "%'"
-	}
-
-	if CreateOn != "" {
-		where = where + " and CreateOn like '%" + CreateOn + "%'"
-	}
-
-	if CreateUserId != "" {
-		where = where + " and CreateUserId like '%" + CreateUserId + "%'"
-	}
-
-	if CreateBy != "" {
-		where = where + " and CreateBy like '%" + CreateBy + "%'"
-	}
-
-	if ModifiedOn != "" {
-		where = where + " and ModifiedOn like '%" + ModifiedOn + "%'"
-	}
-
-	if ModifiedUserId != "" {
-		where = where + " and ModifiedUserId like '%" + ModifiedUserId + "%'"
-	}
-
-	if ModifiedBy != "" {
-		where = where + " and ModifiedBy like '%" + ModifiedBy + "%'"
-	}
-
-	if CreateOn != "" {
-		dates := strings.Split(CreateOn, ",")
-		if len(dates) == 2 {
-			minDate := dates[0]
-			maxDate := dates[1]
-			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
-		}
-	}
 
 	svc := basisbuild.GetOilBasisBuildService(utils.DBE)
 	var list []basisbuild.OilBasisBuild

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

@@ -2,7 +2,6 @@ package oilsupplier
 
 import (
 	"encoding/json"
-	"strings"
 	"time"
 
 	"dashoo.cn/backend/api/business/baseUser"
@@ -35,344 +34,11 @@ func (this *OilGoodsAptitudeController) GetEntityList() {
 			asc = true
 		}
 	}
-	Id := this.GetString("Id")
-	Code := this.GetString("Code")
-	Name := this.GetString("Name")
-	BigClassName := this.GetString("BigClassName")
-	MiddleClassName := this.GetString("MiddleClassName")
-	SmallClassName := this.GetString("SmallClassName")
-	GoodsName := this.GetString("GoodsName")
-	GoodsLevel := this.GetString("GoodsLevel")
-	GoodsDesc := this.GetString("GoodsDesc")
-	Standard := this.GetString("Standard")
-	CompanyType := this.GetString("CompanyType")
-	F01 := this.GetString("F01")
-	F02 := this.GetString("F02")
-	F03 := this.GetString("F03")
-	F04 := this.GetString("F04")
-	F05 := this.GetString("F05")
-	F06 := this.GetString("F06")
-	F07 := this.GetString("F07")
-	F08 := this.GetString("F08")
-	F09 := this.GetString("F09")
-	F10 := this.GetString("F10")
-	F11 := this.GetString("F11")
-	F12 := this.GetString("F12")
-	F13 := this.GetString("F13")
-	F14 := this.GetString("F14")
-	F15 := this.GetString("F15")
-	F16 := this.GetString("F16")
-	F17 := this.GetString("F17")
-	F18 := this.GetString("F18")
-	F19 := this.GetString("F19")
-	F20 := this.GetString("F20")
-	F21 := this.GetString("F21")
-	F22 := this.GetString("F22")
-	F23 := this.GetString("F23")
-	F24 := this.GetString("F24")
-	F25 := this.GetString("F25")
-	F26 := this.GetString("F26")
-	F27 := this.GetString("F27")
-	F28 := this.GetString("F28")
-	F29 := this.GetString("F29")
-	F30 := this.GetString("F30")
-	F31 := this.GetString("F31")
-	F32 := this.GetString("F32")
-	F33 := this.GetString("F33")
-	F34 := this.GetString("F34")
-	F35 := this.GetString("F35")
-	F36 := this.GetString("F36")
-	F37 := this.GetString("F37")
-	F38 := this.GetString("F38")
-	F39 := this.GetString("F39")
-	F40 := this.GetString("F40")
-	F41 := this.GetString("F41")
-	F42 := this.GetString("F42")
-	F43 := this.GetString("F43")
-	F44 := this.GetString("F44")
-	F45 := this.GetString("F45")
-	F46 := this.GetString("F46")
-	Remark := this.GetString("Remark")
-	DeletionStateCode := this.GetString("DeletionStateCode")
-	CreateOn := this.GetString("CreateOn")
-	CreateUserId := this.GetString("CreateUserId")
-	CreateBy := this.GetString("CreateBy")
-	ModifiedOn := this.GetString("ModifiedOn")
-	ModifiedUserId := this.GetString("ModifiedUserId")
-	ModifiedBy := this.GetString("ModifiedBy")
-
-	if Id != "" {
-		where = where + " and Id like '%" + Id + "%'"
-	}
-
-	if Code != "" {
-		where = where + " and Code like '%" + Code + "%'"
-	}
-
-	if Name != "" {
-		where = where + " and Name like '%" + Name + "%'"
-	}
-
-	if BigClassName != "" {
-		where = where + " and BigClassName like '%" + BigClassName + "%'"
-	}
-
-	if MiddleClassName != "" {
-		where = where + " and MiddleClassName like '%" + MiddleClassName + "%'"
-	}
-
-	if SmallClassName != "" {
-		where = where + " and SmallClassName like '%" + SmallClassName + "%'"
-	}
-
-	if GoodsName != "" {
-		where = where + " and GoodsName like '%" + GoodsName + "%'"
-	}
-
-	if GoodsLevel != "" {
-		where = where + " and GoodsLevel like '%" + GoodsLevel + "%'"
-	}
-
-	if GoodsDesc != "" {
-		where = where + " and GoodsDesc like '%" + GoodsDesc + "%'"
-	}
-
-	if Standard != "" {
-		where = where + " and Standard like '%" + Standard + "%'"
-	}
-
-	if CompanyType != "" {
-		where = where + " and CompanyType like '%" + CompanyType + "%'"
-	}
-
-	if F01 != "" {
-		where = where + " and F01 like '%" + F01 + "%'"
-	}
-
-	if F02 != "" {
-		where = where + " and F02 like '%" + F02 + "%'"
-	}
-
-	if F03 != "" {
-		where = where + " and F03 like '%" + F03 + "%'"
-	}
-
-	if F04 != "" {
-		where = where + " and F04 like '%" + F04 + "%'"
-	}
-
-	if F05 != "" {
-		where = where + " and F05 like '%" + F05 + "%'"
-	}
-
-	if F06 != "" {
-		where = where + " and F06 like '%" + F06 + "%'"
-	}
 
-	if F07 != "" {
-		where = where + " and F07 like '%" + F07 + "%'"
-	}
-
-	if F08 != "" {
-		where = where + " and F08 like '%" + F08 + "%'"
-	}
-
-	if F09 != "" {
-		where = where + " and F09 like '%" + F09 + "%'"
-	}
-
-	if F10 != "" {
-		where = where + " and F10 like '%" + F10 + "%'"
-	}
-
-	if F11 != "" {
-		where = where + " and F11 like '%" + F11 + "%'"
-	}
-
-	if F12 != "" {
-		where = where + " and F12 like '%" + F12 + "%'"
-	}
-
-	if F13 != "" {
-		where = where + " and F13 like '%" + F13 + "%'"
-	}
-
-	if F14 != "" {
-		where = where + " and F14 like '%" + F14 + "%'"
-	}
-
-	if F15 != "" {
-		where = where + " and F15 like '%" + F15 + "%'"
-	}
-
-	if F16 != "" {
-		where = where + " and F16 like '%" + F16 + "%'"
-	}
-
-	if F17 != "" {
-		where = where + " and F17 like '%" + F17 + "%'"
-	}
-
-	if F18 != "" {
-		where = where + " and F18 like '%" + F18 + "%'"
-	}
-
-	if F19 != "" {
-		where = where + " and F19 like '%" + F19 + "%'"
-	}
-
-	if F20 != "" {
-		where = where + " and F20 like '%" + F20 + "%'"
-	}
-
-	if F21 != "" {
-		where = where + " and F21 like '%" + F21 + "%'"
-	}
-
-	if F22 != "" {
-		where = where + " and F22 like '%" + F22 + "%'"
-	}
-
-	if F23 != "" {
-		where = where + " and F23 like '%" + F23 + "%'"
-	}
-
-	if F24 != "" {
-		where = where + " and F24 like '%" + F24 + "%'"
-	}
-
-	if F25 != "" {
-		where = where + " and F25 like '%" + F25 + "%'"
-	}
-
-	if F26 != "" {
-		where = where + " and F26 like '%" + F26 + "%'"
-	}
-
-	if F27 != "" {
-		where = where + " and F27 like '%" + F27 + "%'"
-	}
-
-	if F28 != "" {
-		where = where + " and F28 like '%" + F28 + "%'"
-	}
-
-	if F29 != "" {
-		where = where + " and F29 like '%" + F29 + "%'"
-	}
-
-	if F30 != "" {
-		where = where + " and F30 like '%" + F30 + "%'"
-	}
-
-	if F31 != "" {
-		where = where + " and F31 like '%" + F31 + "%'"
-	}
-
-	if F32 != "" {
-		where = where + " and F32 like '%" + F32 + "%'"
-	}
-
-	if F33 != "" {
-		where = where + " and F33 like '%" + F33 + "%'"
-	}
-
-	if F34 != "" {
-		where = where + " and F34 like '%" + F34 + "%'"
-	}
-
-	if F35 != "" {
-		where = where + " and F35 like '%" + F35 + "%'"
-	}
-
-	if F36 != "" {
-		where = where + " and F36 like '%" + F36 + "%'"
-	}
-
-	if F37 != "" {
-		where = where + " and F37 like '%" + F37 + "%'"
-	}
-
-	if F38 != "" {
-		where = where + " and F38 like '%" + F38 + "%'"
-	}
-
-	if F39 != "" {
-		where = where + " and F39 like '%" + F39 + "%'"
-	}
-
-	if F40 != "" {
-		where = where + " and F40 like '%" + F40 + "%'"
-	}
-
-	if F41 != "" {
-		where = where + " and F41 like '%" + F41 + "%'"
-	}
-
-	if F42 != "" {
-		where = where + " and F42 like '%" + F42 + "%'"
-	}
-
-	if F43 != "" {
-		where = where + " and F43 like '%" + F43 + "%'"
-	}
-
-	if F44 != "" {
-		where = where + " and F44 like '%" + F44 + "%'"
-	}
-
-	if F45 != "" {
-		where = where + " and F45 like '%" + F45 + "%'"
-	}
-
-	if F46 != "" {
-		where = where + " and F46 like '%" + F46 + "%'"
-	}
-
-	if Remark != "" {
-		where = where + " and Remark like '%" + Remark + "%'"
-	}
-
-	if DeletionStateCode != "" {
-		where = where + " and DeletionStateCode like '%" + DeletionStateCode + "%'"
-	}
-
-	if CreateOn != "" {
-		where = where + " and CreateOn like '%" + CreateOn + "%'"
-	}
-
-	if CreateUserId != "" {
-		where = where + " and CreateUserId like '%" + CreateUserId + "%'"
-	}
-
-	if CreateBy != "" {
-		where = where + " and CreateBy like '%" + CreateBy + "%'"
-	}
-
-	if ModifiedOn != "" {
-		where = where + " and ModifiedOn like '%" + ModifiedOn + "%'"
-	}
-
-	if ModifiedUserId != "" {
-		where = where + " and ModifiedUserId like '%" + ModifiedUserId + "%'"
-	}
-
-	if ModifiedBy != "" {
-		where = where + " and ModifiedBy like '%" + ModifiedBy + "%'"
-	}
-
-	if CreateOn != "" {
-		dates := strings.Split(CreateOn, ",")
-		if len(dates) == 2 {
-			minDate := dates[0]
-			maxDate := dates[1]
-			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
-		}
-	}
 
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
-	var list []goodsaptitude.OilGoodsAptitude
-	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var list []goodsaptitude.OilGoodsAptitudeView
+	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilGoodsAptDetailViewName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total

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

@@ -209,7 +209,7 @@ func init() {
 			),
 		),
 		//以下是供方管理信息系统
-		beego.NSNamespace("/busisbuild",
+		beego.NSNamespace("/basisbuild",
 			beego.NSInclude(
 				&oilsupplier.OilBasisBuildController{},
 			),

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

@@ -369,24 +369,10 @@
           F24: '',
           F25: '',
           Remark: '',
-          DeletionStateCode: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: '',
 
         },
         tableColumns: [
 
-          {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
           {
             prop: "Code",
             label: '编码',
@@ -583,51 +569,9 @@
             sort: true
           },
 
-          {
-            prop: "DeletionStateCode",
-            label: '删除状态，0正常，1已删除',
-            width: 100,
-            sort: true
-          },
-
           {
             prop: "CreateOn",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CreateUserId",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CreateBy",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ModifiedOn",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ModifiedUserId",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ModifiedBy",
-            label: '',
+            label: '创建时间',
             width: 100,
             sort: true
           },

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

@@ -57,7 +57,7 @@
         </el-table-column>
 
         <el-table-column v-for="column in tableColumns"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :key="column.Id" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+                         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 prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -581,52 +581,72 @@
         },
         tableColumns: [
 
-          {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
           {
             prop: "Code",
             label: '编码',
-            width: 100,
+            width: 120,
             sort: true
           },
 
           {
             prop: "Name",
             label: '名称',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
-            prop: "BigClassName",
+            prop: "Code1",
+            label: '大类编码',
+            width: 120,
+            sort: true
+          },
+          {
+            prop: "Name1",
             label: '大类名称',
-            width: 100,
+            width: 150,
+            sort: true
+          },
+
+          {
+            prop: "Code2",
+            label: '中类编码',
+            width: 120,
             sort: true
           },
 
           {
-            prop: "MiddleClassName",
+            prop: "Name2",
             label: '中类名称',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
-            prop: "SmallClassName",
+            prop: "Code3",
+            label: '小类编码',
+            width: 120,
+            sort: true
+          },
+
+          {
+            prop: "Name3",
             label: '小类名称',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
-            prop: "GoodsName",
-            label: '品名',
-            width: 100,
+            prop: "Code4",
+            label: '品名编码',
+            width: 120,
+            sort: true
+          },
+
+          {
+            prop: "Name4",
+            label: '品名名称',
+            width: 150,
             sort: true
           },
 
@@ -987,55 +1007,6 @@
             sort: true
           },
 
-          {
-            prop: "DeletionStateCode",
-            label: '删除状态，0正常，1已删除',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CreateOn",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CreateUserId",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CreateBy",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ModifiedOn",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ModifiedUserId",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ModifiedBy",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
         ]
       }
     },