bug 准入 不能修改

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

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

@@ -167,4 +167,80 @@ type OilSupplierSelect struct {
 type RegCapitalRange struct {
 	RegCapital1 string
 	RegCapital2 string
+}
+
+type OilSupplierApply struct {
+	Id                  int       `xorm:"not null pk autoincr INT(10)"`
+	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
+	OilCertificateNo    string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
+	Grade               string    `xorm:"comment('级别') VARCHAR(2)"`
+	MgrUnit             string    `xorm:"comment('管理单位') VARCHAR(50)"`
+	OperType            string    `xorm:"comment('经营方式') VARCHAR(50)"`
+	Country             string    `xorm:"comment('国家') VARCHAR(20)"`
+	MaunAgent           string    `xorm:"comment('所代理制造商名称') VARCHAR(100)"`
+	ConstructTeam       string    `xorm:"comment('施工队伍名称') VARCHAR(100)"`
+	CredentialFlag      string    `xorm:"default '1' comment('证件合一标志') VARCHAR(5)"`
+	CommercialNo        string    `xorm:"comment('工商注册号') VARCHAR(50)"`
+	OrganCode           string    `xorm:"comment('组织机构代码') VARCHAR(50)"`
+	CountryTaxNo        string    `xorm:"comment('税务登记证国税编号') VARCHAR(50)"`
+	LocalTaxNo          string    `xorm:"comment('税务登记证地税编号') VARCHAR(50)"`
+	Address             string    `xorm:"comment('单位地址') VARCHAR(500)"`
+	Province            string    `xorm:"comment('省直辖市') VARCHAR(20)"`
+	City                string    `xorm:"comment('地市区县') VARCHAR(20)"`
+	Street              string    `xorm:"comment('街道') VARCHAR(20)"`
+	HouseNo             string    `xorm:"comment('门牌号') VARCHAR(10)"`
+	ZipCode             string    `xorm:"comment('邮编') VARCHAR(20)"`
+	LinkAddress         string    `xorm:"comment('通信地址-单位地址') VARCHAR(500)"`
+	LinkProvince        string    `xorm:"comment('通信地址-省直辖市') VARCHAR(20)"`
+	LinkCity            string    `xorm:"comment('通信地址-地市区县') VARCHAR(20)"`
+	LinkStreet          string    `xorm:"comment('通信地址-街道') VARCHAR(20)"`
+	LinkHouseNo         string    `xorm:"comment('通信地址-门牌号') VARCHAR(10)"`
+	LinkZipCode         string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
+	HseTraining         string    `xorm:"comment('是否需要进行HSE审查培训') VARCHAR(2)"`
+	QualitySystemCert   string    `xorm:"comment('质量管理体系认证情况及认证机构') VARCHAR(200)"`
+	ProductQualityCert  string    `xorm:"comment('产品质量认证情况及认证机构') VARCHAR(200)"`
+	MaunLicense         string    `xorm:"comment('生产制造许可证获证情况及编号') VARCHAR(200)"`
+	QualifCert          string    `xorm:"comment('企业资质证书编号') VARCHAR(200)"`
+	QualifCertLevel     string    `xorm:"comment('企业资质证书级别') VARCHAR(10)"`
+	SafetyLicense       string    `xorm:"comment('安全生产许可证') VARCHAR(200)"`
+	TechServiceLic      string    `xorm:"comment('技术服务类准入许可证') VARCHAR(200)"`
+	TjinNotify          string    `xorm:"comment('外地企业进津备案通知书') VARCHAR(50)"`
+	SpecIndustryCert    string    `xorm:"comment('行业特殊要求的认证证书') VARCHAR(200)"`
+	BusinessScope       string    `xorm:"comment('营业范围') TEXT"`
+	LegalPerson         string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
+	CategoryCode        string    `xorm:"comment('行业类别代码') VARCHAR(10)"`
+	CategoryName        string    `xorm:"comment('行业类别名称') VARCHAR(20)"`
+	RegCapital          float64   `xorm:"default 0 comment('注册资本') FLOAT"`
+	Currency            string    `xorm:"comment('币种') VARCHAR(10)"`
+	ContactName         string    `xorm:"comment('联系人姓名') VARCHAR(20)"`
+	CompanyType         string    `xorm:"comment('公司类型') VARCHAR(20)"`
+	SetupTime           time.Time `xorm:"comment('成立时间') Date"`
+	DepositBank         string    `xorm:"comment('开户银行') VARCHAR(50)"`
+	BankAccount         string    `xorm:"comment('银行账号') VARCHAR(50)"`
+	EMail               string    `xorm:"comment('电子邮箱') VARCHAR(50)"`
+	BankCreditRating    string    `xorm:"comment('银行信用等级') VARCHAR(10)"`
+	Mobile              string    `xorm:"comment('移动电话') VARCHAR(20)"`
+	Telphone            string    `xorm:"comment('固定电话') VARCHAR(20)"`
+	Fax                 string    `xorm:"comment('传真') VARCHAR(20)"`
+	CompanyTel          string    `xorm:"comment('公司电话') VARCHAR(20)"`
+	QQ                  string    `xorm:"comment('QQ号码') VARCHAR(20)"`
+	CompanyUrl          string    `xorm:"comment('公司网址') VARCHAR(20)"`
+	SpecSupplier        string    `xorm:"default '0' comment('是否特殊业务供应商(可不招标)') VARCHAR(2)"`
+	SpecTypeCode        string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(2)"`
+	SpecTypeName        string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(20)"`
+	WZAccessCardNo      string    `xorm:"comment('准入证编码--物质') VARCHAR(20)"`
+	JSAccessCardNo      string    `xorm:"comment('准入证编码--基建') VARCHAR(20)"`
+	JFAccessCardNo      string    `xorm:"comment('准入证编码--技术服务类') VARCHAR(20)"`
+	Remark              string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete            int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn            time.Time `xorm:"DATETIME"`
+	CreateUserId        int       `xorm:"INT(10)"`
+	CreateBy            string    `xorm:"VARCHAR(50)"`
+	ModifiedOn          time.Time `xorm:"DATETIME"`
+	ModifiedUserId      int       `xorm:"INT(10)"`
+	ModifiedBy          string    `xorm:"VARCHAR(50)"`
+	PACNumber           string    `xorm:"comment('中石油准入证编号') VARCHAR(50)"`
+	SupplierCertificate string    `xorm:"comment('中石油物资供应商证书') VARCHAR(200)"`
+	InFlag            string    `xorm:"default '0' comment('准入标识') VARCHAR(10)"`
+	Status            string    `xorm:"not null default '0' comment('状态标识(0未申请，1办理完毕)') VARCHAR(10)"`
 }

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierSession.go

@@ -163,6 +163,7 @@ func (s *OilSupplierSession) GetUpdateCols(oilSupplierCertTableName string, supp
 		"HseTraining",
 		"CredentialFlag",
 		"SupplierCertificate",
+		"PACNumber",
 	}
 
 	if !canEdit {

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
+	"dashoo.cn/backend/api/business/register"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -1904,15 +1905,28 @@ func (this *OilSupplierController) GetEntityAndCert() {
 // @Title 获取实体
 // @Description 获取实体
 // @Success 200 {object} supplier.OilSupplier
-// @router /getbyname/:name [get]
+// @router /getbyname [get]
 func (this *OilSupplierController) GetEntityByName() {
-	name := this.Ctx.Input.Param(":name")
-
-	var model supplier.OilSupplier
+	name := this.GetString("name")
+	typecode := this.GetString("typecode")
 	svc := supplier.GetOilSupplierService(utils.DBE)
-	where := "SupplierName='" + name + "'"
-	svc.GetEntityByWhere(OilSupplierName, where, &model)
+	var model supplier.OilSupplierApply
+
+	var sql string
+	sql = `select a.*,b.InStyle,b.Status from ` + OilSupplierName + ` a `
+	sql += ` left join ` + OilSupplierCertName + ` b on b.SupplierId = a.Id and b.SupplierTypeCode='`+typecode+`'`
+	sql += ` where a.SupplierName ='` + name + `'`
 
+	utils.DBE.SQL(sql).Get(&model)
+
+	if model.SupplierName==""{
+		var model2 register.OilCorporateInfo
+		svc.GetEntityByWhere(OilCorporateInfoName, "SupplierName='" + name + "'", &model2)
+		model2.Remark=""
+		model2.Id=0
+		this.Data["json"] = &model2
+		this.ServeJSON()
+	}
 	this.Data["json"] = &model
 	this.ServeJSON()
 }
@@ -2193,7 +2207,7 @@ func (this *OilSupplierController) DeleteAllEntity() {
 	var model2 suppliercert.OilSupplierCert
 	count2, _ := svc.GetCount(&model2, "SupplierId="+Id)
 	if count2==0{
-		err=svc.DeleteEntityBytbl(OilSupplierName,"SupplierId="+Id)
+		err=svc.DeleteEntityBytbl(OilSupplierName,"Id="+Id)
 	}
 	if err == nil {
 		errinfo.Message = "删除成功"

src/dashoo.cn/frontend_web/src/api/oilsupplier/supplier.js

@@ -59,9 +59,9 @@ export default {
       method: 'GET'
     })
   },
-  getEntityByName (name, myAxios) {
+  getEntityByName (name, typeCode, myAxios) {
     return myAxios({
-      url: '/supplier/getbyname/' + name,
+      url: '/supplier/getbyname?typecode=' + typeCode + '&name=' + name,
       method: 'GET'
     })
   },

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

@@ -17,10 +17,12 @@
 
         <el-col :span="16">
           <el-form-item label="供方名称" prop="SupplierName">
-            <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly"
+            <!-- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly"
                              :fetch-suggestions="querySearch" :maxlength="255" placeholder="请输入内容" style="width: 100%"
                              @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
-            </el-autocomplete>
+            </el-autocomplete> -->
+            <el-input v-model="formData.SupplierName" :maxlength="255"  :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
+            </el-input>
             <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName"
                       :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"
                       v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
@@ -37,7 +39,7 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" v-model="formData.SpecTypeCode" :disabled="!canUpdateSupplier"
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode"  @change="currentSel" :disabled="this.formData.Status > '0'"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
               </el-option>
@@ -47,7 +49,7 @@
 
         <el-col :span="8">
           <el-form-item label="准入方式">
-            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="!canUpdateSupplier"
+            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" v-if="item.Value != '2' && item.Value != '3'"
                          :value="item.Value">
@@ -327,7 +329,7 @@
         </el-col>-->
         <el-col :span="8">
           <el-form-item label="进津备案通知书">
-            <el-input v-model="formData.TJInNotify"  :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"></el-input>
+            <el-input v-model="formData.TjinNotify"  :readonly="this.formData.Status > '0'" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -349,13 +351,13 @@
       <el-row :gutter="60">
         <el-col :span="8">
           <el-form-item label="质量管理体系认证情况">
-            <el-input v-model="formData.QualitySystemCert" :readonly="!canUpdateSupplier" maxlength="200" placeholder="请输入" type="textarea"
+            <el-input v-model="formData.QualitySystemCert" :readonly="this.formData.Status > '0'" maxlength="200" 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" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"
+            <el-input v-model="formData.QualifCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -367,7 +369,7 @@
         </el-col>-->
         <el-col :span="8">
           <el-form-item label="安全生产许可证">
-            <el-input v-model="formData.SafetyLicense" :readonly="!canUpdateSupplier" maxlength="200" placeholder="请输入" type="textarea"
+            <el-input v-model="formData.SafetyLicense" :readonly="this.formData.Status > '0'" maxlength="200" placeholder="请输入" type="textarea"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -375,7 +377,7 @@
 
         <el-col :span="8">
           <el-form-item label="行业特殊要求的认证证书">
-            <el-input v-model="formData.SpecIndustryCert" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"
+            <el-input v-model="formData.SpecIndustryCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -388,7 +390,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="备注">
-            <el-input v-model="formData.Remark" maxlength="500" :readonly="!canUpdateSupplier" placeholder="请输入" type="textarea" style="width: 100%">
+            <el-input v-model="formData.Remark" maxlength="500" :readonly="this.formData.Status > '0'" placeholder="请输入" type="textarea" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -677,10 +679,9 @@
       }
     },
     created() {
-        if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
-        this.formData.SupplierName=this.authUser.Profile.Realname
-        this.searchSupplierName()
-      }
+      //   if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
+      //   this.inputCompanyName(this.authUser.Profile.Realname)
+      // }
     },
     watch: {
       dictData: {
@@ -698,6 +699,20 @@
         else{
           this.showorhidflag='show'
         }
+      },
+        currentSel (event) {
+        if (event==2){
+          this.formData.InStyle='5'
+          // for(let item of this.$refs.inStyle.options) {
+          //   if(item.value=='5'){
+          //       console.log(item.style)
+          //   }else{
+          //      //隐藏
+          //   }
+          // }
+          }else{
+            this.formData.InStyle='1'
+            }
       },
       // commnoChange () {
       //   this.formData.CountryTaxNo = this.formData.CommercialNo
@@ -766,16 +781,16 @@
           this.CompanyTypeOptions = this.dictData['CompanyType']
           this.CurrencyOptions = this.dictData['CurrencyType']
           let suppliers = this.dictData['CompanyNames']
-          for (let idx in suppliers) {
-            suppliers[idx]['value'] = suppliers[idx].SupplierName
-            this.companynames.push(suppliers[idx])
-          }
-          if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
-            if (!this.formData.Id) {
-              this.formData.SupplierName = ''
-            }
-            this.companyReadonly = true
-          }
+          // for (let idx in suppliers) {
+          //   suppliers[idx]['value'] = suppliers[idx].SupplierName
+          //   this.companynames.push(suppliers[idx])
+          // }
+          // if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
+          //   if (!this.formData.Id) {
+          //     this.formData.SupplierName = ''
+          //   }
+          //   this.companyReadonly = true
+          // }
         }
       },
       getCityList(val) {
@@ -812,19 +827,19 @@
         return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
       },
 
-      /** ----------------------- */querySearch(queryString, cb) {
-        var results = queryString ? this.companynames.filter(this.createFilter(queryString)) : this.companynames
-        // 调用 callback 返回建议列表的数据
-        cb(results)
-      },
+      // /** ----------------------- */querySearch(queryString, cb) {
+      //   var results = queryString ? this.companynames.filter(this.createFilter(queryString)) : this.companynames
+      //   // 调用 callback 返回建议列表的数据
+      //   cb(results)
+      // },
       createFilter(queryString) {
         return (restaurant) => {
           return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
         }
       },
-      handleSelect(item) {
-        this.$emit('selectcompany', item)
-      },
+      // handleSelect(item) {
+      //   this.$emit('selectcompany', item)
+      // },
       inputCompanyName(val) {
         this.$emit('inputcompany', val)
       },

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

@@ -20,9 +20,11 @@
 
         <el-col :span="16">
           <el-form-item label="供方名称" prop="SupplierName" >
-            <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
+            <!-- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
                              :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
-            </el-autocomplete>
+            </el-autocomplete> -->
+             <el-input v-model="formData.SupplierName" :maxlength="255"  :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
+            </el-input>
             <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
             </el-input>
           </el-form-item>
@@ -36,7 +38,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="供应商类型">
-            <el-select ref="OperType" v-model="formData.OperType" :disabled="!canUpdateSupplier"
+            <el-select ref="OperType" v-model="formData.OperType" :disabled="this.formData.Status > '0'"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
                          :value="item.Key">
@@ -47,7 +49,7 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" v-model="formData.SpecTypeCode" @change="currentSel" :disabled="!canUpdateSupplier"
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode" @change="currentSel" :disabled="this.formData.Status > '0'"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
                          :value="item.Value">
@@ -75,7 +77,7 @@
 
         <el-col :span="8">
           <el-form-item label="准入方式">
-            <el-select  ref="inStyle" v-model="formData.InStyle" :disabled="!canUpdateSupplier"
+            <el-select  ref="inStyle" v-model="formData.InStyle" :disabled="this.formData.Status > '0'"
                        placeholder="请选择" style="width: 100%" @change="InStyleChange">
               <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
                          :value="item.Value">
@@ -86,7 +88,7 @@
 
          <el-col :span="8">
           <el-form-item label="管理单位" >
-            <el-select filterable v-model="formData.MgrUnit" maxlength="255"  clearable :disabled="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-select filterable v-model="formData.MgrUnit" maxlength="255"  clearable :disabled="this.formData.Status > '0'" placeholder="请输入" style="width: 100%">
             <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
                          :value="item.Key">
               </el-option>
@@ -96,7 +98,7 @@
 
           <el-col :span="8">
           <el-form-item label="中石油准入证编号" >
-            <el-input v-model="formData.PACNumber" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.PACNumber" maxlength="255" :readonly="this.formData.Status > '0'" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -380,23 +382,23 @@
       <el-row :gutter="60">
         <el-col :span="8">
           <el-form-item label="质量管理体系认证情况及认证机构">
-            <el-input v-model="formData.QualitySystemCert" :readonly="!canUpdateSupplier" maxlength="200" placeholder="请输入" type="textarea"
+            <el-input v-model="formData.QualitySystemCert" :readonly="this.formData.Status > '0'" maxlength="200" 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" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"></el-input>
+            <el-input v-model="formData.ProductQualityCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="生产/制造许可证获证情况及编号">
-            <el-input v-model="formData.MaunLicense" placeholder="请输入" :readonly="!canUpdateSupplier" maxlength="200" type="textarea"></el-input>
+            <el-input v-model="formData.MaunLicense" placeholder="请输入" :readonly="this.formData.Status > '0'" maxlength="200" type="textarea"></el-input>
           </el-form-item>
         </el-col>
          <el-col :span="8">
           <el-form-item label="所代理制造商名称" >
-            <el-input v-model="formData.MaunAgent" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" type="textarea">
+            <el-input v-model="formData.MaunAgent" maxlength="255" :readonly="this.formData.Status > '0'" placeholder="请输入" type="textarea">
             </el-input>
           </el-form-item>
         </el-col>
@@ -422,7 +424,7 @@
         </el-col>-->
         <el-col :span="8">
           <el-form-item label="安全生产许可证">
-            <el-input v-model="formData.SafetyLicense" :readonly="!canUpdateSupplier" maxlength="200" placeholder="请输入" type="textarea"
+            <el-input v-model="formData.SafetyLicense" :readonly="this.formData.Status > '0'" maxlength="200" placeholder="请输入" type="textarea"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -430,7 +432,7 @@
 
         <el-col :span="8">
           <el-form-item label="行业特殊要求的认证证书">
-            <el-input v-model="formData.SpecIndustryCert" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"
+            <el-input v-model="formData.SpecIndustryCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -443,7 +445,7 @@
         </el-col>
         <el-col :span="16">
           <el-form-item label="备注">
-            <el-input v-model="formData.Remark" maxlength="500" :readonly="!canUpdateSupplier" placeholder="请输入" type="textarea"
+            <el-input v-model="formData.Remark" maxlength="500" :readonly="this.formData.Status > '0'" placeholder="请输入" type="textarea"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -744,10 +746,9 @@
       }
     },
     created () {
-      if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
-        this.formData.SupplierName=this.authUser.Profile.Realname
-        this.searchSupplierName()
-      }
+      // if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
+      //   this.inputCompanyName(this.authUser.Profile.Realname)
+      // }
     },
     watch: {
       dictData: {
@@ -859,16 +860,16 @@
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
           this.getCountryList(this.dictData['CountryList'])
           let suppliers = this.dictData['CompanyNames']
-          for (let idx in suppliers) {
-            suppliers[idx]['value'] = suppliers[idx].SupplierName
-            this.companynames.push(suppliers[idx])
-          }
-          if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
-            if (!this.formData.Id) {
-              this.formData.SupplierName = ''
-            }
-            this.companyReadonly = true
-          }
+          // for (let idx in suppliers) {
+          //   suppliers[idx]['value'] = suppliers[idx].SupplierName
+          //   this.companynames.push(suppliers[idx])
+          // }
+          // if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
+          //   if (!this.formData.Id) {
+          //     this.formData.SupplierName = ''
+          //   }
+          //   this.companyReadonly = true
+          // }
         }
       },
       getCityList (val) {
@@ -918,24 +919,24 @@
       },
 
       /** ----------------------- */
-      querySearch (queryString, cb) {
-        var results = queryString ? this.companynames.filter(this.createFilter(queryString)) : this.companynames
-        // 调用 callback 返回建议列表的数据
-        cb(results)
-      },
+      // querySearch (queryString, cb) {
+      //   var results = queryString ? this.companynames.filter(this.createFilter(queryString)) : this.companynames
+      //   // 调用 callback 返回建议列表的数据
+      //   cb(results)
+      // },
       createFilter (queryString) {
         return (restaurant) => {
           return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
         }
       },
-      handleSelect (item) {
-        this.$emit('selectcompany', item)
-      },
+      // handleSelect (item) {
+      //   this.$emit('selectcompany', item)
+      // },
       inputCompanyName (val) {
         this.$emit('inputcompany', val)
       },
+      }
     }
-  }
 
 </script>
 <style>

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

@@ -18,9 +18,11 @@
 
         <el-col :span="16">
           <el-form-item label="供方名称" prop="SupplierName" >
-            <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
+            <!-- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
                              :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
-            </el-autocomplete>
+            </el-autocomplete> -->
+            <el-input v-model="formData.SupplierName" :maxlength="255"  :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
+            </el-input>
             <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
             </el-input>
           </el-form-item>
@@ -35,7 +37,7 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" v-model="formData.SpecTypeCode"
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode"  @change="currentSel"
                        placeholder="请选择" style="width: 100%" :disabled="!canUpdateSupplier">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
                          :value="item.Value">
@@ -46,7 +48,7 @@
 
         <el-col :span="8">
           <el-form-item label="准入方式">
-            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="!canUpdateSupplier"
+            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" v-if="item.Value != '2' && item.Value != '3'"
                          :value="item.Value">
@@ -331,13 +333,13 @@
     <el-row :gutter="60">
       <el-col :span="8">
         <el-form-item label="质量管理体系认证情况">
-          <el-input v-model="formData.QualitySystemCert" maxlength="200" :readonly="!canUpdateSupplier" placeholder="请输入" type="textarea"
+          <el-input v-model="formData.QualitySystemCert" maxlength="200" :readonly="this.formData.Status > '0'" 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="请输入" :readonly="!canUpdateSupplier" maxlength="200" type="textarea"
+          <el-input v-model="formData.QualifCert" placeholder="请输入" :readonly="this.formData.Status >'0'" maxlength="200" type="textarea"
                     style="width: 100%">
           </el-input>
         </el-form-item>
@@ -349,7 +351,7 @@
       </el-col>-->
       <el-col :span="8">
         <el-form-item label="安全生产许可证">
-          <el-input v-model="formData.SafetyLicense" maxlength="200" :readonly="!canUpdateSupplier" placeholder="请输入" type="textarea"
+          <el-input v-model="formData.SafetyLicense" maxlength="200" :readonly="this.formData.Status > '0'" placeholder="请输入" type="textarea"
                     style="width: 100%">
           </el-input>
         </el-form-item>
@@ -357,7 +359,7 @@
 
       <el-col :span="8">
         <el-form-item label="行业特殊要求的认证证书">
-          <el-input v-model="formData.SpecIndustryCert" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"
+          <el-input v-model="formData.SpecIndustryCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"
                     style="width: 100%">
           </el-input>
         </el-form-item>
@@ -370,7 +372,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="备注">
-          <el-input v-model="formData.Remark" :readonly="!canUpdateSupplier" maxlength="500" placeholder="请输入" type="textarea"
+          <el-input v-model="formData.Remark" :readonly="this.formData.Status > '0'" maxlength="500" placeholder="请输入" type="textarea"
                     style="width: 100%">
           </el-input>
         </el-form-item>
@@ -659,10 +661,9 @@
     },
 
     created () {
-        if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
-        this.formData.SupplierName=this.authUser.Profile.Realname
-        this.searchSupplierName()
-      }
+      //  if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
+      //   this.inputCompanyName(this.authUser.Profile.Realname)
+      // }
     },
     watch: {
       dictData: {
@@ -680,6 +681,20 @@
           else{
              this.showorhidflag='show'
           }
+      },
+           currentSel (event) {
+        if (event==2){
+          this.formData.InStyle='5'
+          // for(let item of this.$refs.inStyle.options) {
+          //   if(item.value=='5'){
+          //       console.log(item.style)
+          //   }else{
+          //      //隐藏
+          //   }
+          // }
+          }else{
+            this.formData.InStyle='1'
+            }
       },
       // commnoChange () {
       //   this.formData.CountryTaxNo = this.formData.CommercialNo
@@ -749,16 +764,16 @@
           this.CompanyTypeOptions = this.dictData['CompanyType']
           this.CurrencyOptions = this.dictData['CurrencyType']
           let suppliers = this.dictData['CompanyNames']
-          for (let idx in suppliers) {
-            suppliers[idx]['value'] = suppliers[idx].SupplierName
-            this.companynames.push(suppliers[idx])
-          }
-          if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
-            if (!this.formData.Id) {
-              this.formData.SupplierName = ''
-            }
-            this.companyReadonly = true
-          }
+          // for (let idx in suppliers) {
+          //   suppliers[idx]['value'] = suppliers[idx].SupplierName
+          //   this.companynames.push(suppliers[idx])
+          // }
+          // if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
+          //   if (!this.formData.Id) {
+          //     this.formData.SupplierName = ''
+          //   }
+          //   this.companyReadonly = true
+          // }
         }
       },
       getCityList (val) {
@@ -796,19 +811,19 @@
       },
 
       /** ----------------------- */
-      querySearch (queryString, cb) {
-        var results = queryString ? this.companynames.filter(this.createFilter(queryString)) : this.companynames
-        // 调用 callback 返回建议列表的数据
-        cb(results)
-      },
+      // querySearch (queryString, cb) {
+      //   var results = queryString ? this.companynames.filter(this.createFilter(queryString)) : this.companynames
+      //   // 调用 callback 返回建议列表的数据
+      //   cb(results)
+      // },
       createFilter (queryString) {
         return (restaurant) => {
           return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
         }
       },
-      handleSelect (item) {
-        this.$emit('selectcompany', item)
-      },
+      // handleSelect (item) {
+      //   this.$emit('selectcompany', item)
+      // },
       inputCompanyName (val) {
         this.$emit('inputcompany', val)
       }

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

@@ -461,7 +461,7 @@
           QualifCertLevel: '',
           SafetyLicense: '',
           TechServiceLic: '',
-          TJInNotify: '',
+          TjinNotify: '',
           SpecIndustryCert: '',
           BusinessScope: '',
           LegalPerson: '',
@@ -601,14 +601,15 @@
       this.getDictOptions()
       //this.getorgtreelist()
       if (this.IsCompanyUser && this.serviceId === 'add') {
-        apiCert.getEntityByCreatorAndType('02', this.$axios).then(res => {
-          this.certId = res.data.Id
-          this.serviceId = res.data.SupplierId
-          this.formData.Id = res.data.SupplierId
-          this.initDatas()
-        }).catch(err => {
-          console.error(err)
-        })
+        // apiCert.getEntityByCreatorAndType('02', this.$axios).then(res => {
+        //   this.certId = res.data.Id
+        //   this.serviceId = res.data.SupplierId
+        //   this.formData.Id = res.data.SupplierId
+        //   this.initDatas()
+        // }).catch(err => {
+        //   console.error(err)
+        // })
+        this.inputCompany(this.authUser.Profile.Realname)
       } else {
         this.initDatas()
       }
@@ -694,8 +695,8 @@
       },
       inputCompany(val) {
         if (!this.certId) { // 已经关联到子表了，就不能再切换主表ID了
-          api.getEntityByName(val, this.$axios).then(res => {
-            if (res.data && res.data.Id) {
+          api.getEntityByName(val,'02', this.$axios).then(res => {
+            if (res.data) {
               this.SetFormData(res.data)
             }
           }).catch(err => {
@@ -715,14 +716,20 @@
         this.formData.OilCertificateNo = fdata.OilCertificateNo
         this.formData.Grade = fdata.Grade
         this.formData.MgrUnit = fdata.MgrUnit
+        if(fdata.InStyle!=null && fdata.InStyle!=""){
         this.formData.InStyle = fdata.InStyle
+        }      
         this.formData.OperType = fdata.OperType
-        this.formData.Country = fdata.Country
+        if(fdata.Country!=""){
+            this.formData.Country = fdata.Country;
+        }
         this.formData.MaunAgent = fdata.MaunAgent
-        this.formData.ConstructTeam = fdata.ConstructTeam
-        this.formData.CredentialFlag = fdata.CredentialFlag
+        this.formData.ConstructTeam = fdata.ConstructTeam 
+        if(fdata.CredentialFlag!=null&&fdata.CredentialFlag!=""){
+          this.formData.CredentialFlag = fdata.CredentialFlag
+        }
         this.formData.CommercialNo = fdata.CommercialNo
-        if (this.formData.CredentialFlag != "") {
+        if (fdata.CredentialFlag!=null&&fdata.CredentialFlag!="") {
             this.$refs["BasisInfo"].showorhid(this.formData.CredentialFlag)
         }
         this.formData.OrganCode = fdata.OrganCode
@@ -744,27 +751,42 @@
         this.formData.CategoryCode = fdata.CategoryCode
         this.formData.CategoryName = fdata.CategoryName
         this.formData.RegCapital = fdata.RegCapital
+        if(fdata.Currency!=null && fdata.Currency!=""){
         this.formData.Currency = fdata.Currency
+        }
         this.formData.ContactName = fdata.ContactName
-        this.formData.CompanyType = fdata.CompanyType
+        
+        if(fdata.CompanyType!=null && fdata.CompanyType!=""){
+          this.formData.CompanyType = fdata.CompanyType
+        }
         this.formData.SetupTime = fdata.SetupTime
         this.formData.DepositBank = fdata.DepositBank
         this.formData.BankAccount = fdata.BankAccount
         this.formData.EMail = fdata.EMail
         this.formData.BankCreditRating = fdata.BankCreditRating
-        this.formData.Mobile = fdata.Mobile
+          if(fdata.Mobile!=null && fdata.Mobile!=""){
+           this.formData.Mobile = fdata.Mobile;
+        }else{
+           this.formData.Mobile = fdata.UserTelephone;
+        }
         this.formData.Telphone = fdata.Telphone
         this.formData.Fax = fdata.Fax
         this.formData.CompanyTel = fdata.CompanyTel
         this.formData.QQ = fdata.QQ
         this.formData.CompanyUrl = fdata.CompanyUrl
+        if(fdata.HseTraining!=null && fdata.HseTraining!=""){
         this.formData.HseTraining = fdata.HseTraining
-        this.formData.SpecTypeCode = fdata.SpecTypeCode
+        }
+        if(fdata.SpecTypeCode!=null && fdata.SpecTypeCode!=""){
+         this.formData.SpecTypeCode = fdata.SpecTypeCode
+        }
         this.formData.QualitySystemCert = fdata.QualitySystemCert
         this.formData.SafetyLicense = fdata.SafetyLicense
         this.formData.SpecIndustryCert = fdata.SpecIndustryCert
         this.formData.BusinessScope = fdata.BusinessScope
         this.formData.Remark = fdata.Remark
+        this.formData.TjinNotify = fdata.TjinNotify
+        this.formData.Status = fdata.Status
 
         this.$refs['BasisInfo'].CityAry = []
         this.$refs['BasisInfo'].CityAry.push(this.formData.Province)
@@ -801,8 +823,8 @@
       },
 
       initDatas() {
-        this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
+          this.isCanUpdateSupplier(this.formData.Id)
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal

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

@@ -604,17 +604,18 @@
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser;
 
       if (this.IsCompanyUser && this.serviceId === "add") {
-        apiCert
-          .getEntityByCreatorAndType("01", this.$axios)
-          .then(res => {
-            this.certId = res.data.Id;
-            this.serviceId = res.data.SupplierId;
-            this.formData.Id = res.data.SupplierId;
-            this.initDatas();
-          })
-          .catch(err => {
-            console.error(err);
-          });
+        // apiCert
+        //   .getEntityByCreatorAndType("01", this.$axios)
+        //   .then(res => {
+        //     this.certId = res.data.Id;
+        //     this.serviceId = res.data.SupplierId;
+        //     this.formData.Id = res.data.SupplierId;
+        //     this.initDatas();
+        //   })
+        //   .catch(err => {
+        //     console.error(err);
+        //   });
+         this.inputCompany(this.authUser.Profile.Realname)
       } else {
         this.initDatas();
       }
@@ -709,9 +710,9 @@
       inputCompany(val) {
         if (!this.certId) {
           api
-            .getEntityByName(val, this.$axios)
+            .getEntityByName(val,'01', this.$axios)
             .then(res => {
-              if (res.data && res.data.Id) {
+              if (res.data) {
                 this.SetFormData(res.data);
               }
             })
@@ -727,62 +728,83 @@
         }
       },
       SetFormData(fdata) {
-        this.isCanUpdateSupplier(fdata.Id);
-        this.formData.Id = fdata.Id;
-        this.formData.SupplierName = fdata.SupplierName;
-        this.formData.OilCertificateNo = fdata.OilCertificateNo;
-        this.formData.Grade = fdata.Grade;
-        this.formData.MgrUnit = fdata.MgrUnit;
+        console.log(fdata)
+        this.isCanUpdateSupplier(fdata.Id)
+        this.formData.Id = fdata.Id
+        this.formData.SupplierName = fdata.SupplierName
+        this.formData.OilCertificateNo = fdata.OilCertificateNo
+        this.formData.Grade = fdata.Grade
+        this.formData.MgrUnit = fdata.MgrUnit
+        if(fdata.InStyle!=null && fdata.InStyle!=""){
         this.formData.InStyle = fdata.InStyle
-        this.formData.OperType = fdata.OperType;
-        this.formData.Country = fdata.Country;
-        this.formData.MaunAgent = fdata.MaunAgent;
-        this.formData.ConstructTeam = fdata.ConstructTeam;
-        this.formData.CredentialFlag = fdata.CredentialFlag
+        }      
+        this.formData.OperType = fdata.OperType
+        if(fdata.Country!=""){
+            this.formData.Country = fdata.Country;
+        }
+        this.formData.MaunAgent = fdata.MaunAgent
+        this.formData.ConstructTeam = fdata.ConstructTeam 
+        if(fdata.CredentialFlag!=null&&fdata.CredentialFlag!=""){
+          this.formData.CredentialFlag = fdata.CredentialFlag
+        }
         this.formData.CommercialNo = fdata.CommercialNo
-        if (this.formData.CredentialFlag != "") {
+        if (fdata.CredentialFlag!=null&&fdata.CredentialFlag!="") {
             this.$refs["GoodsInfo"].showorhid(this.formData.CredentialFlag)
         }
-        this.formData.OrganCode = fdata.OrganCode;
-        this.formData.CountryTaxNo = fdata.CountryTaxNo;
-        this.formData.LocalTaxNo = fdata.LocalTaxNo;
-        this.formData.Address = fdata.Address;
-        this.formData.Province = fdata.Province;
-        this.formData.City = fdata.City;
-        this.formData.Street = fdata.Street;
-        this.formData.HouseNo = fdata.HouseNo;
-        this.formData.ZipCode = fdata.ZipCode;
-        this.formData.LinkAddress = fdata.LinkAddress;
-        this.formData.LinkProvince = fdata.LinkProvince;
-        this.formData.LinkCity = fdata.LinkCity;
-        this.formData.LinkStreet = fdata.LinkStreet;
-        this.formData.LinkHouseNo = fdata.LinkHouseNo;
-        this.formData.LinkZipCode = fdata.LinkZipCode;
-        this.formData.LegalPerson = fdata.LegalPerson;
-        this.formData.CategoryCode = fdata.CategoryCode;
-        this.formData.CategoryName = fdata.CategoryName;
-        this.formData.RegCapital = fdata.RegCapital;
-        this.formData.Currency = fdata.Currency;
-        this.formData.ContactName = fdata.ContactName;
-        this.formData.CompanyType = fdata.CompanyType;
-        this.formData.SetupTime = fdata.SetupTime;
-        this.formData.DepositBank = fdata.DepositBank;
-        this.formData.BankAccount = fdata.BankAccount;
-        this.formData.EMail = fdata.EMail;
-        this.formData.BankCreditRating = fdata.BankCreditRating;
-        this.formData.Mobile = fdata.Mobile;
-        this.formData.Telphone = fdata.Telphone;
-        this.formData.Fax = fdata.Fax;
-        this.formData.CompanyTel = fdata.CompanyTel;
-        this.formData.QQ = fdata.QQ;
-        this.formData.CompanyUrl = fdata.CompanyUrl;
-        this.formData.HseTraining = fdata.HseTraining;
-        this.formData.SpecTypeCode = fdata.SpecTypeCode;
+        this.formData.OrganCode = fdata.OrganCode
+        this.formData.CountryTaxNo = fdata.CountryTaxNo
+        this.formData.LocalTaxNo = fdata.LocalTaxNo
+        this.formData.Address = fdata.Address
+        this.formData.Province = fdata.Province
+        this.formData.City = fdata.City
+        this.formData.Street = fdata.Street
+        this.formData.HouseNo = fdata.HouseNo
+        this.formData.ZipCode = fdata.ZipCode
+        this.formData.LinkAddress = fdata.LinkAddress
+        this.formData.LinkProvince = fdata.LinkProvince
+        this.formData.LinkCity = fdata.LinkCity
+        this.formData.LinkStreet = fdata.LinkStreet
+        this.formData.LinkHouseNo = fdata.LinkHouseNo
+        this.formData.LinkZipCode = fdata.LinkZipCode
+        this.formData.LegalPerson = fdata.LegalPerson
+        this.formData.CategoryCode = fdata.CategoryCode
+        this.formData.CategoryName = fdata.CategoryName
+        this.formData.RegCapital = fdata.RegCapital
+        if(fdata.Currency!=null && fdata.Currency!=""){
+        this.formData.Currency = fdata.Currency
+        }
+        this.formData.ContactName = fdata.ContactName 
+        if(fdata.CompanyType!=null && fdata.CompanyType!=""){
+          this.formData.CompanyType = fdata.CompanyType
+        }
+        this.formData.SetupTime = fdata.SetupTime
+        this.formData.DepositBank = fdata.DepositBank
+        this.formData.BankAccount = fdata.BankAccount
+        this.formData.EMail = fdata.EMail
+        this.formData.BankCreditRating = fdata.BankCreditRating
+          if(fdata.Mobile!=null && fdata.Mobile!=""){
+           this.formData.Mobile = fdata.Mobile;
+        }else{
+           this.formData.Mobile = fdata.UserTelephone;
+        }
+        this.formData.Telphone = fdata.Telphone
+        this.formData.Fax = fdata.Fax
+        this.formData.CompanyTel = fdata.CompanyTel
+        this.formData.QQ = fdata.QQ
+        this.formData.CompanyUrl = fdata.CompanyUrl
+        if(fdata.HseTraining!=null && fdata.HseTraining!=""){
+        this.formData.HseTraining = fdata.HseTraining
+        }
+        if(fdata.SpecTypeCode!=null && fdata.SpecTypeCode!=""){
+         this.formData.SpecTypeCode = fdata.SpecTypeCode
+        }
         this.formData.QualitySystemCert = fdata.QualitySystemCert
         this.formData.SafetyLicense = fdata.SafetyLicense
         this.formData.SpecIndustryCert = fdata.SpecIndustryCert
         this.formData.BusinessScope = fdata.BusinessScope
         this.formData.Remark = fdata.Remark
+        this.formData.TjinNotify = fdata.TjinNotify
+        this.formData.Status = fdata.Status
 
         this.$refs["GoodsInfo"].CityAry = [];
         this.$refs["GoodsInfo"].CityAry.push(this.formData.Province);
@@ -821,9 +843,9 @@
         this.$refs["winningList"].showDialog();
       },
 
-      initDatas() {
-        this.isCanUpdateSupplier(this.formData.Id);
+      initDatas() { 
         if (this.formData.Id) {
+           this.isCanUpdateSupplier(this.formData.Id);
           api
             .getEntityAndCert(this.certId, this.$axios)
             .then(res => {

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

@@ -594,14 +594,15 @@
       this.getDictOptions()
       //this.getorgtreelist()
       if (this.IsCompanyUser && this.serviceId === 'add') {
-        apiCert.getEntityByCreatorAndType('03', this.$axios).then(res => {
-          this.certId = res.data.Id
-          this.serviceId = res.data.SupplierId
-          this.formData.Id = res.data.SupplierId
-          this.initDatas()
-        }).catch(err => {
-          console.error(err)
-        })
+        // apiCert.getEntityByCreatorAndType('03', this.$axios).then(res => {
+        //   this.certId = res.data.Id
+        //   this.serviceId = res.data.SupplierId
+        //   this.formData.Id = res.data.SupplierId
+        //   this.initDatas()
+        // }).catch(err => {
+        //   console.error(err)
+        // })
+        this.inputCompany(this.authUser.Profile.Realname)
       } else {
         this.initDatas()
       }
@@ -687,8 +688,8 @@
       },
       inputCompany(val) {
         if (!this.certId) {
-          api.getEntityByName(val, this.$axios).then(res => {
-            if (res.data && res.data.Id) {
+          api.getEntityByName(val,'03', this.$axios).then(res => {
+            if (res.data) {
               this.SetFormData(res.data)
             }
           }).catch(err => {
@@ -702,20 +703,26 @@
         }
       },
       SetFormData(fdata) {
-        this.isCanUpdateSupplier(fdata.Id)
+         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
         this.formData.OilCertificateNo = fdata.OilCertificateNo
         this.formData.Grade = fdata.Grade
         this.formData.MgrUnit = fdata.MgrUnit
+        if(fdata.InStyle!=null && fdata.InStyle!=""){
         this.formData.InStyle = fdata.InStyle
+        }      
         this.formData.OperType = fdata.OperType
-        this.formData.Country = fdata.Country
+        if(fdata.Country!=""){
+            this.formData.Country = fdata.Country;
+        }
         this.formData.MaunAgent = fdata.MaunAgent
-        this.formData.ConstructTeam = fdata.ConstructTeam
-        this.formData.CredentialFlag = fdata.CredentialFlag
+        this.formData.ConstructTeam = fdata.ConstructTeam 
+        if(fdata.CredentialFlag!=null&&fdata.CredentialFlag!=""){
+          this.formData.CredentialFlag = fdata.CredentialFlag
+        }
         this.formData.CommercialNo = fdata.CommercialNo
-        if (this.formData.CredentialFlag != "") {
+        if (fdata.CredentialFlag!=null&&fdata.CredentialFlag!="") {
             this.$refs["TechInfo"].showorhid(this.formData.CredentialFlag)
         }
         this.formData.OrganCode = fdata.OrganCode
@@ -737,28 +744,42 @@
         this.formData.CategoryCode = fdata.CategoryCode
         this.formData.CategoryName = fdata.CategoryName
         this.formData.RegCapital = fdata.RegCapital
+        if(fdata.Currency!=null && fdata.Currency!=""){
         this.formData.Currency = fdata.Currency
+        }
         this.formData.ContactName = fdata.ContactName
-        this.formData.CompanyType = fdata.CompanyType
+        
+        if(fdata.CompanyType!=null && fdata.CompanyType!=""){
+          this.formData.CompanyType = fdata.CompanyType
+        }
         this.formData.SetupTime = fdata.SetupTime
         this.formData.DepositBank = fdata.DepositBank
         this.formData.BankAccount = fdata.BankAccount
         this.formData.EMail = fdata.EMail
         this.formData.BankCreditRating = fdata.BankCreditRating
-        this.formData.Mobile = fdata.Mobile
+          if(fdata.Mobile!=null && fdata.Mobile!=""){
+           this.formData.Mobile = fdata.Mobile;
+        }else{
+           this.formData.Mobile = fdata.UserTelephone;
+        }
         this.formData.Telphone = fdata.Telphone
         this.formData.Fax = fdata.Fax
-        this.formData.Fax = fdata.BusinessScope
         this.formData.CompanyTel = fdata.CompanyTel
         this.formData.QQ = fdata.QQ
         this.formData.CompanyUrl = fdata.CompanyUrl
+        if(fdata.HseTraining!=null && fdata.HseTraining!=""){
         this.formData.HseTraining = fdata.HseTraining
-        this.formData.SpecTypeCode = fdata.SpecTypeCode
+        }
+        if(fdata.SpecTypeCode!=null && fdata.SpecTypeCode!=""){
+         this.formData.SpecTypeCode = fdata.SpecTypeCode
+        }
         this.formData.QualitySystemCert = fdata.QualitySystemCert
         this.formData.SafetyLicense = fdata.SafetyLicense
         this.formData.SpecIndustryCert = fdata.SpecIndustryCert
         this.formData.BusinessScope = fdata.BusinessScope
         this.formData.Remark = fdata.Remark
+        this.formData.TjinNotify = fdata.TjinNotify
+        this.formData.Status = fdata.Status
         
 
         this.$refs["TechInfo"].CityAry = []
@@ -796,8 +817,9 @@
       },
 
       initDatas() {
-        this.isCanUpdateSupplier(this.formData.Id)
+       
         if (this.formData.Id) {
+          this.isCanUpdateSupplier(this.formData.Id)
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal