소스 검색

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

953954216 5 달 전
부모
커밋
3ac789209f

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCwxxTbController.java

@@ -119,7 +119,7 @@ public class SysCwxxTbController extends BaseController
      */
     @RequiresPermissions("system:tb:edit")
 //    @RequiresPermissions(value = {"business:tb:edit", "system:tb:edit"}, logical = Logical.OR)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysCwxxTb sysCwxxTb)
     {
         return toAjax(sysCwxxTbService.updateSysCwxxTb(sysCwxxTb));

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

@@ -68,7 +68,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectCwXxTb" parameterType="SysCwxxTb" resultMap="SysCwxxTbResult">
-        select * from sys_cwxx_tb
+        select
+        id,tblx,jglx,lx,gmjjhyfl,dh,dwszdxzqhdm,fddbr,dz,dwmc,tyxydm,djsj,
+        (
+        CASE
+        WHEN SUBSTR(tyxydm,1,2) IN ('91','92') THEN 1
+        WHEN SUBSTR(tyxydm,1,2) IN ('52') THEN 2
+        WHEN SUBSTR(tyxydm,1,2) IN ('12','19') THEN 3
+        ELSE 4
+        END
+        ) AS djbm,
+        zlshgzsrs,shgzsrs,dxbkjysrs,dxzkrs,yhry,nzgrs,nmzgrs,xgdwmc,xgdwtyshxydm,jgjzmj,ylbxddyljgzgzjbm,yljgzyxkzdjh,isfl,xbzt,xz,
+        bnzchj, jysr, bnsrtj, zczj, gdzcyj, ylhly, zyjsjnry, jgglry, gdzcyj, fiftysix, gdzcyj, fiftyfive, fortyfive, thirtyfive, gjshgzsrs,
+        wqsn, bfsn, nlwh, et, qzn, lnr, zfry, tkryjzgydx, qtrx, nmzynxrs, nmzyzrs, nzyzrs, hlxcw, hlxcw, hlxcw, nmcws, fzzj, zfbtsr, gzflzc, qnf
+        from sys_cwxx_tb
         <where>
             <if test="id != null  and id != ''"> and id = #{id}</if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
@@ -102,7 +115,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,
         getxzqhmcbycode(szxzqh) as szxzqh_name,
         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 SUBSTR(a.cwtyshxydm,1,2) IN ('91','92') THEN 1
+        WHEN SUBSTR(a.cwtyshxydm,1,2) IN ('52') THEN 2
+        WHEN SUBSTR(a.cwtyshxydm,1,2) IN ('12','19') THEN 3
+        ELSE 4 END ) AS 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.jzmj jgjzmj,

+ 2 - 2
ruoyi-ui/src/api/system/cwxxTb.js

@@ -62,8 +62,8 @@ export function addTb(data) {
 // 修改财务信息填报
 export function updateTb(data) {
   return request({
-    url: '/system/tb',
-    method: 'put',
+    url: '/system/tb/edit/',
+    method: 'post',
     data: data
   })
 }

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

@@ -42,7 +42,11 @@
           <span>{{ special(scope.row.djsj) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="登记部门" align="center" prop="djbm" />
+      <el-table-column label="登记部门" align="center" prop="djbm">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.CWTB006" :value="scope.row.djbm" />
+        </template>
+      </el-table-column>
       <el-table-column label="统一信用代码" align="center" prop="tyxydm" />
       <el-table-column label="单位名称" align="center" prop="dwmc" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
@@ -106,7 +110,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "Xjgrgl",
-  dicts: [ 'C0038','CH010','CWTB001','CWTB003','CWTB004','CWTB005'],
+  dicts: [ 'C0038','CH010','CWTB001','CWTB003','CWTB004','CWTB005', 'CWTB006'],
   data() {
     return {
       outerVisible: false,
@@ -147,7 +151,7 @@ export default {
         CWTB001: [],
         CWTB004: [],
         CWTB005: [],
-        // CWTB003:[],
+        CWTB006: [],
         isOpt: [
           {
             value: '是', label: '是'
@@ -187,7 +191,7 @@ export default {
           label: '机构-基本信息', child: [
             { key: 'djsj', label: '登记时间', value: '', type: 'date' },
             // {key:'tblx',label:'填报类型',value:'',type:'select',dict:'CWTB002'},
-            { key: 'djbm', label: '登记部门', value: '' },
+            { key: 'djbm', label: '登记部门', value: '' , type: 'select', dict: 'CWTB006', disable:true},
             { key: 'tyxydm', label: '统一社会信用代码', value: '' , disable:true},
             { key: 'dwmc', label: '单位名称', value: '' , disable:true},
             { key: 'fddbr', label: '法定代表人', value: '' },
@@ -317,7 +321,7 @@ export default {
     this.dictOpt.CWTB001=this.dict.type.CWTB001;
     this.dictOpt.CWTB004=this.dict.type.CWTB004;
     this.dictOpt.CWTB005=this.dict.type.CWTB005;
-    // this.dictOpt.CWTB003=this.dict.type.CWTB003;
+    this.dictOpt.CWTB006=this.dict.type.CWTB006;
   },
   methods: {
     getValid(){

+ 7 - 6
ruoyi-ui/src/views/organization/jggl/cwxxTb/index.vue

@@ -14,11 +14,11 @@
                          :options="dictOpt[i.dict]" :props="i.props"></el-cascader>
             <RegionCascaderSelect v-else-if="i.type&&i.type==='RegionCascaderSelect'" v-model="form[i.key]"
                                   style="width: 100%"></RegionCascaderSelect>
-            <el-select v-else-if="i.type&&i.type==='select'" v-model="form[i.key]" :placeholder="'请选择'+i.label">
+            <el-select v-else-if="i.type&&i.type==='select'" v-model="form[i.key]"  :disabled="i.disable"  :placeholder="'请选择'+i.label">
               <el-option v-for="dict in dictOpt[i.dict]" :key="dict.value" :label="dict.label" :value="dict.value">
               </el-option>
             </el-select>
-            <el-input v-else v-model="form[i.key]" :class="i.dw?'dw':''" :disabled="!!i.disable" :placeholder="'请输入'+i.label">
+            <el-input v-else v-model="form[i.key]" :class="i.dw?'dw':''" :disabled="i.disable" :placeholder="'请输入'+i.label">
               <template v-if="i.dw" slot="append">{{i.dw}}</template>
 
             </el-input>
@@ -48,7 +48,7 @@
                            :options="dictOpt[i.dict]" :props="i.props"></el-cascader>
               <RegionCascaderSelect v-else-if="i.type&&i.type==='RegionCascaderSelect'" v-model="form[i.key]"
                                     style="width: 100%"></RegionCascaderSelect>
-              <el-select v-else-if="i.type&&i.type==='select'" v-model="form[i.key]" :placeholder="'请选择'+i.label">
+              <el-select v-else-if="i.type&&i.type==='select'" :disabled="'disabled'" v-model="form[i.key]" :placeholder="'请选择'+i.label">
                 <el-option v-for="dict in dictOpt[i.dict]" :key="dict.value" :label="dict.label" :value="dict.value">
                 </el-option>
               </el-select>
@@ -78,7 +78,7 @@
 
   export default {
     name: 'Xjgrgl',
-    dicts: ['C0038', 'CH010', 'CWTB001', 'CWTB002', 'CWTB003', 'CWTB004', 'CWTB005'],
+    dicts: ['C0038', 'CH010', 'CWTB001', 'CWTB002', 'CWTB003', 'CWTB004', 'CWTB005', 'CWTB006'],
     data() {
       return {
         outerVisible: false,
@@ -117,7 +117,7 @@
           CWTB001: [],
           CWTB004: [],
           CWTB005: [],
-          // CWTB003:[],
+          CWTB006: [],
           isOpt: [
             {
               value: '是', label: '是'
@@ -157,7 +157,7 @@
             label: '机构-基本信息', child: [
               { key: 'djsj', label: '登记时间', value: '', type: 'date' },
               // {key:'tblx',label:'填报类型',value:'',type:'select',dict:'CWTB002'},
-              { key: 'djbm', label: '登记部门', value: '' },
+              { key: 'djbm', label: '登记部门', value: '' , type: 'select', dict: 'CWTB006', disable:true},
               { key: 'tyxydm', label: '统一社会信用代码', value: '' , disable:true},
               { key: 'dwmc', label: '单位名称', value: '' , disable:true},
               { key: 'fddbr', label: '法定代表人', value: '' },
@@ -288,6 +288,7 @@
       this.dictOpt.CWTB001 = this.dict.type.CWTB001
       this.dictOpt.CWTB004 = this.dict.type.CWTB004
       this.dictOpt.CWTB005 = this.dict.type.CWTB005
+      this.dictOpt.CWTB006 = this.dict.type.CWTB006
       // this.dictOpt.CWTB003=this.dict.type.CWTB003;
     },
     methods: {