准入申请、审核

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/business2/permission"
 	"encoding/json"
 	"strconv"
 	"strings"
@@ -636,8 +637,18 @@ func (this *OilSupplierController) GetJoinCertEntityList() {
 	if extOrganizeId == this.User.DepartmentId {
 		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
 	}*/
+
+	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
 		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+	} else {
+		//超级管理员和有查看所有数据权限的用户不加条件
+		svcPerm := permission.GetPermissionService(utils.DBE)
+		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
+			where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+		}
+
 	}
 
 	svc := supplier.GetOilSupplierService(utils.DBE)

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -6,6 +6,7 @@ import (
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/role"
 	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business2/permission"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 	"encoding/json"
@@ -48,13 +49,18 @@ func (this *OilAuditSettingController) GetEntityList() {
 	Remark := this.GetString("Remark")
 	CreateOn := this.GetString("CreateOn")
 
-	OrganizeId = this.User.DepartmentId //无权限看所有时，只看当前部门的数据
-	if OrganizeId != "" {
-		where = where + " and OrganizeId = '" + OrganizeId + "'"
+	svcPerm := permission.GetPermissionService(utils.DBE)
+	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.AuditSetting.AllRecord")
+	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
+		OrganizeId = this.User.DepartmentId //无权限看所有时，只看当前部门的数据
+		if OrganizeId != "" {
+			where = where + " and OrganizeId = '" + OrganizeId + "'"
+		}
 	}
 
 
 
+
 	if OrganizeName != "" {
 		where = where + " and OrganizeName like '%" + OrganizeName + "%'"
 	}

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

@@ -1,7 +1,7 @@
 
 <template>
   <div>
-    <el-form label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform">
+    <el-form label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform" :disabled="disabled">
       <el-row>
         <!--<el-col :span="8">
           <el-form-item label="DEMO">
@@ -351,6 +351,10 @@
         type: Object,
         default: {}
       },
+      disabled: {
+        type: Boolean,
+        default: false
+      },
     },
 
     data () {

src/dashoo.cn/frontend_web/src/components/workflow/wfhistory.vue

@@ -27,7 +27,7 @@
       </el-table-column>
     </el-table>
     <div style="margin-top:5px; text-align: center;">
-      <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance " v-if="entryinfo.instance" style="width:900px">
+      <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance " v-if="entryinfo.instance" style="width:80%; min-width: 1200px; max-width: 1600px">
     </div>
   </div>
 </template>

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

@@ -15,7 +15,7 @@
           <!--v-if="formData.Step>=5"-->
           <el-button type="primary" plain size="mini">增项申请</el-button>
           <router-link :to="'/oilsupplier/supplier/techlist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="authUser.Profile.IsCompanyUser != 1">返回</el-button>
           </router-link>
         </span>
       </div>
@@ -340,14 +340,14 @@
       }
     },
     created () {
-      this.serviceId = this.$route.params.opera
-      this.certId = this.$route.query.certid
-      this.getDictOptions()
+      this.serviceId = this.$route.params.opera + ''
+      this.certId = this.$route.query.certid + ''
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
         this.formData.Id = 0
       }
+      this.getDictOptions()
     },
     methods: {
       equipmentdialog() {
@@ -364,6 +364,7 @@
       },
 
       initDatas () {
+        //console.log("formData = ", this.formData.Id, this.certId)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
@@ -407,6 +408,7 @@
       getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
+          console.log("dictData = ", this.dictData)
           this.initDatas()
           /*this.UnitRelationOptions = res.data.items['UnitRelation']
            this.getCityList(res.data.items['GaodeMapChinaAreas'])
@@ -450,8 +452,8 @@
       },
 
       addEntity() {
-        this.formData.SupplierTypeCode = '03'
-        this.formData.SupplierTypeName = '技术服务类'
+        this.formData.SupplierTypeCode = '02'
+        this.formData.SupplierTypeName = '基建类'
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

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

@@ -15,7 +15,7 @@
           <!--v-if="formData.Step>=5"-->
           <el-button type="primary" plain size="mini">增项申请</el-button>
           <router-link :to="'/oilsupplier/supplier/techlist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="authUser.Profile.IsCompanyUser != 1">返回</el-button>
           </router-link>
         </span>
       </div>
@@ -340,14 +340,14 @@
       }
     },
     created () {
-      this.serviceId = this.$route.params.opera
-      this.certId = this.$route.query.certid
-      this.getDictOptions()
+      this.serviceId = this.$route.params.opera + ''
+      this.certId = this.$route.query.certid + ''
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
         this.formData.Id = 0
       }
+      this.getDictOptions()
     },
     methods: {
       equipmentdialog() {
@@ -364,6 +364,7 @@
       },
 
       initDatas () {
+        //console.log("formData = ", this.formData.Id, this.certId)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data

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

@@ -342,12 +342,12 @@
     created () {
       this.serviceId = this.$route.params.opera + ''
       this.certId = this.$route.query.certid + ''
-      this.getDictOptions()
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
         this.formData.Id = 0
       }
+      this.getDictOptions()
     },
     methods: {
       equipmentdialog() {
@@ -364,6 +364,7 @@
       },
 
       initDatas () {
+        //console.log("formData = ", this.formData.Id, this.certId)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="!IsCompanyUser">
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/supplier' }">基建类类列表</el-breadcrumb-item>
@@ -434,6 +434,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilsupplier/supplier';
+  import certApi from '@/api/oilsupplier/suppliercert'
 
   export default {
     computed: {
@@ -889,12 +890,38 @@
         ]
       }
     },
-    created() {
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      //this.getDictOptions()
+    created () {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+      if (this.IsCompanyUser) {
+        certApi.getEntityByCreatorAndType('02', this.$axios).then(res => {
+          const CertId = res.data.Id
+          const SupplierId = res.data.SupplierId
+          if (CertId) {
+            this.$router.push({
+              path: '/oilsupplier/supplier/' + SupplierId + '/basisedit',
+              query: {
+                certid: CertId
+              }
+            })
+          } else {
+            this.$router.push({
+              path: '/oilsupplier/supplier/add/basisedit',
+              query: {}
+            })
+          }
+
+        }).catch(err => {
+          console.error(err)
+        })
+
+      } else {
+        //查询条件初始值备份
+        Object.assign(this.searchFormReset, this.searchForm);
+        //查询列表
+        this.initDatas();
+        //this.getDictOptions()
+      }
+
     },
     methods: {
       initDatas() {

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="!IsCompanyUser">
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/supplier' }">物资类列表</el-breadcrumb-item>
@@ -434,6 +434,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilsupplier/supplier';
+  import certApi from '@/api/oilsupplier/suppliercert'
 
   export default {
     computed: {
@@ -443,8 +444,9 @@
     },
     name: 'oilsupplier',
 
-    data() {
+    data () {
       return {
+        IsCompanyUser: 0,
         dialogVisible: false,
         //列表数据
         entityList: [],
@@ -890,12 +892,37 @@
         ]
       }
     },
-    created() {
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      //this.getDictOptions()
+    created () {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+      if (this.IsCompanyUser) {
+        certApi.getEntityByCreatorAndType('01', this.$axios).then(res => {
+          const CertId = res.data.Id
+          const SupplierId = res.data.SupplierId
+          if (CertId) {
+            this.$router.push({
+              path: '/oilsupplier/supplier/' + SupplierId + '/goodsedit',
+              query: {
+                certid: CertId
+              }
+            })
+          } else {
+            this.$router.push({
+              path: '/oilsupplier/supplier/add/goodsedit',
+              query: {}
+            })
+          }
+
+        }).catch(err => {
+          console.error(err)
+        })
+
+      } else {
+        //查询条件初始值备份
+        Object.assign(this.searchFormReset, this.searchForm);
+        //查询列表
+        this.initDatas();
+        //this.getDictOptions()
+      }
     },
     methods: {
       initDatas() {

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

@@ -18,322 +18,15 @@
       </div>
 
       <el-tabs tab-position="right">
-        <el-tab-pane label="企业基本信息">
+        <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
-              <span>企业人基本信息</span>
+              <span>供方基本信息表</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" @click="saveEntity">保存基本信息</el-button>
+              </span>
             </div>
-            <el-form label-width="120px" ref="EntityForm" :model="formData">
-              <el-row>
-                <!--<el-col :span="8">
-                  <el-form-item label="DEMO">
-                    <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
-                      <el-option
-                        v-for="item in wellNoOptions"
-                        :key="item.Id"
-                        :label="item.Value"
-                        :value="item.Id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="供方名称">
-                    <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.OilCertificateNo" 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-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-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-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-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-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工队伍名称">
-                    <el-input v-model="formData.ConstructTeam" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="工商注册号">
-                    <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-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-form-item>
-                </el-col>
-
-                <!--<el-col :span="8">
-                  <el-form-item label="税务登记证地税编号">
-                    <el-input v-model="formData.LocalTaxNo" 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-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-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-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-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-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-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-
-            <el-form label-width="120px" ref="EntityFormLic" :model="formData">
-              <el-row>
-                <!--<el-col :span="8">
-                  <el-form-item label="产品质量认证情况及认证机构">
-                    <el-input v-model="formData.ProductQualityCert" placeholder="请输入"  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="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-                <!--<el-col :span="8">
-                  <el-form-item label="外地企业进津备案通知书">
-                    <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="法定代表人姓名">
-                    <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-form-item>
-                </el-col>
-
-                <!--<el-col :span="8">
-                  <el-form-item label="行业类别名称">
-                    <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="注册资本">
-                    <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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-form-item>
-                </el-col>
-
-              </el-row>
-            </el-form>
-
-            <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>
-                </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-form-item>
-                </el-col>
-                <!--<el-col :span="12">
-                  <el-form-item label="企业资质证书级别">
-                    <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </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-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>
-                </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-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>
-                </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-form-item>
-                </el-col>
-              </el-row>
-
-            </el-form>
+            <tech-info v-if="dictData" ref="TechInfo" :formData="formData" :dictData="dictData" :disabled="true"></tech-info>
           </el-card>
         </el-tab-pane>
 
@@ -486,6 +179,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
+  import TechInfo from '@/components/oilsupplier/techinfo'
 
   export default {
     components: {
@@ -498,6 +192,7 @@
       PatentList, //拥有专利、专有技术及工法列表
       WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
       AuditbusList, //待审核业务
+      TechInfo
     },
     computed: {
       ...mapGetters({
@@ -517,6 +212,7 @@
         serviceId: '',
         certId: '',
         classId: '03',
+        dictData: null,
 
         formData: {
           Id: '',
@@ -614,15 +310,15 @@
       }
     },
     created() {
-      this.serviceId = this.$route.params.opera
-      this.certId = this.$route.query.certid
-      this.getDictOptions()
+
+      this.serviceId = this.$route.params.opera + ''
+      this.certId = this.$route.query.certid + ''
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
-        this.initDatas()
       } else {
         this.formData.Id = 0
       }
+      this.getDictOptions()
     },
     methods: {
       equipmentdialog() {
@@ -638,7 +334,7 @@
         this.$refs["winningList"].showDialog()
       },
 
-      initDatas() {
+      initDatas () {
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
@@ -663,10 +359,13 @@
         }
       },
 
-      getDictOptions() {
-        /*api.getDictList(this.$axios).then(res => {}).catch(err => {
+      getDictOptions () {
+        api.getDictList(this.$axios).then(res => {
+          this.dictData = res.data.items
+          this.initDatas()
+        }).catch(err => {
          console.error(err)
-         })*/
+         })
       },
 
       //保存信息