huangxiao hace 1 mes
padre
commit
aa7d1a9a1d

+ 18 - 7
src/main/java/net/mingsoft/tf/action/EnterpriseAction.java

@@ -48,13 +48,13 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn;
 /**
 * 企业管理管理控制层
 * @author 阿白
-* 创建日期:2025年12月13日 上午11:42:16<br/>
+* 创建日期:2025年12月26日 下午4:09:36<br/>
 * 历史修订:<br/>
 */
 @Tag(name = "后台-企业管理接口")
 @Controller("tfEnterpriseAction")
 @RequestMapping("/${ms.manager.path}/tf/enterprise")
-public class EnterpriseAction extends net.mingsoft.tf.action.BaseAction{
+public class EnterpriseAction extends BaseAction{
 
 
     /**
@@ -89,17 +89,19 @@ public class EnterpriseAction extends net.mingsoft.tf.action.BaseAction{
     */
     @Operation(summary = "查询企业管理列表接口")
     @Parameters({
-        @Parameter(name = "enterpriseIntroduction", description = "企业简介", in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseName", description = "企业名称", in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseType", description = "企业类型", in = ParameterIn.QUERY),
+        @Parameter(name = "enterpriseBooth", description = "展位号", in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseContact", description = "联系人", in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseTel", description = "联系电话", in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseAddress", description = "企业地址", in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseEntryTime", description = "入驻时间", in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseOperatingStatus", description = "经营状态", in = ParameterIn.QUERY),
+        @Parameter(name = "enterpriseIntroduction", description = "企业简介", in = ParameterIn.QUERY),
     })
     @RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST})
     @ResponseBody
+    @RequiresPermissions("tf:enterprise:view")
     public ResultData list(@ModelAttribute @Parameter(hidden = true) EnterpriseEntity enterprise) {
         BasicUtil.startPage();
         List enterpriseList = null;
@@ -121,6 +123,7 @@ public class EnterpriseAction extends net.mingsoft.tf.action.BaseAction{
     @Parameter(name = "id", description = "主键ID", required =true,in = ParameterIn.QUERY)
     @GetMapping("/get")
     @ResponseBody
+    @RequiresPermissions("tf:enterprise:view")
     public ResultData get(@ModelAttribute @Parameter(hidden = true) EnterpriseEntity enterprise) {
         if (StringUtils.isBlank(enterprise.getId())) {
             return ResultData.build().error(getResString("err.error",this.getResString("id")));
@@ -136,15 +139,16 @@ public class EnterpriseAction extends net.mingsoft.tf.action.BaseAction{
     */
     @Operation(summary = "保存企业管理列表接口")
     @Parameters({
-        @Parameter(name = "enterpriseIntroduction", description = "企业简介", required = false, in = ParameterIn.QUERY),
-        @Parameter(name = "enterpriseLogo", description = "LOGO", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseName", description = "企业名称", required = true, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseType", description = "企业类型", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "enterpriseBooth", description = "展位号", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseContact", description = "联系人", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseTel", description = "联系电话", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseAddress", description = "企业地址", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseEntryTime", description = "入驻时间", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseOperatingStatus", description = "经营状态", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "enterpriseIntroduction", description = "企业简介", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "enterpriseLogo", description = "LOGO", required = false, in = ParameterIn.QUERY),
     })
     @PostMapping("/save")
     @ResponseBody
@@ -159,6 +163,9 @@ public class EnterpriseAction extends net.mingsoft.tf.action.BaseAction{
         if (!StringUtil.checkLength(enterprise.getEnterpriseName()+"", 0, 255)) {
           return ResultData.build().error(getResString("err.length", this.getResString("enterprise.name"), "0", "255"));
         }
+        if (  StringUtils.isNotBlank(enterprise.getEnterpriseBooth()) && !StringUtil.checkLength(enterprise.getEnterpriseBooth()+"", 0, 255)) {
+          return ResultData.build().error(getResString("err.length", this.getResString("enterprise.booth"), "0", "255"));
+        }
         if (  StringUtils.isNotBlank(enterprise.getEnterpriseContact()) && !StringUtil.checkLength(enterprise.getEnterpriseContact()+"", 0, 255)) {
           return ResultData.build().error(getResString("err.length", this.getResString("enterprise.contact"), "0", "255"));
         }
@@ -195,15 +202,16 @@ public class EnterpriseAction extends net.mingsoft.tf.action.BaseAction{
     @Operation(summary = "更新企业管理列表接口")
     @Parameters({
         @Parameter(name = "id", description = "主键ID", required =true,in = ParameterIn.QUERY),
-        @Parameter(name = "enterpriseIntroduction", description = "企业简介", required = false, in = ParameterIn.QUERY),
-        @Parameter(name = "enterpriseLogo", description = "LOGO", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseName", description = "企业名称", required = true, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseType", description = "企业类型", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "enterpriseBooth", description = "展位号", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseContact", description = "联系人", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseTel", description = "联系电话", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseAddress", description = "企业地址", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseEntryTime", description = "入驻时间", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "enterpriseOperatingStatus", description = "经营状态", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "enterpriseIntroduction", description = "企业简介", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "enterpriseLogo", description = "LOGO", required = false, in = ParameterIn.QUERY),
     })
     @PostMapping("/update")
     @ResponseBody
@@ -223,6 +231,9 @@ public class EnterpriseAction extends net.mingsoft.tf.action.BaseAction{
         if (!StringUtil.checkLength(enterprise.getEnterpriseName()+"", 0, 255)) {
           return ResultData.build().error(getResString("err.length", this.getResString("enterprise.name"), "0", "255"));
         }
+        if (  StringUtils.isNotBlank(enterprise.getEnterpriseBooth()) && !StringUtil.checkLength(enterprise.getEnterpriseBooth()+"", 0, 255)) {
+          return ResultData.build().error(getResString("err.length", this.getResString("enterprise.booth"), "0", "255"));
+        }
         if (  StringUtils.isNotBlank(enterprise.getEnterpriseContact()) && !StringUtil.checkLength(enterprise.getEnterpriseContact()+"", 0, 255)) {
           return ResultData.build().error(getResString("err.length", this.getResString("enterprise.contact"), "0", "255"));
         }

+ 8 - 2
src/main/java/net/mingsoft/tf/biz/IEnterpriseBiz.java

@@ -3,14 +3,20 @@ package net.mingsoft.tf.biz;
 import net.mingsoft.base.biz.IBaseBiz;
 import net.mingsoft.tf.entity.EnterpriseEntity;
 
+import java.util.List;
 
 /**
  * 企业管理业务
+ *
  * @author 阿白
  * 创建日期:2025年12月13日 上午11:42:16<br/>
  * 历史修订:<br/>
  */
 public interface IEnterpriseBiz extends IBaseBiz<EnterpriseEntity> {
-
-
+    /**
+     * 根据公司模糊搜索
+     * <p>
+     * 查有展位的公司
+     */
+    List<EnterpriseEntity> queryByName(String name);
 }

+ 20 - 14
src/main/java/net/mingsoft/tf/biz/impl/EnterpriseBizImpl.java

@@ -1,34 +1,40 @@
 package net.mingsoft.tf.biz.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import net.mingsoft.base.biz.impl.BaseBizImpl;
 import net.mingsoft.base.dao.IBaseDao;
-import java.util.*;
-import net.mingsoft.tf.entity.EnterpriseEntity;
 import net.mingsoft.tf.biz.IEnterpriseBiz;
 import net.mingsoft.tf.dao.IEnterpriseDao;
+import net.mingsoft.tf.entity.EnterpriseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
-* 企业管理管理持久化层
-* @author 阿白
-* 创建日期:2025年12月13日 上午11:42:16<br/>
-* 历史修订:<br/>
-*/
+ * 企业管理管理持久化层
+ *
+ * @author 阿白
+ * 创建日期:2025年12月13日 上午11:42:16<br/>
+ * 历史修订:<br/>
+ */
 @Service("tfenterpriseBizImpl")
-public class EnterpriseBizImpl extends BaseBizImpl<IEnterpriseDao,EnterpriseEntity> implements IEnterpriseBiz {
-
+public class EnterpriseBizImpl extends BaseBizImpl<IEnterpriseDao, EnterpriseEntity> implements IEnterpriseBiz {
 
     @Autowired
     private IEnterpriseDao enterpriseDao;
 
-
     @Override
     protected IBaseDao getDao() {
         // TODO Auto-generated method stub
         return enterpriseDao;
     }
 
-
-
+    @Override
+    public List<EnterpriseEntity> queryByName(String name) {
+        return enterpriseDao.selectList(new LambdaQueryWrapper<>(EnterpriseEntity.class)
+                .like(EnterpriseEntity::getEnterpriseName, name)
+                .isNotNull(EnterpriseEntity::getEnterpriseBooth)
+        );
+    }
 }

+ 4 - 3
src/main/java/net/mingsoft/tf/dao/IEnterpriseDao.xml

@@ -3,19 +3,20 @@
 <mapper namespace="net.mingsoft.tf.dao.IEnterpriseDao">
 
 	<resultMap id="resultMap" type="net.mingsoft.tf.entity.EnterpriseEntity">
-				<result column="ENTERPRISE_INTRODUCTION" property="enterpriseIntroduction" /><!--企业简介 -->
-				<result column="ENTERPRISE_LOGO" property="enterpriseLogo" /><!--LOGO -->
 				<result column="ENTERPRISE_NAME" property="enterpriseName" /><!--企业名称 -->
 				<result column="ENTERPRISE_TYPE" property="enterpriseType" /><!--企业类型 -->
+				<result column="ENTERPRISE_BOOTH" property="enterpriseBooth" /><!--展位号 -->
 				<result column="ENTERPRISE_CONTACT" property="enterpriseContact" /><!--联系人 -->
 				<result column="ENTERPRISE_TEL" property="enterpriseTel" /><!--联系电话 -->
 				<result column="ENTERPRISE_ADDRESS" property="enterpriseAddress" /><!--企业地址 -->
 				<result column="ENTERPRISE_ENTRY_TIME" property="enterpriseEntryTime" /><!--入驻时间 -->
 				<result column="ENTERPRISE_OPERATING_STATUS" property="enterpriseOperatingStatus" /><!--经营状态 -->
+				<result column="ENTERPRISE_INTRODUCTION" property="enterpriseIntroduction" /><!--企业简介 -->
+				<result column="ENTERPRISE_LOGO" property="enterpriseLogo" /><!--LOGO -->
 	</resultMap>
 
 	<select id="query" resultMap="resultMap">
-		SELECT * FROM MDIY_FORM_ENTERPRISE
+		SELECT * FROM ENTERPRISE
 		<where>
 			DEL=0
 			<include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include>

+ 51 - 33
src/main/java/net/mingsoft/tf/entity/EnterpriseEntity.java

@@ -26,16 +26,6 @@ public class EnterpriseEntity extends BaseEntity {
 private static final long serialVersionUID = 1765597336717L;
 
     /**
-    * 企业简介
-    */
-    
-    private String enterpriseIntroduction;
-    /**
-    * LOGO
-    */
-    
-    private String enterpriseLogo;
-    /**
     * 企业名称
     */
     @TableField(condition = SqlCondition.LIKE)
@@ -46,6 +36,11 @@ private static final long serialVersionUID = 1765597336717L;
     
     private String enterpriseType;
     /**
+    * 展位号
+    */
+    @TableField(condition = SqlCondition.LIKE)
+    private String enterpriseBooth;
+    /**
     * 联系人
     */
     @TableField(condition = SqlCondition.LIKE)
@@ -72,34 +67,18 @@ private static final long serialVersionUID = 1765597336717L;
     */
     
     private String enterpriseOperatingStatus;
-
-
-    /**
-    * 设置企业简介
-    */
-    public void setEnterpriseIntroduction(String enterpriseIntroduction) {
-        this.enterpriseIntroduction = enterpriseIntroduction;
-    }
-
     /**
-    * 获取企业简介
+    * 企业简介
     */
-    public String getEnterpriseIntroduction() {
-        return this.enterpriseIntroduction;
-    }
+    
+    private String enterpriseIntroduction;
     /**
-    * 设置LOGO
+    * LOGO
     */
-    public void setEnterpriseLogo(String enterpriseLogo) {
-        this.enterpriseLogo = enterpriseLogo;
-    }
+    
+    private String enterpriseLogo;
+
 
-    /**
-    * 获取LOGO
-    */
-    public String getEnterpriseLogo() {
-        return this.enterpriseLogo;
-    }
     /**
     * 设置企业名称
     */
@@ -127,6 +106,19 @@ private static final long serialVersionUID = 1765597336717L;
         return this.enterpriseType;
     }
     /**
+    * 设置展位号
+    */
+    public void setEnterpriseBooth(String enterpriseBooth) {
+        this.enterpriseBooth = enterpriseBooth;
+    }
+
+    /**
+    * 获取展位号
+    */
+    public String getEnterpriseBooth() {
+        return this.enterpriseBooth;
+    }
+    /**
     * 设置联系人
     */
     public void setEnterpriseContact(String enterpriseContact) {
@@ -191,6 +183,32 @@ private static final long serialVersionUID = 1765597336717L;
     public String getEnterpriseOperatingStatus() {
         return this.enterpriseOperatingStatus;
     }
+    /**
+    * 设置企业简介
+    */
+    public void setEnterpriseIntroduction(String enterpriseIntroduction) {
+        this.enterpriseIntroduction = enterpriseIntroduction;
+    }
+
+    /**
+    * 获取企业简介
+    */
+    public String getEnterpriseIntroduction() {
+        return this.enterpriseIntroduction;
+    }
+    /**
+    * 设置LOGO
+    */
+    public void setEnterpriseLogo(String enterpriseLogo) {
+        this.enterpriseLogo = enterpriseLogo;
+    }
+
+    /**
+    * 获取LOGO
+    */
+    public String getEnterpriseLogo() {
+        return this.enterpriseLogo;
+    }
 
 
 }

+ 12 - 5
src/main/java/net/mingsoft/tf/wx/ExhibitorAction.java

@@ -13,10 +13,7 @@ import net.mingsoft.basic.bean.UploadConfigBean;
 import net.mingsoft.people.action.BaseAction;
 import net.mingsoft.people.action.people.FileAction;
 import net.mingsoft.people.util.PeopleUtil;
-import net.mingsoft.tf.biz.IBoothBiz;
-import net.mingsoft.tf.biz.IExhibitionBiz;
-import net.mingsoft.tf.biz.IExhibitorBiz;
-import net.mingsoft.tf.biz.IPeopleExhibitorBiz;
+import net.mingsoft.tf.biz.*;
 import net.mingsoft.tf.biz.impl.ExhibitorBizImpl;
 import net.mingsoft.tf.entity.ExhibitionEntity;
 import net.mingsoft.tf.entity.ExhibitorEntity;
@@ -47,6 +44,8 @@ public class ExhibitorAction extends BaseAction {
     @Autowired
     private IExhibitorBiz exhibitorBiz;
     @Autowired
+    private IEnterpriseBiz enterpriseBiz;
+    @Autowired
     private IPeopleExhibitorBiz peopleExhibitorBiz;
     @Autowired
     private IBoothBiz boothBiz;
@@ -110,8 +109,16 @@ public class ExhibitorAction extends BaseAction {
         return ResultData.build().success(Optional.ofNullable(name)
                 .filter(StrUtil::isNotBlank)
                 .stream()
-                .map(exhibitorBiz::queryByName)
+                .map(enterpriseBiz::queryByName)
                 .flatMap(Collection::stream)
+                .map(item -> {
+                    ExhibitorEntity ee = new ExhibitorEntity();
+                    ee.setExhibitorName(item.getEnterpriseName());
+                    ee.setExhibitorBooth(item.getEnterpriseBooth());
+                    ee.setExhibitorLogo(item.getEnterpriseLogo());
+                    ee.setExhibitorIntroduction(item.getEnterpriseIntroduction());
+                    return ee;
+                })
                 .peek(item -> {
                     item.setExhibitorContact(null);
                     item.setExhibitorPhone(null);

+ 17 - 1
src/main/webapp/WEB-INF/manager/tf/enterprise/form.ftl

@@ -49,6 +49,18 @@
 
                                 </el-col>
                         </el-row>
+            <!--展位号-->
+
+	        <el-form-item  label="展位号" prop="enterpriseBooth">
+	            <el-input
+                        v-model="form.enterpriseBooth"
+                         :disabled="false"
+                          :readonly="false"
+                          :style="{width:  '100%'}"
+                          :clearable="true"
+                        placeholder="请输入展位号">
+                </el-input>
+	        </el-form-item>   
                         <el-row
                                 :gutter="0"
                                 justify="start" align="top">
@@ -189,6 +201,8 @@ placeholder="请选择入驻时间"                    :readonly="false"
                     enterpriseName:'',
                     				// 企业类型
                     				enterpriseType:"",
+                    // 展位号
+                    enterpriseBooth:'',
                     // 联系人
                     enterpriseContact:'',
                     // 联系电话
@@ -208,6 +222,8 @@ placeholder="请选择入驻时间"                    :readonly="false"
                 rules:{
                         // 企业名称
                         enterpriseName: [{"type":"string","message":"企业名称格式不正确"},{"required":true,"message":"企业名称不能为空"},{"min":0,"max":255,"message":"企业名称长度必须为0-255"}],
+                        // 展位号
+                        enterpriseBooth: [{"min":0,"max":255,"message":"展位号长度必须为0-255"}],
                         // 联系人
                         enterpriseContact: [{"min":0,"max":255,"message":"联系人长度必须为0-255"}],
                         // 联系电话
@@ -286,7 +302,7 @@ placeholder="请选择入驻时间"                    :readonly="false"
                 ms.http.get(ms.manager + "/tf/enterprise/get.do", {"id":id}).then(function (res) {
                     that.loading = false
                     if(res.result&&res.data) {
-                                                                                                  if (res.data.enterpriseLogo) {
+                                                                                                                     if (res.data.enterpriseLogo) {
                           res.data.enterpriseLogo = JSON.parse(res.data.enterpriseLogo);
                           res.data.enterpriseLogo.forEach(function (value) {
                              if(!value.url.startsWith("http://") && !value.url.startsWith("https://")){

+ 42 - 17
src/main/webapp/WEB-INF/manager/tf/enterprise/index.ftl

@@ -51,6 +51,22 @@
 
                                         </el-col>
                                         <el-col :span=8>
+            <!--展位号-->
+
+	        <el-form-item  label="展位号" prop="enterpriseBooth">
+	            <el-input
+                        v-model="form.enterpriseBooth"
+                         :disabled="false"
+                          :readonly="false"
+                          :style="{width:  '100%'}"
+                          :clearable="true"
+                        placeholder="请输入展位号">
+                </el-input>
+	        </el-form-item>   
+                                        </el-col>
+                        </el-row>
+                        <el-row>
+                                        <el-col :span=8>
             <!--联系人-->
 
 	        <el-form-item  label="联系人" prop="enterpriseContact">
@@ -64,8 +80,6 @@
                 </el-input>
 	        </el-form-item>   
                                         </el-col>
-                        </el-row>
-                        <el-row>
                                         <el-col :span=8>
 <!--经营状态-->
 
@@ -81,7 +95,7 @@
     </el-form-item>
 
                                         </el-col>
-                                <el-col :span=16 style="display: flex;justify-content: end;padding-right: 10px;">
+                                <el-col :span=8 style="display: flex;justify-content: end;padding-right: 10px;">
                                     <el-button type="primary" class="el-icon-search" size="default" @click="currentPage=1;list(true)">搜索</el-button>
                                     <el-button @click="rest"  class="el-icon-refresh" size="default">重置</el-button>
                                     <ms-search ref="search" @search="search" :search-json="searchJson" :search-key="historyKey"></ms-search>
@@ -96,6 +110,22 @@
                     {{emptyText}}
                 </template>
                     <el-table-column type="selection" width="40" :selectable="isChecked"></el-table-column>
+                            <el-table-column label="企业名称"   align="left" prop="enterpriseName">
+                            </el-table-column>
+                        <el-table-column label="企业类型"   align="left" prop="enterpriseType" :formatter="enterpriseTypeFormat">
+                        </el-table-column>
+                            <el-table-column label="展位号"   align="left" prop="enterpriseBooth">
+                            </el-table-column>
+                            <el-table-column label="联系人"   align="left" prop="enterpriseContact">
+                            </el-table-column>
+                            <el-table-column label="联系电话"   align="left" prop="enterpriseTel">
+                            </el-table-column>
+                            <el-table-column label="企业地址"   align="left" prop="enterpriseAddress">
+                            </el-table-column>
+                <el-table-column label="入驻时间"   min-width="200" align="center" prop="enterpriseEntryTime" >
+                    </el-table-column>
+                        <el-table-column label="经营状态"   align="left" prop="enterpriseOperatingStatus" :formatter="enterpriseOperatingStatusFormat">
+                        </el-table-column>
                     <el-table-column min-width="80" label="LOGO"  align="left">
                         <template #default="scope">
                             <template v-if="scope.row.enterpriseLogo&&scope.row.enterpriseLogo !=''&&JSON.parse(scope.row.enterpriseLogo).length">
@@ -114,20 +144,6 @@
                             </template>
                         </template>
                     </el-table-column>
-                            <el-table-column label="企业名称"   align="left" prop="enterpriseName">
-                            </el-table-column>
-                        <el-table-column label="企业类型"   align="left" prop="enterpriseType" :formatter="enterpriseTypeFormat">
-                        </el-table-column>
-                            <el-table-column label="联系人"   align="left" prop="enterpriseContact">
-                            </el-table-column>
-                            <el-table-column label="联系电话"   align="left" prop="enterpriseTel">
-                            </el-table-column>
-                            <el-table-column label="企业地址"   align="left" prop="enterpriseAddress">
-                            </el-table-column>
-                <el-table-column label="入驻时间"   min-width="200" align="center" prop="enterpriseEntryTime" >
-                    </el-table-column>
-                        <el-table-column label="经营状态"   align="left" prop="enterpriseOperatingStatus" :formatter="enterpriseOperatingStatusFormat">
-                        </el-table-column>
                     <el-table-column  min-width="180" align="center" label="创建时间" prop="createDate"></el-table-column>
                     <el-table-column label="操作"  width="180" align="center" fixed="right">
                             <template #default="scope">
@@ -192,6 +208,15 @@
 },    {
     "isSearch": "true",
     "action": "and",
+    "field": "ENTERPRISE_BOOTH",
+    "el": "eq",
+    "model": "enterpriseBooth",
+    "name": "展位号",
+    "type": "input"
+    },
+    {
+    "isSearch": "true",
+    "action": "and",
     "field": "ENTERPRISE_CONTACT",
     "el": "eq",
     "model": "enterpriseContact",

+ 5 - 0
src/main/webapp/static/locale/lang/enterprise/en_US.js

@@ -5,6 +5,11 @@ var en_US ={
             placeholder:'',
             help:'',
         },
+        enterpriseBooth:{
+            text:'展位号',
+            placeholder:'请输入展位号',
+            help:'',
+        },
         gridZztst:{
             text:'栅格布局',
             placeholder:'',

+ 5 - 0
src/main/webapp/static/locale/lang/enterprise/zh_CN.js

@@ -6,6 +6,11 @@ var zh_CN ={
             placeholder:'',
             help:'',
         },
+        enterpriseBooth:{
+            text:'展位号',
+            placeholder:'请输入展位号',
+            help:'',
+        },
         gridZztst:{
             text:'栅格布局',
             placeholder:'',