准入的查询

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

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

@@ -39,7 +39,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 	sql += ` b.DesignerTotal, `
 	sql += ` b.SkillerTotal, `
 	sql += ` b.Status, `
-	sql += ` b.WorkflowId `
+	sql += ` b.WorkflowId, b.CreateOn `
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
 	sql += ` where ` + where

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

@@ -383,280 +383,118 @@ func (this *OilSupplierController) GetJoinCertEntityList() {
 			asc = true
 		}
 	}
-	Id := this.GetString("Id")
 	SupplierName := this.GetString("SupplierName")
 	SupplierTypeName := this.GetString("SupplierTypeName")
-	OilCertificateNo := this.GetString("OilCertificateNo")
-	Grade := this.GetString("Grade")
-	MgrUnit := this.GetString("MgrUnit")
+	CreateOn := this.GetString("CreateOn")
+	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	OperType := this.GetString("OperType")
+	SpecTypeCode := this.GetString("SpecTypeCode")
 	Country := this.GetString("Country")
-	MaunAgent := this.GetString("MaunAgent")
-	ConstructTeam := this.GetString("ConstructTeam")
+	InStyle := this.GetString("InStyle")
+	MgrUnit := this.GetString("MgrUnit")
+	PACNumber := this.GetString("PACNumber")
 	CommercialNo := this.GetString("CommercialNo")
-	OrganCode := this.GetString("OrganCode")
-	CountryTaxNo := this.GetString("CountryTaxNo")
-	LocalTaxNo := this.GetString("LocalTaxNo")
-	Address := this.GetString("Address")
 	Province := this.GetString("Province")
 	City := this.GetString("City")
 	Street := this.GetString("Street")
-	HouseNo := this.GetString("HouseNo")
-	ZipCode := this.GetString("ZipCode")
-	QualitySystemCert := this.GetString("QualitySystemCert")
-	ProductQualityCert := this.GetString("ProductQualityCert")
-	MaunLicense := this.GetString("MaunLicense")
-	QualifCert := this.GetString("QualifCert")
-	QualifCertLevel := this.GetString("QualifCertLevel")
-	SafetyLicense := this.GetString("SafetyLicense")
-	TechServiceLic := this.GetString("TechServiceLic")
-	TJInNotify := this.GetString("TJInNotify")
-	SpecIndustryCert := this.GetString("SpecIndustryCert")
+	Address := this.GetString("Address")
+	LinkProvince := this.GetString("LinkProvince")
+	LinkCity := this.GetString("LinkCity")
+	LinkStreet := this.GetString("LinkStreet")
+	LinkAddress := this.GetString("LinkAddress")
 	LegalPerson := this.GetString("LegalPerson")
-	CategoryCode := this.GetString("CategoryCode")
-	CategoryName := this.GetString("CategoryName")
-	RegCapital := this.GetString("RegCapital")
-	Currency := this.GetString("Currency")
 	ContactName := this.GetString("ContactName")
 	CompanyType := this.GetString("CompanyType")
 	SetupTime := this.GetString("SetupTime")
-	DepositBank := this.GetString("DepositBank")
-	BankAccount := this.GetString("BankAccount")
-	EMail := this.GetString("EMail")
-	BankCreditRating := this.GetString("BankCreditRating")
-	Mobile := this.GetString("Mobile")
-	Telphone := this.GetString("Telphone")
-	Fax := this.GetString("Fax")
-	CompanyTel := this.GetString("CompanyTel")
-	QQ := this.GetString("QQ")
-	CompanyUrl := this.GetString("CompanyUrl")
-	SpecSupplier := this.GetString("SpecSupplier")
-	SpecTypeCode := this.GetString("SpecTypeCode")
-	SpecTypeName := this.GetString("SpecTypeName")
-	Remark := this.GetString("Remark")
-	CreateOn := this.GetString("CreateOn")
-	SupplierTypeCode := this.GetString("SupplierTypeCode")
-	status := this.GetString("Status")
-
-	if status != "" {
-		where = where + " and b.Status='" + status + "'"
-	}
-	if Id != "" {
-		where = where + " and a.Id like '%" + Id + "%'"
-	}
+	RegCapital1 := this.GetString("RegCapital1")
+	RegCapital2 := this.GetString("RegCapital2")
+	BusinessScope := this.GetString("BusinessScope")
 
 	if SupplierName != "" {
 		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
 	}
-
 	if SupplierTypeName != "" {
 		where = where + " and b.SupplierTypeName like '%" + SupplierTypeName + "%'"
 	}
-
-	if OilCertificateNo != "" {
-		where = where + " and a.OilCertificateNo like '%" + OilCertificateNo + "%'"
-	}
-
-	if Grade != "" {
-		where = where + " and a.Grade like '%" + Grade + "%'"
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and b.CreateOn>='" + minDate + "' and b.CreateOn<='" + maxDate + "'"
+		}
 	}
-
-	if MgrUnit != "" {
-		where = where + " and a.MgrUnit like '%" + MgrUnit + "%'"
+	if SupplierTypeCode != "" {
+		where = where + " and b.SupplierTypeCode ='" + SupplierTypeCode + "'"
 	}
-
 	if OperType != "" {
 		where = where + " and a.OperType like '%" + OperType + "%'"
 	}
-
+	if SpecTypeCode != "" {
+		where = where + " and a.SpecTypeCode = '" + SpecTypeCode + "'"
+	}
 	if Country != "" {
 		where = where + " and a.Country like '%" + Country + "%'"
 	}
-
-	if MaunAgent != "" {
-		where = where + " and a.MaunAgent like '%" + MaunAgent + "%'"
-	}
-
-	if ConstructTeam != "" {
-		where = where + " and a.ConstructTeam like '%" + ConstructTeam + "%'"
-	}
-
-	if CommercialNo != "" {
-		where = where + " and a.CommercialNo like '%" + CommercialNo + "%'"
-	}
-
-	if OrganCode != "" {
-		where = where + " and a.OrganCode like '%" + OrganCode + "%'"
+	if InStyle != "" {
+		where = where + " and b.InStyle ='" + InStyle + "'"
 	}
-
-	if CountryTaxNo != "" {
-		where = where + " and a.CountryTaxNo like '%" + CountryTaxNo + "%'"
+	if MgrUnit != "" {
+		where = where + " and a.MgrUnit like '%" + MgrUnit + "%'"
 	}
-
-	if LocalTaxNo != "" {
-		where = where + " and a.LocalTaxNo like '%" + LocalTaxNo + "%'"
+	if PACNumber != "" {
+		where = where + " and a.PACNumber ='" + PACNumber + "'"
 	}
-
-	if Address != "" {
-		where = where + " and a.Address like '%" + Address + "%'"
+	if CommercialNo != "" {
+		where = where + " and a.CommercialNo ='" + CommercialNo + "'"
 	}
-
 	if Province != "" {
-		where = where + " and a.Province like '%" + Province + "%'"
+		where = where + " and a.Province ='" + Province + "'"
 	}
-
 	if City != "" {
-		where = where + " and a.City like '%" + City + "%'"
+		where = where + " and a.City ='" + City + "'"
 	}
-
 	if Street != "" {
-		where = where + " and a.Street like '%" + Street + "%'"
-	}
-
-	if HouseNo != "" {
-		where = where + " and a.HouseNo like '%" + HouseNo + "%'"
-	}
-
-	if ZipCode != "" {
-		where = where + " and a.ZipCode like '%" + ZipCode + "%'"
-	}
-
-	if QualitySystemCert != "" {
-		where = where + " and a.QualitySystemCert like '%" + QualitySystemCert + "%'"
-	}
-
-	if ProductQualityCert != "" {
-		where = where + " and a.ProductQualityCert like '%" + ProductQualityCert + "%'"
+		where = where + " and a.Street ='" + Street + "'"
 	}
-
-	if MaunLicense != "" {
-		where = where + " and a.MaunLicense like '%" + MaunLicense + "%'"
-	}
-
-	if QualifCert != "" {
-		where = where + " and a.QualifCert like '%" + QualifCert + "%'"
-	}
-
-	if QualifCertLevel != "" {
-		where = where + " and a.QualifCertLevel like '%" + QualifCertLevel + "%'"
+	if Address != "" {
+		where = where + " and a.Address ='" + Address + "'"
 	}
-
-	if SafetyLicense != "" {
-		where = where + " and a.SafetyLicense like '%" + SafetyLicense + "%'"
+	if LinkProvince != "" {
+		where = where + " and a.LinkProvince ='" + LinkProvince + "'"
 	}
-
-	if TechServiceLic != "" {
-		where = where + " and a.TechServiceLic like '%" + TechServiceLic + "%'"
+	if LinkCity != "" {
+		where = where + " and a.LinkCity ='" + LinkCity + "'"
 	}
-
-	if TJInNotify != "" {
-		where = where + " and a.TJInNotify like '%" + TJInNotify + "%'"
+	if LinkStreet != "" {
+		where = where + " and a.LinkStreet ='" + LinkStreet + "'"
 	}
-
-	if SpecIndustryCert != "" {
-		where = where + " and a.SpecIndustryCert like '%" + SpecIndustryCert + "%'"
+	if LinkAddress != "" {
+		where = where + " and a.LinkAddress ='" + LinkAddress + "'"
 	}
-
 	if LegalPerson != "" {
-		where = where + " and a.LegalPerson like '%" + LegalPerson + "%'"
-	}
-
-	if CategoryCode != "" {
-		where = where + " and a.CategoryCode like '%" + CategoryCode + "%'"
-	}
-
-	if CategoryName != "" {
-		where = where + " and a.CategoryName like '%" + CategoryName + "%'"
-	}
-
-	if RegCapital != "" {
-		where = where + " and a.RegCapital like '%" + RegCapital + "%'"
-	}
-
-	if Currency != "" {
-		where = where + " and a.Currency like '%" + Currency + "%'"
+		where = where + " and a.LegalPerson ='" + LegalPerson + "'"
 	}
-
 	if ContactName != "" {
-		where = where + " and a.ContactName like '%" + ContactName + "%'"
+		where = where + " and a.ContactName ='" + ContactName + "'"
 	}
-
 	if CompanyType != "" {
 		where = where + " and a.CompanyType like '%" + CompanyType + "%'"
 	}
-
 	if SetupTime != "" {
-		where = where + " and a.SetupTime like '%" + SetupTime + "%'"
-	}
-
-	if DepositBank != "" {
-		where = where + " and a.DepositBank like '%" + DepositBank + "%'"
-	}
-
-	if BankAccount != "" {
-		where = where + " and a.BankAccount like '%" + BankAccount + "%'"
+		where = where + " and a.SetupTime ='" + SetupTime + "'"
 	}
-
-	if EMail != "" {
-		where = where + " and a.EMail like '%" + EMail + "%'"
-	}
-
-	if BankCreditRating != "" {
-		where = where + " and a.BankCreditRating like '%" + BankCreditRating + "%'"
-	}
-
-	if Mobile != "" {
-		where = where + " and a.Mobile like '%" + Mobile + "%'"
-	}
-
-	if Telphone != "" {
-		where = where + " and a.Telphone like '%" + Telphone + "%'"
-	}
-
-	if Fax != "" {
-		where = where + " and a.Fax like '%" + Fax + "%'"
-	}
-
-	if CompanyTel != "" {
-		where = where + " and a.CompanyTel like '%" + CompanyTel + "%'"
-	}
-
-	if QQ != "" {
-		where = where + " and a.QQ like '%" + QQ + "%'"
-	}
-
-	if CompanyUrl != "" {
-		where = where + " and a.CompanyUrl like '%" + CompanyUrl + "%'"
-	}
-
-	if SpecSupplier != "" {
-		where = where + " and a.SpecSupplier like '%" + SpecSupplier + "%'"
+	//注册资金范围
+	if RegCapital1 != "" {
+		where = where + " and a.RegCapital >= '" + RegCapital1 + "'"
 	}
-
-	if SpecTypeCode != "" {
-		where = where + " and a.SpecTypeCode like '%" + SpecTypeCode + "%'"
-	}
-
-	if SpecTypeName != "" {
-		where = where + " and a.SpecTypeName like '%" + SpecTypeName + "%'"
-	}
-
-	if Remark != "" {
-		where = where + " and a.Remark like '%" + Remark + "%'"
+	if RegCapital2 != "" {
+		where = where + " and a.RegCapital <= '" + RegCapital2 + "'"
 	}
-
-	if CreateOn != "" {
-		dates := strings.Split(CreateOn, ",")
-		if len(dates) == 2 {
-			minDate := dates[0]
-			maxDate := dates[1]
-			where = where + " and a.CreateOn>='" + minDate + "' and a.CreateOn<='" + maxDate + "'"
-		}
+	if BusinessScope != "" {
+		where = where + " and a.BusinessScope like '%" + BusinessScope + "%'"
 	}
 
-	if SupplierTypeCode != "" {
-		where = where + " and b.SupplierTypeCode = '" + SupplierTypeCode + "'"
-	}
 
 	//企业用户只看自己的数据记录
 	/*parameterSvc := baseparameter.GetBaseparameterService(utils.DBE) //取出外部门ID
@@ -1738,7 +1576,8 @@ func (this *OilSupplierController) GetDictList() {
 	dictList["UnitRelation"] = dictSvc.GetKeyValueItems("UnitRelation")
 	dictList["CompanyType"] = dictSvc.GetKeyValueItems("CompanyType")
 	dictList["InOptions"] = dictSvc.GetKeyValueItems("InOptions")
-
+	dictList["OperType"] = dictSvc.GetKeyValueItems("OperType")
+	dictList["ManagementUnit"] = dictSvc.GetKeyValueItems("ManagementUnit")
 	var userEntity userRole.Base_User
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)

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

@@ -92,7 +92,7 @@
     </el-card>
 
     <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="advancedsearchForm" label-width="110px">
+      <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
 
           <el-col :span="12">
@@ -102,349 +102,195 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="企业名称">
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
+        
+         <!-- <el-col :span="12">
+          <el-form-item label="供应商类型">
+            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col> -->
+
+        <el-col :span="12">
+          <el-form-item label="单位关系">
+            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+       <el-col :span="12">
+          <el-form-item label="国家">
+            <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
+              <el-option
+                v-for="item in countryListOptions"
+                :key="item.key"
+                :label="item.value"
+                :value="item.value">
+                <span style="float: left">{{ item.value }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
           <el-col :span="12">
-            <el-form-item label="中石油供应商证书号">
-              <el-input size="mini" v-model="searchForm.OilCertificateNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="级别">
-              <el-input size="mini" v-model="searchForm.Grade" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="管理单位">
-              <el-input size="mini" v-model="searchForm.MgrUnit" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="经营方式">
-              <el-input size="mini" v-model="searchForm.OperType" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="国家">
-              <el-input size="mini" v-model="searchForm.Country" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="所代理制造商名称">
-              <el-input size="mini" v-model="searchForm.MaunAgent" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="施工队伍名称">
-              <el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="工商注册号">
-              <el-input size="mini" v-model="searchForm.CommercialNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="组织机构代码">
-              <el-input size="mini" v-model="searchForm.OrganCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="税务登记证国税编号">
-              <el-input size="mini" v-model="searchForm.CountryTaxNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="税务登记证地税编号">
-              <el-input size="mini" v-model="searchForm.LocalTaxNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="单位地址">
-              <el-input size="mini" v-model="searchForm.Address" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="省直辖市">
-              <el-input size="mini" v-model="searchForm.Province" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="地市区县">
-              <el-input size="mini" v-model="searchForm.City" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="街道">
-              <el-input size="mini" v-model="searchForm.Street" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="门牌号">
-              <el-input size="mini" v-model="searchForm.HouseNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="邮编">
-              <el-input size="mini" v-model="searchForm.ZipCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="质量管理体系认证情况及认证机构">
-              <el-input size="mini" v-model="searchForm.QualitySystemCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="产品质量认证情况及认证机构">
-              <el-input size="mini" v-model="searchForm.ProductQualityCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="生产制造许可证获证情况及编号">
-              <el-input size="mini" v-model="searchForm.MaunLicense" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="企业资质证书编号">
-              <el-input size="mini" v-model="searchForm.QualifCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="企业资质证书级别">
-              <el-input size="mini" v-model="searchForm.QualifCertLevel" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="安全生产许可证">
-              <el-input size="mini" v-model="searchForm.SafetyLicense" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="技术服务类准入许可证">
-              <el-input size="mini" v-model="searchForm.TechServiceLic" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="外地企业进津备案通知书">
-              <el-input size="mini" v-model="searchForm.TJInNotify" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="行业特殊要求的认证证书">
-              <el-input size="mini" v-model="searchForm.SpecIndustryCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="法定代表人姓名">
-              <el-input size="mini" v-model="searchForm.LegalPerson" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="行业类别代码">
-              <el-input size="mini" v-model="searchForm.CategoryCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="行业类别名称">
-              <el-input size="mini" v-model="searchForm.CategoryName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="注册资本">
-              <el-input size="mini" v-model="searchForm.RegCapital" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="币种">
-              <el-input size="mini" v-model="searchForm.Currency" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="联系人姓名">
-              <el-input size="mini" v-model="searchForm.ContactName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="准入方式">
+            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="管理单位" >
+            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="公司类型">
-              <el-input size="mini" v-model="searchForm.CompanyType" style="width:100%" placeholder="请输入"></el-input>
+        <el-col :span="12">
+          <el-form-item label="中石油准入证编号" >
+            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+ 
+ 
+        <el-col :span="12">
+          <el-form-item label="统一社会信用代码">
+            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="注册地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="CityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.Address"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="24">
+            <el-form-item label="通信地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="LinkCityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleLinkAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.LinkAddress"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="法人">
+              <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人">
+              <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="公司类型" prop="CompanyType" >
+              <el-select size="mini" v-model="searchForm.CompanyType" maxlength="50" filterable placeholder="请选择" style="width: 100%;">
+                <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
+                           style="width: 100%">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="成立时间">
-              <el-input size="mini" v-model="searchForm.SetupTime" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="开户银行">
-              <el-input size="mini" v-model="searchForm.DepositBank" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="银行账号">
-              <el-input size="mini" v-model="searchForm.BankAccount" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="电子邮箱">
-              <el-input size="mini" v-model="searchForm.EMail" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="银行信用等级">
-              <el-input size="mini" v-model="searchForm.BankCreditRating" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="移动电话">
-              <el-input size="mini" v-model="searchForm.Mobile" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="固定电话">
-              <el-input size="mini" v-model="searchForm.Telphone" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="传真">
-              <el-input size="mini" v-model="searchForm.Fax" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="公司电话">
-              <el-input size="mini" v-model="searchForm.CompanyTel" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="QQ号码">
-              <el-input size="mini" v-model="searchForm.QQ" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="公司网址">
-              <el-input size="mini" v-model="searchForm.CompanyUrl" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="是否特殊业务供应商(可不招标)">
-              <el-input size="mini" v-model="searchForm.SpecSupplier" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）">
-              <el-input size="mini" v-model="searchForm.SpecTypeCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）">
-              <el-input size="mini" v-model="searchForm.SpecTypeName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="删除状态，0正常，1已删除">
-              <el-input size="mini" v-model="searchForm.IsDelete" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+              <el-date-picker
+                v-model="searchForm.SetupTime"
+                size="mini"
+                type="date"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        <el-col>
+          <el-form-item label="注册资本（万元）">
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital1" placeholder="请输入内容"></el-input>
+            </el-col>
+            <el-col :span="1">
+              <span>&nbsp;~</span>
+            </el-col>
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital2" placeholder="请输入内容"></el-input>
+            </el-col>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
+        <el-col :span="24">
+            <el-form-item label="营业范围">
+              <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
-          </el-col>
+        </el-col>
+       
+       </el-row>
 
-        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -471,8 +317,24 @@
       return {
         canApply: false,
         dialogVisible: false,
+        //列表数据
+         countryoptions: [],
+        CityAry: [],
+        LinkCityAry:[],
+        countryprops: {
+        value: 'adcode',
+        label: 'name',
+        children: 'districts'
+        },
         //列表数据
         entityList: [],
+        OperTypeOptions:[],
+        UnitRelationOptions:[],
+        countryListOptions:[],
+        CompanyTypeOptions: [],
+        InOptions: [],
+        ManagementUnitOptions:[],
+        dictData: null,
         //分页参数
         size: 10,
         currentPage: 1,
@@ -489,62 +351,28 @@
         searchForm: {
           Id: '',
           SupplierName: '',
-          OilCertificateNo: '',
-          Grade: '',
-          MgrUnit: '',
-          OperType: '',
-          Country: '',
-          MaunAgent: '',
-          ConstructTeam: '',
-          CommercialNo: '',
-          OrganCode: '',
-          CountryTaxNo: '',
-          LocalTaxNo: '',
-          Address: '',
-          Province: '',
+          OperType:'',
+          SpecTypeCode:'',
+          Country:'',
+          InStyle:'',
+          MgrUnit:'',
+          PACNumber:'',
+          CommercialNo:'',
+          Province:'',
           City: '',
-          Street: '',
-          HouseNo: '',
-          ZipCode: '',
-          QualitySystemCert: '',
-          ProductQualityCert: '',
-          MaunLicense: '',
-          QualifCert: '',
-          QualifCertLevel: '',
-          SafetyLicense: '',
-          TechServiceLic: '',
-          TJInNotify: '',
-          SpecIndustryCert: '',
-          LegalPerson: '',
-          CategoryCode: '',
-          CategoryName: '',
-          RegCapital: '',
-          Currency: '',
-          ContactName: '',
-          CompanyType: '',
-          SetupTime: '',
-          DepositBank: '',
-          BankAccount: '',
-          EMail: '',
-          BankCreditRating: '',
-          Mobile: '',
-          Telphone: '',
-          Fax: '',
-          CompanyTel: '',
-          QQ: '',
-          CompanyUrl: '',
-          SpecSupplier: '',
-          SpecTypeCode: '',
-          SpecTypeName: '',
-          Remark: '',
-          IsDelete: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: '',
-
+          Street:'',
+          Address:'',
+          LinkProvince:'',
+          LinkCity:'',
+          LinkStreet:'',
+          LinkAddress:'',
+          LegalPerson:'',
+          ContactName:'',
+          CompanyType:'',
+          SetupTime:'',
+          RegCapital1:'',
+          RegCapital2:'',
+          BusinessScope:'',
         },
         tableColumns: [
 
@@ -921,7 +749,7 @@
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
       this.initDatas();
-      //this.getDictOptions()
+      this.getDictOptions()
     },
 
     methods: {
@@ -963,8 +791,15 @@
       },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
+           this.dictData = res.data.items
+           console.log(this.dictData)
+           this.OperTypeOptions = this.dictData['OperType']
+           this.UnitRelationOptions = this.dictData['UnitRelation']
+           this.InOptions = this.dictData['InOptions']
+           this.CompanyTypeOptions = this.dictData['CompanyType']
+           this.getCountryList(this.dictData['CountryList'])
+           this.ManagementUnitOptions=this.dictData['ManagementUnit']
+           this.getCityList(this.dictData['GaodeMapChinaAreas'])
 
         }).catch(err => {
           console.error(err)
@@ -992,8 +827,38 @@
         Object.assign(this.searchForm, this.searchFormReset);
         //this.searchForm = this.searchFormReset;
         this.CreateOn = ''
+        this.CityAry = []
+        this.LinkCityAry=[]
         this.initDatas()
       },
+      getCityList (val) {
+      let resultData = JSON.parse(val)
+      let countstr = JSON.stringify(resultData.districts[0].districts)
+      countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+      this.countryoptions = JSON.parse(countstr)
+    },
+      getCountryList (val) {
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
+          })
+        }
+      },
+      handleLinkAreaChange (value) {
+      this.searchForm.LinkProvince = value[0]
+      this.searchForm.LinkCity = value[1]
+      this.searchForm.LinkStreet = value[2]
+      },
+      handleAreaChange (value) {
+      this.searchForm.Province = value[0]
+      this.searchForm.City = value[1]
+      this.searchForm.Street = value[2]
+      },
       handleSearch() {
         this.currentPage = 1;
         this.dialogVisible = false;

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

@@ -89,8 +89,8 @@
       </el-pagination>
     </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="advancedsearchForm" label-width="110px">
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="750px">
+      <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
 
           <el-col :span="12">
@@ -105,301 +105,190 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
+        
+         <el-col :span="12">
+          <el-form-item label="供应商类型">
+            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="单位关系">
+            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+       <el-col :span="12">
+          <el-form-item label="国家">
+            <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
+              <el-option
+                v-for="item in countryListOptions"
+                :key="item.key"
+                :label="item.value"
+                :value="item.value">
+                <span style="float: left">{{ item.value }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
           <el-col :span="12">
-            <el-form-item label="工商注册号">
-              <el-input size="mini" v-model="searchForm.CommercialNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="组织机构代码">
-              <el-input size="mini" v-model="searchForm.OrganCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="税务登记证国税编号">
-              <el-input size="mini" v-model="searchForm.CountryTaxNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="税务登记证地税编号">
-              <el-input size="mini" v-model="searchForm.LocalTaxNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="中石油供应商证书号" label-width="130px">
-              <el-input size="mini" v-model="searchForm.OilCertificateNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="级别">
-              <el-input size="mini" v-model="searchForm.Grade" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="管理单位">
-              <el-input size="mini" v-model="searchForm.MgrUnit" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="单位关系">
-              <el-input size="mini" v-model="searchForm.SpecTypeCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="供应商类型">
-              <el-input size="mini" v-model="searchForm.OperType" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="国家">
-              <el-input size="mini" v-model="searchForm.Country" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="施工队伍名称">-->
-              <!--<el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-
-          <el-col :span="12">
-            <el-form-item label="单位地址">
-              <el-input size="mini" v-model="searchForm.Address" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="省直辖市">
-              <el-input size="mini" v-model="searchForm.Province" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="地市区县">
-              <el-input size="mini" v-model="searchForm.City" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="街道">
-              <el-input size="mini" v-model="searchForm.Street" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="门牌号">
-              <el-input size="mini" v-model="searchForm.HouseNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="邮编">
-              <el-input size="mini" v-model="searchForm.ZipCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="法定代表人姓名">
-              <el-input size="mini" v-model="searchForm.LegalPerson" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="注册资本">
-              <el-input size="mini" v-model="searchForm.RegCapital" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="币种">
-              <el-input size="mini" v-model="searchForm.Currency" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="联系人姓名">
-              <el-input size="mini" v-model="searchForm.ContactName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="准入方式">
+            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="管理单位" >
+            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="公司类型">
-              <el-input size="mini" v-model="searchForm.CompanyType" style="width:100%" placeholder="请输入"></el-input>
+        <el-col :span="12">
+          <el-form-item label="中石油准入证编号" >
+            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+ 
+ 
+        <el-col :span="12">
+          <el-form-item label="统一社会信用代码">
+            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="注册地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="CityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.Address"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="24">
+            <el-form-item label="通信地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="LinkCityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleLinkAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.LinkAddress"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="法人">
+              <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人">
+              <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="公司类型" prop="CompanyType" >
+              <el-select size="mini" v-model="searchForm.CompanyType" maxlength="50" filterable placeholder="请选择" style="width: 100%;">
+                <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
+                           style="width: 100%">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="成立时间">
-              <el-input size="mini" v-model="searchForm.SetupTime" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="开户银行">
-              <el-input size="mini" v-model="searchForm.DepositBank" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="银行账号">
-              <el-input size="mini" v-model="searchForm.BankAccount" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="财务电话">
-              <el-input size="mini" v-model="searchForm.CompanyTel" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="固定电话">
-              <el-input size="mini" v-model="searchForm.Telphone" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="传真">
-              <el-input size="mini" v-model="searchForm.Fax" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="电子邮箱">-->
-              <!--<el-input size="mini" v-model="searchForm.EMail" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <el-col :span="12">
-            <el-form-item label="银行信用等级">
-              <el-input size="mini" v-model="searchForm.BankCreditRating" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="24">
-            <el-form-item label="质量管理体系认证情况及认证机构">
-              <el-input size="mini" v-model="searchForm.QualitySystemCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="24">
-            <el-form-item label="产品质量认证情况及认证机构">
-              <el-input size="mini" v-model="searchForm.ProductQualityCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="24">
-            <el-form-item label="生产/制造许可证获证情况及编号">
-              <el-input size="mini" v-model="searchForm.MaunLicense" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="所代理制造商名称">
-              <el-input size="mini" v-model="searchForm.MaunAgent" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--<el-col :span="24">-->
-            <!--<el-form-item label="企业资质证书编号">-->
-              <!--<el-input size="mini" v-model="searchForm.QualifCert" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="企业资质证书级别">-->
-              <!--<el-input size="mini" v-model="searchForm.QualifCertLevel" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <el-col :span="12">
-            <el-form-item label="安全生产许可证">
-              <el-input size="mini" v-model="searchForm.SafetyLicense" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="技术服务类准入许可证">-->
-              <!--<el-input size="mini" v-model="searchForm.TechServiceLic" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="外地企业进津备案通知书">-->
-              <!--<el-input size="mini" v-model="searchForm.TJInNotify" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="行业特殊要求的认证证书">-->
-              <!--<el-input size="mini" v-model="searchForm.SpecIndustryCert" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="行业类别代码">-->
-              <!--<el-input size="mini" v-model="searchForm.CategoryCode" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="行业类别名称">-->
-              <!--<el-input size="mini" v-model="searchForm.CategoryName" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="移动电话">-->
-              <!--<el-input size="mini" v-model="searchForm.Mobile" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="QQ号码">-->
-              <!--<el-input size="mini" v-model="searchForm.QQ" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="公司网址">-->
-              <!--<el-input size="mini" v-model="searchForm.CompanyUrl" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="是否特殊业务供应商(可不招标)">-->
-              <!--<el-input size="mini" v-model="searchForm.SpecSupplier" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!---->
-
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）">-->
-              <!--<el-input size="mini" v-model="searchForm.SpecTypeName" style="width:100%" placeholder="请输入"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
+              <el-date-picker
+                v-model="searchForm.SetupTime"
+                size="mini"
+                type="date"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        <el-col>
+          <el-form-item label="注册资本（万元）">
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital1" placeholder="请输入内容"></el-input>
+            </el-col>
+            <el-col :span="1">
+              <span>&nbsp;~</span>
+            </el-col>
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital2" placeholder="请输入内容"></el-input>
+            </el-col>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+        <el-col :span="24">
+            <el-form-item label="营业范围">
+              <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
-          </el-col>
+        </el-col>
+       
+       </el-row>
 
-        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -426,8 +315,23 @@
       return {
         canApply: false,
         dialogVisible: false,
+        countryoptions: [],
+        CityAry: [],
+        LinkCityAry:[],
+        countryprops: {
+        value: 'adcode',
+        label: 'name',
+        children: 'districts'
+        },
         //列表数据
         entityList: [],
+        OperTypeOptions:[],
+        UnitRelationOptions:[],
+        countryListOptions:[],
+        CompanyTypeOptions: [],
+        InOptions: [],
+        ManagementUnitOptions:[],
+        dictData: null,
         //分页参数
         size: 10,
         currentPage: 1,
@@ -444,62 +348,28 @@
         searchForm: {
           Id: '',
           SupplierName: '',
-          OilCertificateNo: '',
-          Grade: '',
-          MgrUnit: '',
-          OperType: '',
-          Country: '',
-          MaunAgent: '',
-          ConstructTeam: '',
-          CommercialNo: '',
-          OrganCode: '',
-          CountryTaxNo: '',
-          LocalTaxNo: '',
-          Address: '',
-          Province: '',
+          OperType:'',
+          SpecTypeCode:'',
+          Country:'',
+          InStyle:'',
+          MgrUnit:'',
+          PACNumber:'',
+          CommercialNo:'',
+          Province:'',
           City: '',
-          Street: '',
-          HouseNo: '',
-          ZipCode: '',
-          QualitySystemCert: '',
-          ProductQualityCert: '',
-          MaunLicense: '',
-          QualifCert: '',
-          QualifCertLevel: '',
-          SafetyLicense: '',
-          TechServiceLic: '',
-          TJInNotify: '',
-          SpecIndustryCert: '',
-          LegalPerson: '',
-          CategoryCode: '',
-          CategoryName: '',
-          RegCapital: '',
-          Currency: '',
-          ContactName: '',
-          CompanyType: '',
-          SetupTime: '',
-          DepositBank: '',
-          BankAccount: '',
-          EMail: '',
-          BankCreditRating: '',
-          Mobile: '',
-          Telphone: '',
-          Fax: '',
-          CompanyTel: '',
-          QQ: '',
-          CompanyUrl: '',
-          SpecSupplier: '',
-          SpecTypeCode: '',
-          SpecTypeName: '',
-          Remark: '',
-          IsDelete: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: '',
-
+          Street:'',
+          Address:'',
+          LinkProvince:'',
+          LinkCity:'',
+          LinkStreet:'',
+          LinkAddress:'',
+          LegalPerson:'',
+          ContactName:'',
+          CompanyType:'',
+          SetupTime:'',
+          RegCapital1:'',
+          RegCapital2:'',
+          BusinessScope:'',
         },
         tableColumns: [
 
@@ -876,7 +746,7 @@
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
       this.initDatas();
-      //this.getDictOptions()
+      this.getDictOptions()
     },
 
     methods: {
@@ -887,6 +757,16 @@
           return true
         }
       },
+      handleLinkAreaChange (value) {
+      this.searchForm.LinkProvince = value[0]
+      this.searchForm.LinkCity = value[1]
+      this.searchForm.LinkStreet = value[2]
+      },
+      handleAreaChange (value) {
+      this.searchForm.Province = value[0]
+      this.searchForm.City = value[1]
+      this.searchForm.Street = value[2]
+      },
       initDatas() {
         //分页及列表条件
         let params = {
@@ -917,14 +797,38 @@
       },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
+           this.dictData = res.data.items
+           console.log(this.dictData)
+           this.OperTypeOptions = this.dictData['OperType']
+           this.UnitRelationOptions = this.dictData['UnitRelation']
+           this.InOptions = this.dictData['InOptions']
+           this.CompanyTypeOptions = this.dictData['CompanyType']
+           this.getCountryList(this.dictData['CountryList'])
+           this.ManagementUnitOptions=this.dictData['ManagementUnit']
+           this.getCityList(this.dictData['GaodeMapChinaAreas'])
 
         }).catch(err => {
           console.error(err)
         })
       },
-
+    getCityList (val) {
+      let resultData = JSON.parse(val)
+      let countstr = JSON.stringify(resultData.districts[0].districts)
+      countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+      this.countryoptions = JSON.parse(countstr)
+    },
+      getCountryList (val) {
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
+          })
+        }
+      },
       searchCommand(command) {
         if (command == 'search') {
           this.dialogVisible = true
@@ -945,6 +849,8 @@
       clearSearch() {
         Object.assign(this.searchForm, this.searchFormReset);
         //this.searchForm = this.searchFormReset;
+        this.CityAry = []
+        this.LinkCityAry=[]
         this.CreateOn = ''
         this.initDatas()
       },

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

@@ -92,7 +92,7 @@
     </el-card>
 
     <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="advancedsearchForm" label-width="110px">
+      <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
 
           <el-col :span="12">
@@ -102,349 +102,195 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="企业名称">
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
+        
+         <!-- <el-col :span="12">
+          <el-form-item label="供应商类型">
+            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col> -->
+
+        <el-col :span="12">
+          <el-form-item label="单位关系">
+            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+       <el-col :span="12">
+          <el-form-item label="国家">
+            <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
+              <el-option
+                v-for="item in countryListOptions"
+                :key="item.key"
+                :label="item.value"
+                :value="item.value">
+                <span style="float: left">{{ item.value }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
           <el-col :span="12">
-            <el-form-item label="中石油供应商证书号">
-              <el-input size="mini" v-model="searchForm.OilCertificateNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="级别">
-              <el-input size="mini" v-model="searchForm.Grade" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="管理单位">
-              <el-input size="mini" v-model="searchForm.MgrUnit" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="经营方式">
-              <el-input size="mini" v-model="searchForm.OperType" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="国家">
-              <el-input size="mini" v-model="searchForm.Country" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="所代理制造商名称">
-              <el-input size="mini" v-model="searchForm.MaunAgent" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="施工队伍名称">
-              <el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="工商注册号">
-              <el-input size="mini" v-model="searchForm.CommercialNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="组织机构代码">
-              <el-input size="mini" v-model="searchForm.OrganCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="税务登记证国税编号">
-              <el-input size="mini" v-model="searchForm.CountryTaxNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="税务登记证地税编号">
-              <el-input size="mini" v-model="searchForm.LocalTaxNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="单位地址">
-              <el-input size="mini" v-model="searchForm.Address" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="省直辖市">
-              <el-input size="mini" v-model="searchForm.Province" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="地市区县">
-              <el-input size="mini" v-model="searchForm.City" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="街道">
-              <el-input size="mini" v-model="searchForm.Street" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="门牌号">
-              <el-input size="mini" v-model="searchForm.HouseNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="邮编">
-              <el-input size="mini" v-model="searchForm.ZipCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="质量管理体系认证情况及认证机构">
-              <el-input size="mini" v-model="searchForm.QualitySystemCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="产品质量认证情况及认证机构">
-              <el-input size="mini" v-model="searchForm.ProductQualityCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="生产制造许可证获证情况及编号">
-              <el-input size="mini" v-model="searchForm.MaunLicense" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="企业资质证书编号">
-              <el-input size="mini" v-model="searchForm.QualifCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="企业资质证书级别">
-              <el-input size="mini" v-model="searchForm.QualifCertLevel" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="安全生产许可证">
-              <el-input size="mini" v-model="searchForm.SafetyLicense" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="技术服务类准入许可证">
-              <el-input size="mini" v-model="searchForm.TechServiceLic" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="外地企业进津备案通知书">
-              <el-input size="mini" v-model="searchForm.TJInNotify" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="行业特殊要求的认证证书">
-              <el-input size="mini" v-model="searchForm.SpecIndustryCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="法定代表人姓名">
-              <el-input size="mini" v-model="searchForm.LegalPerson" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="行业类别代码">
-              <el-input size="mini" v-model="searchForm.CategoryCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="行业类别名称">
-              <el-input size="mini" v-model="searchForm.CategoryName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="注册资本">
-              <el-input size="mini" v-model="searchForm.RegCapital" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="币种">
-              <el-input size="mini" v-model="searchForm.Currency" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="联系人姓名">
-              <el-input size="mini" v-model="searchForm.ContactName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="准入方式">
+            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="管理单位" >
+            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="公司类型">
-              <el-input size="mini" v-model="searchForm.CompanyType" style="width:100%" placeholder="请输入"></el-input>
+        <el-col :span="12">
+          <el-form-item label="中石油准入证编号" >
+            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+ 
+ 
+        <el-col :span="12">
+          <el-form-item label="统一社会信用代码">
+            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="注册地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="CityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.Address"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="24">
+            <el-form-item label="通信地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="LinkCityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleLinkAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.LinkAddress"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="法人">
+              <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人">
+              <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="公司类型" prop="CompanyType" >
+              <el-select size="mini" v-model="searchForm.CompanyType" maxlength="50" filterable placeholder="请选择" style="width: 100%;">
+                <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
+                           style="width: 100%">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="成立时间">
-              <el-input size="mini" v-model="searchForm.SetupTime" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="开户银行">
-              <el-input size="mini" v-model="searchForm.DepositBank" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="银行账号">
-              <el-input size="mini" v-model="searchForm.BankAccount" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="电子邮箱">
-              <el-input size="mini" v-model="searchForm.EMail" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="银行信用等级">
-              <el-input size="mini" v-model="searchForm.BankCreditRating" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="移动电话">
-              <el-input size="mini" v-model="searchForm.Mobile" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="固定电话">
-              <el-input size="mini" v-model="searchForm.Telphone" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="传真">
-              <el-input size="mini" v-model="searchForm.Fax" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="公司电话">
-              <el-input size="mini" v-model="searchForm.CompanyTel" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="QQ号码">
-              <el-input size="mini" v-model="searchForm.QQ" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="公司网址">
-              <el-input size="mini" v-model="searchForm.CompanyUrl" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="是否特殊业务供应商(可不招标)">
-              <el-input size="mini" v-model="searchForm.SpecSupplier" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）">
-              <el-input size="mini" v-model="searchForm.SpecTypeCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）">
-              <el-input size="mini" v-model="searchForm.SpecTypeName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="删除状态，0正常，1已删除">
-              <el-input size="mini" v-model="searchForm.IsDelete" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+              <el-date-picker
+                v-model="searchForm.SetupTime"
+                size="mini"
+                type="date"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        <el-col>
+          <el-form-item label="注册资本（万元）">
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital1" placeholder="请输入内容"></el-input>
+            </el-col>
+            <el-col :span="1">
+              <span>&nbsp;~</span>
+            </el-col>
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital2" placeholder="请输入内容"></el-input>
+            </el-col>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
+        <el-col :span="24">
+            <el-form-item label="营业范围">
+              <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
-          </el-col>
+        </el-col>
+       
+       </el-row>
 
-        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -472,7 +318,23 @@
         canApply: false,
         dialogVisible: false,
         //列表数据
+        countryoptions: [],
+        CityAry: [],
+        LinkCityAry:[],
+        countryprops: {
+        value: 'adcode',
+        label: 'name',
+        children: 'districts'
+        },
+        //列表数据
         entityList: [],
+        OperTypeOptions:[],
+        UnitRelationOptions:[],
+        countryListOptions:[],
+        CompanyTypeOptions: [],
+        InOptions: [],
+        ManagementUnitOptions:[],
+        dictData: null,
         //分页参数
         size: 10,
         currentPage: 1,
@@ -490,65 +352,31 @@
           SupplierId: '',
           CertId: '',
         },
-        searchForm: {
+          searchForm: {
           Id: '',
           SupplierName: '',
-          OilCertificateNo: '',
-          Grade: '',
-          MgrUnit: '',
-          OperType: '',
-          Country: '',
-          MaunAgent: '',
-          ConstructTeam: '',
-          CommercialNo: '',
-          OrganCode: '',
-          CountryTaxNo: '',
-          LocalTaxNo: '',
-          Address: '',
-          Province: '',
+          OperType:'',
+          SpecTypeCode:'',
+          Country:'',
+          InStyle:'',
+          MgrUnit:'',
+          PACNumber:'',
+          CommercialNo:'',
+          Province:'',
           City: '',
-          Street: '',
-          HouseNo: '',
-          ZipCode: '',
-          QualitySystemCert: '',
-          ProductQualityCert: '',
-          MaunLicense: '',
-          QualifCert: '',
-          QualifCertLevel: '',
-          SafetyLicense: '',
-          TechServiceLic: '',
-          TJInNotify: '',
-          SpecIndustryCert: '',
-          LegalPerson: '',
-          CategoryCode: '',
-          CategoryName: '',
-          RegCapital: '',
-          Currency: '',
-          ContactName: '',
-          CompanyType: '',
-          SetupTime: '',
-          DepositBank: '',
-          BankAccount: '',
-          EMail: '',
-          BankCreditRating: '',
-          Mobile: '',
-          Telphone: '',
-          Fax: '',
-          CompanyTel: '',
-          QQ: '',
-          CompanyUrl: '',
-          SpecSupplier: '',
-          SpecTypeCode: '',
-          SpecTypeName: '',
-          Remark: '',
-          IsDelete: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: ''
-
+          Street:'',
+          Address:'',
+          LinkProvince:'',
+          LinkCity:'',
+          LinkStreet:'',
+          LinkAddress:'',
+          LegalPerson:'',
+          ContactName:'',
+          CompanyType:'',
+          SetupTime:'',
+          RegCapital1:'',
+          RegCapital2:'',
+          BusinessScope:'',
         },
         tableColumns: [
 
@@ -925,7 +753,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
       //查询列表
       this.initDatas()
-      //this.getDictOptions()
+      this.getDictOptions()
     },
 
     methods: {
@@ -964,22 +792,56 @@
           console.error(err)
         })
       },
-      getDictOptions () {
+       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
+           this.dictData = res.data.items
+           console.log(this.dictData)
+           this.OperTypeOptions = this.dictData['OperType']
+           this.UnitRelationOptions = this.dictData['UnitRelation']
+           this.InOptions = this.dictData['InOptions']
+           this.CompanyTypeOptions = this.dictData['CompanyType']
+           this.getCountryList(this.dictData['CountryList'])
+           this.ManagementUnitOptions=this.dictData['ManagementUnit']
+           this.getCityList(this.dictData['GaodeMapChinaAreas'])
 
         }).catch(err => {
           console.error(err)
         })
       },
-
+    getCityList (val) {
+      let resultData = JSON.parse(val)
+      let countstr = JSON.stringify(resultData.districts[0].districts)
+      countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+      this.countryoptions = JSON.parse(countstr)
+    },
+    getCountryList (val) {
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
+          })
+        }
+      },
       searchCommand(command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
         }
+      },
+       handleLinkAreaChange (value) {
+      this.searchForm.LinkProvince = value[0]
+      this.searchForm.LinkCity = value[1]
+      this.searchForm.LinkStreet = value[2]
+      },
+      handleAreaChange (value) {
+      this.searchForm.Province = value[0]
+      this.searchForm.City = value[1]
+      this.searchForm.Street = value[2]
       },
       //列表排序功能
       orderby(column) {
@@ -995,6 +857,8 @@
         Object.assign(this.searchForm, this.searchFormReset);
         //this.searchForm = this.searchFormReset;
         this.CreateOn = ''
+        this.CityAry = []
+        this.LinkCityAry=[]
         this.initDatas()
       },
       handleSearch() {