加2列推荐单位 和 专业处室审核

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

@@ -20,7 +20,7 @@ func GetSelectService(xormEngine *xorm.Engine) *SelectService {
 	return s
 }
 
-func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, supplierCertTableName, OilInfoChangeName, OilSupplierCertSubName,
+func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, supplierCertTableName, OilInfoChangeName, OilCorporateInfoName, OilSupplierCertSubName,
 	OilSupplierFileName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where,having, liftjoon string) (total int64) {
 
 	//获取总记录数
@@ -42,19 +42,21 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 	sql += `a.LegalPerson,a.RegCapital,a.Mobile,b.AuditDate,b.ApplyTime,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,`
+	sql += `b.InStyle, b.Id CertId, f.FullName, g.CheckUnitName, `
 	sql += `group_concat(distinct e.NeedFileType) NeedFileType `
 	if liftjoon != "" {
 		sql += `,group_concat(distinct d.Name) CerSubName `
 	}
 	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 += liftjoon
 	sql += `left join ` + OilSupplierFileName + ` e  on e.SupplierId = a.Id `
 	sql += `where ` + where
 
-	sql += ` group by a.Id,b.Id ` + having
+	sql += ` group by a.Id,b.Id,g.CheckUnitName ` + having
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `
 	} else {

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

@@ -239,6 +239,8 @@ type OilSupplierSelect struct {
 	NeedFileType     string    //资质
 	CerSubName       string    //准入范围
 	InStyle          string    //准入方式
+	FullName         string    //专业科室审批
+	CheckUnitName    string    //推荐单位
 }
 
 //type NeedFileTypeStruct struct {

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

@@ -98,6 +98,12 @@ func (this *SelectController) GetTList() {
 	if model.OldSupplierName != "" {
 		where = where + " and OldSupplierName like '%" + model.OldSupplierName + "%'"
 	}
+	if model.FullName != "" {
+		where = where + " and f.FullName like '%" + model.FullName + "%'"
+	}
+	if model.CheckUnitName != "" {
+		where = where + " and g.CheckUnitName like '%" + model.CheckUnitName + "%'"
+	}
 
 	//准入类别（基建，物资，技术服务）
 	if model.SupplierTypeCode != "" {
@@ -226,7 +232,7 @@ func (this *SelectController) GetTList() {
 	svc := selectbusiness.GetSelectService(utils.DBE)
 	var list []supplier.OilSupplierSelect
 
-	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, OilInfoChangeName,OilSupplierCertSubName,
+	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, OilInfoChangeName,OilCorporateInfoName,OilSupplierCertSubName,
 		OilSupplierFileName, page.CurrentPage, page.Size, orderby, asc, &list, where,having, leftjoin)
 
 	var datainfo DataInfo

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -137,6 +137,12 @@
                         </router-link>
                       </el-col>
                     </el-row>
+                    <el-row>
+                      <router-link :to="'/loginclient'">
+                        <el-button type="text"
+                                  round>体验最新登录版本</el-button>
+                      </router-link>
+                    </el-row>
                   </el-form>
                 </el-col>
               </el-row>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/index.vue

@@ -2,12 +2,12 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>大港油田{{cardTitle}}目录</el-breadcrumb-item>
+      <el-breadcrumb-item>{{cardTitle}}目录</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);" v-loading="loading">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 大港油田{{cardTitle}}目录
+          <i class="icon icon-table2"></i> {{cardTitle}}目录
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="时间">

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

@@ -134,6 +134,8 @@
           </template>
         </el-table-column>
         <el-table-column label="企业曾用名" width="280px" prop="OldSupplierName" align="center"></el-table-column>
+        <el-table-column label="推荐单位" width="280px" prop="CheckUnitName" align="center"></el-table-column>
+        <el-table-column label="专业处室审核" width="280px" prop="FullName" align="center"></el-table-column>
       </el-table>
 
       <!-- 分页 -->
@@ -561,6 +563,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+        <el-col :span="12">
+          <el-form-item label="推荐单位">
+            <el-input size="mini" v-model="searchForm.CheckUnitName" placeholder="请输入内容"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="专业科室(审批)">
+            <el-input size="mini" v-model="searchForm.FullName" placeholder="请输入内容"></el-input>
+          </el-form-item>
+        </el-col>
+        </el-row>
         <el-row>
           <el-form-item label="注册资本（万元）">
             <el-col :span="5">
@@ -891,7 +905,9 @@ export default {
         HseTraining: '',
         // NeedFileType: [],
         NeedFileType: '',
-        CerSubName: ''
+        CerSubName: '',
+        FullName: '',
+        CheckUnitName: ''
       },
       searchFormSub: {
         Code: '',
@@ -1136,6 +1152,7 @@ export default {
         .getCompanyList(params, this.searchForm, this.$axios)
         .then(res => {
           this.entityList = res.data.items
+          console.log(res,"aaaaaaaaaaaaaaaaaaaaa")
           this.currentItemCount = res.data.currentItemCount
           this.loading = false
         })