Kaynağa Gözat

Merge branch 'wm-基本信息、老人用品' of sckj/mz-cloud into master

sunkuosheng521 2 yıl önce
ebeveyn
işleme
9fc2a2f643

+ 119 - 5
ruoyi-ui/src/views/business/lhcj/sxxx/yljgSxxx/index.vue

@@ -68,7 +68,7 @@
             @click="handleDelete(scope.row, scope.$index)" v-hasPermi="['business:yljgSxxx:remove']">删除</el-button>
           <el-button v-if="scope.row.lzzt == '00'" size="mini" type="text" icon="el-icon-edit"
             @click="handleStart(scope.row)" v-hasPermi="['business:yljgSxxx:edit']">提交</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetails(scope.row)"
             v-hasPermi="['business:yljgSxxx:query']">详情</el-button>
         </template>
       </el-table-column>
@@ -78,9 +78,9 @@
       @pagination="getList" />
 
     <!-- 添加或修改养老机构失信信息对话框 -->
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <h3>机构信息</h3>
         <el-form-item label="养老服务机构名称" prop="jgmc">
           <el-input v-model="form.jgmc" placeholder="请输入机构名称" />
         </el-form-item>
@@ -114,6 +114,7 @@
         <el-form-item label="通信地址" prop="txdzms">
           <el-input v-model="form.txdzms" placeholder="请输入通信地址" />
         </el-form-item>
+        <h3>失信信息</h3>
 
         <el-form-item label="来源途径" prop="sjly">
           <el-select v-model="form.sjly" placeholder="请选择数据来源">
@@ -162,6 +163,76 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
+    <!--详细-->
+    <el-dialog v-dialog-drag title="养老机构失信信息" :visible.sync="openXQ" width="700px" :append-to-body="true"
+      custom-class="custom">
+      <h3>机构信息</h3>
+      <table>
+        <tr>
+          <td>养老服务机构名称:</td>
+          <td>{{ dataDetails.jgmc }}</td>
+          <td>统一社会信用代码:</td>
+          <td>{{ dataDetails.tyshxydm }}</td>
+        </tr>
+        <tr>
+          <td>法人(负责人)姓名:</td>
+          <td>{{ dataDetails.frxm }}</td>
+          <td>联系方式:</td>
+          <td>{{ dataDetails.lxdh }}</td>
+        </tr>
+        <tr>
+          <td>证件类型:</td>
+          <td>{{ translateDict("C0015", dataDetails.frzjlx) }}</td>
+          <td>证件号码:</td>
+          <td>{{ dataDetails.frzjhm }}</td>
+        </tr>
+        <tr>
+          <td>通信地址:</td>
+          <td  colspan="3">{{ dataDetails.frxm }}</td>
+        </tr>
+
+      </table>
+      <h3>失信信息</h3>
+      <table>
+        <tr>
+          <td>来源途径:</td>
+          <td colspan="3">{{ translateDict("CH042", dataDetails.sjly) }}</td>
+        </tr>
+        <tr>
+          <td>失信信息描述:</td>
+          <td colspan="3">{{ dataDetails.ms }}</td>
+        </tr>
+        <tr>
+          <td>是否处罚:</td>
+          <td colspan="3">{{ translateDict("CZ035", dataDetails.isCf) }}</td>
+        </tr>
+        <tr>
+          <td>处罚依据:</td>
+          <td colspan="3">{{ dataDetails.cfyj }}</td>
+        </tr>
+        <tr>
+          <td>处罚内容:</td>
+          <td colspan="3">{{ dataDetails.cfnr }}</td>
+        </tr>
+        <tr>
+          <td>处罚部门:</td>
+          <td>{{ translateDict("CH036", dataDetails.cfbm) }}</td>
+          <td>处罚时间:</td>
+          <td>{{ special(dataDetails.cfrq,'date') }}</td>
+        </tr>
+        <tr>
+          <td>相关材料:</td>
+          <td colspan="3">{{ dataDetails.sxxxXgcl }}</td>
+        </tr>
+        
+
+      </table>
+
+
+    </el-dialog>
   </div>
 </template>
 
@@ -189,10 +260,12 @@ export default {
       total: 0,
       // 养老机构失信信息表格数据
       yljgSxxxList: [],
+       dataDetails: {},
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      openXQ: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -353,6 +426,13 @@ export default {
         this.title = "修改养老机构失信信息";
       });
     },
+    /** 详细 */
+    handleDetails(row) {
+      getYljgSxxx(row.id).then(response => {
+        this.dataDetails = response.data
+        this.openXQ = true
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -484,7 +564,41 @@ export default {
       this.download('business/yljgSxxx/export', {
         ...this.queryParams
       }, `yljgSxxx_${new Date().getTime()}.xlsx`)
-    }
+    },
+     translateDict(type, value) {
+      return this.selectDictLabel(this.dict.type[type], value)
+    },
   }
 };
 </script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+table td {
+  width: 10%;
+  height: 2.5rem;
+  padding: .5%;
+  font-weight: 500;
+  border: 1px solid #ddd;
+}
+
+table {
+  width: 100%;
+  border-collapse: collapse;
+  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;
+}
+</style>

+ 132 - 327
ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/jbxx/index.vue

@@ -7,268 +7,229 @@
         </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="请输入统一社会信用代码"
-          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="请输入统一社会信用代码" 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-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
 
-    <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="szxzqhName" width="240"/>
-      <el-table-column label="类别" align="center" prop="lb" width="400">
-        <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">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleXQ(scope.row)"
-          >详情
-          </el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--          >修改</el-button>-->
-        </template>
-      </el-table-column>
-    </el-table>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['business:ygJbxx:export']">导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-     </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="szxzqhName" width="240" />
+          <el-table-column label="类别" align="center" prop="lb" width="400">
+            <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">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleXQ(scope.row)">详情
+              </el-button>
+
+            </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>
     </el-row>
 
     <!--详情-->
-    <el-dialog
-      v-dialog-drag
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body>
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" append-to-body>
 
-    <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-      <!--</el-form-item>-->
       <h3>机构基本信息</h3>
       <table>
         <tr>
           <td>统一社会信用代码</td>
-          <td>{{form.tyshxydm}}</td>
+          <td>{{ form.tyshxydm }}</td>
           <td>单位名称</td>
-          <td>{{form.jgmc}}</td>
+          <td>{{ form.jgmc }}</td>
           <td>单位建立日期</td>
-          <td>{{special(form.jlrq)}}</td>
+          <td>{{ special(form.jlrq) }}</td>
         </tr>
         <tr>
           <td>所属行政区划</td>
-          <td>{{form.ssxzqhName}}</td>
+          <td>{{ form.ssxzqhName }}</td>
           <td>单位所在行政区划</td>
-          <td>{{form.szxzqhName}} </td>
+          <td>{{ form.szxzqhName }} </td>
           <td>单位门牌号</td>
-          <td>{{form.txdz}} </td>
+          <td>{{ form.txdz }} </td>
         </tr>
       </table>
       <h3>法定代表人或负责人信息</h3>
       <table>
         <tr>
           <td>法定代表人或负责人姓名</td>
-          <td>{{form.frxm}}</td>
+          <td>{{ form.frxm }}</td>
           <td>法定代表人或负责人证件类型</td>
-          <td>{{translateDict('C0015',form.frzjlx)}}</td>
+          <td>{{ translateDict('C0015', form.frzjlx) }}</td>
           <td>法定代表人或负责人证件号码</td>
-          <td>{{form.frzjhm}}</td>
+          <td>{{ form.frzjhm }}</td>
         </tr>
         <tr>
           <td>法定代表人或负责人联系方式</td>
-          <td>{{form.frlxfs}}</td>
+          <td>{{ form.frlxfs }}</td>
           <td>法人登记机关</td>
-          <td>{{form.frdjjg}}</td>
+          <td>{{ form.frdjjg }}</td>
           <td>法人类型</td>
-          <td>{{translateDict('CH007',form.frlx)}}</td>
+          <td>{{ translateDict('CH007', form.frlx) }}</td>
         </tr>
       </table>
       <h3>场所信息</h3>
       <table>
         <tr>
           <td>全托床位数量(个)</td>
-          <td>{{form.qtcws}}</td>
+          <td>{{ form.qtcws }}</td>
           <td>日托床位数量(个)</td>
-          <td>{{form.qtcws}}</td>
+          <td>{{ form.qtcws }}</td>
           <td>护理型床位数量(个)</td>
-          <td>{{form.hlxcws}}</td>
+          <td>{{ form.hlxcws }}</td>
         </tr>
         <tr>
           <td>床位总数量(个)</td>
-          <td>{{form.cwzs}}</td>
+          <td>{{ form.cwzs }}</td>
           <td>建筑面积(㎡)</td>
-          <td>{{form.jzmj}}</td>
+          <td>{{ form.jzmj }}</td>
           <td>占地面积(㎡)</td>
-          <td>{{form.zdmj}}</td>
+          <td>{{ form.zdmj }}</td>
         </tr>
         <tr>
           <td>场所性质</td>
-          <td>{{translateDict('CH009',form.csxz)}}</td>
+          <td>{{ translateDict('CH009', form.csxz) }}</td>
           <td>是否享受养老服务税费减免</td>
-          <td>{{translateDict('CZ035',form.isJm)}}</td>
+          <td>{{ translateDict('CZ035', form.isJm) }}</td>
         </tr>
       </table>
       <h3>扩展信息</h3>
       <table>
         <tr>
           <td>类别</td>
-          <td>{{translateDict('CZ030',form.lb)}}</td>
+          <td>{{ translateDict('CZ030', form.lb) }}</td>
           <td>单位性质</td>
-          <td>{{translateDict('C0038',form.dwxz)}}</td>
+          <td>{{ translateDict('C0038', form.dwxz) }}</td>
           <td>兴办主体</td>
-          <td>{{translateDict('CH010',form.xbzt)}}</td>
+          <td>{{ translateDict('CH010', form.xbzt) }}</td>
         </tr>
         <tr>
           <td>是否街道(乡镇)区域性养老中心</td>
-          <td>{{translateDict('CZ035',form.isQyxylfwzx)}}</td>
+          <td>{{ translateDict('CZ035', form.isQyxylfwzx) }}</td>
           <td>所处位置</td>
-          <td>{{translateDict('CH012',form.scwz)}}</td>
+          <td>{{ translateDict('CH012', form.scwz) }}</td>
           <td>是否投保责任险代码</td>
-          <td>{{translateDict('CZ035',form.isTbzrx)}}</td>
+          <td>{{ translateDict('CZ035', form.isTbzrx) }}</td>
         </tr>
         <tr>
           <td>是否长护险定点机构</td>
-          <td>{{translateDict('CZ035',form.isChxddjg)}}</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>
+          <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>{{ 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>
+          <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>
+          <td colspan="5">{{ translateDict('CH052', form.szlrlx, true) }}</td>
         </tr>
         <tr>
           <td>医疗服务形式</td>
-          <td>{{translateDict('CZ035',form.isKzylfw)}}</td>
+          <td>{{ translateDict('CZ035', form.isKzylfw) }}</td>
           <td>内设医疗机构</td>
-          <td>{{translateDict('CH013',form.nsyljg,true)}}</td>
+          <td>{{ translateDict('CH013', form.nsyljg, true) }}</td>
           <td>与医疗机构签约合作</td>
-          <td>{{translateDict('CH014',form.yljgqyhz,true)}}</td>
+          <td>{{ translateDict('CH014', form.yljgqyhz, true) }}</td>
         </tr>
         <tr>
           <td>是否取得医疗机构执业许可证书</td>
-          <td>{{translateDict('CZ035',form.isYljgzyxk)}}</td>
+          <td>{{ translateDict('CZ035', form.isYljgzyxk) }}</td>
           <td>是否取得医疗保险定点医疗机构资格证书</td>
-          <td>{{translateDict('CZ035',form.isYlbxddzg)}}</td>
+          <td>{{ translateDict('CZ035', form.isYlbxddzg) }}</td>
         </tr>
       </table>
       <h3>其他信息</h3>
       <table>
         <tr>
           <td>机构运营状态</td>
-          <td>{{translateDict('CH026',form.sczt)}}</td>
+          <td>{{ translateDict('CH026', form.sczt) }}</td>
           <td>操作原因</td>
-          <td>{{form.czyy}}</td>
+          <td>{{ form.czyy }}</td>
           <td>操作时间</td>
-          <td>{{special(form.czsj)}}</td>
+          <td>{{ special(form.czsj) }}</td>
         </tr>
       </table>
-    </el-form>
-      <div slot="footer" class="dialog-footer" v-if="isXQ">
-        <el-button
-          type="primary"
-          @click="submitFormAndStart"
-          :loading="submitFormLoading"
-        >提 交
-        </el-button
-        >
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {listSqJcxx, getSqJcxx, updateSqJgKyzt} from '@/api/business/fwjggl/sqJcxx'
-import { Regular,chineseOne, idCard } from '@/utils/regular'
+import { listSqJcxx, getSqJcxx, updateSqJgKyzt } from '@/api/business/fwjggl/sqJcxx'
+import { Regular, chineseOne, idCard } from '@/utils/regular'
 import { mapState } from 'vuex'
 
 export default {
   name: "Bn",
   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',  
+    'CZ035',    'CZ030'],
   data() {
     return {
-      isXQ:false,
+      isXQ: false,
       fixation: {},
       openXQ: false,
       // 遮罩层
@@ -302,109 +263,7 @@ export default {
       // 表单参数
       form: {
       },
-      // 表单校验
-      rules: {
-        tyshxydm: [
-          { required: true, message: "统一社会信用代码不能为空", trigger: "blur" },
-          { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur'},
-        ],
-        jgmc: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
-          { max: 100, message: '单位名称不能超过100个字符', trigger: 'blur'},
-        ],
-        jlrq: [
-          { required: true, message: "单位建立日期不能为空", trigger: "blur" },
-        ],
-        // ssxzqh: [
-        //   { required: true, message: "单位所属行政区划不能为空", trigger: "blur" },
-        //   { max: 12, message: '单位所属行政区划不能超过12个字符', trigger: 'blur'},
-        // ],
-        // szxzqh: [
-        //   { required: true, message: "单位所在行政区划不能为空", trigger: "blur" },
-        //   { max: 12, message: '单位所在行政区划不能超过12个字符', trigger: 'blur'},
-        // ],
-        txdz: [
-          { required: true, message: "单位通信详细地址不能为空", trigger: "blur" },
-          { max: 100, message: '单位通信详细地址不能超过100个字符', trigger: 'blur'},
-        ],
-        frxm: [
-          { required: true, message: "法定代表人或负责人姓名不能为空", trigger: "blur" },
-          { max: 72, message: '法定代表人或负责人姓名不能超过72个字符', trigger: 'blur'},
-          { validator: chineseOne, trigger: 'blur' },
-        ],
-        frzjlx: [
-          { required: true, message: "法定代表人或负责人证件类型不能为空", trigger: "change" },
-        ],
-        frzjhm: [
-          { required: true, message: "法定代表人或负责人证件号码不能为空", trigger: "blur" },
-          { validator: idCard, trigger: 'blur' },
-        ],
-        frlxfs: [
-          { required: true, message: "法定代表人或负责人联系方式不能为空", trigger: "blur" },
-          { max: 32, message: '法定代表人或负责人联系方式不能超过32个字符', trigger: 'blur'},
-        ],
-        frdjjg: [
-          { required: true, message: "法人登记机关不能为空", trigger: "blur" },
-          { max: 40, message: '法人登记机关不能超过40个字符', trigger: 'blur'},
-        ],
-        frlx: [
-          { required: true, message: "法人类型不能为空", trigger: "change" },
-        ],
-        qtcws: [
-          { required: true, message: "全托床位数量不能为空", trigger: "blur" },
-        ],
-        rtcws: [
-          { required: true, message: "日托床位数量不能为空", trigger: "blur" },
-        ],
-        cwzs: [
-          { required: true, message: "床位总数量不能为空", trigger: "blur" },
-        ],
-        hlxcws: [
-          { required: true, message: "护理型床位数量不能为空", trigger: "blur" },
-        ],
-        jzmj: [
-          { required: true, message: "建筑面积不能为空", trigger: "blur" },
-        ],
-        zdmj: [
-          { required: true, message: "占地面积不能为空", trigger: "blur" },
-        ],
-        csxz: [
-          { required: true, message: "场所性质不能为空", trigger: "change" },
-        ],
-        dwxz: [
-          { required: true, message: "单位性质不能为空", trigger: "change" },
-        ],
-        scwz: [
-          { required: true, message: "所处位置不能为空", trigger: "change" },
-        ],
-        isTbzrx: [
-          { required: true, message: "是否投保责任险不能为空", trigger: "blur" },
-        ],
-        szlrlx: [
-          { required: true, message: "收住老人类型不能为空", trigger: "blur" },
-        ],
-        szlrlxQt: [
-          { max: 100, message: '收住老人其他类型说明不能超过100个字符', trigger: 'blur'},
-        ],
-        xbzt: [
-          { required: true, message: "兴办主体不能为空", trigger: "change" },
-        ],
-        bhsqs: [
-          { max: 100, message: '备案申请书不能超过100个字符', trigger: 'blur'},
-        ],
-        jgdjzs: [
-          { max: 100, message: '养老机构登记证书不能超过100个字符', trigger: 'blur'},
-        ],
-        cns: [
-          { max: 100, message: '承诺书不能超过100个字符', trigger: 'blur'},
-        ],
-        hzdcl: [
-          { max: 100, message: '回传回执单材料不能超过100个字符', trigger: 'blur'},
-        ],
-        qtcl: [
-          { max: 100, message: '其他材料不能超过100个字符', trigger: 'blur'},
-        ],
-      }
+
     };
   },
   created() {
@@ -433,6 +292,7 @@ export default {
     }
   },
   methods: {
+
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.xzqhId = data.code
@@ -467,7 +327,7 @@ export default {
     },
     // 表单重置
     reset() {
-      this.submitFormLoading =false;
+      this.submitFormLoading = false;
       (this.searchXydm = null),
         this.form = {
           id: null,
@@ -544,77 +404,22 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    handleXQ(row){
-      this.handleUpdate(row,true)
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row,is) {
-      this.reset();
-      const id = row.id || this.ids
-      getSqJcxx(id).then(response => {
-        this.form = response.data;
-        /****** sks 需要改动的地方 start ******/
-        this.copyForm=this.deepCopy(response.data)
-        /****** sks 需要改动的地方 end ******/
-        this.open = true;
-        this.title = "修改开业状态";
-
-        if (is)
-        { this.title = '等级评定申请详情'
-          this.isXQ=false
-        }else
-        {
-          this.title = '修改等级评定申请'
-          this.isXQ=true
-        }
 
-      });
-    },
-    /** 提交按钮 */
-    submitFormAndStart() {
-      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){
-              updateSqJgKyzt({...formData,id:this.form.id})
-                .then((response) => {
-                  this.$modal.msgSuccess('修改成功')
-                  this.open = false
-                  this.jcxxList=this.dataReplacement(this.jcxxList,this.form.id,formData);
-                })
-                .finally(() => (this.submitFormLoading = false))
-            }else {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              if (this.queryParams.pageSize===this.cwList.length)
-              {
-                this.jcxxList.pop();
-              }
-              this.jcxxList.unshift({...this.form,id:response.data});
-              this.total++;
-              this.submitFormLoading = false;
-            }
-
-          }
-        }
-      })
-    },
-    particulars(row) {
+    handleXQ(row) {
       this.reset()
-      getSqJcxx(row.id).then(response => {
-        this.open = true
+      const id = row.id || this.ids
+      getSqJcxx(id).then((response) => {
         this.form = response.data
-        this.form.szlx = this.form.szlrlx ? this.form.szlrlx.split(',') : []
+        this.open = true
       })
     },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/fwjggl/sqJcxx/export', {
+        ...this.queryParams
+      }, `sqJcxx_${new Date().getTime()}.xlsx`)
+    }
   }
 };
 </script>

+ 62 - 1
ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/lryp/commonality/index.vue

@@ -134,8 +134,9 @@
     </el-dialog>
 
     <!--详细-->
-    <el-dialog v-dialog-drag title="老人用品详细信息" :visible.sync="openXQ" width="1200px" :append-to-body="true"
+    <el-dialog v-dialog-drag title="老人用品详细信息" :visible.sync="openXQ" width="700px" :append-to-body="true"
       custom-class="custom">
+      <h3>单位信息</h3>
       <table>
         <tr>
           <td>单位名称:</td>
@@ -145,9 +146,38 @@
         </tr>
         <tr>
           <td>单位门牌号:</td>
+          <td colspan="3">{{ dataDetails.szxzqhName }}</td>
         </tr>
 
       </table>
+      <h3>产品信息</h3>
+      <table>
+        <tr>
+          <td>产品名称:</td>
+          <td>{{ dataDetails.lrypmc }}</td>
+          <td>产品类型:</td>
+          <td>{{ translateDict("CH001", dataDetails.lrypggxh) }}</td>
+        </tr>
+        <tr>
+          <td>产品规格型号:</td>
+          <td>{{ translateDict("XZ007", dataDetails.lryplx) }}</td>
+          <td>产品价格(元):</td>
+          <td>{{ dataDetails.ypjg }}</td>
+        </tr>
+        <tr>
+          <td>生产厂商:</td>
+          <td>{{ dataDetails.ypsccs }}</td>
+          <td>产品使用对象:</td>
+          <td>{{ translateDict("XZ006", dataDetails.lrypsydx) }}</td>
+        </tr>
+        <tr>
+          <td>产品用途:</td>
+          <td colspan="3">{{ dataDetails.lrypyt }}</td>
+          
+        </tr>
+
+      </table>
+
 
     </el-dialog>
   </div>
@@ -303,6 +333,9 @@ export default {
         }
       });
     },
+     translateDict(type, value) {
+      return this.selectDictLabel(this.dict.type[type], value)
+    },
   }
 };
 </script>
@@ -314,4 +347,32 @@ export default {
 .el-date-editor.el-input {
   width: 100%;
 }
+table td {
+  width: 10%;
+  height: 2.5rem;
+  padding: .5%;
+  font-weight: 500;
+  border: 1px solid #ddd;
+}
+
+table {
+  width: 100%;
+  border-collapse: collapse;
+  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;
+}
 </style>

+ 1 - 1
ruoyi-ui/src/views/business/xxcx/fwjg/yljg/jbxx/index.vue

@@ -659,7 +659,7 @@ export default {
         this.title = "修改开业状态";
 
         if (is)
-        { this.title = '等级评定申请详情'
+        { this.title = '基本信息'
           this.isXQ=false
         }else
         {