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

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

@@ -92,7 +92,9 @@
       :visible.sync="open"
       width="1500px"
       append-to-body>
-      <ajgsx :data="form"></ajgsx>
+      <el-scrollbar wrapClass="scrollbar-wrap">
+        <ajgsx :data="form"></ajgsx>
+      </el-scrollbar>
     </el-dialog>
   </div>
 </template>

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

@@ -2,7 +2,8 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
-        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
+        <QueryThisLevel :initLevel="queryParams.isBj" :active="1" :inactive="0" @changeLevel="changSwitch">
+        </QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -10,106 +11,73 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="140px">
+          label-width="140px">
 
           <el-form-item label="统一社会信用代码" prop="tyshxydm">
-            <el-input
-              v-model="queryParams.tyshxydm"
-              placeholder="请输入统一社会信用代码" maxlength="18"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.tyshxydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="机构名称" prop="jgmc">
-            <el-input
-              v-model="queryParams.jgmc"
-              placeholder="请输入机构名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.jgmc" placeholder="请输入机构名称" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="是否备案" prop="isBa">
             <el-select v-model="queryParams.isBa" placeholder="请选择" clearable>
-              <el-option
-                v-for="dict in dict.type.CZ035"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
 
           <el-form-item label="机构运营状态" prop="sczt">
             <el-select v-model="queryParams.sczt" placeholder="请选择" clearable>
-              <el-option
-                v-for="dict in dict.type.CH026"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+              <el-option v-for="dict in dict.type.CH026" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </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-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                v-hasPermi="['business:jcxx:export']">导出</el-button>
           </el-form-item>
         </el-form>
 
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['business:jcxx:export']"
-          >导出</el-button
-          >
-        </el-col>
-
         <el-table v-loading="loading" :data="jcxxList">
           <el-table-column label="序号" align="center">
             <template slot-scope="scope">
               {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200"/>
-          <el-table-column label="机构名称" align="center" prop="jgmc" width="240"/>
+          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
+          <el-table-column label="机构名称" align="center" prop="jgmc" width="240" />
           <el-table-column label="是否备案" align="center" prop="isBa">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ035" :value="scope.row.isBa"/>
+              <dict-tag :options="dict.type.CZ035" :value="scope.row.isBa" />
             </template>
           </el-table-column>
           <el-table-column label="运营状态" align="center" prop="sczt" width="200">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.CH026" :value="scope.row.sczt"/>
+              <dict-tag :options="dict.type.CH026" :value="scope.row.sczt" />
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleXQ(scope.row)"
-                v-hasPermi="['business:jcxx:query']"
-              >详情
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleXQ(scope.row)"
+                v-hasPermi="['business:jcxx:query']">详情
               </el-button>
-<!--              <el-button-->
-<!--                size="mini"-->
-<!--                type="text"-->
-<!--                icon="el-icon-edit"-->
-<!--                @click="handleUpdate(scope.row)"-->
-<!--                v-hasPermi="['business:jcxx:edit']"-->
-<!--              >修改-->
-<!--              </el-button>-->
+              <!--              <el-button-->
+              <!--                size="mini"-->
+              <!--                type="text"-->
+              <!--                icon="el-icon-edit"-->
+              <!--                @click="handleUpdate(scope.row)"-->
+              <!--                v-hasPermi="['business:jcxx:edit']"-->
+              <!--              >修改-->
+              <!--              </el-button>-->
               <el-dropdown @command="changDate" trigger="click">
                 <span class="el-dropdown-link">
                   更多<i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-for="dict in dict.type.CH026" :key="dict.value" :command="{id: scope.row.id,command:dict.value}">{{dict.label}}</el-dropdown-item>
+                  <el-dropdown-item v-for="dict in dict.type.CH026" :key="dict.value"
+                    :command="{id: scope.row.id,command:dict.value}">{{dict.label}}</el-dropdown-item>
 
                 </el-dropdown-menu>
               </el-dropdown>
@@ -117,26 +85,16 @@
           </el-table-column>
         </el-table>
 
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
       </el-col>
     </el-row>
     <!--详情-->
-    <el-dialog
-      v-dialog-drag
-      :title="title"
-      :visible.sync="open"
-      width="1200px"
-      append-to-body>
-        <!--</el-form-item>-->
-        <el-scrollbar wrapClass="scrollbar-wrap">
-          <h3>机构基本信息</h3>
-          <table>
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1200px" append-to-body>
+      <!--</el-form-item>-->
+      <el-scrollbar wrapClass="scrollbar-wrap">
+        <h3>机构基本信息</h3>
+        <table>
           <tr>
             <td>统一社会信用代码</td>
             <td>{{ form.tyshxydm }}</td>
@@ -152,9 +110,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>
@@ -171,9 +129,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 +154,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>
@@ -230,11 +188,12 @@
             <td>{{ translateDict('CZ035', form.isTgjjylsmfw) }}</td>
             <td>居家上门服务项目(月均)</td>
             <td>{{
-                form.isTgjjylsmfw == '1' ? ((Number(form.tgjjylsmfwCwrc) + Number(form.tgjjylsmfwZcrc) + Number(form.tgjjylsmfwZjrc) +
-                  Number(form.tgjjylsmfwZxrc) + Number(form.tgjjylsmfwXyrc) + Number(form.tgjjylsmfwKfrc) +
-                  Number(form.tgjjylsmfwZyrc) + Number(form.tgjjylsmfwGarc) + Number(form.tgjjylsmfwQtrc)
-                ) / 9) : '--'
-              }}
+            form.isTgjjylsmfw == '1' ? ((Number(form.tgjjylsmfwCwrc) + Number(form.tgjjylsmfwZcrc) +
+            Number(form.tgjjylsmfwZjrc) +
+            Number(form.tgjjylsmfwZxrc) + Number(form.tgjjylsmfwXyrc) + Number(form.tgjjylsmfwKfrc) +
+            Number(form.tgjjylsmfwZyrc) + Number(form.tgjjylsmfwGarc) + Number(form.tgjjylsmfwQtrc)
+            ) / 9) : '--'
+            }}
             </td>
           </tr>
           <tr>
@@ -242,10 +201,11 @@
             <td>{{ translateDict('CZ035', form.isTgsqylfw) }}</td>
             <td>社区养老服务项目(月均)</td>
             <td>{{
-                form.isTgjjylsmfw == '1' ? ((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) + Number(form.tgsqylfwWyrc) +
-                  Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
-                ) / 6) : '--'
-              }}
+            form.isTgjjylsmfw == '1' ? ((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) +
+            Number(form.tgsqylfwWyrc) +
+            Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
+            ) / 6) : '--'
+            }}
             </td>
           </tr>
           <tr>
@@ -313,9 +273,9 @@
               {{ '最低：' + form.qtsfZd }}
             </td>
           </tr>
-          </table>
-          <h3>其他信息</h3>
-          <table>
+        </table>
+        <h3>其他信息</h3>
+        <table>
           <tr>
             <td>机构运营状态</td>
             <td>{{ translateDict('CH026', form.sczt) }}</td>
@@ -324,43 +284,27 @@
             <td>操作时间</td>
             <td>{{ special(form.czsj) }}</td>
           </tr>
-          </table>
-        </el-scrollbar>
+        </table>
+      </el-scrollbar>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!--操作-->
-    <el-dialog
-      v-dialog-drag
-      title="操作"
-      :visible.sync="openCz"
-      width="500px"
-      append-to-body>
+    <el-dialog v-dialog-drag title="操作" :visible.sync="openCz" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-            <el-form-item label="操作原因" prop="czyy" >
-              <el-input v-model="form.czyy" placeholder="请输入操作原因"/>
-            </el-form-item>
-            <el-form-item label="操作时间" prop="czsj">
-              <el-date-picker
-                clearable
-                v-model="form.czsj"
-                type="date"
-                value-format="yyyyMMdd"
-                placeholder="请选择申请日期"
-              >
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item label="操作原因" prop="czyy">
+          <el-input v-model="form.czyy" placeholder="请输入操作原因" />
+        </el-form-item>
+        <el-form-item label="操作时间" prop="czsj">
+          <el-date-picker clearable v-model="form.czsj" type="date" value-format="yyyyMMdd" placeholder="请选择申请日期">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="submitFormAndStart"
-          :loading="submitFormLoading"
-          v-hasPermi="['business:jcxx:updateJgKyzt']"
-        >提 交
-        </el-button
-        >
+        <el-button type="primary" @click="submitFormAndStart" :loading="submitFormLoading"
+          v-hasPermi="['business:jcxx:updateJgKyzt']">提 交
+        </el-button>
         <el-button @click="openCz=false">取 消</el-button>
       </div>
     </el-dialog>
@@ -368,8 +312,8 @@
 </template>
 
 <script>
-import {getJcxx, listJcxx, updateJgKyzt} from '@/api/business/fwjggl/jcxx'
-import {mapState} from 'vuex'
+import { getJcxx, listJcxx, updateJgKyzt } from '@/api/business/fwjggl/jcxx'
+import { mapState } from 'vuex'
 
 export default {
   name: "Bn",
@@ -411,7 +355,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         // 是否仅查询本级
-        isBj:'0',
+        isBj: '0',
       },
       searchXydm: null,
       // 表单参数
@@ -420,13 +364,13 @@ export default {
       // 表单校验
       rules: {
         czyy: [
-          {required: true, message: "操作原因不能为空", trigger: "change"},
+          { required: true, message: "操作原因不能为空", trigger: "change" },
         ],
         czsj: [
-          {required: true, message: "操作时间不能为空", trigger: "change"},
+          { required: true, message: "操作时间不能为空", trigger: "change" },
         ],
       },
-      openCz:false,
+      openCz: false,
     };
   },
   created() {
@@ -438,12 +382,12 @@ export default {
   methods: {
     changDate(row) {
       this.reset();
-      this.form.id=row.id;
-      this.form.sczt=row.command;
-      this.openCz=true;
+      this.form.id = row.id;
+      this.form.sczt = row.command;
+      this.openCz = true;
     },
     // switch单击事件
-    changSwitch(value){
+    changSwitch(value) {
       this.queryParams.isBj = value
       this.handleQuery()
     },
@@ -483,11 +427,11 @@ export default {
     reset() {
       this.submitFormLoading = false;
       this.searchXydm = null
-        this.form = {
-          sczt:null,
-          czyy:null,
-          czsj:null
-        };
+      this.form = {
+        sczt: null,
+        czyy: null,
+        czsj: null
+      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -642,6 +586,7 @@ h3 {
 .el-textarea {
   width: 100%;
 }
+
 .sxzd {
   font-weight: 600;
   margin: 10px 15px;

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

@@ -2,266 +2,222 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
-        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
+        <QueryThisLevel :initLevel="queryParams.isBj" :active="1" :inactive="0" @changeLevel="changSwitch">
+        </QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
         </dept-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="140px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="140px">
 
-      <el-form-item label="统一社会信用代码" prop="tyshxydm">
-        <el-input
-          v-model="queryParams.tyshxydm"
-          placeholder="请输入统一社会信用代码" maxlength="18"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="jgmc">
-        <el-input
-          v-model="queryParams.jgmc"
-          placeholder="请输入机构名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="类别" prop="lb">
-        <el-select v-model="queryParams.lb" placeholder="请选择" clearable>
-          <el-option
-            v-for="dict in dict.type.CZ030"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+          <el-form-item label="统一社会信用代码" prop="tyshxydm">
+            <el-input v-model="queryParams.tyshxydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="单位名称" prop="jgmc">
+            <el-input v-model="queryParams.jgmc" placeholder="请输入机构名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="类别" prop="lb">
+            <el-select v-model="queryParams.lb" placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CZ030" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
 
-      <el-form-item label="机构运营状态" prop="sczt">
-        <el-select v-model="queryParams.sczt" placeholder="请选择" clearable>
-          <el-option
-            v-for="dict in dict.type.CH026"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+          <el-form-item label="机构运营状态" prop="sczt">
+            <el-select v-model="queryParams.sczt" placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CH026" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </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-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-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+            v-hasPermi="['business:sqJcxx:export']">导出</el-button>
+          </el-form-item>
+        </el-form>
 
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['business:sqJcxx:export']"
-          >导出</el-button
-          >
-        </el-col>
-
-    <el-table v-loading="loading" :data="jcxxList">
-      <el-table-column label="序号" align="center">
-        <template slot-scope="scope">
-          {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
-        </template>
-      </el-table-column>
-      <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200"/>
-      <el-table-column label="单位名称" align="center" prop="jgmc" width="240"/>
-      <el-table-column label="所属区划" align="center" prop="ssxzqhName" width="240"/>
-      <el-table-column label="类别" align="center" prop="lb" width="700">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ030" :value="scope.row.lb"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="运营状态" align="center" prop="sczt" width="240">
-        <template slot-scope="scope">
-        <dict-tag :options="dict.type.CH026" :value="scope.row.sczt"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleXQ(scope.row)"
-            v-hasPermi="['business:sqJcxx:query']"
-          >详情
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:sqJcxx:edit']"
-          >修改</el-button>
-          <el-dropdown @command="changDate" trigger="click">
+        <el-table v-loading="loading" :data="jcxxList">
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
+            </template>
+          </el-table-column>
+          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
+          <el-table-column label="单位名称" align="center" prop="jgmc" width="240" />
+          <el-table-column label="所属区划" align="center" prop="ssxzqhName" width="240" />
+          <el-table-column label="类别" align="center" prop="lb" width="700">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CZ030" :value="scope.row.lb" />
+            </template>
+          </el-table-column>
+          <el-table-column label="运营状态" align="center" prop="sczt" width="240">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CH026" :value="scope.row.sczt" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140" fixed="right">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleXQ(scope.row)"
+                v-hasPermi="['business:sqJcxx:query']">详情
+              </el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['business:sqJcxx:edit']">修改</el-button>
+              <el-dropdown @command="changDate" trigger="click">
                 <span class="el-dropdown-link">
                   更多<i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item v-for="dict in dict.type.CH026" :key="dict.value" :command="{id: scope.row.id,command:dict.value}">{{dict.label}}</el-dropdown-item>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item v-for="dict in dict.type.CH026" :key="dict.value"
+                    :command="{id: scope.row.id,command:dict.value}">{{dict.label}}</el-dropdown-item>
 
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-    </el-table>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+        </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    </el-col>
+        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
+      </el-col>
     </el-row>
     <!--详情-->
-    <el-dialog
-      v-dialog-drag
-      :title="title"
-      :visible.sync="open"
-      width="1200px"
-      append-to-body>
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <!--</el-form-item>-->
       <el-scrollbar wrapClass="scrollbar-wrap">
         <h3>机构基本信息</h3>
         <table>
-        <tr>
-          <td>统一社会信用代码</td>
-          <td>{{form.tyshxydm}}</td>
-          <td>单位名称</td>
-          <td>{{form.jgmc}}</td>
-          <td>单位建立日期</td>
-          <td>{{special(form.jlrq)}}</td>
+          <tr>
+            <td>统一社会信用代码</td>
+            <td>{{form.tyshxydm}}</td>
+            <td>单位名称</td>
+            <td>{{form.jgmc}}</td>
+            <td>单位建立日期</td>
+            <td>{{special(form.jlrq)}}</td>
 
-        </tr>
-        <tr>
-          <td>所属行政区划</td>
-          <td>{{form.ssxzqhName}}</td>
-          <td>单位所在行政区划</td>
-          <td>{{form.szxzqhName}} </td>
-          <td>单位门牌号</td>
-          <td>{{form.txdz}} </td>
-        </tr>
+          </tr>
+          <tr>
+            <td>所属行政区划</td>
+            <td>{{form.ssxzqhName}}</td>
+            <td>单位所在行政区划</td>
+            <td>{{form.szxzqhName}} </td>
+            <td>单位门牌号</td>
+            <td>{{form.txdz}} </td>
+          </tr>
         </table>
         <h3>法定代表人或负责人信息</h3>
         <table>
-        <tr>
-          <td>法定代表人或负责人姓名</td>
-          <td>{{form.frxm}}</td>
-          <td>法定代表人或负责人证件类型</td>
-          <td>{{translateDict('C0015',form.frzjlx)}}</td>
-          <td>法定代表人或负责人证件号码</td>
-          <td>{{form.frzjhm}}</td>
-        </tr>
-        <tr>
-          <td>法定代表人或负责人联系方式</td>
-          <td>{{form.frlxfs}}</td>
-          <td>法人登记机关</td>
-          <td>{{form.frdjjg}}</td>
-          <td>法人类型</td>
-          <td>{{translateDict('CH007',form.frlx)}}</td>
-        </tr>
+          <tr>
+            <td>法定代表人或负责人姓名</td>
+            <td>{{form.frxm}}</td>
+            <td>法定代表人或负责人证件类型</td>
+            <td>{{translateDict('C0015',form.frzjlx)}}</td>
+            <td>法定代表人或负责人证件号码</td>
+            <td>{{form.frzjhm}}</td>
+          </tr>
+          <tr>
+            <td>法定代表人或负责人联系方式</td>
+            <td>{{form.frlxfs}}</td>
+            <td>法人登记机关</td>
+            <td>{{form.frdjjg}}</td>
+            <td>法人类型</td>
+            <td>{{translateDict('CH007',form.frlx)}}</td>
+          </tr>
         </table>
         <h3>场所信息</h3>
         <table>
-        <tr>
-          <td>全托床位数量(个)</td>
-          <td>{{form.qtcws}}</td>
-          <td>日托床位数量(个)</td>
-          <td>{{form.qtcws}}</td>
-          <td>护理型床位数量（个）</td>
-          <td>{{form.hlxcws}}</td>
-        </tr>
-        <tr>
-          <td>床位总数量(个)</td>
-          <td>{{form.cwzs}}</td>
-          <td>建筑面积(㎡)</td>
-          <td>{{form.jzmj}}</td>
-          <td>占地面积(㎡)</td>
-          <td>{{form.zdmj}}</td>
-        </tr>
-        <tr>
-          <td>场所性质</td>
-          <td>{{translateDict('CH009',form.csxz)}}</td>
-          <td>是否享受养老服务税费减免</td>
-          <td>{{translateDict('CZ035',form.isJm)}}</td>
-        </tr>
+          <tr>
+            <td>全托床位数量(个)</td>
+            <td>{{form.qtcws}}</td>
+            <td>日托床位数量(个)</td>
+            <td>{{form.qtcws}}</td>
+            <td>护理型床位数量（个）</td>
+            <td>{{form.hlxcws}}</td>
+          </tr>
+          <tr>
+            <td>床位总数量(个)</td>
+            <td>{{form.cwzs}}</td>
+            <td>建筑面积(㎡)</td>
+            <td>{{form.jzmj}}</td>
+            <td>占地面积(㎡)</td>
+            <td>{{form.zdmj}}</td>
+          </tr>
+          <tr>
+            <td>场所性质</td>
+            <td>{{translateDict('CH009',form.csxz)}}</td>
+            <td>是否享受养老服务税费减免</td>
+            <td>{{translateDict('CZ035',form.isJm)}}</td>
+          </tr>
         </table>
         <h3>扩展信息</h3>
         <table>
-        <tr>
-          <td>类别</td>
-          <td>{{translateDict('CZ030',form.lb)}}</td>
-          <td>单位性质</td>
-          <td>{{translateDict('C0038',form.dwxz)}}</td>
-          <td>兴办主体</td>
-          <td>{{translateDict('CH010',form.xbzt)}}</td>
-        </tr>
-        <tr>
-          <td>是否街道(乡镇)区域性养老中心</td>
-          <td>{{translateDict('CZ035',form.isQyxylfwzx)}}</td>
-          <td>所处位置</td>
-          <td>{{translateDict('CH012',form.scwz)}}</td>
-          <td>是否投保责任险代码</td>
-          <td>{{translateDict('CZ035',form.isTbzrx)}}</td>
-        </tr>
-        <tr>
-          <td>是否长护险定点机构</td>
-          <td>{{translateDict('CZ035',form.isChxddjg)}}</td>
-          <td>社区养老服务项目(月均)</td>
-          <td>{{form.isTgjjylsmfw=='1'?((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) + Number(form.tgsqylfwWyrc) +
+          <tr>
+            <td>类别</td>
+            <td>{{translateDict('CZ030',form.lb)}}</td>
+            <td>单位性质</td>
+            <td>{{translateDict('C0038',form.dwxz)}}</td>
+            <td>兴办主体</td>
+            <td>{{translateDict('CH010',form.xbzt)}}</td>
+          </tr>
+          <tr>
+            <td>是否街道(乡镇)区域性养老中心</td>
+            <td>{{translateDict('CZ035',form.isQyxylfwzx)}}</td>
+            <td>所处位置</td>
+            <td>{{translateDict('CH012',form.scwz)}}</td>
+            <td>是否投保责任险代码</td>
+            <td>{{translateDict('CZ035',form.isTbzrx)}}</td>
+          </tr>
+          <tr>
+            <td>是否长护险定点机构</td>
+            <td>{{translateDict('CZ035',form.isChxddjg)}}</td>
+            <td>社区养老服务项目(月均)</td>
+            <td>{{form.isTgjjylsmfw=='1'?((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) +
+            Number(form.tgsqylfwWyrc) +
             Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
-          )/6):'--'}}</td>
-        </tr>
-        <tr>
-          <td>是否提供居家上门服务</td>
-          <td>{{translateDict('CZ035',form.isTgjjylsmfw)}}</td>
-          <td>居家上门服务项目(月均)</td>
-          <td>{{ form.isTgjjylsmfw=='1'?((Number(form.tgjjylsmfwCwrc) + Number(form.tgjjylsmfwZcrc) + Number(form.tgjjylsmfwZjrc) +
+            )/6):'--'}}</td>
+          </tr>
+          <tr>
+            <td>是否提供居家上门服务</td>
+            <td>{{translateDict('CZ035',form.isTgjjylsmfw)}}</td>
+            <td>居家上门服务项目(月均)</td>
+            <td>{{ form.isTgjjylsmfw=='1'?((Number(form.tgjjylsmfwCwrc) + Number(form.tgjjylsmfwZcrc) +
+            Number(form.tgjjylsmfwZjrc) +
             Number(form.tgjjylsmfwZxrc) + Number(form.tgjjylsmfwXyrc) + Number(form.tgjjylsmfwKfrc) +
             Number(form.tgjjylsmfwZyrc) + Number(form.tgjjylsmfwGarc) + Number(form.tgjjylsmfwQtrc)
-          )/9):'--'}}</td>
-        </tr>
-        <tr>
-          <td>收住老年人类型</td>
-          <td colspan="5">{{translateDict('CH052',form.szlrlx,true)}}</td>
-        </tr>
-        <tr>
-          <td>医疗服务形式</td>
-          <td>{{translateDict('CZ035',form.isKzylfw)}}</td>
-          <td>内设医疗机构</td>
-          <td>{{translateDict('CH013',form.nsyljg,true)}}</td>
-          <td>与医疗机构签约合作</td>
-          <td>{{translateDict('CH014',form.yljgqyhz,true)}}</td>
-        </tr>
-        <tr>
-          <td>是否取得医疗机构执业许可证书</td>
-          <td>{{translateDict('CZ035',form.isYljgzyxk)}}</td>
-          <td>是否取得医疗保险定点医疗机构资格证书</td>
-          <td>{{translateDict('CZ035',form.isYlbxddzg)}}</td>
-        </tr>
+            )/9):'--'}}</td>
+          </tr>
+          <tr>
+            <td>收住老年人类型</td>
+            <td colspan="5">{{translateDict('CH052',form.szlrlx,true)}}</td>
+          </tr>
+          <tr>
+            <td>医疗服务形式</td>
+            <td>{{translateDict('CZ035',form.isKzylfw)}}</td>
+            <td>内设医疗机构</td>
+            <td>{{translateDict('CH013',form.nsyljg,true)}}</td>
+            <td>与医疗机构签约合作</td>
+            <td>{{translateDict('CH014',form.yljgqyhz,true)}}</td>
+          </tr>
+          <tr>
+            <td>是否取得医疗机构执业许可证书</td>
+            <td>{{translateDict('CZ035',form.isYljgzyxk)}}</td>
+            <td>是否取得医疗保险定点医疗机构资格证书</td>
+            <td>{{translateDict('CZ035',form.isYlbxddzg)}}</td>
+          </tr>
         </table>
         <h3>其他信息</h3>
         <table>
-        <tr>
-          <td>机构运营状态</td>
-          <td>{{translateDict('CH026',form.sczt)}}</td>
-          <td>操作原因</td>
-          <td>{{form.czyy}}</td>
-          <td>操作时间</td>
-          <td>{{special(form.czsj)}}</td>
-        </tr>
+          <tr>
+            <td>机构运营状态</td>
+            <td>{{translateDict('CH026',form.sczt)}}</td>
+            <td>操作原因</td>
+            <td>{{form.czyy}}</td>
+            <td>操作时间</td>
+            <td>{{special(form.czsj)}}</td>
+          </tr>
         </table>
       </el-scrollbar>
       <div slot="footer" class="dialog-footer">
@@ -269,48 +225,26 @@
       </div>
     </el-dialog>
     <!--修改-->
-    <el-dialog
-      custom-class="custom"
-      v-dialog-drag
-      :title="title"
-      :visible.sync="openXG"
-      width="1500px"
-      append-to-body>
+    <el-dialog custom-class="custom" v-dialog-drag :title="title" :visible.sync="openXG" width="1500px" append-to-body>
       <el-scrollbar wrapClass="scrollbar-wrap">
         <sqjcxx :jgId="jgId" @changeOpen="changeOpen"></sqjcxx>
       </el-scrollbar>
     </el-dialog>
     <!--操作-->
-    <el-dialog
-      v-dialog-drag
-      title="操作"
-      :visible.sync="openCz"
-      width="500px"
-      append-to-body>
+    <el-dialog v-dialog-drag title="操作" :visible.sync="openCz" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="操作原因" prop="czyy" >
-          <el-input v-model="form.czyy" placeholder="请输入操作原因"/>
+        <el-form-item label="操作原因" prop="czyy">
+          <el-input v-model="form.czyy" placeholder="请输入操作原因" />
         </el-form-item>
         <el-form-item label="操作时间" prop="czsj">
-          <el-date-picker
-            clearable
-            v-model="form.czsj"
-            type="date"
-            value-format="yyyyMMdd"
-            placeholder="请选择申请日期"
-          >
+          <el-date-picker clearable v-model="form.czsj" type="date" value-format="yyyyMMdd" placeholder="请选择申请日期">
           </el-date-picker>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="submitFormAndStart"
-          :loading="submitFormLoading"
-          v-hasPermi="['business:sqJcxx:updateSqJgKyzt']"
-        >提 交
-        </el-button
-        >
+        <el-button type="primary" @click="submitFormAndStart" :loading="submitFormLoading"
+          v-hasPermi="['business:sqJcxx:updateSqJgKyzt']">提 交
+        </el-button>
         <el-button @click="openCz=false">取 消</el-button>
       </div>
     </el-dialog>
@@ -318,22 +252,22 @@
 </template>
 
 <script>
-import {businessGetSqJcxx, listSqJcxx, updateSqJgKyzt} from '@/api/business/fwjggl/sqJcxx'
-import {mapState} from 'vuex'
+import { businessGetSqJcxx, listSqJcxx, updateSqJgKyzt } from '@/api/business/fwjggl/sqJcxx'
+import { mapState } from 'vuex'
 import sqjcxx from '../../../organization/jggl/sqJcxx/index'
 
 export default {
   name: "Index",
   dicts: [
-      'C0038', 'C0015', 'CH026',
-      'CH007', 'CH009','CH010','CH012', 'CH013', 'CH014','C0015','CH052', 'CH059', 'CH060',
-      'CZ035', 'CZ005', 'CZ026', 'CZ004', 'CZ030',
-      'XZ036', 'XZ065','XZ070'],
+    'C0038', 'C0015', 'CH026',
+    'CH007', 'CH009', 'CH010', 'CH012', 'CH013', 'CH014', 'C0015', 'CH052', 'CH059', 'CH060',
+    'CZ035', 'CZ005', 'CZ026', 'CZ004', 'CZ030',
+    'XZ036', 'XZ065', 'XZ070'],
   data() {
     return {
       fixation: {},
       openXQ: false,
-      openXG:false,
+      openXG: false,
       // 遮罩层
       loading: true,
       submitFormLoading: false,
@@ -362,43 +296,43 @@ export default {
         pageSize: 10,
         lb: null,
         // 是否仅查询本级
-        isBj:'0',
+        isBj: '0',
       },
       searchXydm: null,
       // 表单参数
       form: {
       },
-      jgId:null,
+      jgId: null,
       // 表单校验
       rules: {
         czyy: [
-          {required: true, message: "操作原因不能为空", trigger: "change"},
+          { required: true, message: "操作原因不能为空", trigger: "change" },
         ],
         czsj: [
-          {required: true, message: "操作时间不能为空", trigger: "change"},
+          { required: true, message: "操作时间不能为空", trigger: "change" },
         ],
       },
-      openCz:false,
+      openCz: false,
     };
   },
   created() {
     this.getList();
   },
-  components:{
-    sqjcxx:sqjcxx
+  components: {
+    sqjcxx: sqjcxx
   },
   computed: {
     ...mapState(['user']),
   },
   methods: {
-    changeOpen(){
-      this.openXG=false;
+    changeOpen() {
+      this.openXG = false;
       this.getList();
     },
     // switch单击事件
-    changSwitch(value){
-    this.queryParams.isBj = value
-    this.handleQuery()
+    changSwitch(value) {
+      this.queryParams.isBj = value
+      this.handleQuery()
     },
     // 节点单击事件
     handleNodeClick(data) {
@@ -407,9 +341,9 @@ export default {
     },
     changDate(row) {
       this.reset();
-      this.form.id=row.id;
-      this.form.sczt=row.command;
-      this.openCz=true;
+      this.form.id = row.id;
+      this.form.sczt = row.command;
+      this.openCz = true;
     },
     translateDict(type, value, is) {
       if (is && value && value.length > 0) {
@@ -440,12 +374,12 @@ export default {
     },
     // 表单重置
     reset() {
-      this.submitFormLoading =false;
+      this.submitFormLoading = false;
       this.searchXydm = null
       this.form = {
-        sczt:null,
-        czyy:null,
-        czsj:null
+        sczt: null,
+        czyy: null,
+        czsj: null
       };
       this.resetForm("form");
     },
@@ -462,22 +396,22 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    handleXQ(row){
+    handleXQ(row) {
       this.reset();
       const id = row.id || this.ids
       businessGetSqJcxx(id).then(response => {
         this.form = response.data;
-          this.open = true;
-          this.title = '社区养老服务机构和设施详细信息'
+        this.open = true;
+        this.title = '社区养老服务机构和设施详细信息'
       })
     },
     /** 修改按钮操作 */
-    handleUpdate(row,is) {
+    handleUpdate(row, is) {
       this.reset();
-      this.jgId=row.id;
+      this.jgId = row.id;
       this.openXG = true;
       this.title = '社区养老服务机构和设施'
     },
@@ -589,16 +523,20 @@ h3 {
 .el-textarea {
   width: 100%;
 }
+
 .sxzd {
   font-weight: 600;
   margin: 10px 15px;
 }
-::v-deep .custom>.el-dialog__body{
+
+::v-deep .custom>.el-dialog__body {
   padding-bottom: 50px;
+
   .scrollbar-wrap {
     height: 750px;
   }
-  .app-container{
+
+  .app-container {
     padding: 0 20px;
   }
 }

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

@@ -1,5 +1,5 @@
 <template>
-   <lryp :isJg="false" :isCZ="true" :isFwjg="true"></lryp>
+   <lryp :isJg="false" :isCZ="true" :source="2"></lryp>
 </template>
 
 <script>

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

@@ -2,18 +2,19 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24" v-if="!yljgId">
-        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
+        <QueryThisLevel :initLevel="queryParams.isBj" :active="1" :inactive="0" @changeLevel="changSwitch">
+        </QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
         </dept-tree>
       </el-col>
-      <el-col  :span="yljgId?24:20" :xs="24">
+      <el-col :span="yljgId?24:20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+          label-width="68px">
           <el-form-item label="统一社会信用代码" prop="tyshxydm" label-width="125px">
             <el-input v-model="queryParams.tyshxydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable
-                      @keyup.enter.native="handleQuery" />
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="单位名称" prop="jgmc" v-show="isJg">
             <el-input v-model="queryParams.jgmc" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
@@ -37,50 +38,17 @@
           <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-button v-if="isShow.yljg" type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['search:lryp:export']">导出</el-button>
+            <el-button v-if="isShow.sqyljg" type="warning" plain icon="el-icon-download" size="mini"
+              @click="handleExport" v-hasPermi="['search:lryp:listSq']">导出</el-button>
+            <el-button v-if="isShow.fwjggl" type="warning" plain icon="el-icon-download" size="mini"
+              @click="handleExport" v-hasPermi="['business:lryp:export']">导出</el-button>
           </el-form-item>
         </el-form>
 
         <el-row :gutter="10" class="mb8" v-if="!yljgId">
-          <el-col :span="1.5">
-            <el-button
-              v-if="isJg"
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['search:lryp:export']"
-            >导出</el-button>
-            <el-button
-              v-else
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['search:lryp:listSq']"
-            >导出</el-button>
-            <el-button
-              v-if="isFwjg"
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['business:lryp:export']"
-            >导出</el-button>
-          </el-col>
-<!--          <el-col :span="1.5" v-if="isCZ">-->
-<!--            <el-button-->
-<!--              type="primary"-->
-<!--              plain-->
-<!--              icon="el-icon-plus"-->
-<!--              size="mini"-->
-<!--              @click="handleAdd"-->
-<!--              v-hasPermi="['business:lryp:add']"-->
-<!--            >新增</el-button>-->
-<!--          </el-col>-->
-          <el-col :span="10" style="color: rgb(247, 132, 119);" v-if="!isCZ">
+          <el-col :span="12" style="color: rgb(247, 132, 119);" v-if="!isCZ">
             老人用品查询数据范围为：正常营业{{ isJg ? '养老机构' : '社区养老服务机构和设施' }}的老年用品
           </el-col>
 
@@ -117,24 +85,15 @@
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isJg">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                v-if="isCZ"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['business:lryp:edit']"
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                v-if="isCZ"
-                icon="el-icon-delete"
+              <el-button size="mini" type="text" v-if="isCZ" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['business:lryp:edit']">修改</el-button>
+              <el-button size="mini" type="text" v-if="isCZ" icon="el-icon-delete"
                 @click="handleDelete(scope.row,(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1,scope.$index)"
-                v-hasPermi="['business:lryp:remove']"
-              >删除</el-button>
-              <el-button v-if="isFwjg" size="mini" type="text" icon="el-icon-edit" v-hasPermi="['business:lryp:query']" @click="handleDetails(scope.row)">详情 </el-button>
-              <el-button v-else size="mini" type="text" icon="el-icon-edit" v-hasPermi="['search:lryp:listSq']" @click="handleDetails(scope.row)">详情 </el-button>
+                v-hasPermi="['business:lryp:remove']">删除</el-button>
+              <el-button v-if="isShow.fwjggl" size="mini" type="text" icon="el-icon-edit"
+                v-hasPermi="['business:lryp:query']" @click="handleDetails(scope.row)">详情 </el-button>
+              <el-button v-else size="mini" type="text" icon="el-icon-edit" v-hasPermi="['search:lryp:listSq']"
+                @click="handleDetails(scope.row)">详情 </el-button>
             </template>
           </el-table-column>
           <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!is_Component">-->
@@ -147,13 +106,14 @@
         </el-table>
 
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                    :limit.sync="queryParams.pageSize" @pagination="getList" />
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
     <!-- 添加或修改老人用品对话框 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <SelectionJg v-if="!form.id"  :dictType="isJg?'yljg':'sqyljg'" :selectType="isJg?'yljg':'sqyljg'" v-model="searchXydm"  @getJgxx="getJgxx"></SelectionJg>
+        <SelectionJg v-if="!form.id" :dictType="isJg ? 'yljg' : 'sqyljg'" :selectType="isJg ? 'yljg' : 'sqyljg'"
+          v-model="searchXydm" @getJgxx="getJgxx"></SelectionJg>
         <h3>单位信息</h3>
         <table>
           <tr>
@@ -216,7 +176,7 @@
 
     <!--详细-->
     <el-dialog v-dialog-drag title="老人用品详细信息" :visible.sync="openXQ" width="700px" :append-to-body="true"
-               custom-class="custom">
+      custom-class="custom">
       <h3>单位信息</h3>
       <table>
         <tr>
@@ -265,351 +225,359 @@
 </template>
 
 <script>
-import {addLryp, delLryp, getLryp, listLryp, updateLryp} from "@/api/business/fwjggl/lryp";
-import {addLrypCx, delLrypCx, getLrypCx, listLrypCx, updateLrypCx} from "@/api/search/xxcx/lryp";
-import {mapState} from 'vuex'
+import { addLryp, delLryp, getLryp, listLryp, updateLryp } from "@/api/business/fwjggl/lryp";
+import { addLrypCx, delLrypCx, getLrypCx, listLrypCx, updateLrypCx } from "@/api/search/xxcx/lryp";
+import { mapState } from 'vuex'
 
 export default {
-    name: "Lryp",
-    dicts: ['XZ007', 'XZ006', 'CH001'],
-    data() {
-      return {
-        isShow:{
-          yljg:false,
-          sqyljg:false,
-          fwjggl:false,
-        },
-        // 遮罩层
-        loading: true,
-        submitFormLoading: false,
-        // 选中数组
-        ids: [],
-        items: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 老人用品表格数据
-        lrypList: [],
-        dataDetails: {},
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        openXQ: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          lrypmc: null,
-          lryplx: null,
-          ypsccs: null,
-          tyshxydm: null,
-          jgmc: null,
-          // 是否仅查询本级
-          isBj:'0',
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          lrypmc: [
-            { required: true, message: "老年用品名称不能为空", trigger: "blur" },
-            { min: 1, max: 100, message: "字段最大长度为100", trigger: "blur" }
-          ],
-          lryplx: [
-            { required: true, message: "老年用品类型不能为空", trigger: "change" }
-          ],
-          lrypyt: [
-            { max: 100, message: "字段最大长度为100", trigger: "blur" }
-          ],
-          ypsccs: [
-            { required: true, message: "用品生产厂商不能为空", trigger: "blur" },
-            { max: 72, message: '用品生产厂商不能超过72个字符', trigger: 'blur' }
-          ],
-          ypjg: [
-            { required: true, message: "请输入老年用品价格! 输入值必须大于0", trigger: "blur" },
-            // { min: 1, message: "输入值必须大于0", trigger: "blur" }
-          ]
-        },
-        searchXydm: null,
-        yljgId:'',
-        request:{
-          listLryp:listLryp,
-          getLryp:getLryp,
-          addLryp:addLryp,
-          updateLryp:updateLryp,
-          delLryp:delLryp
-        },
-        request1:{
-          listLryp:listLryp,
-          getLryp:getLryp,
-          addLryp:addLryp,
-          updateLryp:updateLryp,
-          delLryp:delLryp
-        },
-        request2:{
-          listLryp:listLrypCx,
-          getLryp:getLrypCx,
-          addLryp:addLrypCx,
-          updateLryp:updateLrypCx,
-          delLryp:delLrypCx
-        }
-      };
-    },
-    created() {
-      if (this.isJg) {
-        this.queryParams.createUserType = '01'
-      } else {
-        this.queryParams.createUserType = '02'
-      }
-      this.yljgId=this.jgId
-      if(this.isCZ)
-      {
-        this.request=this.request1
-      }else {
-        this.request=this.request2
-      }
-      this.getList();
-    },
-    props: {
-      //是否可以进行修改删除操作，true是可以,false是不可以  服务机构管理=》社区机构信息=》老人用品
-      isCZ: {
-        type: Boolean,
-        default: false
+  name: "Lryp",
+  dicts: ['XZ007', 'XZ006', 'CH001'],
+  data() {
+    return {
+      isShow: {
+        yljg: false,
+        sqyljg: false,
+        fwjggl: false,
       },
-      //是否是机构，false是社区养老机构,true是养老机构
-      isJg: {
-        type: Boolean,
-        default: true
+      // 遮罩层
+      loading: true,
+      submitFormLoading: false,
+      // 选中数组
+      ids: [],
+      items: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 老人用品表格数据
+      lrypList: [],
+      dataDetails: {},
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      openXQ: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        lrypmc: null,
+        lryplx: null,
+        ypsccs: null,
+        tyshxydm: null,
+        jgmc: null,
+        // 是否仅查询本级
+        isBj: '0',
       },
-      isFwjg:{
-        type: Boolean,
-        default:false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        lrypmc: [
+          { required: true, message: "老年用品名称不能为空", trigger: "blur" },
+          { min: 1, max: 100, message: "字段最大长度为100", trigger: "blur" }
+        ],
+        lryplx: [
+          { required: true, message: "老年用品类型不能为空", trigger: "change" }
+        ],
+        lrypyt: [
+          { max: 100, message: "字段最大长度为100", trigger: "blur" }
+        ],
+        ypsccs: [
+          { required: true, message: "用品生产厂商不能为空", trigger: "blur" },
+          { max: 72, message: '用品生产厂商不能超过72个字符', trigger: 'blur' }
+        ],
+        ypjg: [
+          { required: true, message: "请输入老年用品价格! 输入值必须大于0", trigger: "blur" },
+          // { min: 1, message: "输入值必须大于0", trigger: "blur" }
+        ]
       },
-      jgId: {
-        type: String,
-        default: ""
+      searchXydm: null,
+      yljgId: '',
+      request: {
+        listLryp: listLryp,
+        getLryp: getLryp,
+        addLryp: addLryp,
+        updateLryp: updateLryp,
+        delLryp: delLryp
       },
-    },
-    watch:{
-      jgId(newDATA){
-        this.yljgId=newDATA;
-        this.handleQuery();
+      request1: {
+        listLryp: listLryp,
+        getLryp: getLryp,
+        addLryp: addLryp,
+        updateLryp: updateLryp,
+        delLryp: delLryp
+      },
+      request2: {
+        listLryp: listLrypCx,
+        getLryp: getLrypCx,
+        addLryp: addLrypCx,
+        updateLryp: updateLrypCx,
+        delLryp: delLrypCx
       }
+    };
+  },
+  created() {
+    if (this.isJg) {
+      this.queryParams.createUserType = '01'
+    } else {
+      this.queryParams.createUserType = '02'
+    }
+    this.yljgId = this.jgId
+    if (this.isCZ) {
+      this.request = this.request1
+    } else {
+      this.request = this.request2
+    }
+    switch (this.source) {
+      case 0:
+        this.isShow.yljg = true;
+        break;
+      case 1:
+        this.isShow.sqyljg = true;
+        break;
+      case 2:
+        this.isShow.fwjggl = true;
+        break;
+    }
+    this.getList();
+  },
+  props: {
+    //是否可以进行修改删除操作，true是可以,false是不可以  服务机构管理=》社区机构信息=》老人用品
+    isCZ: {
+      type: Boolean,
+      default: false
     },
-    computed: {
-      ...mapState(['user']),
+    //是否是机构，false是社区养老机构,true是养老机构
+    isJg: {
+      type: Boolean,
+      default: true
     },
-    methods: {
-      getJgxx(res) {
-        this.form.tyshxydm = res.data.tyshxydm
-        this.form.jgmc = res.data.jgmc
-        this.form.txdz = res.data.txdz
-        this.form.jgId = res.data.id
-        this.form.szxzqhName = res.data.szxzqhName
-      },
-      // switch单击事件
-      changSwitch(value){
-        this.queryParams.isBj = value
-        this.handleQuery()
-      },
-      // 节点单击事件
-      handleNodeClick(data) {
-        this.queryParams.xzqhId = data.code
-        this.handleQuery()
-      },
-      /** 查询老人用品列表 */
-      getList() {
-        this.loading = true;
-        this.request.listLryp({...this.queryParams,jgId:this.yljgId}).then(response => {
-          this.lrypList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.submitFormLoading = false;
-        this.searchXydm = null
-        this.form = {
-          id: null,
-          jgId: null,
-          lrypmc: null,
-          lryplx: null,
-          lrypyt: null,
-          lrypsydx: null,
-          ypsccs: null,
-          ypjg: null,
-          lrypggxh: null,
-          tyshxydm:null,
-          jgmc:null,
-          txdz:null,
-          szxzqhName:null,
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        this.request.getLryp(id).then(response => {
-          this.form = response.data;
-          this.copyForm=this.deepCopy(response.data);
-          this.open = true;
-          this.title = "修改老年用品";
-        });
-      },
-      handleDetails(row) {
-        this.request.getLryp(row.id).then(response => {
-          this.dataDetails = response.data
-          this.openXQ = true
-        })
-      },
-      /** 提交按钮 */
-      submitForm() {
-        if(!this.form.jgId)
-        {
-          this.$modal.msgError('请选择机构')
-          return false
-        }
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.submitFormLoading = true;
-            if (this.form.id != null) {
-              let formData=this.comparisonObject(this.form,this.copyForm)
-              if(formData)
-              {
-                this.request.updateLryp({...formData,id:this.form.id}).then(response => {
-                  this.$modal.msgSuccess("修改成功");
-                  this.open = false;
-                  this.lrypList=this.dataReplacement(this.lrypList,this.form.id,formData);
-                  // this.getList();
-                }).finally(()=>this.submitFormLoading =false);
-              }else {
+    source: {
+      type: Number,
+      default: 0,
+    },
+    jgId: {
+      type: String,
+      default: ""
+    },
+  },
+  watch: {
+    jgId(newDATA) {
+      this.yljgId = newDATA;
+      this.handleQuery();
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  methods: {
+    getJgxx(res) {
+      this.form.tyshxydm = res.data.tyshxydm
+      this.form.jgmc = res.data.jgmc
+      this.form.txdz = res.data.txdz
+      this.form.jgId = res.data.id
+      this.form.szxzqhName = res.data.szxzqhName
+    },
+    // switch单击事件
+    changSwitch(value) {
+      this.queryParams.isBj = value
+      this.handleQuery()
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.xzqhId = data.code
+      this.handleQuery()
+    },
+    /** 查询老人用品列表 */
+    getList() {
+      this.loading = true;
+      this.request.listLryp({ ...this.queryParams, jgId: this.yljgId }).then(response => {
+        this.lrypList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.submitFormLoading = false;
+      this.searchXydm = null
+      this.form = {
+        id: null,
+        jgId: null,
+        lrypmc: null,
+        lryplx: null,
+        lrypyt: null,
+        lrypsydx: null,
+        ypsccs: null,
+        ypjg: null,
+        lrypggxh: null,
+        tyshxydm: null,
+        jgmc: null,
+        txdz: null,
+        szxzqhName: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      this.request.getLryp(id).then(response => {
+        this.form = response.data;
+        this.copyForm = this.deepCopy(response.data);
+        this.open = true;
+        this.title = "修改老年用品";
+      });
+    },
+    handleDetails(row) {
+      this.request.getLryp(row.id).then(response => {
+        this.dataDetails = response.data
+        this.openXQ = true
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      if (!this.form.jgId) {
+        this.$modal.msgError('请选择机构')
+        return false
+      }
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.submitFormLoading = true;
+          if (this.form.id != null) {
+            let formData = this.comparisonObject(this.form, this.copyForm)
+            if (formData) {
+              this.request.updateLryp({ ...formData, id: this.form.id }).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
-                this.submitFormLoading = false;
-              }
+                this.lrypList = this.dataReplacement(this.lrypList, this.form.id, formData);
+                // this.getList();
+              }).finally(() => this.submitFormLoading = false);
             } else {
-              this.request.addLryp(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                if (this.queryParams.pageSize===this.lrypList.length)
-                {
-                  this.lrypList.pop();
-                }
-                this.lrypList.unshift({...this.form,id:response.data});
-                this.total++;
-              }).finally(()=>this.submitFormLoading =false);
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.submitFormLoading = false;
             }
+          } else {
+            this.request.addLryp(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              if (this.queryParams.pageSize === this.lrypList.length) {
+                this.lrypList.pop();
+              }
+              this.lrypList.unshift({ ...this.form, id: response.data });
+              this.total++;
+            }).finally(() => this.submitFormLoading = false);
           }
-        });
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加老年用品";
-      },
-      /** 删除按钮操作 */
-      handleDelete(row,index,ind) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('确认删除' + this.changeDelData(row,'lrypmc','老年用品名称',index) + '的记录？').then(()=>{
-          return this.request.delLryp(ids);
-        }).then(() => {
-          this.lrypList.splice(ind,1);
-          if(this.lrypList.length===0)
-          {
-            this.getList();
-          }else {
-            this.total--;
-          }
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-      },
-      translateDict(type, value) {
-        return this.selectDictLabel(this.dict.type[type], value)
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(
-          "organization/lryp/export",
-          {
-            ...this.queryParams,
-          },
-          `老人用品数据_${new Date().getTime()}.xlsx`
-        );
-      },
-    }
-  };
+        }
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加老年用品";
+    },
+    /** 删除按钮操作 */
+    handleDelete(row, index, ind) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('确认删除' + this.changeDelData(row, 'lrypmc', '老年用品名称', index) + '的记录？').then(() => {
+        return this.request.delLryp(ids);
+      }).then(() => {
+        this.lrypList.splice(ind, 1);
+        if (this.lrypList.length === 0) {
+          this.getList();
+        } else {
+          this.total--;
+        }
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    translateDict(type, value) {
+      return this.selectDictLabel(this.dict.type[type], value)
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "organization/lryp/export",
+        {
+          ...this.queryParams,
+        },
+        `老人用品数据_${new Date().getTime()}.xlsx`
+      );
+    },
+  }
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select {
-    width: 100%;
-  }
+.el-select {
+  width: 100%;
+}
 
-  .el-date-editor.el-input {
-    width: 100%;
-  }
-  table td {
-    width: 10%;
-    height: 2.5rem;
-    padding: .5%;
-    font-weight: 500;
-    border: 1px solid #ddd;
-  }
+.el-date-editor.el-input {
+  width: 100%;
+}
 
-  table {
-    width: 100%;
-    border-collapse: collapse;
-    border: 1px solid #ddd;
-  }
+table td {
+  width: 10%;
+  height: 2.5rem;
+  padding: .5%;
+  font-weight: 500;
+  border: 1px solid #ddd;
+}
 
-  table td:nth-child(odd) {
-    text-align: right;
-    background: #f5f5f5;
-  }
-  h3 {
-    /*margin: 0;*/
-    padding: 0.5rem !important;
-    background-image: -o-linear-gradient(290deg, #ddd 10%, #fff 90%);
-    background-image: linear-gradient(160deg, #ddd 10%, #fff 90%);
-    color: #000;
-    font-weight: 500;
-    font-size: 1.1rem;
-    margin-bottom: 10px;
-  }
+table {
+  width: 100%;
+  border-collapse: collapse;
+  border: 1px solid #ddd;
+}
 
+table td:nth-child(odd) {
+  text-align: right;
+  background: #f5f5f5;
+}
 
-  .formFlex {
-    display: flex;
-  }
+h3 {
+  /*margin: 0;*/
+  padding: 0.5rem !important;
+  background-image: -o-linear-gradient(290deg, #ddd 10%, #fff 90%);
+  background-image: linear-gradient(160deg, #ddd 10%, #fff 90%);
+  color: #000;
+  font-weight: 500;
+  font-size: 1.1rem;
+  margin-bottom: 10px;
+}
 
-  .formWidth2 {
-    width: 50%;
-  }
 
-  .sxzd {
+.formFlex {
+  display: flex;
+}
+
+.formWidth2 {
+  width: 50%;
+}
+
+.sxzd {
   font-weight: 600;
   margin: 10px 15px;
-  }
+}
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-   <lryp :isJg="false"></lryp>
+   <lryp :source="1" :isJg="false"></lryp>
 </template>
 
 <script>