近三年主要工程业绩列表获取

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

@@ -0,0 +1,23 @@
+package performance
+
+import "time"
+
+type OilThreeYearsPerformance struct {
+	Id             int       `xorm:"not null pk autoincr INT(10)"`
+	SupplierCertId int       `xorm:"INT(10)"`
+	ProjectName    string    `xorm:"VARCHAR(100)"`
+	BearContent    string    `xorm:"VARCHAR(100)"`
+	OwnerUnit      string    `xorm:"VARCHAR(100)"`
+	StartTime      time.Time `xorm:"DATETIME"`
+	StopTime       time.Time `xorm:"DATETIME"`
+	Tudge          int       `xorm:"INT(10)"`
+	UseItemValue   string    `xorm:"VARCHAR(20)"`
+	Remark         string    `xorm:"VARCHAR(500)"`
+	IsDelete       int       `xorm:"INT(10)"`
+	CreateOn       time.Time `xorm:"DATETIME created"` //创建时间
+	CreateUserId   int       `xorm:"INT(10)"`
+	CreateBy       string    `xorm:"VARCHAR(50)"` //创建人
+	ModifiedOn     time.Time `xorm:"DATETIME updated"`
+	ModifiedUserId int       `xorm:"INT(10)"`
+	ModifiedBy     string    `xorm:"VARCHAR(50)"`
+}

src/dashoo.cn/backend/api/business/performance/performanceService.go

@@ -0,0 +1,21 @@
+package performance
+
+import (
+	//"fmt"
+	//"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	//"dashoo.cn/utils"
+	//. "dashoo.cn/utils/db"
+	"github.com/go-xorm/xorm"
+)
+
+type PerformanceService struct {
+	MyServiceBase
+}
+
+func GetPerformanceService(xormEngine *xorm.Engine) *PerformanceService {
+	s := new(PerformanceService)
+	s.DBE = xormEngine
+	return s
+}

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

@@ -0,0 +1,44 @@
+package oilsupplier
+
+import (
+	//	"encoding/json"
+	//"strings"
+
+	//"time"
+	//"fmt"
+
+	"dashoo.cn/backend/api/business/performance"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+)
+
+type PerformanceController struct {
+	BaseController
+}
+
+// @Title 获取近三年主要工程业绩列表
+// @Description get user by token
+// @Success 200 {object} models.Userblood
+// @router /performancellist [get]
+func (this *PerformanceController) PerformanceList() {
+	page := this.GetPageInfoForm()
+	var list []performance.OilThreeYearsPerformance
+	svc := performance.GetPerformanceService(utils.DBE)
+	where := " 1=1"
+	orderby := "StopTime"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}

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

@@ -252,6 +252,12 @@ func init() {
 				&oilsupplier.OilAuditSettingController{},
 			),
 		),
+		//近三年主要工程业绩
+		beego.NSNamespace("/performance",
+			beego.NSInclude(
+				&oilsupplier.PerformanceController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

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

@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <el-dialog title="近三年主要工程业绩" :visible.sync="visible" top="5vh" width="90%">
+      <!-- <el-form label-width="90px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="查询条件">
+              <el-input v-model="keyword" placeholder="请输入身份证号或姓名或内部编号" style="width:60%"></el-input>
+              <router-link :to="'/biobank/source/addsource/operation'">
+                <el-button style="float: right;margin-left:10px;" type="primary">添加新来源</el-button>
+              </router-link>
+              <el-button style="float: right;" type="primary" class="el-button" @click="seachdata">查 询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form> -->
+      <el-table :data="performanceList" :stripe="true">
+        <!-- <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="small" @click="handleselect(scope.row)" type="text" title="选择">
+              <i class="icon icon-checkmark"></i> 选择</el-button>
+          </template>
+        </el-table-column> -->
+        <el-table-column prop="ProjectName" label="设备名称" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="BearContent" label="主要内容" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="OwnerUnit" label="业主单位" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="StartTime" label="起始时间" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.StartTime+'') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="StopTime" label="结束时间" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.StartTime+'') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="Tudge" label="有无事故" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="Remark" label="备注" show-overflow-tooltip>
+        </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-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  export default {
+    name: 'PerformanceList',
+    props: {
+      visible: {
+        type: Boolean,
+        default: false
+      }
+    },
+    created() {
+      this.initData()
+    },
+    computed: {
+      ...mapGetters({
+        session: 'session'
+      })
+    },
+    watch: {
+      visible(val) {
+        this.selfVisible = val
+        if (this.visible) {
+          this.createoptions
+        }
+      },
+      selfVisible(val) {
+        this.$emit('update:visible', val)
+      }
+    },
+    data() {
+      return {
+        performanceList: [],
+        currentPage: 1, // 分页
+        size: 10,
+        currentItemCount: 0,
+        selfVisible: this.visible // 避免vue双向绑定警告
+      }
+    },
+    methods: {
+      initData() {
+        let _this = this
+        // request
+        const params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+        }
+        this.$axios.get('performance/performancellist', {
+            params
+          })
+          .then(res => {
+            _this.performanceList = res.data.items
+            _this.currentItemCount = res.data.currentItemCount
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      seachdata() {
+        this.initData()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initData()
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initData()
+      },
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 16)
+        }
+      },
+      //   handleselect(val) {
+      //     this.$emit('close', val)
+      //     this.selfVisible = false
+      //   }
+    }
+  }
+
+</script>
+
+<style>
+
+
+</style>

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

@@ -51,7 +51,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="供方名称">
-                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -99,19 +99,19 @@
 
                 <el-col :span="8">
                   <el-form-item label="工商注册号">
-                    <el-input v-model="formData.CommercialNo" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="组织机构代码">
-                    <el-input v-model="formData.OrganCode" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="税务登记证编号">
-                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -123,37 +123,37 @@
 
                 <el-col :span="8">
                   <el-form-item label="省直辖市">
-                    <el-input v-model="formData.Province" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.Province" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="地市区县">
-                    <el-input v-model="formData.City" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.City" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="街道">
-                    <el-input v-model="formData.Street" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.Street" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="门牌号">
-                    <el-input v-model="formData.HouseNo" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.HouseNo" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="邮编">
-                    <el-input v-model="formData.ZipCode" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="16">
                   <el-form-item label="单位地址">
-                    <el-input v-model="formData.Address" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.Address" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -179,13 +179,13 @@
 
                 <el-col :span="8">
                   <el-form-item label="法定代表人姓名">
-                    <el-input v-model="formData.LegalPerson" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="行业类别">
-                    <el-input v-model="formData.CategoryCode" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -197,95 +197,95 @@
 
                 <el-col :span="8">
                   <el-form-item label="注册资本">
-                    <el-input v-model="formData.RegCapital" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="联系人姓名">
-                    <el-input v-model="formData.ContactName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="币种">
-                    <el-input v-model="formData.Currency" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="公司类型">
-                    <el-input v-model="formData.CompanyType" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="成立时间">
-                    <el-input v-model="formData.SetupTime" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="开户银行">
-                    <el-input v-model="formData.DepositBank" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="银行账号">
-                    <el-input v-model="formData.BankAccount" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="移动电话">
-                    <el-input v-model="formData.Mobile" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="固定电话">
-                    <el-input v-model="formData.Telphone" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="传真">
-                    <el-input v-model="formData.Fax" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="公司电话">
-                    <el-input v-model="formData.CompanyTel" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="电子邮箱">
-                    <el-input v-model="formData.EMail" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="QQ号码">
-                    <el-input v-model="formData.QQ" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="银行信用等级">
-                    <el-input v-model="formData.BankCreditRating" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="公司网址">
-                    <el-input v-model="formData.CompanyUrl" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="HSE审查培训">
-                    <el-input v-model="formData.CompanyUrl" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -295,13 +295,15 @@
             <el-form label-position="top" ref="EntityFormCert" :model="formData">
               <el-row :gutter="20">
                 <el-col :span="8">
-                  <el-form-item  label="质量管理体系认证情况及认证机构">
-                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  <el-form-item label="质量管理体系认证情况及认证机构">
+                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
+                      style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="企业资质证书">
-                    <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                    <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
                   </el-form-item>
                 </el-col>
                 <!--<el-col :span="12">
@@ -311,27 +313,33 @@
                 </el-col>-->
                 <el-col :span="8">
                   <el-form-item label="安全生产许可证">
-                    <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                    <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <el-form-item label="中石油勘探与生产工程技术服务市场准入许可证或监督服务市场准入证"> <!--技术服务类准入许可证-->
-                    <el-input v-model="formData.TechServiceLic" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  <el-form-item label="中石油勘探与生产工程技术服务市场准入许可证或监督服务市场准入证">
+                    <!--技术服务类准入许可证-->
+                    <el-input v-model="formData.TechServiceLic" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="行业特殊要求的认证证书">
-                    <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                    <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <el-form-item  label="企业简介（成立时间、人数、经营规模、信誉、主要生产设备及保障能力等情况）">
-                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  <el-form-item label="企业简介（成立时间、人数、经营规模、信誉、主要生产设备及保障能力等情况）">
+                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
+                      style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
-                    <el-input v-model="formData.Remark" placeholder="请输入"  type="textarea" style="width: 100%"></el-input>
+                    <el-input v-model="formData.Remark" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -357,61 +365,71 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="企业员工总数">
-                    <el-input-number v-model="formData.WorkerTotal" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.WorkerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="合同化用工数量">
-                    <el-input-number v-model="formData.ContractNum" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.ContractNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="大学及以上学历人员数量">
-                    <el-input-number v-model="formData.UniversityNum" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.UniversityNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术、管理人员数量">
-                    <el-input-number v-model="formData.TechnicalNum" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.TechnicalNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="高级及以上职称人员数量">
-                    <el-input-number v-model="formData.AboveProfNum" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.AboveProfNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="中级职称人员数量">
-                    <el-input-number v-model="formData.MiddleProfNum" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.MiddleProfNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格人员数量">
-                    <el-input-number v-model="formData.NationalRegNum" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.NationalRegNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格证书总数">
-                    <el-input-number v-model="formData.NationalCertTotal" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.NationalCertTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="设计人员总数">
-                    <el-input-number v-model="formData.DesignerTotal" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.DesignerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术工人总数">
-                    <el-input-number v-model="formData.SkillerTotal" controls-position="right"  :min="0" style="width: 100%"></el-input-number>
+                    <el-input-number v-model="formData.SkillerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -431,7 +449,7 @@
               <span>近三年主要工程业绩</span>
               <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
             </div>
-            <supplier-file-table height="360px" style="margin-top: 20px"></supplier-file-table>
+            <el-table :data="performanceList" height="360px" style="margin-top: 20px"></el-table>
           </el-card>
 
           <el-card class="box-card" style="margin-top: 10px;">
@@ -467,25 +485,23 @@
                   </router-link>
 
                   <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-                    <el-alert
-                      title=""
-                      description="确认要删除吗？"
-                      type="warning"
-                      :closable="false">
+                    <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
                     </el-alert>
-                    <br/>
+                    <br />
                     <div style="text-align: right; margin: 0">
                       <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
                     </div>
-                    <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
+                    <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small"
+                      @click="scope.row.deleteConfirmFlag = true">
                       <i class="el-icon-delete"></i>
                     </el-button>
                   </el-popover>
                 </template>
               </el-table-column>
 
-              <el-table-column v-for="column in tableColumns" :key="column.Id"
-                               v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+              <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
+                :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
+              </el-table-column>
 
               <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
@@ -519,8 +535,9 @@
         </el-tab-pane>
       </el-tabs>
 
-
     </el-card>
+
+    <performance-list @close="performancelistCallback" :visible.sync="performancelist"></performance-list>
   </div>
 </template>
 
@@ -533,11 +550,15 @@
   import WfHistory from '@/components/workflow/wfhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
+  import PerformanceList from '../../../../components/oilsupplier/performancelist'
+
   export default {
     components: {
       SupplierFileTable,
       WfHistory,
-      SupplierCertEdit
+      SupplierCertEdit,
+
+      PerformanceList, //近三年主要工程业绩列表
     },
     computed: {
       ...mapGetters({
@@ -546,8 +567,11 @@
     },
     name: 'oilsupplierEdit',
 
-    data () {
+    data() {
       return {
+        performanceList: [],
+        performancelist: false,
+
         serviceId: '',
         certId: '',
         formData: {
@@ -667,11 +691,11 @@
 
       }
     },
-    created () {
+    created() {
       this.serviceId = this.$route.params.opera
       this.certId = this.$route.query.certid
       this.getDictOptions()
-      if(this.serviceId != 'add' && this.serviceId>0) {
+      if (this.serviceId != 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
         this.initDatas()
       } else {
@@ -679,8 +703,13 @@
       }
     },
     methods: {
-      initDatas () {
-        if(this.formData.Id) {
+      //近三年主要工程业绩列表返回
+      performancelistCallback(val) {
+        console.log("11111111111111111111111111")
+      },
+
+      initDatas() {
+        if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
           }).catch(err => {
@@ -689,7 +718,7 @@
         }
       },
 
-      getDictOptions () {
+      getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           //this.wellNoOptions = res.data.items['WellNo']
           //this.supervisersOptions = res.data.items['Supervisers']
@@ -699,7 +728,7 @@
       },
 
       //保存信息
-      saveEntity () {
+      saveEntity() {
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
@@ -716,7 +745,7 @@
       },
 
       //保存信息
-      saveCertEntity () {
+      saveCertEntity() {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
@@ -766,7 +795,7 @@
         });
       },
 
-      CheckCompanyBase () {
+      CheckCompanyBase() {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -784,9 +813,9 @@
         return true
       },
 
-      updateEntityNumber () {
-        if( !this.CheckCompanyBase() ) {
-            return false
+      updateEntityNumber() {
+        if (!this.CheckCompanyBase()) {
+          return false
         }
         api.updateEntityNumber(this.formData.Id + '_' + this.certId, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {