技术服务类配置列表

src/dashoo.cn/backend/api/business/oilsupplier/technologyservice/oiltechnologyservice.go

@@ -7,10 +7,6 @@ import (
 type OilTechnologyService struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
 	ClassId           int	    `xorm:"not null default '' comment('分类ID') 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)"`
-	ClassLevelId4     int    	`xorm:"not null default '0' comment('四级分类名称') INT(11)"`
 	OrgId             int       `xorm:"default 0 comment('部门ID') INT(10)"`
 	OrgName           string    `xorm:"default '' comment('部门名称') VARCHAR(100)"`
 	F01               string    `xorm:"default '' VARCHAR(2)"`
@@ -74,3 +70,17 @@ type OilTechnologyService struct {
 	ModifiedUserId    int       `xorm:"INT(10)"`
 	ModifiedBy        string    `xorm:"VARCHAR(50)"`
 }
+
+type OilTechnologyServiceView 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'"`
+	OilTechnologyService `xorm:"extends"`
+}

src/dashoo.cn/backend/api/business/oilsupplier/technologyservice/oiltechnologyserviceService.go

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

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

src/dashoo.cn/backend/api/controllers/oilsupplier/technologyservice.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/technologyservice"
 	. "dashoo.cn/backend/api/controllers"
@@ -36,384 +35,14 @@ func (this *OilTechnologyServiceController) GetEntityList() {
 			asc = true
 		}
 	}
-	Id := this.GetString("Id")
-	Code := this.GetString("Code")
+	/*Code := this.GetString("Code")
 	Name := this.GetString("Name")
-	Code1 := this.GetString("Code1")
-	Name1 := this.GetString("Name1")
-	Code2 := this.GetString("Code2")
-	Name2 := this.GetString("Name2")
-	Code3 := this.GetString("Code3")
-	Name3 := this.GetString("Name3")
-	Code4 := this.GetString("Code4")
-	Name4 := this.GetString("Name4")
 	OrgId := this.GetString("OrgId")
-	OrgName := this.GetString("OrgName")
-	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")
-	F47 := this.GetString("F47")
-	F48 := this.GetString("F48")
-	F49 := this.GetString("F49")
-	F50 := this.GetString("F50")
-	F51 := this.GetString("F51")
-	F52 := this.GetString("F52")
-	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 Code1 != "" {
-		where = where + " and Code1 like '%" + Code1 + "%'"
-	}
-
-	if Name1 != "" {
-		where = where + " and Name1 like '%" + Name1 + "%'"
-	}
-
-	if Code2 != "" {
-		where = where + " and Code2 like '%" + Code2 + "%'"
-	}
-
-	if Name2 != "" {
-		where = where + " and Name2 like '%" + Name2 + "%'"
-	}
-
-	if Code3 != "" {
-		where = where + " and Code3 like '%" + Code3 + "%'"
-	}
-
-	if Name3 != "" {
-		where = where + " and Name3 like '%" + Name3 + "%'"
-	}
-
-	if Code4 != "" {
-		where = where + " and Code4 like '%" + Code4 + "%'"
-	}
-
-	if Name4 != "" {
-		where = where + " and Name4 like '%" + Name4 + "%'"
-	}
-
-	if OrgId != "" {
-		where = where + " and OrgId like '%" + OrgId + "%'"
-	}
-
-	if OrgName != "" {
-		where = where + " and OrgName like '%" + OrgName + "%'"
-	}
-
-	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 F47 != "" {
-		where = where + " and F47 like '%" + F47 + "%'"
-	}
-
-	if F48 != "" {
-		where = where + " and F48 like '%" + F48 + "%'"
-	}
-
-	if F49 != "" {
-		where = where + " and F49 like '%" + F49 + "%'"
-	}
-
-	if F50 != "" {
-		where = where + " and F50 like '%" + F50 + "%'"
-	}
-
-	if F51 != "" {
-		where = where + " and F51 like '%" + F51 + "%'"
-	}
-
-	if F52 != "" {
-		where = where + " and F52 like '%" + F52 + "%'"
-	}
-
-	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 + "'"
-		}
-	}
+	OrgName := this.GetString("OrgName")*/
 
 	svc := technologyservice.GetOilTechnologyServiceService(utils.DBE)
-	var list []technologyservice.OilTechnologyService
-	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var list []technologyservice.OilTechnologyServiceView
+	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilTechsrvDetailViewName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -159,32 +159,6 @@ module.exports = {
     baseURL: '//47.92.212.59:10091/api/'
   },
   ignore: [
-    'pages/customer/**/*.*',
-    'pages/detection/**/*.*',
-    'pages/documentmanage/**/*.*',
-    'pages/handover/**/*.*',
-    'pages/hospitalresult/**/*.*',
-    'pages/donors/**/*.*',
-    'pages/equipment/**/*.*',
-    'pages/handover/**/*.*',
-    'pages/hospitalresult/**/*.*',
-    'pages/instrument/!**!/!*.*',
-    'pages/labInfo/**/*.*',
-    'pages/lims/!**!/!*.*',
-    'pages/lisapply/**/*.*',
-    'pages/lispackageresult/**/*.*',
-    'pages/log/**/*.*',
-    'pages/makerTemplates/**/*.*',
-    'pages/material/**/*.*',
-    'pages/positivereport/**/*.*',
-    'pages/preprocess/**/*.*',
-    'pages/projectmanage/**/*.*',
-    'pages/qualitycontrol/**/*.*',
-    'pages/report/**/*.*',
-    'pages/sampleboard/**/*.*',
-    'pages/samples/**/*.*',
-    'pages/sampletest/**/*.*',
     /*'pages/setting/!**!/!*.*',*/
-    'pages/transferLab/**/*.*',
   ]
 }

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

@@ -15,10 +15,10 @@
           </router-link>
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <!--<el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
+          </el-form-item>-->
 
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -57,7 +57,7 @@
         </el-table-column>
 
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :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">
@@ -153,372 +153,6 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="部门名称">
-              <el-input size="mini" v-model="searchForm.OrgName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F01" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F02" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F03" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F04" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F05" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F06" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F07" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F08" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F09" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F10" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F11" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F12" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F13" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F14" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F15" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F16" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F17" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F18" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F19" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F20" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F21" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F22" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F23" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F24" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F25" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F26" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F27" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F28" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F29" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F30" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F31" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F32" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F33" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F34" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F35" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F36" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F37" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F38" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F39" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F40" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F41" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F42" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F43" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F44" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F45" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F46" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F47" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F48" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F49" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F50" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F51" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.F52" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="删除状态，0正常，1已删除">
-              <el-input size="mini" v-model="searchForm.DeletionStateCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -560,7 +194,6 @@
         //查询项
         searchFormReset: {},
         searchForm: {
-          Id: '',
           Code: '',
           Name: '',
           Code1: '',
@@ -625,134 +258,118 @@
           F50: '',
           F51: '',
           F52: '',
-          Remark: '',
-          DeletionStateCode: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: '',
-
+          Remark: ''
         },
         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: "Code1",
             label: '一级编码',
-            width: 100,
+            width: 120,
             sort: true
           },
 
           {
             prop: "Name1",
             label: '一级名称',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
             prop: "Code2",
             label: '二级编码',
-            width: 100,
+            width: 120,
             sort: true
           },
 
           {
             prop: "Name2",
             label: '二级名称',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
             prop: "Code3",
             label: '三级编码',
-            width: 100,
+            width: 120,
             sort: true
           },
 
           {
             prop: "Name3",
             label: '三级名称',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
             prop: "Code4",
             label: '四级编码',
-            width: 100,
+            width: 120,
             sort: true
           },
 
           {
             prop: "Name4",
             label: '四级名称',
-            width: 100,
+            width: 150,
             sort: true
           },
 
-          {
+          /*{
             prop: "OrgId",
             label: '部门ID',
-            width: 100,
+            width: 120,
             sort: true
-          },
+          },*/
 
           {
             prop: "OrgName",
             label: '部门名称',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
             prop: "F01",
-            label: '',
-            width: 100,
+            label: '营业执照',
+            width: 150,
             sort: true
           },
 
           {
             prop: "F02",
-            label: '',
-            width: 100,
+            label: '组织机构代码证',
+            width: 150,
             sort: true
           },
 
           {
             prop: "F03",
-            label: '',
-            width: 100,
+            label: '税务登记证',
+            width: 150,
             sort: true
           },
 
           {
             prop: "F04",
-            label: '',
-            width: 100,
+            label: '银行开户许可证',
+            width: 150,
             sort: true
           },
 
@@ -1099,52 +716,10 @@
             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,
+            label: '添加时间',
+            width: 150,
             sort: true
           },
 
@@ -1169,17 +744,17 @@
         }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn.length == 2) {
+        /*if (this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
-        }
+        }*/
         //查询条件
         Object.assign(params, this.searchForm)
         //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getList('', params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -1187,7 +762,7 @@
         })
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           //this.dictOptions.customerList = res.data.items['customerList']
           //this.dictOptions.projectList = res.data.items['projectList']