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

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

@@ -41,28 +41,36 @@
     <!-- 添加或修改先进个人管理对话框 -->
     <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">
-        <div   v-for="(it,ind) in optData" :key="it.label">
+        <div v-for="(it,ind) in optData" :key="it.label">
           <h3>{{it.label}}：</h3>
-          <div class="formFlex">
-            <el-form-item  v-for="(i,t) in it.child"  :key="i.key"  :label="i.label" :prop="i.key" class="flex-item">
+          <div class="formFlex" style="position: relative">
+            <el-form-item v-for="(i,t) in it.child" :key="i.key" :label="i.label" :prop="i.key" class="flex-item">
               <el-date-picker
                 v-if="i.type&&i.type==='date'" v-model="form[i.key]" :placeholder="'请选择'+i.label"
                 value-format="yyyyMMdd"
                 type="date">
               </el-date-picker>
-              <el-cascader v-else-if="i.type&&i.type==='cascader'" :placeholder="'请选择'+i.label" v-model="form[i.key]" :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-cascader v-else-if="i.type&&i.type==='cascader'" :placeholder="'请选择'+i.label" v-model="form[i.key]"
+                           :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-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':''" :placeholder="'请输入'+i.label" >
+              <el-input v-else v-model="form[i.key]" :class="i.dw?'dw':''" :placeholder="'请输入'+i.label">
                 <template v-if="i.dw" slot="append">{{i.dw}}</template>
+
               </el-input>
+              <!--<span v-if="i.ts"  class="textStyle">{{i.ts}}</span>-->
             </el-form-item>
           </div>
         </div>
       </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
     </el-dialog>
 
   </div>
@@ -81,11 +89,11 @@ export default {
     return {
       outerVisible: false,
       innerVisible: false,
-      tempTblx:null,
+      tempTblx: null,
       // 遮罩层
       loading: true,
       submitFormLoading: false,
-      activeName:'name0',
+      activeName: 'name0',
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -99,7 +107,7 @@ export default {
       // 先进个人管理表格数据
       xjgrglList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       //表彰时间范围
@@ -107,165 +115,174 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
-      dictOpt:{
-        C0038:[],
-        CH010:[],
-        CWTB001:[],
-        CWTB004:[],
-        CWTB005:[],
+      dictOpt: {
+        C0038: [],
+        CH010: [],
+        CWTB001: [],
+        CWTB004: [],
+        CWTB005: [],
         // CWTB003:[],
-        isOpt:[
+        isOpt: [
           {
-            value:'是',label:'是',
+            value: '是', label: '是'
           },
           {
-            value:'否',label:'否',
-          },
+            value: '否', label: '否'
+          }
         ],
-        gblxOpt:[
+        gblxOpt: [
           {
-            value:'公办',label:'公办',
+            value: '公办', label: '公办'
           },
           {
-            value:'民办',label:'民办',
+            value: '民办', label: '民办'
           },
           {
-            value:'公建民营',label:'公建民营',
+            value: '公建民营', label: '公建民营'
           }
-        ],
+        ]
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        zczj: [{ required: true, message: "资产总计不能为空", trigger: "blur" }],
-        gdzcyj: [{ required: true, message: "固定资产原价不能为空", trigger: "blur" }],
-        bnsrtj: [{ required: true, message: "本年收入合计不能为空", trigger: "blur" }],
-        jysr: [{ required: true, message: "经营收入不能为空", trigger: "blur" }],
-        bnzchj: [{ required: true, message: "本年支出合计不能为空", trigger: "blur" }],
-        qnf: [{ required: true, message: "取暖费不能为空", trigger: "blur" }],
-        gzflzc: [{ required: true, message: "工资支出不能为空", trigger: "blur" }],
+        zczj: [{ required: true, message: '资产总计不能为空', trigger: 'blur' }],
+        gdzcyj: [{ required: true, message: '固定资产原价不能为空', trigger: 'blur' }],
+        bnsrtj: [{ required: true, message: '本年收入合计不能为空', trigger: 'blur' }],
+        jysr: [{ required: true, message: '经营收入不能为空', trigger: 'blur' }],
+        bnzchj: [{ required: true, message: '本年支出合计不能为空', trigger: 'blur' }],
+        qnf: [{ required: true, message: '取暖费不能为空', trigger: 'blur' }],
+        gzflzc: [{ required: true, message: '工资支出不能为空', trigger: 'blur' }]
       },
       openXQ: false,
       dataDetails: {},
-      optData:[
+      optData: [
         {
-          label:'机构-基本信息',child:[
-            {key:'djsj',label:'登记时间',value:'',type:'date'},
-            {key:'djbm',label:'登记部门',value:''},
-            {key:'tyxydm',label:'统一社会信用代码',value:''},
-            {key:'dwmc',label:'单位名称',value:''},
-            {key:'fddbr',label:'法定代表人',value:''},
-            {key:'dz',label:'地址',value:''},
-            {key:'dwszdxzqhdm',label:'单位所在地行政区划代码',value:''},
+          label: '机构-基本信息', child: [
+            { key: 'djsj', label: '登记时间', value: '', type: 'date' },
+            // {key:'tblx',label:'填报类型',value:'',type:'select',dict:'CWTB002'},
+            { key: 'djbm', label: '登记部门', value: '' },
+            { key: 'tyxydm', label: '统一社会信用代码', value: '' , disable:true},
+            { key: 'dwmc', label: '单位名称', value: '' , disable:true},
+            { key: 'fddbr', label: '法定代表人', value: '' },
+            { key: 'dz', label: '地址', value: '' },
+            { key: 'dwszdxzqhdm', label: '单位所在地行政区划代码', value: '' , disable:true},
             // {key:'dwszdxzqhdm',label:'单位所在地行政区划代码',type:'RegionCascaderSelect',value:''},
-            {key:'dh',label:'电话',value:''},
-            {key:'gmjjhyfl',label:'国民经济行业分类',value:'社会工作'},
-            {key:'jglx',label:'机构类型',value:'',type:'select',dict:'CWTB004'},
-            {key:'lx',label:'类型',value:'社会福利院'},
-            {key:'xz',label:'性质',value:'',type:'cascader',dict:'CWTB005',props:{
+            { key: 'dh', label: '电话', value: '' },
+            { key: 'gmjjhyfl', label: '国民经济行业分类', value: '社会工作' },
+            { key: 'jglx', label: '机构类型', value: '', type: 'select', dict: 'CWTB004' },
+            { key: 'lx', label: '类型', value: '社会福利院', disable:true },
+            {
+              key: 'xz', label: '性质', value: '', type: 'cascader', dict: 'CWTB005', props: {
                 emitPath: false,
                 checkStrictly: true
-              }},
-            {key:'xbzt',label:'兴办主体',value:'',type:'select',dict:'CH010',},
-            {key:'jgjzmj',label:'机构建筑面积（平方米）',value:''},
+              }
+            },
+            { key: 'xbzt', label: '兴办主体', value: '', type: 'select', dict: 'CH010' },
+            { key: 'jgjzmj', label: '机构建筑面积（平方米）', value: '' }
 
           ]
         },
         {
-          label:'机构-其他信息',child:[
-            {key:'isfl',label:'是否为所有权、经营权分离公办养老机构',value:'',type:'select',dict:'isOpt'},
+          label: '机构-其他信息', child: [
+            { key: 'isfl', label: '是否为所有权、经营权分离公办养老机构', value: '', type: 'select', dict: 'isOpt' },
             // {key:'isrtb',label:'是否设有儿童部',value:'',type:'select',dict:'isOpt'},
-            {key:'yljgzyxkzdjh',label:'医疗机构执业许可证登记号',value:''},
-            {key:'ylbxddyljgzgzjbm',label:'医疗保险定点医疗机构资格证书编码',value:''},
-          ],
+            { key: 'yljgzyxkzdjh', label: '医疗机构执业许可证登记号', value: '' },
+            { key: 'ylbxddyljgzgzjbm', label: '医疗保险定点医疗机构资格证书编码', value: '' }
+          ]
         },
         {
-          label:'机构-床位数',child:[
-            {key:'nmcws',label:'年末床位数',value:0},
-            {key:'hlxcw',label:'护理型床位',value:0},
+          label: '机构-床位数', child: [
+            { key: 'nmcws', label: '年末床位数', value: 0 },
+            { key: 'hlxcw', label: '护理型床位', value: 0 }
           ]
         },
         {
-          label:'从业人员-年末职工信息',child:[
-            {key:'nmzgrs',label:'职工人数',value:0},
-            {key:'nzgrs',label:'女职工人数',value:0},
-            {key:'yhry',label:'医护人员',value:0},
-          ],
+          label: '从业人员-年末职工信息', child: [
+            { key: 'nmzgrs', label: '职工人数', value: 0 },
+            { key: 'nzgrs', label: '女职工人数', value: 0 },
+            { key: 'yhry', label: '医护人员', value: 0 }
+          ]
         },
         {
-          label:'从业人员-受教育程度',child:[
-            {key:'dxzkrs',label:'大学专科人数',value:0},
-            {key:'dxbkjysrs',label:'大学本科及以上人数',value:0},
-          ],
+          label: '从业人员-受教育程度', child: [
+            { key: 'dxzkrs', label: '大学专科人数', value: 0 },
+            { key: 'dxbkjysrs', label: '大学本科及以上人数', value: 0 }
+          ]
         },
         {
-          label:'从业人员-职业资格水平',child:[
-            {key:'zlshgzsrs',label:'助理社会工作师人数',value:0},
-            {key:'shgzsrs',label:'社会工作师人数',value:0},
-            {key:'gjshgzsrs',label:'高级社会工作师人数',value:0},
-          ],
+          label: '从业人员-职业资格水平', child: [
+            { key: 'zlshgzsrs', label: '助理社会工作师人数', value: 0 },
+            { key: 'shgzsrs', label: '社会工作师人数', value: 0 },
+            { key: 'gjshgzsrs', label: '高级社会工作师人数', value: 0 }
+          ]
         },
         {
-          label:'从业人员-年龄结构',child:[
-            {key:'thirtyfive',label:'35岁及以下人数',value:0},
-            {key:'fortyfive',label:'36岁至45岁人数',value:0},
-            {key:'fiftyfive',label:'46岁至55岁人数',value:0},
-            {key:'fiftysix',label:'56岁及以上人数',value:0},
-          ],
+          label: '从业人员-年龄结构', child: [
+            { key: 'thirtyfive', label: '35岁及以下人数', value: 0 },
+            { key: 'fortyfive', label: '36岁至45岁人数', value: 0 },
+            { key: 'fiftyfive', label: '46岁至55岁人数', value: 0 },
+            { key: 'fiftysix', label: '56岁及以上人数', value: 0 }
+          ]
         },
         {
-          label:'从业人员-人员性质',child:[
-            {key:'jgglry',label:'机构管理人员数',value:0},
-            {key:'zyjsjnry',label:'专业技术技能人员数',value:0},
-            {key:'ylhly',label:'养老护理员数',value:0},
-          ],
+          label: '从业人员-人员性质', child: [
+            { key: 'jgglry', label: '机构管理人员数', value: 0 },
+            { key: 'zyjsjnry', label: '专业技术技能人员数', value: 0 },
+            { key: 'ylhly', label: '养老护理员数', value: 0 }
+          ]
         },
         {
-          label:'在院人数',child:[
-            {key:'nzyzrs',label:'年在院总人天数',value:0},
-            {key:'nmzyzrs',label:'年末在院总人数',value:0},
-            {key:'nmzynxrs',label:'年末在院女性总人数',value:0},
+          label: '在院人数', child: [
+            { key: 'nzyzrs', label: '年在院总人天数', value: 0 },
+            { key: 'nmzyzrs', label: '年末在院总人数', value: 0 },
+            { key: 'nmzynxrs', label: '年末在院女性总人数', value: 0 }
           ]
         },
         {
-          label:'年末在院人员-按性质分',child:[
-            {key:'qtrx',label:'其他人员',value:0},
-            {key:'tkryjzgydx',label:'特困人员救助供养对象',value:0},
-            {key:'zfry',label:'自费人员',value:0},
+          label: '年末在院人员-按性质分', child: [
+            { key: 'qtrx', label: '其他人员', value: 0 },
+            { key: 'tkryjzgydx', label: '特困人员救助供养对象', value: 0 },
+            { key: 'zfry', label: '自费人员', value: 0 }
           ]
         },
         {
-          label:'年末在院人员-按年龄分',child:[
-            {key:'lnr',label:'老年人',value:0},
-            {key:'qzn',label:'青壮年',value:0},
-            {key:'et',label:'儿童',value:0},
+          label: '年末在院人员-按年龄分', child: [
+            { key: 'lnr', label: '老年人', value: 0 },
+            { key: 'qzn', label: '青壮年', value: 0 },
+            { key: 'et', label: '儿童', value: 0 }
           ]
         },
         {
-          label:'年末在院人员-按类型分类',child:[
-            {key:'nlwh',label:'能力完好',value:0},
-            {key:'bfsn',label:'部分失能',value:0},
-            {key:'wqsn',label:'完全失能',value:0},
+          label: '年末在院人员-按类型分类', child: [
+            { key: 'nlwh', label: '能力完好', value: 0 },
+            { key: 'bfsn', label: '部分失能', value: 0 },
+            { key: 'wqsn', label: '完全失能', value: 0 }
           ]
         },
         {
-          label:'财务信息',child:[
-            {key:'zczj',label:'资产总计',value:0,dw:'万元'},
-            {key:'gdzcyj',label:'固定资产原价',value:0,dw:'万元'},
-            {key:'bnsrtj',label:'本年收入合计',value:0,dw:'万元'},
-            {key:'jysr',label:'经营收入',value:0,dw:'万元'},
-            {key:'bnzchj',label:'本年支出合计',value:0,dw:'万元'},
-            {key:'qnf',label:'取暖费',value:0,dw:'万元'},
-            {key:'gzflzc',label:'工资支出',value:0,dw:'万元'},
-            {key:'zfbtsr',label:'政府补贴收入',value:0,dw:'万元'},
-            {key:'fzzj',label:'负债合计',value:0,dw:'万元'},
+          label: '财务信息', child: [
+            { key: 'zczj', label: '资产总计', value: 0, dw: '万元' },
+            { key: 'gdzcyj', label: '资产总计中固定资产原价', value: 0, dw: '万元' },
+            // {key:'gdzcyj',label:'固定资产原价',value:0,dw:'万元',ts:'固定资产原价是资产总计的其中一项'},
+            { key: 'fzzj', label: '负债合计', value: 0, dw: '万元' },
+            { key: 'bnsrtj', label: '本年收入合计', value: 0, dw: '万元' },
+            { key: 'jysr', label: '本年收入中经营收入', value: 0, dw: '万元' },
+            // {key:'jysr',label:'经营收入',value:0,dw:'万元',ts:'经营收入是本年收入合计的其中一项'},
+            { key: 'zfbtsr', label: '本年收入中政府补贴收入', value: 0, dw: '万元' },
+            // {key:'zfbtsr',label:'政府补贴收入',value:0,dw:'万元',ts:'政府补贴收入是本年收入合计的其中一项'},
+            { key: 'bnzchj', label: '本年支出合计', value: 0, dw: '万元' },
+            { key: 'qnf', label: '本年支出中取暖费', value: 0, dw: '万元' },
+            // {key:'qnf',label:'取暖费',value:0,dw:'万元',ts:'取暖费是本年支出合计的其中一项'},
+            { key: 'gzflzc', label: '本年支出中工资支出', value: 0, dw: '万元' }
+            // {key:'gzflzc',label:'工资支出',value:0,dw:'万元',ts:'工资支出是本年支出合计的其中一项'},
           ]
+
         }
       ]
-    };
+    }
   },
   created() {
     this.getList();
@@ -518,5 +535,24 @@ h3 {
   font-size: 1.1rem;
   margin-bottom: 10px;
 }
+.dw ::v-deep .el-input__inner {
+  width: 151px !important;
+}
+.footer {
+  position: fixed;
+  bottom: 10px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 9;
+}
+.textStyle {
+  color: rgb(204, 51, 51);
+  position: absolute;
+  width: 400px;
+  bottom: -17px;
+  left: -407px;
+  text-align: right;
+  font-size: 12px;
+}
 </style>
 

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

@@ -32,26 +32,6 @@
     </div>
 
 
-    <el-dialog title="选择填报时段" :visible.sync="innerVisible">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="填报时段" prop="tblx">
-          <!--          <el-input v-model="form.tblx" placeholder="请输入填报时段"/>-->
-          <el-select v-model="form.tblx" placeholder="请选择填报时段">
-            <el-option
-              v-for="dict in dict.type.CWTB003"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="innerVisible = false">取 消</el-button>
-        <el-button type="primary" :disabled="form.tblx?false:true" @click="handleAdd">确定</el-button>
-      </div>
-    </el-dialog>
-
     <!-- 添加或修改先进个人管理对话框 -->
     <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" label-width="180px" :inline="true">