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

ruoyi-ui/src/views/organization/rcyy/jzxx/index.vue

@@ -32,7 +32,7 @@
     <el-table v-loading="loading" :data="jzxxList">
       <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="jzzt">
@@ -56,7 +56,7 @@
           <el-button v-if="isCl" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['organization:jzxx:edit']">修改</el-button>
           <el-button v-if="isCl" size="mini" type="text" icon="el-icon-delete"
-            @click="handleDelete(scope.row,(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1,scope.$index)"
+            @click="handleDelete(scope.row, (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1, scope.$index)"
             v-hasPermi="['organization:jzxx:remove']">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)"
             v-hasPermi="['organization:jzxx:query']">详情</el-button>
@@ -64,7 +64,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
     <!-- 添加或修改养老机构_捐赠信息对话框 -->
@@ -118,35 +118,35 @@
       <table>
         <tr>
           <td>捐赠主体</td>
-          <td>{{translateDict('XZ010',form.jzzt)}}</td>
+          <td>{{ translateDict('XZ010', form.jzzt) }}</td>
           <td>捐赠方式</td>
-          <td>{{translateDict('CZ009',form.jzfs)}}</td>
+          <td>{{ translateDict('CZ009', form.jzfs) }}</td>
         </tr>
         <tr>
           <td>捐赠人名称</td>
-          <td>{{form.jzrmc}}</td>
+          <td>{{ form.jzrmc }}</td>
           <td>捐赠金额(元)</td>
-          <td>{{form.jzje}}</td>
+          <td>{{ form.jzje }}</td>
         </tr>
         <tr>
           <td>手机号码</td>
-          <td>{{form.lxdh}}</td>
+          <td>{{ form.lxdh }}</td>
           <td>捐赠日期</td>
-          <td>{{form.jzsj}}</td>
+          <td>{{ form.jzsj }}</td>
         </tr>
         <tr>
           <td>证件号码</td>
-          <td>{{form.zjhm}}</td>
+          <td>{{ form.zjhm }}</td>
           <td>捐赠金额(元)</td>
-          <td>{{form.jzje}}</td>
+          <td>{{ form.jzje }}</td>
         </tr>
         <tr>
           <td>捐赠款使用情况</td>
-          <td colspan="3">{{form.jzksyqk}}</td>
+          <td colspan="3">{{ form.jzksyqk }}</td>
         </tr>
         <tr>
           <td>捐赠描述</td>
-          <td colspan="3">{{form.jzms}}</td>
+          <td colspan="3">{{ form.jzms }}</td>
         </tr>
       </table>
     </el-dialog>
@@ -242,7 +242,7 @@ export default {
       }
       listJzxx(this.queryParams).then(response => {
         console.log(response);
-        response.isCl == 0 ? this.isCl = true : this.isCl = false
+        response.rows.foreach((item) => { item.isCl == 0 ? this.isCl = true : this.isCl = false })
         this.jzxxList = response.rows;
         this.total = response.total;
         this.loading = false;

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/cyry/commonality/index.vue

@@ -87,9 +87,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="年龄" prop="sfzhm">
-          <number placeholder="请输入年龄最小值" v-model.sync="beginAge" :min="0" style="display: inline-block" />
+          <number placeholder="请输入年龄最小值" v-model="beginAge" :min="0" style="display: inline-block" />
           ~
-          <number placeholder="请输入年龄最大值" v-model.sync="endAge" :min="0" style="display: inline-block" />
+          <number placeholder="请输入年龄最大值" v-model="endAge" :min="0" style="display: inline-block" />
         </el-form-item>
         <el-form-item label="职务" prop="zw">
           <el-input v-model="advancedQueryParams.zw" placeholder="请输入职务" clearable @keyup.enter.native="handleQuery" />

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/jbxx/index.vue

@@ -167,40 +167,40 @@
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="全托床位数量最小值" prop="qtcwsMin">
-            <number v-model.sync="advancedQueryParams.qtcwsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.qtcwsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="全托床位数量最大值" prop="qtcwsMax">
-            <number v-model.sync="advancedQueryParams.qtcwsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.qtcwsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="日托床位数量最小值" prop="rtcwsMin">
-            <number v-model.sync="advancedQueryParams.rtcwsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.rtcwsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="日托床位数量最大值" prop="rtcwsMax">
-            <number v-model.sync="advancedQueryParams.rtcwsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.rtcwsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="护理型床位数量最小值" prop="hlxcwsMin">
-            <number v-model.sync="advancedQueryParams.hlxcwsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.hlxcwsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="护理型床位数量最大值" prop="hlxcwsMax">
-            <number v-model.sync="advancedQueryParams.hlxcwsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.hlxcwsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="床位总数量最小值" prop="cwzsMin">
-            <number v-model.sync="advancedQueryParams.cwzsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.cwzsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="床位总数量最大值" prop="cwzsMax">
-            <number v-model.sync="advancedQueryParams.cwzsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.cwzsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="建筑面积最小值" prop="jzmjMin">
-            <number v-model.sync="advancedQueryParams.jzmjMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.jzmjMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="建筑面积最大值" prop="jzmjMax">
-            <number v-model.sync="advancedQueryParams.jzmjMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.jzmjMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="占地面积最小值" prop="zdmjMin">
-            <number v-model.sync="advancedQueryParams.zdmjMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.zdmjMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="占地面积最大值" prop="zdmjMax">
-            <number v-model.sync="advancedQueryParams.zdmjMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.zdmjMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="场所性质" prop="csxz">
             <el-select v-model="advancedQueryParams.csxz" multiple collapse-tags placeholder="请选择" clearable>
@@ -262,10 +262,10 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="入住老年人数最小值" prop="rzlnrsMin">
-            <number v-model.sync="advancedQueryParams.rzlnrsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.rzlnrsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="入住老年人数最大值" prop="rzlnrsMax">
-            <number v-model.sync="advancedQueryParams.rzlnrsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.rzlnrsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
 
 

ruoyi-ui/src/views/search/xxcx/fwjg/yljg/jbxx/index.vue

@@ -92,28 +92,28 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="全托床位数量最小值" prop="qtcwsMin">
-            <number v-model.sync="advancedQueryParams.qtcwsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.qtcwsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="全托床位数量最大值" prop="qtcwsMax">
-            <number v-model.sync="advancedQueryParams.qtcwsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.qtcwsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="日托床位数量最小值" prop="rtcwsMin">
-            <number v-model.sync="advancedQueryParams.rtcwsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.rtcwsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="日托床位数量最大值" prop="rtcwsMax">
-            <number v-model.sync="advancedQueryParams.rtcwsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.rtcwsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="护理型床位数量最小值" prop="hlxcwsMin">
-            <number v-model.sync="advancedQueryParams.hlxcwsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.hlxcwsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="护理型床位数量最大值" prop="hlxcwsMax">
-            <number v-model.sync="advancedQueryParams.hlxcwsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.hlxcwsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="床位总数量最小值" prop="cwzsMin">
-            <number v-model.sync="advancedQueryParams.cwzsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.cwzsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="床位总数量最大值" prop="cwzsMax">
-            <number v-model.sync="advancedQueryParams.cwzsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.cwzsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="单位性质" prop="dwxz">
             <el-select v-model="advancedQueryParams.dwxz" multiple collapse-tags placeholder="请选择" clearable>
@@ -246,16 +246,16 @@
                       @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="建筑面积最小值" prop="jzmjMin">
-            <number v-model.sync="advancedQueryParams.jzmjMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.jzmjMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="建筑面积最大值" prop="jzmjMax">
-            <number v-model.sync="advancedQueryParams.jzmjMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.jzmjMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="占地面积最小值" prop="zdmjMin">
-            <number v-model.sync="advancedQueryParams.zdmjMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.zdmjMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="占地面积最大值" prop="zdmjMax">
-            <number v-model.sync="advancedQueryParams.zdmjMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.zdmjMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="是否通过消防审验" prop="isXfsyZt">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isXfsyZt">
@@ -288,28 +288,28 @@
             </el-select>
           </el-form-item>
           <el-form-item label="护理费最小值" prop="hlfZd">
-            <number v-model.sync="advancedQueryParams.hlfZd" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.hlfZd" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="护理费最大值" prop="hlfZg">
-            <number v-model.sync="advancedQueryParams.hlfZg" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.hlfZg" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="床位费最小值" prop="cwfZd">
-            <number v-model.sync="advancedQueryParams.cwfZd" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.cwfZd" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="床位费最大值" prop="cwfZg">
-            <number v-model.sync="advancedQueryParams.cwfZg" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.cwfZg" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="膳食费最小值" prop="ssfZd">
-            <number v-model.sync="advancedQueryParams.ssfZd" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.ssfZd" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="膳食费最大值" prop="ssfZg">
-            <number v-model.sync="advancedQueryParams.ssfZg" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.ssfZg" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="押金/备用金最小值" prop="yzZd">
-            <number v-model.sync="advancedQueryParams.yzZd" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.yzZd" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="押金/备用金最大值" prop="yzZg">
-            <number v-model.sync="advancedQueryParams.yzZg" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.yzZg" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="是否其他收费" prop="isQtsf">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isQtsf">
@@ -322,16 +322,16 @@
                       @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="其他收费最小值" prop="qtsfZd">
-            <number v-model.sync="advancedQueryParams.qtsfZd" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.qtsfZd" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="其他收费最大值" prop="qtsfZg">
-            <number v-model.sync="advancedQueryParams.qtsfZg" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.qtsfZg" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="月末收住老年人数最小值" prop="ymszlrsMin">
-            <number v-model.sync="advancedQueryParams.ymszlrsMin" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.ymszlrsMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
           <el-form-item label="月末收住老年人数最大值" prop="ymszlrsMax">
-            <number v-model.sync="advancedQueryParams.ymszlrsMax" :min="0" :max="999999" :precision="0" />
+            <number v-model="advancedQueryParams.ymszlrsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
 
 

ruoyi-web/src/components/CareHomeSel/index.vue

@@ -386,7 +386,7 @@ export default {
 .dialog-footer button:first-child {
   margin-right: 10px;
 }
-::v-deep .scroll-wrap{
+:deep(.scroll-wrap){
   height: 62vh;
   padding-right: 10px;
 }

ruoyi-web/src/components/OrgTreeSel/index.vue

@@ -163,7 +163,7 @@ export default defineComponent({
 .dialog-footer button:first-child {
   margin-right: 10px;
 }
-::v-deep .scroll-wrap{
+:deep(.scroll-wrap){
   height: 62vh;
   padding-right: 10px;
 }

ruoyi-web/src/components/OrgTreeSelEmbed/index.vue

@@ -129,7 +129,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-  ::v-deep .scroll-wrap{
+  :deep(.scroll-wrap){
     height: 62vh;
     padding-right: 10px;
   }