Merge branch '陈航-CodingBUG修改' of sckj/mz-cloud into master

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywJgBnController.java

@@ -119,6 +119,7 @@ public class ZwywJgBnController extends BaseController
         zwywJgBnService.checkUpdateLzzt(zwywJgBn);
         zwywJgBnService.checkIdCard(zwywJgBn);
         zwywJgBnService.checkUpdateBlxx(zwywJgBn);
+        zwywJgBnService.checkBarq(zwywJgBn);
         return toAjax(zwywJgBnService.updateZwywJgBn(zwywJgBn));
     }
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/domain/YljgQtaqzc.java

@@ -165,4 +165,8 @@ public class YljgQtaqzc extends BaseEntity
     @TableField(exist = false)
     private String isBj;
 
+    /** 检查部门名称 */
+    @TableField(exist = false)
+    private String checkBm;
+
 }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/domain/YljgXfaqzcxx.java

@@ -170,6 +170,10 @@ public class YljgXfaqzcxx extends BaseEntity
     @TableField(exist = false)
     private String isZgwc;
 
+    /** 是否整改超时 */
+    @TableField(exist = false)
+    private String isZgcs;
+
     /** 统一社会信用代码 */
     @Excel(name = "统一社会信用代码")
     @TableField(exist = false)
@@ -207,6 +211,10 @@ public class YljgXfaqzcxx extends BaseEntity
     @TableField(exist = false)
     private String isBj;
 
+    /** 检查部门名称 */
+    @TableField(exist = false)
+    private String checkBm;
+
     /** 检查信息信息 */
     @TableField(exist = false)
     @Valid

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/IZwywJgBnService.java

@@ -67,6 +67,7 @@ public interface IZwywJgBnService
     public void checkInsertZt(ZwywJgBn zwywJgBn);
     public void checkUpdateLzzt(ZwywJgBn zwywJgBn);
     public void checkUpdateBlxx(ZwywJgBn zwywJgBn);
+    public void checkBarq(ZwywJgBn zwywJgBn);
     public void checkIdCard(ZwywJgBn zwywJgBn);
 
 }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/YljgQtaqzcServiceImpl.java

@@ -56,9 +56,9 @@ public class YljgQtaqzcServiceImpl implements IYljgQtaqzcService
     public List<YljgQtaqzc> selectYljgQtaqzcListByGroupId(YljgQtaqzc yljgQtaqzc)
     {
         if(StringUtils.isNotNull(yljgQtaqzc.getIsJc())){
-            if(yljgQtaqzc.getIsJc().equals("0")){
+            if("0".equals(yljgQtaqzc.getIsJc())){ // 自查
                 return yljgQtaqzcMapper.selectYljgQtaqzcListByGroupId(yljgQtaqzc);
-            }else{
+            }else{ // 检查
                 return selectYljgQtaqjcList(yljgQtaqzc);
             }
         }else{

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywJgBnServiceImpl.java

@@ -300,6 +300,16 @@ public class ZwywJgBnServiceImpl implements IZwywJgBnService
             }
         }
     }
+    public void checkBarq(ZwywJgBn zwywJgBn){
+        if(StringUtils.isNotBlank(zwywJgBn.getBarq())){
+            ZwywJgBn OrgBn = zwywJgBnMapper.selectZwywBnListById(zwywJgBn.getId());
+            YljgJcxx yljgJcxx = new YljgJcxx();
+            yljgJcxx.setId(OrgBn.getJgId());
+            yljgJcxx.setBasj(zwywJgBn.getBarq());
+            yljgJcxxMapper.updateYljgBaById(yljgJcxx);
+        }
+    }
+
 
     public static Map<String, List<Object>> compareFields(Object obj1, Object obj2, String[] ignoreArr) {
         try{
@@ -380,8 +390,8 @@ public class ZwywJgBnServiceImpl implements IZwywJgBnService
     }
 
     public void checkIdCard(ZwywJgBn zwywJgBn){
-        ZwywJgBn originBn;
         if (StringUtils.isNotBlank(zwywJgBn.getId())){
+            ZwywJgBn originBn;
             originBn = zwywJgBnMapper.selectById(zwywJgBn.getId());
             if(StringUtils.isNotBlank(zwywJgBn.getFrzjlx())){ // 如果身份证类型存在
                 if(zwywJgBn.getFrzjlx().equals(DocumentTypeStatus.INLAND.getCode())){ // 身份证类型为'内地'

ruoyi-modules/mz-business/src/main/resources/mapper/business/YljgQtaqzcMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="txdz"    column="txdz"    />
         <result property="szxzqh"    column="szxzqh"    />
         <result property="szqh"    column="szqh"    />
+        <result property="checkBm"    column="check_bm"    />
     </resultMap>
 
 
@@ -70,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginJcsj != null and params.beginJcsj != '' and (params.endJcsj == null or params.endJcsj == '')"> and jcsj &gt;= #{params.beginJcsj}</if>
             <if test="(params.beginJcsj == null or params.beginJcsj == '') and params.endJcsj != null and params.endJcsj != ''"> and jcsj &lt;= #{params.endJcsj}</if>
         </where>
+        ORDER BY a.jcsj DESC
     </select>
 
     <select id="selectYljgQtaqzcList" parameterType="YljgQtaqzc" resultMap="YljgQtaqzcResult" >
@@ -93,12 +95,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="(params.beginJcsj == null or params.beginJcsj == '') and params.endJcsj != null and params.endJcsj != ''"> and jcsj &lt;= #{params.endJcsj}</if>
             AND a.is_jc='0'
         </where>
-        ORDER BY a.create_time_str ASC
+        ORDER BY a.jcsj DESC
     </select>
 
     <select id="selectYljgQtaqjcList" parameterType="YljgQtaqzc" resultMap="YljgQtaqzcResult" >
         SELECT
         b.jgmc, b.tyshxydm, b.txdz, getxzqhmcbycode(b.szxzqh) as szqh,
+        a.create_unit_name as check_bm,
         a.id, a.jg_id, a.is_czwt, a.wtlx,  a.fxwt, a.zgcs, a.zgsx,
         a.zgzrr,  a.is_zgwc, a.zgwcqk, a.wcsj, a.jcsj, a.jcr
         FROM yljg_qtaqzc a
@@ -117,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="(params.beginJcsj == null or params.beginJcsj == '') and params.endJcsj != null and params.endJcsj != ''"> and jcsj &lt;= #{params.endJcsj}</if>
             AND a.is_jc='1'
         </where>
-        ORDER BY a.create_time_str ASC
+        ORDER BY a.jcsj DESC
     </select>
 
     <select id="selectYljgQtaqzcById" parameterType="string" resultMap="YljgQtaqzcResult">

ruoyi-modules/mz-business/src/main/resources/mapper/business/YljgXfaqzcxxMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="isYh"    column="is_yh"    />
         <result property="isZgwc"    column="is_zgwc"    />
+        <result property="isZgcs"    column="is_zgcs"    />
         <result property="tyshxydm"    column="tyshxydm"    />
         <result property="jgmc"    column="jgmc"    />
         <result property="xbzt"    column="xbzt"    />
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="txdz"    column="txdz"    />
         <result property="isJgxfaqdbgc"    column="is_jgxfaqdbgc"    />
         <result property="isJc"    column="is_jc"    />
-        <result property="isJc"    column="is_jc"    />
+        <result property="checkBm"    column="check_bm"    />
     </resultMap>
 
     <resultMap id="YljgXfaqzcxxYljgJcxmxxResult" type="YljgXfaqzcxx" extends="YljgXfaqzcxxResult">
@@ -127,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) AS is_zgwc,
         (SELECT COUNT( id ) FROM yljg_jcxmxx WHERE xfaqzcxx_id = a.id AND is_sf = '是' AND DATE_FORMAT(NOW(), '%Y%m%d') &lt;= zgwcsx) as is_yh,
         a.id, a.jg_id, a.xfaqfzr, a.xfaqfzrzjlx, a.xfaqfzrzjhm, a.xfaqfzrdh, a.xfaqglr,
+        a.create_unit_name as check_bm,
         a.xfaqglrzjlx, a.is_jgxfaqdbgc, a.is_jc, getxzqhmcbycode(b.szxzqh) as szxzqh_name,
         a.xfaqglrzjhm, a.xfaqglrdh, mhhjyssya, a.xfsyhbaqk, a.jtqk, a.pbqk, a.pbqkqt, a.aqzd, a.zcsj, a.zcfzer, a.zt,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
@@ -141,8 +143,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyshxydm != null and tyshxydm != ''"> and b.tyshxydm like concat('%',#{tyshxydm}, '%')</if>
             <if test="isYh != null  and isYh != '' and isYh == 1"> and ( (SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是') &gt; 0 ) </if>
             <if test="isYh != null  and isYh != '' and isYh == 0"> and ( (SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是') = 0 ) </if>
-            <if test="isZgwc != null  and isZgwc != '' and isZgwc == '00'"> and
-             ( (SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是' AND is_wczg ='0' AND DATE_FORMAT(NOW(), '%Y%m%d') > zgwcsx) > 0 )
+
+            <if test="isZgcs != null  and isZgcs != '' and isZgcs == '01'"> and
+                (
+                    ( SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是' AND is_wczg ='1' AND wczfsj &lt;= zgwcsx) > 0
+                    OR
+                    ( SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是' AND is_wczg ='0' AND DATE_FORMAT(NOW(), '%Y%m%d') &gt; zgwcsx ) > 0
+                )
+            </if>
+
+            <if test="isZgcs != null  and isZgcs != '' and isZgcs == '02'"> and
+                (
+                    ( SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是' AND is_wczg ='1' AND wczfsj > zgwcsx) > 0
+                    OR
+                    ( SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是' AND is_wczg ='0' AND DATE_FORMAT(NOW(), '%Y%m%d') &lt;= zgwcsx ) > 0
+                )
             </if>
 
             <if test="isZgwc != null  and isZgwc != '' and isZgwc == '01'"> and
@@ -152,9 +167,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 (SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是' AND is_wczg ='0' AND DATE_FORMAT(NOW(), '%Y%m%d') > zgwcsx) = 0
              )
             </if>
-
             <if test="isZgwc != null  and isZgwc != '' and isZgwc == '02'"> and
-             ( (SELECT COUNT(id) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf='是' AND is_wczg ='0' ) = 0 )
+                (
+                ( SELECT COUNT(0) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf = '是' ) != 0
+                AND
+                ( SELECT COUNT(0) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_wczg = '1' ) != 0
+                AND
+                ( SELECT COUNT(0) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_sf = '是' )
+                =
+                ( SELECT COUNT(0) FROM yljg_jcxmxx where xfaqzcxx_id = a.id AND is_wczg = '1' )
+                )
             </if>
             <if test="zt != null  and zt != ''"> and a.zt = #{zt}</if>
             <if test="params.beginTbrq != null and params.beginTbrq != '' and params.endTbrq != null and params.endTbrq != ''"> and a.zcsj between #{params.beginTbrq} and #{params.endTbrq}</if>
@@ -162,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="(params.beginTbrq == null or params.beginTbrq == '') and params.endTbrq != null and params.endTbrq != ''"> and a.zcsj &lt;= #{params.endTbrq}</if>
             AND a.is_jc='1' AND ( a.zt = '2' OR ( a.zt = '1' AND a.create_unit = #{createUnit} ) )
         </where>
-        ORDER BY  a.zt ASC, a.create_time_str DESC
+        ORDER BY  a.zt ASC, a.zcsj DESC
     </select>
 
     <!--政务业务-综合监管-消防安全自查-->

ruoyi-modules/mz-business/src/main/resources/mapper/business/ZwywJgBnMapper.xml

@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyshxydm != null and tyshxydm != ''"> and a.tyshxydm = #{tyshxydm}</if>
             <if test="ssxzqh != null  and ssxzqh != ''"> and a.ssxzqh like concat(#{ssxzqh}, '%')</if>
             <if test="szxzqh != null  and szxzqh != ''"> and a.szxzqh like concat(#{szxzqh}, '%')</if>
-            <if test="jgmc != null  and jgmc != ''"> and a.jgmc = #{jgmc}</if>
+            <if test="jgmc != null  and jgmc != ''"> and a.jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="bnLzzt != null  and bnLzzt != ''"> and a.bn_lzzt = #{bnLzzt}</if>
             <if test="bnCjzt != null  and bnCjzt != ''"> and a.bn_cjzt = #{bnCjzt}</if>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/service/impl/YljgJcxxServiceImpl.java

@@ -122,8 +122,8 @@ public class YljgJcxxServiceImpl implements IYljgJcxxService
 
     @Override
     public void checkIdCard(YljgJcxx yljgJcxx){
-        YljgJcxx originJg;
         if (StringUtils.isNotBlank(yljgJcxx.getId())){
+            YljgJcxx originJg;
             originJg = yljgJcxxMapper.selectYljgJcxxById(yljgJcxx.getId());
             if(StringUtils.isNotBlank(yljgJcxx.getFrzjlx())){ // 如果身份证类型存在
                 if(yljgJcxx.getFrzjlx().equals(DocumentTypeStatus.INLAND.getCode())){ // 身份证类型为'内地'
@@ -151,12 +151,16 @@ public class YljgJcxxServiceImpl implements IYljgJcxxService
 
     @Override
     public void checkShxydm(YljgJcxx yljgJcxx){
-        if(StringUtils.isNotBlank(yljgJcxx.getTyshxydm())){
-                if(yljgJcxx.getTyshxydm().length() != 18){
-                    throw new ServiceException("统一社会信用代码由国家编制,为18位字符");
-                }
-        }else{
+        if(StringUtils.isNull(yljgJcxx.getTyshxydm())){
+            yljgJcxx.setTyshxydm(yljgJcxxMapper.selectById(yljgJcxx).getTyshxydm()); // 无统一社会信用代码,为18位0
+        }else if(StringUtils.isEmpty(yljgJcxx.getTyshxydm())){
             yljgJcxx.setTyshxydm("000000000000000000"); // 无统一社会信用代码,为18位0
+        }else{
+            if(yljgJcxx.getTyshxydm().length() != 18){
+                throw new ServiceException("统一社会信用代码由国家编制,为18位字符");
+            }else{
+                yljgJcxx.setTyshxydm(yljgJcxx.getTyshxydm()); // 无统一社会信用代码,为18位0
+            }
         }
     }
 

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgYjyaMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="szxzqh != null  and szxzqh != ''"> and b.szxzqh like concat( #{szxzqh}, '%')</if>
             <if test="ssxzqh != null  and ssxzqh != ''"> and b.ssxzqh like concat( #{ssxzqh}, '%')</if>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
-            <if test="jgmc != null  and jgmc != ''"> and b.jgmc = #{jgmc}</if>
+            <if test="jgmc != null  and jgmc != ''"> and b.jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="yjyafzr != null  and yjyafzr != ''"> and a.yjyafzr = #{yjyafzr}</if>
             <if test="yjyalb != null  and yjyalb != ''"> and a.yjyalb = #{yjyalb}</if>
             <if test="params.beginYjyazdsj != null and params.beginYjyazdsj != '' and params.endYjyazdsj != null and params.endYjyazdsj != ''"> and a.yjyazdsj between #{params.beginYjyazdsj} and #{params.endYjyazdsj}</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgZrbxxxMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="szxzqh != null  and szxzqh != ''"> and b.szxzqh like concat( #{szxzqh}, '%')</if>
             <if test="ssxzqh != null  and ssxzqh != ''"> and b.ssxzqh like concat( #{ssxzqh}, '%')</if>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
-            <if test="jgmc != null  and jgmc != ''"> and b.jgmc = #{jgmc}</if>
+            <if test="jgmc != null  and jgmc != ''"> and b.jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="tbbxmc != null  and tbbxmc != ''"> and a.tbbxmc like concat('%', #{tbbxmc}, '%')</if>
             <if test="tbgs != null  and tbgs != ''"> and a.tbgs like concat('%', #{tbgs}, '%')</if>
             <if test="params.beginTbrq != null and params.beginTbrq != '' and params.endTbrq != null and params.endTbrq != ''"> and a.tbrq between #{params.beginTbrq} and #{params.endTbrq}</if>

ruoyi-ui/src/views/business/fwjggl/ajgsx/qtaqjc/index.vue

@@ -87,6 +87,7 @@
           <span>{{ special(scope.row.jcsj) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="检查部门" align="center" prop="checkBm" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="260">
         <template slot-scope="scope">
           <span v-if="is_Component" style="margin-right: 10px;">

ruoyi-ui/src/views/business/fwjggl/ajgsx/xfaqjcxx/index.vue

@@ -34,6 +34,12 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否整改超时" prop="isZgcs" v-if="!isZc">
+        <el-radio-group v-model="queryParams.isZgcs">
+          <el-radio v-for="dict in dict.type.XZ102" :key="dict.value" :label="dict.value">{{dict.label}}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -94,6 +100,7 @@
           <span>{{ special(scope.row.zcsj) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="检查部门" align="center" prop="checkBm" />
       <el-table-column label="状态" align="center" prop="zt">
         <template slot-scope="scope">
           {{scope.row.zt=='2'?'提交':'暂存'}}
@@ -645,7 +652,7 @@ import TreeNodeDialog from '../../../../tool/build/TreeNodeDialog'
 export default {
   name: 'Xfaqzcxx',
   components: { TreeNodeDialog },
-  dicts: ['CZ035', 'C0015', 'XZ012', 'CH010', 'XZ083'],
+  dicts: ['CZ035', 'C0015', 'XZ012', 'CH010', 'XZ083', 'XZ102'],
   data() {
     return {
       // 上传配置

ruoyi-ui/src/views/business/fwjggl/bn/index.vue

@@ -70,6 +70,11 @@
           <dict-tag :options="dict.type.XZ070" :value="scope.row.bnLzzt" />
         </template>
       </el-table-column>
+      <el-table-column label="备案状态" align="center" prop="bnCjzt" :formatter = "stateFormat">
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.XZ070" :value="scope.row.bnLzzt" />-->
+<!--        </template>-->
+      </el-table-column>
       <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.bnLzzt==='00'"
@@ -1097,6 +1102,9 @@ export default {
     }
   },
   methods: {
+    stateFormat(row, column) {
+      return row.bnCjzt==1?'登记':'变更';
+    },
     changeChecked(is) {
       if (!this.form.frxm) {
         this.$modal.msgWarning('请填写法人信息')

ruoyi-ui/src/views/business/fwjggl/jgfwjc/index.vue

@@ -210,7 +210,7 @@
               v-if="!scope.row.shjg"
               icon="el-icon-edit"
               @click="examine(scope.row,'SH')"
-              v-hasPermi="['business:fwjcJcxx:query']"
+              v-hasPermi="['business:fwjc:edit']"
             >审核
             </el-button>
           </template>

ruoyi-ui/src/views/business/lrxx/lrxqpg/index.vue

@@ -65,16 +65,16 @@
           <dict-tag :options="dict.type.XZ021" :value="scope.row.pglx"/>
         </template>
       </el-table-column>
-      <el-table-column label="需求评估状态" align="center" prop="pgzt">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.XZ022" :value="scope.row.pgzt"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="业务办理结果" align="center" prop="bljg">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CH051" :value="scope.row.bljg"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="需求评估状态" align="center" prop="pgzt">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.XZ022" :value="scope.row.pgzt"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="业务办理结果" align="center" prop="bljg">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.CH051" :value="scope.row.bljg"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
            <el-button

ruoyi-ui/src/views/search/xxcx/fwjg/zhjg/yjya/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
+      <el-form-item label="机构名称" prop="jgmc">
+        <el-input v-model="queryParams.jgmc" placeholder="请输入机构名称" clearable />
+      </el-form-item>
       <el-form-item label="应急预案类别" prop="yjyalb">
         <el-select v-model="queryParams.yjyalb" placeholder="请选择应急预案类别" clearable>
           <el-option
@@ -97,6 +100,7 @@ export default {
         pageSize: 10,
         yjyalb: null,
         yjyazdsj: null,
+        jgmc: null,
       },
       // 表单参数
       form: {},
@@ -175,6 +179,7 @@ export default {
         yjyafzrsfzh: null,
         yjyazdsj: null,
         yjyafj: null,
+        jgmc: null,
       };
       this.resetForm("form");
     },

ruoyi-ui/src/views/search/xxcx/fwjg/zhjg/zrbxxx/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="机构名称" prop="jgmc">
+        <el-input v-model="queryParams.jgmc" placeholder="请输入机构名称" clearable />
+      </el-form-item>
       <el-form-item label="投保保险名称" prop="tbbxmc">
         <el-input
           v-model="queryParams.tbbxmc"
@@ -100,6 +103,7 @@ export default {
         tbbxmc: null,
         tbgs: null,
         tbrq: null,
+        jgmc: null,
       },
       // 表单参数
       form: {},
@@ -175,6 +179,7 @@ export default {
         tbyxq: null,
         tbrq: null,
         tbhtwj: null,
+        jgmc: null,
       };
       this.resetForm("form");
     },

ruoyi-ui/src/views/system/zhgl/sqyljg/index.vue

@@ -111,7 +111,7 @@
 <!--              <el-dropdown-item :command="{id: scope.row.id,command:'d'}" v-if="scope.row.status==='02'" >账号编辑</el-dropdown-item>-->
               <el-dropdown-item :command="{id: scope.row.id,command:'d'}" v-if="scope.row.status==='02'" v-hasPermi="['organization:sqjgZhgl:query']">账号编辑</el-dropdown-item>
               <el-dropdown-item :command="{id: scope.row.id,command:'a'}" v-if="scope.row.status==='02' || scope.row.status==='03'" v-hasPermi="['organization:sqjgZhgl:edit']">账号启用</el-dropdown-item>
-              <el-dropdown-item :command="{id: scope.row.id,command:'x'}" v-if="scope.row.status==='01'" v-hasPermi="['organization:sqjgZhgl:addUserZhxx']">再次开通</el-dropdown-item>
+              <el-dropdown-item :command="{id: scope.row.id,command:'x'}" v-if="scope.row.status==='01'" v-hasPermi="['organization:sqjgZhgl:addUserZhxx']">增加用户</el-dropdown-item>
               <el-dropdown-item :command="{id: scope.row.id,command:'b'}" v-if="scope.row.status==='01'" v-hasPermi="['organization:sqjgZhgl:edit']">账号禁用</el-dropdown-item>
               <el-dropdown-item :command="{id: scope.row.id,command:'c'}" v-if="scope.row.status==='01'||scope.row.status==='03'" v-hasPermi="['organization:sqjgZhgl:remove']">账号删除</el-dropdown-item>
             </el-dropdown-menu>

ruoyi-ui/src/views/system/zhgl/yljg/index.vue

@@ -65,7 +65,7 @@
             <span class="el-dropdown-link"> 更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item :command="{ id: scope.row.id, command: 'a' }" v-if="scope.row.status==='02'||scope.row.status==='03'" v-hasPermi="['organization:yljgZhgl:edit']">启用</el-dropdown-item>
-              <el-dropdown-item :command="{ id: scope.row.id, command: 'x' }" v-if="scope.row.status==='01'" v-hasPermi="['organization:yljgZhgl:addUserZhxx']">再次开通</el-dropdown-item>
+              <el-dropdown-item :command="{ id: scope.row.id, command: 'x' }" v-if="scope.row.status==='01'" v-hasPermi="['organization:yljgZhgl:addUserZhxx']">增加用户</el-dropdown-item>
               <el-dropdown-item :command="{ id: scope.row.id, command: 'b' }" v-if="scope.row.status==='01'" v-hasPermi="['organization:yljgZhgl:edit']">禁用</el-dropdown-item>
               <el-dropdown-item :command="{ id: scope.row.id, command: 'c' }" v-if="scope.row.status==='01'||scope.row.status==='03'" v-hasPermi="['organization:yljgZhgl:remove']">删除</el-dropdown-item>
             </el-dropdown-menu>
@@ -358,7 +358,7 @@ export default {
       })
     },
 
-    /** 再次开通账号按钮操作 */
+    /** 增加用户账号按钮操作 */
     handleAddZhxx(row) {
       const ids = row.id || this.ids
       this.form.id = ids