供方信息查询，样式及数据

src/dashoo.cn/backend/api/business/oilsupplier/selectbusiness/selectservice.go

@@ -38,11 +38,11 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 	sqlCount += `group by a.Id,b.Id `+having+`) f`*/
 	// TODO 推荐单位不从供方注册表取
 	var sql string
-	sql = `select SQL_CALC_FOUND_ROWS a.Id,a.SupplierName,b.AccessCardNo,max(c.OldSupplierName) OldSupplierName,b.SupplierTypeCode,`
+	sql = `select SQL_CALC_FOUND_ROWS a.Id,a.SupplierName,b.AccessCardNo, a.OldSupplierName, b.SupplierTypeCode,`
 	sql += `a.LegalPerson,a.RegCapital,a.Mobile,b.AuditDate,b.ApplyTime,b.EffectEndTime,b.InFlag,a.ContactName,a.CommercialNo, `
 	sql += `a.DepositBank,a.HseTraining,a.CompanyType,a.SetupTime,a.Address,a.Province,a.City,a.Street, `
 	sql += `a.LinkAddress,a.LinkProvince,a.LinkCity,a.LinkStreet,a.BusinessScope, `
-	sql += `b.InStyle, b.Id CertId, f.FullName, g.CheckUnitName, b.Remark, `
+	sql += `b.InStyle, b.Id CertId, f.FullName, b.RecUnitName as CheckUnitName, b.Remark, `
 	sql += `group_concat(distinct e.NeedFileType) NeedFileType `
 	if liftjoon != "" {
 		sql += `,group_concat(distinct d.Name) CerSubName `
@@ -50,13 +50,13 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 	sql += `from ` + supplierTableName + ` a `
 	sql += `left join ` + supplierCertTableName + ` b on b.SupplierId = a.Id `
 	sql += `left join  Base_Organize f on f.Id = b.ThirdAudit `
-	sql += `left join  OilCorporateInfo g on g.CommercialNo = a.CommercialNo `
-	sql += `left join ` + OilInfoChangeName + ` c  on c.SupplierId = a.Id `
+	// sql += `left join  OilCorporateInfo g on g.CommercialNo = a.CommercialNo `
+	// sql += `left join ` + OilInfoChangeName + ` c  on c.SupplierId = a.Id `
 	sql += liftjoon
 	sql += `left join ` + OilSupplierFileName + ` e  on e.SupplierId = a.Id `
 	sql += `where ` + where
 
-	sql += ` group by a.Id,b.Id,g.CheckUnitName ` + having
+	sql += ` group by a.Id,b.Id ` + having
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `
 	} else {

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

@@ -7,6 +7,7 @@ import (
 type OilSupplier struct {
 	Id                  int       `xorm:"not null pk autoincr INT(10)"`
 	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
+	OldSupplierName     string    `xorm:"comment('曾用名') VARCHAR(255)"`
 	OilCertificateNo    string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
 	Grade               string    `xorm:"comment('级别') VARCHAR(2)"`
 	MgrUnit             string    `xorm:"comment('管理单位') VARCHAR(50)"`
@@ -222,7 +223,7 @@ type OilSupplierSelect struct {
 	Mobile           string    //移动电话
 	AuditDate        time.Time //最后一次年审
 	ApplyTime        time.Time //申请时间
-	EffectEndTime	 time.Time //有效期至
+	EffectEndTime    time.Time //有效期至
 	InFlag           string    //状态
 	ContactName      string    //联系人姓名
 	CommercialNo     string    //统一社会信用代码
@@ -277,18 +278,18 @@ type OilSupplierContrast struct {
 	InStyle          string    //准入方式
 	Remark           string
 
-	SubCnt           int
-	NoSubCnt           int
-	HeaderCodes           string
-	SubNames           string
-	CertSubCodes           string
-	SubClassIds           string
-	Checked           string   // 0没问题 1缺资质
-	MinClassId           string   // subclassid的最小值
-	OneTwoCount         int   // 1变2
-	TwoOneCount           int   // 2变1
-	IsDelete           int   // 2变1
-	ZzName           string   // 缺少的资质名
+	SubCnt       int
+	NoSubCnt     int
+	HeaderCodes  string
+	SubNames     string
+	CertSubCodes string
+	SubClassIds  string
+	Checked      string // 0没问题 1缺资质
+	MinClassId   string // subclassid的最小值
+	OneTwoCount  int    // 1变2
+	TwoOneCount  int    // 2变1
+	IsDelete     int    // 2变1
+	ZzName       string // 缺少的资质名
 }
 
 //type NeedFileTypeStruct struct {
@@ -387,9 +388,9 @@ type ExpireFile struct {
 }
 
 type ManualDelete struct {
-	Code         string
-	Name 		 string
-	Operation    string
+	Code      string
+	Name      string
+	Operation string
 }
 
 type ExpireFileList struct {
@@ -497,7 +498,7 @@ type OilSupplierInte struct {
 
 const (
 	// 管理单位
-	MGRUNIT string = "大港油田分公司"
+	MGRUNIT           string = "大港油田分公司"
 	BIDDING_BOOK_NAME string = "中标通知书"
 
 	// 企业信息-级别
@@ -511,15 +512,15 @@ const (
 	GOODS_LEVEL_2 string = "2"
 
 	// 准入方式
-	IN_STYPE_REVIEW string = "1" // 评审准入
+	IN_STYPE_REVIEW        string = "1" // 评审准入
 	IN_STYPE_GOODS_LEVEL_1 string = "2" // 一级物资备案准入
 	IN_STYPE_GOODS_LEVEL_2 string = "3" // 二级物资备案准入
-	IN_STYPE_STRATEGIC string = "4" // 战略合作准入
-	IN_STYPE_PLURALISM string = "5" // 内部多元准入
-	IN_STYPE_BIDDING string = "6" // 招标准入
+	IN_STYPE_STRATEGIC     string = "4" // 战略合作准入
+	IN_STYPE_PLURALISM     string = "5" // 内部多元准入
+	IN_STYPE_BIDDING       string = "6" // 招标准入
 
 	//准入类型 SupplierTypeCode
-	SUPPLIER_TYPE_GOODS string = "01" // 物资类
-	SUPPLIER_TYPE_BASIC string = "02" // 基建类
+	SUPPLIER_TYPE_GOODS      string = "01" // 物资类
+	SUPPLIER_TYPE_BASIC      string = "02" // 基建类
 	SUPPLIER_TYPE_TECHNOLOGY string = "03" // 技术服务类
 )

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -73,7 +73,8 @@ func (s *TmpzcgtSession) InsertSupplier() error {
 	CompanyUrl,
 	Remark,
 	CreateBy,
-	SetupTime
+	SetupTime,
+	OilCertificateNo
 ) SELECT
 	企业名称 AS SupplierName,
 	级别 AS Grade,
@@ -115,7 +116,8 @@ func (s *TmpzcgtSession) InsertSupplier() error {
 	公司网址 AS CompanyUrl,
 	备注 AS Remark,
 	'导入' As CreateBy,
-	STR_TO_DATE(IF(成立时间='', NULL, 成立时间),IF(LENGTH(成立时间)>8 or locate('-',成立时间) >0, '%Y-%m-%d', '%Y%m%d')) AS SetupTime
+	STR_TO_DATE(IF(成立时间='', NULL, 成立时间),IF(LENGTH(成立时间)>8 or locate('-',成立时间) >0, '%Y-%m-%d', '%Y%m%d')) AS SetupTime,
+    中石油供应商证书号 as OilCertificateNo
 FROM 
 	T_资格预审表 WHERE ID IN (SELECT MAX(ID) FROM T_资格预审表 GROUP BY 企业名称);` //WHERE 准入标识 != '取消'
 	_, err := s.DBE.Query(sql)

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

@@ -107,13 +107,13 @@ func (this *SelectController) GetTList() {
 	}
 
 	if model.OldSupplierName != "" {
-		where = where + " and OldSupplierName like '%" + model.OldSupplierName + "%'"
+		where = where + " and a.OldSupplierName like '%" + model.OldSupplierName + "%'"
 	}
 	if FullId != "" {
 		where = where + " and f.Id = '" + FullId + "'"
 	}
 	if CheckUId != "" {
-		where = where + " and g.CheckUnitId = '" + CheckUId + "'"
+		where = where + " and b.RecUnitId = '" + CheckUId + "'"
 	}
 
 	//准入类别（基建，物资，技术服务）

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -9,8 +9,8 @@
     <!--内框顶部显示-->
     <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
       <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 供方信息查询
+       <span>
+          <i class="icon icon-table2"></i> <!--供方信息查询-->
         </span>
 
         <el-form
@@ -462,7 +462,7 @@
 
     <!--查询框-->
     <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form label-width="135px">
+      <el-form label-width="135px" size="mini">
         <el-row>
           <el-col :span="12">
             <el-form-item label="准入编码">
@@ -638,22 +638,24 @@
                               end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="注册资本(万元)">
+              <el-col :span="11">
+                <el-input size="mini" v-model="searchForm.RegCapital1" placeholder="请输入内容"></el-input>
+              </el-col>
+              <el-col :span="2">
+                <span>&nbsp;~</span>
+              </el-col>
+              <el-col :span="11">
+                <el-input size="mini" v-model="searchForm.RegCapital2" placeholder="请输入内容"></el-input>
+              </el-col>
+            </el-form-item>
+          </el-col>
+
         </el-row>
         <el-row>
-          <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-row>
 
-        <el-row>
           <el-col :span="24">
             <el-form-item label="注册地址">
               <el-row>