Merge branch 'CH-1028-Prod' of sckj/mz-cloud into master

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCwxxTbMapper.xml

@@ -101,12 +101,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,
         getxzqhmcbycode(szxzqh) as szxzqh_name,
-        a.id as jg_id , a.jlrq djsj, a.tyshxydm tyxydm, a.jgmc dwmc, a.frxm fddbr, a.txdz dz, substring(a.ssxzqh,1,6) dwszdxzqhdm,
+        a.id as jg_id , a.jlrq djsj, a.cwtyshxydm tyxydm, a.cwjgmc dwmc, a.frxm fddbr, a.txdz dz, substring(a.ssxzqh,1,6) dwszdxzqhdm,
         a.frdjjg djbm, a.frlxfs dh, a.sczt bdlx, a.cwbj lx,
-
         ( case when SUBSTRING(dwxz,1,1) =3 then 10 when SUBSTRING(dwxz,1,1) =2 then 30 when dwxz =42 then 42  else null end) jglx,
         ( case when SUBSTRING(dwxz,1,1) =3 then 2 when SUBSTRING(dwxz,1,1) =2 then 1 when dwxz =42 then 3 else null	end	) xz,
-        a.xbzt, a.yljgzyxkzh yljgzyxkzdjh, a.jzmj jgjzmj,
+        a.xbzt, a.jzmj jgjzmj,
         (select count(0) from yljg_yg_jbxx where jg_id = a.id and state = '1') nmzgrs,
         (select count(0) from yljg_yg_jbxx where jg_id = a.id and state = '1' and  xb = '2') nzgrs,
         (select count(0) from yljg_yg_jbxx where jg_id = a.id and state = '1' and  zylx in ('01','02','03','06','09','10')) yhry,

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

@@ -1,5 +1,24 @@
 <template>
   <div class="app-container">
+
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="140px">
+      <el-form-item label="统一社会信用代码" prop="tyxydm">
+        <el-input v-model="queryParams.tyxydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable
+                  @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="单位名称" prop="dwmc">
+        <el-input v-model="queryParams.dwmc" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+<!--      <el-form-item label="单位所属行政区划" prop="xzqh">-->
+<!--        <RegionCascaderSelect v-model="xzqh" style="width: 100%" endLevel="2" :isDataRoot="true" valueProp="code">-->
+<!--        </RegionCascaderSelect>-->
+<!--      </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>
+      </el-form-item>
+    </el-form>
+
     <el-row :gutter="10" class="mb8">
       <el-button
         type="warning"
@@ -38,9 +57,12 @@
       </el-table-column>
     </el-table>
 
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+                @pagination="getList" />
+
     <!-- 添加或修改先进个人管理对话框 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1600px" append-to-body>
-      <el-form class="add-form" ref="form" :model="form" :rules="rules" :disabled="true" label-width="180px" :inline="true">
+      <el-form class="add-form" ref="form" :model="form" :rules="rules" :disabled="true" label-width="180px" :inline="true" >
         <div v-for="(it,ind) in optData" :key="it.label">
           <h3>{{it.label}}：</h3>
           <div class="formFlex" style="position: relative">
@@ -115,7 +137,9 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        tyxydm: null,
+        dwmc: null
       },
       dictOpt: {
         C0038: [],
@@ -345,6 +369,11 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      if (this.xzqh) {
+        this.queryParams.ssxzqh = this.xzqh[this.xzqh.length - 1]
+      } else {
+        this.queryParams.ssxzqh = null
+      }
       this.getList();
     },
     /** 重置按钮操作 */
@@ -503,7 +532,7 @@ export default {
 };
 </script>
 <style ref="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-input__inner{
+.add-form ::v-deep .el-input__inner{
   width: 220px;
 }
 .formBox {