Merge branch 'NanMing1' of sckj/mz-cloud into master

ruoyi-ui/src/assets/styles/index.scss

@@ -210,4 +210,11 @@ aside {
   color: #515a6e;
   font-size: 14px;
   border-bottom: 1px solid #dfe6ec;
+}
+.el-dialog__body{
+  padding:10px 20px 20px;
+}
+.scrollbar-wrap {
+  height: 720px;
+  padding: 10px;
 }

ruoyi-ui/src/layout/index.vue

@@ -108,7 +108,7 @@ export default {
     position: fixed;
     top: 0;
     /*right: 0;*/
-    z-index: 2003;
+    z-index: 102;
     width: 100%;
     padding: 0;
     //width: calc(100% - #{$sideBarWidth});
@@ -116,7 +116,7 @@ export default {
   }
   .main-container .fixed-header{
     width: calc(100% - #{$sideBarWidth});
-    z-index: 2001;
+    z-index: 99;
   }
 
   .hideSidebar .fixed-header {

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

@@ -823,6 +823,7 @@ export default {
 
   .formWidth2 {
     width: 50%;
+    margin-bottom: 16px;
   }
 
   .formWidth3 {

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSq/index.vue

@@ -2,7 +2,8 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="200px">
       <el-form-item label="统一社会信用代码" prop="xydm">
-        <el-input v-model="queryParams.xydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.xydm" 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" />
@@ -46,9 +47,7 @@
     <el-table v-loading="loading" :data="djpdSqList">
       <el-table-column label="序号" align="center">
         <template slot-scope="scope">
-          {{
-              (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}
+          {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}
         </template>
       </el-table-column>
       <el-table-column label="统一社会信用代码" align="center" prop="xydm" />
@@ -99,50 +98,54 @@
 
     <!-- 添加或修改等级评定申请对话框 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1200px" append-to-body>
-      <div v-if="!form.id">
-        <SelectionJg v-if="showSearchJg" v-model="searchXydm" dictType="yljg" selectType="djpd" @getJgxx="getJgxx"></SelectionJg>
-      </div>
-      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-        <!--<el-form-item label="机构ID" prop="jgId" style="display: none">-->
-        <!--<el-input v-model="form.jgId" placeholder="请输入机构ID"/>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="统一社会信用代码" prop="xydm" style="display: none">-->
-        <!--<el-input v-model="form.xydm" placeholder="请输入统一社会信用代码" maxlength="18"/>-->
-        <!--</el-form-item>-->
-        <Jg :list="form"></Jg>
-        <h3>等级评定申请信息</h3>
-        <div class="formFlex">
-          <el-form-item label="是否符合基本条件和要求" prop="isFhyq" class="formWidth2">
-            <el-select v-model="form.isFhyq" placeholder="请选择是否符合基本条件和要求">
-              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="申请等级" prop="sqdj" class="formWidth2">
-            <el-select v-model="form.sqdj" placeholder="请选择申请等级">
-              <el-option v-for="dict in dict.type.CZ012" :key="dict.value" :label="dict.label" :value="dict.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="申请人姓名" prop="sqrxm" class="formWidth2">
-            <el-input v-model="form.sqrxm" placeholder="请输入申请人姓名" />
-          </el-form-item>
-          <el-form-item label="申请人联系电话" prop="sqrlxdh" class="formWidth2">
-            <el-input v-model="form.sqrlxdh" placeholder="请输入申请人联系电话" />
-          </el-form-item>
+      <el-scrollbar wrapClass="scrollbar-wrap">
+        <div v-if="!form.id">
+          <SelectionJg v-if="showSearchJg" v-model="searchXydm" dictType="yljg" selectType="djpd" @getJgxx="getJgxx">
+          </SelectionJg>
         </div>
-        <div class="formFlex">
-          <el-form-item label="申请日期" prop="sqsj" class="formWidth2">
-            <el-date-picker clearable v-model="form.sqsj" type="date" value-format="yyyyMMdd" placeholder="请选择申请日期">
-            </el-date-picker>
+        <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+          <!--<el-form-item label="机构ID" prop="jgId" style="display: none">-->
+          <!--<el-input v-model="form.jgId" placeholder="请输入机构ID"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item label="统一社会信用代码" prop="xydm" style="display: none">-->
+          <!--<el-input v-model="form.xydm" placeholder="请输入统一社会信用代码" maxlength="18"/>-->
+          <!--</el-form-item>-->
+          <Jg :list="form"></Jg>
+          <h3>等级评定申请信息</h3>
+          <div class="formFlex">
+            <el-form-item label="是否符合基本条件和要求" prop="isFhyq" class="formWidth2">
+              <el-select v-model="form.isFhyq" placeholder="请选择是否符合基本条件和要求">
+                <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="申请等级" prop="sqdj" class="formWidth2">
+              <el-select v-model="form.sqdj" placeholder="请选择申请等级">
+                <el-option v-for="dict in dict.type.CZ012" :key="dict.value" :label="dict.label" :value="dict.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="formFlex">
+            <el-form-item label="申请人姓名" prop="sqrxm" class="formWidth2">
+              <el-input v-model="form.sqrxm" placeholder="请输入申请人姓名" />
+            </el-form-item>
+            <el-form-item label="申请人联系电话" prop="sqrlxdh" class="formWidth2">
+              <el-input v-model="form.sqrlxdh" placeholder="请输入申请人联系电话" />
+            </el-form-item>
+          </div>
+          <div class="formFlex">
+            <el-form-item label="申请日期" prop="sqsj" class="formWidth2">
+              <el-date-picker clearable v-model="form.sqsj" type="date" value-format="yyyyMMdd" placeholder="请选择申请日期">
+              </el-date-picker>
+            </el-form-item>
+          </div>
+          <el-form-item label="相关材料">
+            <file-upload v-model="form.xgcl" />
           </el-form-item>
-        </div>
-        <el-form-item label="相关材料">
-          <file-upload v-model="form.xgcl" />
-        </el-form-item>
-      </el-form>
+        </el-form>
+      </el-scrollbar>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :loading="submitFormLoading">暂 存
         </el-button>
@@ -172,8 +175,8 @@ import {
   updateDjpdSq,
   updateDjpdStart
 } from '@/api/business/fwjggl/djpd/djpdSq'
-import {chineseOne,Regular} from '@/utils/regular'
-import {mapState} from 'vuex'
+import { chineseOne, Regular } from '@/utils/regular'
+import { mapState } from 'vuex'
 
 export default {
   name: 'DjpdSq',
@@ -237,7 +240,7 @@ export default {
           { validator: chineseOne, trigger: 'blur' }
         ],
         sqrlxdh: [
-          { required: true,message: '申请人联系电话不能为空',trigger: 'blur' },
+          { required: true, message: '申请人联系电话不能为空', trigger: 'blur' },
           { pattern: Regular.Mobile, message: '号码格式：131xxxxxxxx或010-88xxxxx', trigger: 'blur' }
         ],
         sqsj: [

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

@@ -119,13 +119,15 @@
     </el-dialog>
     <!--检查-->
     <el-dialog
+      custom-class="custom"
       v-dialog-drag
       :title="title"
       :visible.sync="openJc"
       width="1600px"
       append-to-body>
-      <QualityDetails :data="jcData" :isXQ="isXQ" @changData="changData"></QualityDetails>
-
+      <el-scrollbar wrapClass="scrollbar-wrap">
+        <QualityDetails :data="jcData" :isXQ="isXQ" @changData="changData"></QualityDetails>
+      </el-scrollbar>
     </el-dialog>
     <!--检查记录-->
     <el-dialog
@@ -501,4 +503,13 @@ export default {
   .zdJc{
     color: red;font-size: 22px;margin-right: 3px
   }
+  ::v-deep .custom>.el-dialog__body{
+  padding-bottom: 50px;
+  .scrollbar-wrap {
+    height: 760px;
+  }
+  .app-container{
+    padding: 0 20px;
+  }
+}
 </style>

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

@@ -133,11 +133,10 @@
       :visible.sync="open"
       width="1200px"
       append-to-body>
-
-
         <!--</el-form-item>-->
-        <h3>机构基本信息</h3>
-        <table>
+        <el-scrollbar wrapClass="scrollbar-wrap">
+          <h3>机构基本信息</h3>
+          <table>
           <tr>
             <td>统一社会信用代码</td>
             <td>{{ form.tyshxydm }}</td>
@@ -153,9 +152,9 @@
             <td>单位通信地址</td>
             <td colspan="5">{{ form.szxzqhName }} {{ form.txdz }}</td>
           </tr>
-        </table>
-        <h3>法定代表人或负责人信息</h3>
-        <table>
+          </table>
+          <h3>法定代表人或负责人信息</h3>
+          <table>
           <tr>
             <td>法定代表人或负责人姓名</td>
             <td>{{ form.frxm }}</td>
@@ -172,9 +171,9 @@
             <td>法人类型</td>
             <td>{{ translateDict('CH007', form.frlx) }}</td>
           </tr>
-        </table>
-        <h3>场所信息</h3>
-        <table>
+          </table>
+          <h3>场所信息</h3>
+          <table>
           <tr>
             <td>全托床位数量(个)</td>
             <td>{{ form.qtcws }}</td>
@@ -197,9 +196,9 @@
             <td>是否通过消防部门审验合格</td>
             <td>{{ translateDict('CZ035', form.isXfsyZt) }}</td>
           </tr>
-        </table>
-        <h3>扩展信息</h3>
-        <table>
+          </table>
+          <h3>扩展信息</h3>
+          <table>
           <tr>
             <td>单位性质</td>
             <td>{{ translateDict('C0038', form.dwxz) }}</td>
@@ -314,9 +313,9 @@
               {{ '最低：' + form.qtsfZd }}
             </td>
           </tr>
-        </table>
-        <h3>其他信息</h3>
-        <table>
+          </table>
+          <h3>其他信息</h3>
+          <table>
           <tr>
             <td>机构运营状态</td>
             <td>{{ translateDict('CH026', form.sczt) }}</td>
@@ -325,7 +324,8 @@
             <td>操作时间</td>
             <td>{{ special(form.czsj) }}</td>
           </tr>
-        </table>
+          </table>
+        </el-scrollbar>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div>

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

@@ -133,8 +133,9 @@
       width="1200px"
       append-to-body>
       <!--</el-form-item>-->
-      <h3>机构基本信息</h3>
-      <table>
+      <el-scrollbar wrapClass="scrollbar-wrap">
+        <h3>机构基本信息</h3>
+        <table>
         <tr>
           <td>统一社会信用代码</td>
           <td>{{form.tyshxydm}}</td>
@@ -152,9 +153,9 @@
           <td>单位门牌号</td>
           <td>{{form.txdz}} </td>
         </tr>
-      </table>
-      <h3>法定代表人或负责人信息</h3>
-      <table>
+        </table>
+        <h3>法定代表人或负责人信息</h3>
+        <table>
         <tr>
           <td>法定代表人或负责人姓名</td>
           <td>{{form.frxm}}</td>
@@ -171,9 +172,9 @@
           <td>法人类型</td>
           <td>{{translateDict('CH007',form.frlx)}}</td>
         </tr>
-      </table>
-      <h3>场所信息</h3>
-      <table>
+        </table>
+        <h3>场所信息</h3>
+        <table>
         <tr>
           <td>全托床位数量(个)</td>
           <td>{{form.qtcws}}</td>
@@ -196,9 +197,9 @@
           <td>是否享受养老服务税费减免</td>
           <td>{{translateDict('CZ035',form.isJm)}}</td>
         </tr>
-      </table>
-      <h3>扩展信息</h3>
-      <table>
+        </table>
+        <h3>扩展信息</h3>
+        <table>
         <tr>
           <td>类别</td>
           <td>{{translateDict('CZ030',form.lb)}}</td>
@@ -250,9 +251,9 @@
           <td>是否取得医疗保险定点医疗机构资格证书</td>
           <td>{{translateDict('CZ035',form.isYlbxddzg)}}</td>
         </tr>
-      </table>
-      <h3>其他信息</h3>
-      <table>
+        </table>
+        <h3>其他信息</h3>
+        <table>
         <tr>
           <td>机构运营状态</td>
           <td>{{translateDict('CH026',form.sczt)}}</td>
@@ -261,19 +262,23 @@
           <td>操作时间</td>
           <td>{{special(form.czsj)}}</td>
         </tr>
-      </table>
+        </table>
+      </el-scrollbar>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!--修改-->
     <el-dialog
+      custom-class="custom"
       v-dialog-drag
       :title="title"
       :visible.sync="openXG"
-      width="1800px"
+      width="1500px"
       append-to-body>
-      <sqjcxx :jgId="jgId" @changeOpen="changeOpen"></sqjcxx>
+      <el-scrollbar wrapClass="scrollbar-wrap">
+        <sqjcxx :jgId="jgId" @changeOpen="changeOpen"></sqjcxx>
+      </el-scrollbar>
     </el-dialog>
     <!--操作-->
     <el-dialog
@@ -588,4 +593,13 @@ h3 {
   font-weight: 600;
   margin: 10px 15px;
 }
+::v-deep .custom>.el-dialog__body{
+  padding-bottom: 50px;
+  .scrollbar-wrap {
+    height: 750px;
+  }
+  .app-container{
+    padding: 0 20px;
+  }
+}
 </style>

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

@@ -228,7 +228,7 @@
     />
 
     <!-- 添加或修改老人基本信息对话框 -->
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1500px" custom-class="custom"
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1500px" class="scrollbar-box"
                :append-to-body="true">
       <!--<el-steps :active="active" finish-status="success" v-if="form.id">-->
       <!--<el-step title="老年人基本信息"></el-step>-->
@@ -236,7 +236,7 @@
       <!--<el-step title="巡访联系人信息"></el-step>-->
       <!--</el-steps>-->
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-scrollbar wrapClass="scrollbar-wrapper" viewClass="view-wrapper">
+        <el-scrollbar wrapClass="scrollbar-wrap">
         <el-tabs v-model="activeName" type="card">
           <el-tab-pane label="基础信息" name="first">
             <h3>
@@ -1771,12 +1771,4 @@ export default {
   .el-tabs__header {
     margin: 0;
   }
-
-  ::v-deep .custom>.el-dialog__body {
-  padding: 10px 20px;
-  .scrollbar-wrapper {
-    height: 720px;
-    padding: 10px 10px 0;
-  }
-}
 </style>