业务添加组件

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

@@ -6,7 +6,7 @@ import (
 
 type OilTechnologyService struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
-	ClassId           int	    `xorm:"not null default '' comment('分类ID') INT(11)"`
+	ClassId           int       `xorm:"not null default '' comment('分类ID') INT(11)"`
 	OrgId             int       `xorm:"default 0 comment('部门ID') INT(10)"`
 	OrgName           string    `xorm:"default '' comment('部门名称') VARCHAR(100)"`
 	F01               string    `xorm:"default '' VARCHAR(2)"`
@@ -72,15 +72,23 @@ type OilTechnologyService struct {
 }
 
 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'"`
+	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"`
 }
+
+type TechnologyBusiness struct {
+	Id       int
+	Code     string
+	Name     string
+	ParentId int
+	Remark   string
+}

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

@@ -1,14 +1,15 @@
 package oilsupplier
 
 import (
-	"dashoo.cn/business/userRole"
+	"encoding/json"
+	"strings"
+	"time"
+
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business/userRole"
 	"dashoo.cn/utils"
-	"encoding/json"
-	"strings"
-	"time"
 )
 
 type OilSupplierCertSubController struct {
@@ -20,7 +21,6 @@ type OilSupplierCertSubController struct {
 // @Success 200 {object} []suppliercertsub.OilSupplierCertSub
 // @router /list [get]
 func (this *OilSupplierCertSubController) GetEntityList() {
-
 	//获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1 "
@@ -53,72 +53,58 @@ func (this *OilSupplierCertSubController) GetEntityList() {
 		where = where + " and Id like '%" + Id + "%'"
 	}
 
-
 	if SupplierId != "" {
 		where = where + " and SupplierId like '%" + SupplierId + "%'"
 	}
 
-
 	if SupplierCertId != "" {
 		where = where + " and SupplierCertId like '%" + SupplierCertId + "%'"
 	}
 
-
 	if SubClassId != "" {
-		where = where + " and SubClassId like '%" + SubClassId + "%'"
+		where = where + " and SubClassId = '" + SubClassId + "'"
 	}
 
-
 	if Code != "" {
 		where = where + " and Code like '%" + Code + "%'"
 	}
 
-
 	if Name != "" {
 		where = where + " and Name like '%" + Name + "%'"
 	}
 
-
 	if Remark != "" {
 		where = where + " and Remark like '%" + Remark + "%'"
 	}
 
-
 	if IsDelete != "" {
 		where = where + " and IsDelete like '%" + IsDelete + "%'"
 	}
 
-
 	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 {
@@ -130,7 +116,7 @@ func (this *OilSupplierCertSubController) GetEntityList() {
 
 	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
 	var list []suppliercertsub.OilSupplierCertSub
-	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetPagingEntitiesWithoutAccCode(page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
@@ -267,8 +253,6 @@ func (this *OilSupplierCertSubController) UpdateEntity() {
 		"ModifiedUserId",
 
 		"ModifiedBy",
-
-
 	}
 	err := svc.UpdateEntityBytbl(OilSupplierCertSubName, id, &model, cols)
 	if err == nil {
@@ -315,4 +299,101 @@ func (this *OilSupplierCertSubController) DeleteEntity() {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	}
-}
+}
+
+// @Title 新增准入范围
+// @Description 新增准入范围
+// @Success	200	{object} controllers.Request
+// @router /addbusiness [post]
+func (this *OilSupplierCertSubController) AddBusiness() {
+	var model suppliercertsub.OilSupplierCertSub
+	var jsonblob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonblob, &model)
+	model.CreateBy = this.User.Realname
+	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
+	_, err := svc.InsertEntityBytbl(OilSupplierCertSubName, &model)
+	var errinfo ErrorDataInfo
+	if err == nil {
+		errinfo.Message = "操作成功！"
+		errinfo.Code = 0
+		errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 更新准入范围
+// @Description 更新准入范围
+// @Param	id	path	string	true
+// @Success	200	{object}
+// @router /editbusiness/:id [put]
+func (this *OilSupplierCertSubController) EditBusiness() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	var model suppliercertsub.OilSupplierCertSub
+	var jsonblob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonblob, &model)
+	var entity suppliercertsub.OilSupplierCertSub
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
+	opdesc := "编辑准入范围-" + model.Name
+	var cols []string = []string{"Name", "Code", "Remark", "IsDelete", "ModifiedBy", "ModifiedUserId"}
+	err := svc.UpdateOperationAndWriteLogBytbl(OilSupplierCertSubName, BaseOperationLogName, id, &model, &entity, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "准入范围")
+
+	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 /businessdelete/:Id [delete]
+func (this *OilSupplierCertSubController) BusinessDelete() {
+	Id := this.Ctx.Input.Param(":Id")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	where := " Id= " + Id
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
+	err := svc.DeleteEntityBytbl(OilSupplierCertSubName, where)
+	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()
+	}
+}

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

@@ -6,6 +6,7 @@ import (
 
 	"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"
@@ -344,3 +345,18 @@ func (this *OilTechnologyServiceController) DeleteEntity() {
 		this.ServeJSON()
 	}
 }
+
+// @Title get
+// @Description get SampleType by token
+// @Success 200 {object} sampletype.SampleType
+// @router /businesslist [get]
+func (this *OilTechnologyServiceController) BusinessList() {
+	svc := technologyservice.GetOilTechnologyServiceService(utils.DBE)
+	where := " 1 = 1 "
+	var list []technologyservice.TechnologyBusiness
+	svc.GetEntitysByWhere(OilTechnologyServiceClassName, where, &list)
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}

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

@@ -0,0 +1,292 @@
+<template>
+  <div>
+    <el-table :data="businessList">
+      <el-table-column label="操作" width="70" align="center" fixed>
+        <template slot-scope="scope">
+          <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)"></el-button>
+          <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
+            @click="deletedata(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="Name" 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 :title="Title" :visible.sync="visible" top="5vh">
+      <el-form :model="BusinessForm" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="名称" required>
+              <el-cascader :options="techTreeList" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                v-model="selectedorg" placeholder="请选择菜单" @change="getCode()"></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="编码" required>
+              <el-input v-model="BusinessForm.Code" placeholder="请输入编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注信息">
+              <el-input v-model="BusinessForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
+        <el-button @click="visible = false">取 消</el-button>
+        <el-button type="primary" @click="savedata()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  export default {
+    name: 'EquipmentList',
+    props: {
+      SupplierCertId: {
+        type: String,
+        default: '0'
+      },
+      SupplierId: {
+        type: String,
+        default: '0'
+      },
+      SubClassId: {
+        type: String,
+        default: '0'
+      }
+    },
+    created() {
+      this.initData()
+      this.getbusiness()
+    },
+    computed: {
+      ...mapGetters({
+        session: 'session'
+      })
+    },
+    data() {
+      return {
+        businessList: [],
+        techList: [],
+        techTreeList: [],
+        orgtreeprops: {
+          value: 'id',
+          label: 'Name',
+          children: 'children'
+        },
+        selectedorg: [],
+
+        Title: '',
+        BusinessForm: {
+          Id: '',
+          SupplierId: '',
+          SupplierCertId: '',
+          SubClassId: '',
+          Code: '',
+          Name: '',
+          Remark: '',
+          IsDelete: 0
+        },
+        visible: false,
+        selfVisible: this.visible, // 避免vue双向绑定警告
+        currentPage: 1, // 分页
+        size: 10,
+        currentItemCount: 0,
+      }
+    },
+    methods: {
+      initData() {
+        let _this = this
+        const params = {
+          SupplierCertId: this.SupplierCertId,
+          SubClassId: this.SubClassId,
+          _currentPage: this.currentPage,
+          _size: this.size,
+        }
+        this.$axios.get('suppliercertsub/list', {
+            params
+          })
+          .then(res => {
+            _this.businessList = res.data.items
+            _this.currentItemCount = res.data.currentItemCount
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      getbusiness() {
+        let _this = this
+        this.$axios.get('technologyservice/businesslist', {})
+          .then(res => {
+            _this.techList = res.data.items
+            _this.techTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      getCode() {
+        for (var i = 0; i < this.techList.length; i++) {
+          if (this.selectedorg[this.selectedorg.length - 1] == this.techList[i].Id) {
+            this.BusinessForm.Name = this.techList[i].Name
+            this.BusinessForm.Code = this.techList[i].Code
+          }
+        }
+      },
+      savedata() {
+        if (this.Title == '新增准入范围') {
+          this.addBusiness()
+        } else if (this.Title == '编辑准入范围') {
+          this.editBusiness()
+        }
+      },
+      addBusiness() {
+        let _this = this
+        _this.BusinessForm.SupplierId = parseInt(_this.BusinessForm.SupplierId)
+        _this.BusinessForm.SupplierCertId = parseInt(_this.BusinessForm.SupplierCertId)
+        _this.BusinessForm.SubClassId = parseInt(_this.BusinessForm.SubClassId)
+        _this.$axios.post('/suppliercertsub/addbusiness/', _this.BusinessForm)
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              this.visible = false
+              this.initData()
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      editBusiness() {
+        let _this = this
+        _this.BusinessForm.SupplierId = parseInt(_this.BusinessForm.SupplierId)
+        _this.BusinessForm.SupplierCertId = parseInt(_this.BusinessForm.SupplierCertId)
+        _this.BusinessForm.SubClassId = parseInt(_this.BusinessForm.SubClassId)
+        _this.$axios.put('/suppliercertsub/editbusiness/' + _this.BusinessForm.Id, _this.BusinessForm)
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              this.visible = false
+              this.initData()
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      deletedata(val) {
+        let _this = this;
+        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            _this.$axios.delete('suppliercertsub/businessdelete/' + val.Id, {})
+              .then(function (response) {
+                // response
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: "success",
+                    message: response.data.message
+                  });
+                  _this.initData();
+                } else {
+                  _this.$message({
+                    type: "warning",
+                    message: response.data.message
+                  });
+                }
+              })
+              .catch(function (error) {
+                console.log(error);
+              });
+          })
+          .catch(() => {});
+      },
+      showDialog() {
+        this.Title = '新增准入范围'
+        this.BusinessForm.SupplierId = this.SupplierId
+        this.BusinessForm.SupplierCertId = this.SupplierCertId
+        this.BusinessForm.SubClassId = this.SubClassId
+        this.BusinessForm.Code = ''
+        this.BusinessForm.Name = ''
+        this.BusinessForm.Remark = ''
+        this.BusinessForm.IsDelete = 0
+        this.visible = true
+      },
+      openDialog(val) {
+        this.Title = '编辑准入范围'
+        this.BusinessForm.Id = val.Id
+        this.BusinessForm.SupplierId = val.SupplierId
+        this.BusinessForm.SupplierCertId = val.SupplierCertId
+        this.BusinessForm.SubClassId = val.SubClassId
+        this.BusinessForm.Code = val.Code
+        this.BusinessForm.Name = val.Name
+        this.BusinessForm.Remark = val.Remark
+        this.BusinessForm.IsDelete = val.IsDelete
+        this.visible = true
+      },
+      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, 10)
+        }
+      },
+    }
+  }
+
+</script>
+
+<style>
+
+
+</style>

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

@@ -67,7 +67,6 @@
         type: Boolean,
         default: false
       },
-      equipmentForm: {}
     },
     created() {
       this.initData()
@@ -80,7 +79,6 @@
     data() {
       return {
         equipmentList: [],
-        SupplierCertId: '',
         Title: '',
         EquipmentForm: {
           Id: '',

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

@@ -80,7 +80,6 @@
         type: Boolean,
         default: false
       },
-      patentForm: {}
     },
     created() {
       this.initData()
@@ -93,7 +92,6 @@
     data() {
       return {
         patentList: [],
-        SupplierCertId: '',
         Title: '',
         PatentForm: {
           Id: '',

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

@@ -104,7 +104,6 @@
         type: Boolean,
         default: false
       },
-      performanceForm: {}
     },
     created() {
       this.initData()
@@ -117,7 +116,6 @@
     data() {
       return {
         performanceList: [],
-        SupplierCertId: '',
         Title: '',
         PerformanceForm: {
           Id: '',

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

@@ -0,0 +1,292 @@
+<template>
+  <div>
+    <el-table :data="subfileList">
+      <el-table-column label="操作" width="70" align="center" fixed>
+        <template slot-scope="scope">
+          <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)"></el-button>
+          <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
+            @click="deletedata(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="Name" 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 :title="Title" :visible.sync="visible" top="5vh">
+      <el-form :model="BusinessForm" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="名称" required>
+              <el-cascader :options="techTreeList" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                v-model="selectedorg" placeholder="请选择菜单" @change="getCode()"></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="编码" required>
+              <el-input v-model="BusinessForm.Code" placeholder="请输入编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注信息">
+              <el-input v-model="BusinessForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
+        <el-button @click="visible = false">取 消</el-button>
+        <el-button type="primary" @click="savedata()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  export default {
+    name: 'EquipmentList',
+    props: {
+      SupplierCertId: {
+        type: String,
+        default: '0'
+      },
+      SupplierId: {
+        type: String,
+        default: '0'
+      },
+      SubClassId: {
+        type: String,
+        default: '0'
+      }
+    },
+    created() {
+      this.initData()
+      this.getbusiness()
+    },
+    computed: {
+      ...mapGetters({
+        session: 'session'
+      })
+    },
+    data() {
+      return {
+        subfileList: [],
+        techList: [],
+        techTreeList: [],
+        orgtreeprops: {
+          value: 'id',
+          label: 'Name',
+          children: 'children'
+        },
+        selectedorg: [],
+
+        Title: '',
+        BusinessForm: {
+          Id: '',
+          SupplierId: '',
+          SupplierCertId: '',
+          SubClassId: '',
+          Code: '',
+          Name: '',
+          Remark: '',
+          IsDelete: 0
+        },
+        visible: false,
+        selfVisible: this.visible, // 避免vue双向绑定警告
+        currentPage: 1, // 分页
+        size: 10,
+        currentItemCount: 0,
+      }
+    },
+    methods: {
+      initData() {
+        let _this = this
+        const params = {
+          SupplierCertId: this.SupplierCertId,
+          SubClassId: this.SubClassId,
+          _currentPage: this.currentPage,
+          _size: this.size,
+        }
+        this.$axios.get('suppliercertsub/list', {
+            params
+          })
+          .then(res => {
+            _this.subfileList = res.data.items
+            _this.currentItemCount = res.data.currentItemCount
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      getbusiness() {
+        let _this = this
+        this.$axios.get('technologyservice/businesslist', {})
+          .then(res => {
+            _this.techList = res.data.items
+            _this.techTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      getCode() {
+        for (var i = 0; i < this.techList.length; i++) {
+          if (this.selectedorg[this.selectedorg.length - 1] == this.techList[i].Id) {
+            this.BusinessForm.Name = this.techList[i].Name
+            this.BusinessForm.Code = this.techList[i].Code
+          }
+        }
+      },
+      savedata() {
+        if (this.Title == '新增准入范围') {
+          this.addBusiness()
+        } else if (this.Title == '编辑准入范围') {
+          this.editBusiness()
+        }
+      },
+      addBusiness() {
+        let _this = this
+        _this.BusinessForm.SupplierId = parseInt(_this.BusinessForm.SupplierId)
+        _this.BusinessForm.SupplierCertId = parseInt(_this.BusinessForm.SupplierCertId)
+        _this.BusinessForm.SubClassId = parseInt(_this.BusinessForm.SubClassId)
+        _this.$axios.post('/suppliercertsub/addbusiness/', _this.BusinessForm)
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              this.visible = false
+              this.initData()
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      editBusiness() {
+        let _this = this
+        _this.BusinessForm.SupplierId = parseInt(_this.BusinessForm.SupplierId)
+        _this.BusinessForm.SupplierCertId = parseInt(_this.BusinessForm.SupplierCertId)
+        _this.BusinessForm.SubClassId = parseInt(_this.BusinessForm.SubClassId)
+        _this.$axios.put('/suppliercertsub/editbusiness/' + _this.BusinessForm.Id, _this.BusinessForm)
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              this.visible = false
+              this.initData()
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      deletedata(val) {
+        let _this = this;
+        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            _this.$axios.delete('suppliercertsub/businessdelete/' + val.Id, {})
+              .then(function (response) {
+                // response
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: "success",
+                    message: response.data.message
+                  });
+                  _this.initData();
+                } else {
+                  _this.$message({
+                    type: "warning",
+                    message: response.data.message
+                  });
+                }
+              })
+              .catch(function (error) {
+                console.log(error);
+              });
+          })
+          .catch(() => {});
+      },
+      showDialog() {
+        this.Title = '新增准入范围'
+        this.BusinessForm.SupplierId = this.SupplierId
+        this.BusinessForm.SupplierCertId = this.SupplierCertId
+        this.BusinessForm.SubClassId = this.SubClassId
+        this.BusinessForm.Code = ''
+        this.BusinessForm.Name = ''
+        this.BusinessForm.Remark = ''
+        this.BusinessForm.IsDelete = 0
+        this.visible = true
+      },
+      openDialog(val) {
+        this.Title = '编辑准入范围'
+        this.BusinessForm.Id = val.Id
+        this.BusinessForm.SupplierId = val.SupplierId
+        this.BusinessForm.SupplierCertId = val.SupplierCertId
+        this.BusinessForm.SubClassId = val.SubClassId
+        this.BusinessForm.Code = val.Code
+        this.BusinessForm.Name = val.Name
+        this.BusinessForm.Remark = val.Remark
+        this.BusinessForm.IsDelete = val.IsDelete
+        this.visible = true
+      },
+      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, 10)
+        }
+      },
+    }
+  }
+
+</script>
+
+<style>
+
+
+</style>

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

@@ -1,130 +0,0 @@
-<template>
-  <div>
-    <el-dialog :title="Title" :visible.sync="visible" top="5vh">
-      <el-form ref="refWinning" :model="WinningForm" label-width="100px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="奖项名称">
-              <el-input v-model="WinningForm.AwardName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="颁奖机关">
-              <el-input v-model="WinningForm.Authorities"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="获奖时间">
-              <el-date-picker style="width: 100%" v-model="WinningForm.WinningTime" type="date" placeholder="请选择获奖时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="WinningForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
-        <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" @click="savedata()">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import {
-    mapGetters
-  } from 'vuex'
-  export default {
-    name: 'winningdialog',
-    props: {
-      visible: {
-        type: Boolean,
-        default: false
-      },
-      WinningForm: {}
-    },
-    created() {},
-    computed: {
-      ...mapGetters({
-        session: 'session'
-      })
-    },
-    watch: {
-      visible(val) {
-        this.selfVisible = val
-        if (this.visible) {
-          this.WinningForm.Id = this.WinningForm.Id
-          if (this.WinningForm.Id == 0) {
-            this.Title = '新增近三年获得省部级及以上主要技术、管理成果、获奖项目'
-          }
-          this.WinningForm.SupplierCertId = this.WinningForm.SupplierCertId
-        }
-      },
-      selfVisible(val) {
-        this.$emit('update:visible', val)
-      },
-    },
-    data() {
-      return {
-        Title: '',
-        WinningForm: {
-          Id: '',
-          SupplierCertId: '',
-          Authorities: '',
-          OwnerUnit: '',
-          WinningTime: new Date(),
-          Remark: '',
-        },
-        selfVisible: this.visible // 避免vue双向绑定警告
-      }
-    },
-    methods: {
-      savedata() {
-        if (this.Title == '新增近三年获得省部级及以上主要技术、管理成果、获奖项目') {
-          this.addWinning()
-        } else if (this.Title == '编辑近三年获得省部级及以上主要技术、管理成果、获奖项目') {
-          this.editWinning()
-        }
-      },
-      addWinning() {
-        let _this = this
-        _this.WinningForm.SupplierCertId = parseInt(_this.WinningForm.SupplierCertId)
-        _this.$axios.post('/winning/addwinning/', _this.WinningForm)
-          .then(res => {
-            if (res.data.code === 0) {
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-              this.callback()
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-      callback() {
-        this.selfVisible = false
-        this.$emit('close')
-      },
-    }
-  }
-
-</script>
-
-<style>
-  .samplerecoveope .el-radio {
-    padding: 8px 15px 0 0;
-    margin-left: -2px;
-  }
-
-</style>

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

@@ -71,7 +71,6 @@
         type: Boolean,
         default: false
       },
-      winningForm: {}
     },
     created() {
       this.initData()
@@ -84,7 +83,6 @@
     data() {
       return {
         winningList: [],
-        SupplierCertId: '',
         Title: '',
         WinningForm: {
           Id: '',

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

@@ -45,7 +45,7 @@
 
               <el-col :span="12">
                 <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>
 
@@ -93,19 +93,19 @@
 
               <el-col :span="12">
                 <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="12">
                 <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="12">
                 <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>
 
@@ -117,37 +117,37 @@
 
               <el-col :span="24">
                 <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-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-row>
@@ -156,13 +156,15 @@
           <el-form label-position="top" ref="EntityFormCert" :model="formData">
             <el-row :gutter="20">
               <el-col :span="12">
-                <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="12">
                 <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">
@@ -172,17 +174,20 @@
               </el-col>-->
               <el-col :span="12">
                 <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="12">
                 <el-form-item label="外地企业进津备案通知书">
-                  <el-input v-model="formData.TJInNotify" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  <el-input v-model="formData.TJInNotify" placeholder="请输入" type="textarea" style="width: 100%">
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <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-row>
@@ -203,13 +208,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>
 
@@ -221,95 +226,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>
 
@@ -319,18 +324,142 @@
           <el-form label-position="top" ref="EntityFormCert" :model="formData">
             <el-row>
               <el-col :span="24">
-                <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-row>
             <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-form>
         </el-tab-pane>
+
+        <el-tab-pane label="企业情况" :disabled="formData.Step < 1">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>企业人员结构情况</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" @click="updateEntityNumber">保存人员结构情况</el-button>
+              </span>
+            </div>
+
+            <el-form label-width="220px" ref="EntityFormNumber" :model="formData">
+              <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-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-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-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-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-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-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-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-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-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-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>企业主要装备情况</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog">添加</el-button>
+            </div>
+            <equipment-list ref="equipmentList" :data="equipmentList" :SupplierCertId="certId" height="360px"
+              style="margin-top: 20px"></equipment-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年主要工程业绩</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog">添加</el-button>
+            </div>
+            <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" height="360px"
+              style="margin-top: 20px"></performance-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>拥有专利、专有技术及工法</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog">添加</el-button>
+            </div>
+            <patent-list ref="patentList" :data="patentList" :SupplierCertId="certId" height="360px"
+              style="margin-top: 20px">
+            </patent-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog">添加</el-button>
+            </div>
+            <winning-list ref="winningList" :data="winningList" :SupplierCertId="certId" height="360px"
+              style="margin-top: 20px">
+            </winning-list>
+          </el-card>
+        </el-tab-pane>
         <!--<el-tab-pane label="推荐信息">
           <el-form label-width="130px" ref="EntityForm" :model="formData">
             <el-row>
@@ -527,25 +656,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">
@@ -570,8 +697,18 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier';
+
+  import EquipmentList from '../../../../components/oilsupplier/equipmentlist'
+  import PerformanceList from '../../../../components/oilsupplier/performancelist'
+  import PatentList from '../../../../components/oilsupplier/patentlist'
+  import WinningList from '../../../../components/oilsupplier/winninglist'
   export default {
-    components: {},
+    components: {
+      EquipmentList, //企业主要装备情况
+      PerformanceList, //近三年主要工程业绩列表
+      PatentList, //拥有专利、专有技术及工法列表
+      WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -581,6 +718,11 @@
 
     data() {
       return {
+        equipmentList: [], //企业主要装备情况
+        performanceList: [], //近三年主要工程业绩       
+        patentList: [], //拥有专利、专有技术及工法      
+        winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
+
         serviceId: '',
         stepActive: 0,
         formData: {
@@ -656,8 +798,7 @@
 
         },
 
-        tableColumns: [
-          {
+        tableColumns: [{
             prop: "SubClassId",
             label: '分类名称',
             width: 100,
@@ -695,9 +836,10 @@
     },
     created() {
       this.serviceId = this.$route.params.opera;
+      this.certId = this.$route.query.certid
       this.getDictOptions();
       console.log(this.serviceId);
-      if(this.serviceId != 'add' && this.serviceId>0) {
+      if (this.serviceId != 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
       } else {
@@ -705,8 +847,21 @@
       }
     },
     methods: {
+      equipmentdialog() {
+        this.$refs["equipmentList"].showDialog()
+      },
+      performancedialog() {
+        this.$refs["performanceList"].showDialog()
+      },
+      patentdialog() {
+        this.$refs["patentList"].showDialog()
+      },
+      winningdialog() {
+        this.$refs["winningList"].showDialog()
+      },
+
       initDatas() {
-        if(this.formData.Id) {
+        if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             this.formData = res.data;
           }).catch(err => {

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

@@ -45,37 +45,37 @@
 
               <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>
 
               <el-col :span="8">
                 <el-form-item label="经营方式">
-                  <el-input v-model="formData.OperType" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-input v-model="formData.OperType" placeholder="请输入" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="国家">
-                  <el-input v-model="formData.Country" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-input v-model="formData.Country" placeholder="请输入" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="所代理制造商名称">
-                  <el-input v-model="formData.MaunAgent" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-input v-model="formData.MaunAgent" placeholder="请输入" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="级别">
-                  <el-input v-model="formData.Grade" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-input v-model="formData.Grade" placeholder="请输入" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="管理单位">
-                  <el-input v-model="formData.MgrUnit" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-input v-model="formData.MgrUnit" placeholder="请输入" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
@@ -95,19 +95,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>
 
@@ -119,31 +119,31 @@
 
               <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-row>
@@ -152,20 +152,23 @@
           <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.ProductQualityCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  <el-input v-model="formData.ProductQualityCert" 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.MaunLicense" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+                  <el-input v-model="formData.MaunLicense" placeholder="请输入" type="textarea" style="width: 100%">
+                  </el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -182,13 +185,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>
 
@@ -200,95 +203,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>
 
@@ -298,18 +301,143 @@
           <el-form label-position="top" ref="EntityFormCert" :model="formData">
             <el-row>
               <el-col :span="24">
-                <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-row>
             <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-form>
         </el-tab-pane>
+
+        <el-tab-pane label="企业情况" :disabled="formData.Step < 1">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>企业人员结构情况</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" @click="updateEntityNumber">保存人员结构情况</el-button>
+              </span>
+            </div>
+
+            <el-form label-width="220px" ref="EntityFormNumber" :model="formData">
+              <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-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-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-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-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-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-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-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-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-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-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>企业主要装备情况</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog">添加</el-button>
+            </div>
+            <equipment-list ref="equipmentList" :data="equipmentList" :SupplierCertId="certId" height="360px"
+              style="margin-top: 20px"></equipment-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年主要工程业绩</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog">添加</el-button>
+            </div>
+            <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" height="360px"
+              style="margin-top: 20px"></performance-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>拥有专利、专有技术及工法</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog">添加</el-button>
+            </div>
+            <patent-list ref="patentList" :data="patentList" :SupplierCertId="certId" height="360px"
+              style="margin-top: 20px">
+            </patent-list>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog">添加</el-button>
+            </div>
+            <winning-list ref="winningList" :data="winningList" :SupplierCertId="certId" height="360px"
+              style="margin-top: 20px">
+            </winning-list>
+          </el-card>
+        </el-tab-pane>
+
         <!--<el-tab-pane label="推荐信息">
           <el-form label-width="130px" ref="EntityForm" :model="formData">
             <el-row>
@@ -506,25 +634,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">
@@ -549,8 +675,18 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier';
+
+  import EquipmentList from '../../../../components/oilsupplier/equipmentlist'
+  import PerformanceList from '../../../../components/oilsupplier/performancelist'
+  import PatentList from '../../../../components/oilsupplier/patentlist'
+  import WinningList from '../../../../components/oilsupplier/winninglist'
   export default {
-    components: {},
+    components: {
+      EquipmentList, //企业主要装备情况
+      PerformanceList, //近三年主要工程业绩列表
+      PatentList, //拥有专利、专有技术及工法列表
+      WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -560,6 +696,11 @@
 
     data() {
       return {
+        equipmentList: [], //企业主要装备情况
+        performanceList: [], //近三年主要工程业绩       
+        patentList: [], //拥有专利、专有技术及工法      
+        winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
+
         serviceId: '',
         stepActive: 0,
         formData: {
@@ -636,8 +777,7 @@
 
         },
 
-        tableColumns: [
-          {
+        tableColumns: [{
             prop: "SubClassId",
             label: '分类名称',
             width: 100,
@@ -675,9 +815,10 @@
     },
     created() {
       this.serviceId = this.$route.params.opera;
+      this.certId = this.$route.query.certid
       this.getDictOptions();
       console.log(this.serviceId);
-      if(this.serviceId != 'add' && this.serviceId>0) {
+      if (this.serviceId != 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
       } else {
@@ -685,8 +826,21 @@
       }
     },
     methods: {
+      equipmentdialog() {
+        this.$refs["equipmentList"].showDialog()
+      },
+      performancedialog() {
+        this.$refs["performanceList"].showDialog()
+      },
+      patentdialog() {
+        this.$refs["patentList"].showDialog()
+      },
+      winningdialog() {
+        this.$refs["winningList"].showDialog()
+      },
+
       initDatas() {
-        if(this.formData.Id) {
+        if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             this.formData = res.data;
           }).catch(err => {

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

@@ -441,7 +441,7 @@
               <span>企业主要装备情况</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog">添加</el-button>
             </div>
-            <equipment-list ref="equipmentList" :data="EquipmentList" :SupplierCertId="certId" height="360px"
+            <equipment-list ref="equipmentList" :data="equipmentList" :SupplierCertId="certId" height="360px"
               style="margin-top: 20px"></equipment-list>
           </el-card>
 
@@ -479,40 +479,18 @@
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">分类</span>
-              <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="businessdialog">添加</el-button>
             </div>
-            <el-table border height="360px" style="width: 100%">
-              <el-table-column label="操作" min-width="100" align="center" fixed>
-                <template slot-scope="scope">
-                  <router-link :to="'/oilsupplier/oilsuppliercertsub/' + scope.row.Id + '/operation'">
-                    <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-                  </router-link>
-                  <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-                    <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
-                    </el-alert>
-                    <br />
-                    <div style="text-align: right; margin: 0">
-                      <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-                    </div>
-                    <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small"
-                      @click="scope.row.deleteConfirmFlag = true">
-                      <i class="el-icon-delete"></i>
-                    </el-button>
-                  </el-popover>
-                </template>
-              </el-table-column>
-              <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
-                :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
-              </el-table-column>
-            </el-table>
+            <business-list ref="businessList" :data="businessList" :SupplierCertId="certId" :SupplierId="serviceId"
+              :SubClassId="classId" height="360px" style="margin-top: 20px"></business-list>
           </el-card>
 
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">分类文档</span>
-              <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="subfiledialog">添加</el-button>
             </div>
-            <supplier-file-table height="360px" style="margin-top: 20px"></supplier-file-table>
+            <subfile-list ref="subfileList" :data="subfileList" height="360px" style="margin-top: 20px"></subfile-list>
           </el-card>
         </el-tab-pane>
 
@@ -529,7 +507,6 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-
   </div>
 </template>
 
@@ -546,6 +523,8 @@
   import PerformanceList from '../../../../components/oilsupplier/performancelist'
   import PatentList from '../../../../components/oilsupplier/patentlist'
   import WinningList from '../../../../components/oilsupplier/winninglist'
+  import BusinessList from '../../../../components/oilsupplier/businesslist'
+  import SubfileList from '../../../../components/oilsupplier/subfilelist'
 
   export default {
     components: {
@@ -557,6 +536,8 @@
       PerformanceList, //近三年主要工程业绩列表
       PatentList, //拥有专利、专有技术及工法列表
       WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
+      BusinessList, //选择准入范围
+      SubfileList, //文档
     },
     computed: {
       ...mapGetters({
@@ -567,13 +548,17 @@
 
     data() {
       return {
-        equipmentlist: [], //企业主要装备情况
-        performanceList: [], //近三年主要工程业绩
-        patentList: [], //拥有专利、专有技术及工法
+        equipmentList: [], //企业主要装备情况
+        performanceList: [], //近三年主要工程业绩       
+        patentList: [], //拥有专利、专有技术及工法      
         winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
+        businessList: [], //准入业务
+        subfileList: [], //文档
 
         serviceId: '',
         certId: '',
+        classId: '2',
+
         formData: {
           Id: '',
           SupplierName: '',
@@ -699,6 +684,12 @@
       winningdialog() {
         this.$refs["winningList"].showDialog()
       },
+      businessdialog() {
+        this.$refs["businessList"].showDialog()
+      },
+      subfiledialog() {
+        this.$refs["subfileList"].showDialog()
+      },
 
       initDatas() {
         if (this.formData.Id) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -34,7 +34,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="100" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/basisedit'">
+            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/basisedit?certid=' + scope.row.CertId">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
             </router-link>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -34,7 +34,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="100" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/goodsedit'">
+            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/goodsedit?certid=' + scope.row.CertId">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
             </router-link>