Merge branch '20221122_sun高龄津贴相关改动' of sckj/mz-cloud into master

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/domain/ZwywBtglGlbtxm.java

@@ -1,6 +1,7 @@
 package com.ruoyi.business.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -53,6 +54,12 @@ public class ZwywBtglGlbtxm extends BaseEntity
     @Size(min = 1, max = 18, message = "{项目编号}")
     private String xmbh;
 
+    @Excel(name = "行政区划")
+    @ApiModelProperty(value = "行政区划", required = true)
+    @NotBlank(message = "{行政区划}",groups = AddGroup.class)
+    @Size(min = 1, max = 12, message = "{行政区划}")
+    private String xzqh;
+
     /** 启用日期 */
     @Excel(name = "启用日期")
     @ApiModelProperty(value = "启用日期", required = true)
@@ -98,4 +105,7 @@ public class ZwywBtglGlbtxm extends BaseEntity
     @ApiModelProperty(value = "项目状态")
     @Size(max = 2, message = "{项目状态}")
     private String xmzt;
+
+    @TableField(exist = false)
+    private String xzqhName;
 }

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglGlbtServiceImpl.java

@@ -285,11 +285,10 @@ public class ZwywBtglGlbtServiceImpl implements IZwywBtglGlbtService
         for (ZwywBtglGlbt n: glbtList){
             msg.append(ImportUtils.checkAndTrans(n));
             ZwywBtglGlbt glbt = new ZwywBtglGlbt();
-            glbt.setXzqh(n.getXzqh());
             glbt.setSqrZjhm(SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, n.getSqrZjhm()));
-            glbt.setStatus(AdvancedStatus.MONTH.getCode());
-            if (ObjectUtils.isNotEmpty(zwywBtglGlbtMapper.selectOne(new LambdaQueryWrapper<>(glbt)))){
-                msg.append("<").append("证件号码：").append(n.getSqrZjhm()).append(" >已存在当前系统中,请修改。<br />");
+            ZwywBtglGlbt in = zwywBtglGlbtMapper.selectOne(new LambdaQueryWrapper<>(glbt));
+            if (ObjectUtils.isNotEmpty(in)){
+                zwywBtglGlbtMapper.deleteById(in);
             }
             if (StringUtils.isEmpty(n.getBfje())) {
                 n.setBfje(null);
@@ -319,18 +318,17 @@ public class ZwywBtglGlbtServiceImpl implements IZwywBtglGlbtService
         SecurityContextHolder.set(SecurityConstants.LOGIN_USER, user);
         List<SysDept> deptList = sysDeptJlMapper.selectSysDeptJl().stream().filter(d -> Arrays.stream(d.getAncestors()
                 .split(",")).count() < 3).collect(Collectors.toList());
-        LambdaQueryWrapper<ZwywBtglGlbt> lqw = new LambdaQueryWrapper<ZwywBtglGlbt>()
-                .eq(ZwywBtglGlbt::getStatus, AdvancedStatus.MONTH.getCode())
-                .le(ZwywBtglGlbt::getFfyf, DateUtils.dateTime().substring(0, 6));
-        List<ZwywBtglGlbt> glbtList = zwywBtglGlbtMapper.selectList(lqw);
         for (SysDept dept: deptList) {
-            String deptLocate = unitHandler(dept.getLocationCode());
-            List<ZwywBtglGlbt> deptGlbtList = glbtList.stream().filter(v -> v.getXzqh().contains(deptLocate))
-                    .collect(Collectors.toList());
+            LambdaQueryWrapper<ZwywBtglGlbt> lqw = new LambdaQueryWrapper<ZwywBtglGlbt>()
+                    .eq(ZwywBtglGlbt::getStatus, AdvancedStatus.MONTH.getCode())
+                    .le(ZwywBtglGlbt::getFfyf, DateUtils.dateTime().substring(0, 6))
+                    .apply("and xzqh in (SELECT code FROM sys_dept_jl WHERE code = '"
+                            + dept.getLocationCode() + "' or FIND_IN_SET ('" + dept.getLocationCode() + "', ancestors ))");
+            List<ZwywBtglGlbt> deptGlbtList = zwywBtglGlbtMapper.selectList(lqw);
             // 根据等级部门查询该部门创建且启用日期及停用日期符合要求的高领津贴项目
             LambdaQueryWrapper<ZwywBtglGlbtxm> xmLqw = new LambdaQueryWrapper<ZwywBtglGlbtxm>()
                     .eq(ZwywBtglGlbtxm::getXmzt, GlbtXmztStatus.QY.getCode())
-                    .eq(ZwywBtglGlbtxm::getCreateUnit, dept.getDeptId())
+                    .eq(ZwywBtglGlbtxm::getXzqh, dept.getLocationCode())
                     .le(ZwywBtglGlbtxm::getQyrq, DateUtils.dateTime())
                     .and(wq -> wq.ge(ZwywBtglGlbtxm::getTyrq, DateUtils.dateTime())
                             .or().isNull(ZwywBtglGlbtxm::getTyrq));

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglGlbtxmServiceImpl.java

@@ -1,19 +1,18 @@
 package com.ruoyi.business.service.impl;
 
-import java.util.List;
-
-import com.ruoyi.business.domain.ZwywBtglXmgl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.business.domain.ZwywBtglGlbtxm;
+import com.ruoyi.business.mapper.ZwywBtglGlbtxmMapper;
+import com.ruoyi.business.service.IZwywBtglGlbtxmService;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Arrays;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.business.mapper.ZwywBtglGlbtxmMapper;
-import com.ruoyi.business.domain.ZwywBtglGlbtxm;
-import com.ruoyi.business.service.IZwywBtglGlbtxmService;
+import java.util.List;
 
 /**
  * 补贴管理高龄补贴项目信息Service业务层处理
@@ -27,6 +26,9 @@ public class ZwywBtglGlbtxmServiceImpl implements IZwywBtglGlbtxmService
     @Autowired
     private ZwywBtglGlbtxmMapper zwywBtglGlbtxmMapper;
 
+    @Autowired
+    private SysDeptJlMapper sysDeptJlMapper;
+
     /**
      * 查询补贴管理高龄补贴项目信息
      *
@@ -36,7 +38,9 @@ public class ZwywBtglGlbtxmServiceImpl implements IZwywBtglGlbtxmService
     @Override
     public ZwywBtglGlbtxm selectZwywBtglGlbtxmById(String id)
     {
-        return zwywBtglGlbtxmMapper.selectById(id);
+        ZwywBtglGlbtxm res = zwywBtglGlbtxmMapper.selectById(id);
+        res.setXzqhName(sysDeptJlMapper.getXzqhNames(res.getXzqh()));
+        return res;
     }
 
     /**
@@ -48,7 +52,9 @@ public class ZwywBtglGlbtxmServiceImpl implements IZwywBtglGlbtxmService
     @Override
     public List<ZwywBtglGlbtxm> selectZwywBtglGlbtxmList(ZwywBtglGlbtxm zwywBtglGlbtxm)
     {
-        return zwywBtglGlbtxmMapper.selectList(new LambdaQueryWrapper<>(zwywBtglGlbtxm));
+        List<ZwywBtglGlbtxm> res = zwywBtglGlbtxmMapper.selectList(new LambdaQueryWrapper<>(zwywBtglGlbtxm));
+        res.forEach(r -> r.setXzqhName(sysDeptJlMapper.getXzqhNames(r.getXzqh())));
+        return res;
     }
 
     /**
@@ -61,7 +67,7 @@ public class ZwywBtglGlbtxmServiceImpl implements IZwywBtglGlbtxmService
     public int insertZwywBtglGlbtxm(ZwywBtglGlbtxm zwywBtglGlbtxm)
     {
         LambdaQueryWrapper<ZwywBtglGlbtxm> lqw = new LambdaQueryWrapper<ZwywBtglGlbtxm>()
-                .eq(ZwywBtglGlbtxm::getCreateUnit, SecurityUtils.getUserUnitId())
+                .eq(ZwywBtglGlbtxm::getXzqh, zwywBtglGlbtxm.getXzqh())
                 .and(wq -> wq.ge(ZwywBtglGlbtxm::getTyrq, zwywBtglGlbtxm.getQyrq()).or().isNull(ZwywBtglGlbtxm::getTyrq));
         if (StringUtils.isNotEmpty(zwywBtglGlbtxm.getTyrq())) {
             lqw.le(ZwywBtglGlbtxm::getQyrq, zwywBtglGlbtxm.getTyrq());

ruoyi-modules/mz-business-btgl/src/main/resources/mapper/business/ZwywBtglGlbtxmMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="xmmc"    column="xmmc"    />
         <result property="xmbh"    column="xmbh"    />
+        <result property="xzqh"    column="xzqh"    />
         <result property="qyrq"    column="qyrq"    />
         <result property="tyrq"    column="tyrq"    />
         <result property="btzjE"    column="btzj_e"    />

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywBtglGlbtxmController.java

@@ -1,29 +1,21 @@
 package com.ruoyi.business.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.security.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.system.validate.group.AddGroup;
 import com.ruoyi.business.domain.ZwywBtglGlbtxm;
 import com.ruoyi.business.service.IZwywBtglGlbtxmService;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.validate.group.AddGroup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 补贴管理高龄补贴项目信息Controller
@@ -45,7 +37,6 @@ public class ZwywBtglGlbtxmController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ZwywBtglGlbtxm zwywBtglGlbtxm)
     {
-        zwywBtglGlbtxm.setCreateUnit(SecurityUtils.getUserUnitId());
         startPage();
         List<ZwywBtglGlbtxm> list = zwywBtglGlbtxmService.selectZwywBtglGlbtxmList(zwywBtglGlbtxm);
         return getDataTable(list);

ruoyi-ui/src/views/business/btgl/glbtxm/index.vue

@@ -29,6 +29,7 @@
       </el-table-column>
       <el-table-column label="项目名称" align="center" prop="xmmc" />
       <el-table-column label="项目编号" align="center" prop="xmbh" />
+      <el-table-column label="应用行政区划" align="center" prop="xzqhName" />
       <el-table-column label="启用日期" align="center" prop="qyrq" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.qyrq) }}</span>
@@ -105,6 +106,13 @@
             <el-form-item label="补贴资金(100岁以上)" prop="btzjH" class="formWidth2">
               <number placeholder="补贴资金(100岁以上)" v-model.sync="form.btzjH" :min="0" :max="10000000000" :precision="2" />
             </el-form-item>
+
+            <el-form-item label="应用行政区划" prop="xzqhName" class="formWidth2 itemFlex ">
+              <el-input v-model="form.xzqhName" placeholder="请输入应用行政区划" :disabled="true" />
+              <el-button type="primary" @click="handleds" style="margin-left: 5px">选择行政区划</el-button>
+            </el-form-item>
+          </div>
+          <div class="flexBox">
             <el-form-item label="项目描述" prop="xmms" class="formWidth2">
               <el-input v-model="form.xmms" type="textarea" maxlength="100" show-word-limit placeholder="请输入项目描述" />
             </el-form-item>
@@ -117,6 +125,12 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="行政区划选择" :visible.sync="openSelect" width="400px" append-to-body>
+      <span class="sxzd">行政区划</span>
+      <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
+      </dept-tree>
+    </el-dialog>
+
     <!-- 详情 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="openXq" width="900px" append-to-body>
       <el-scrollbar wrapClass="scrollbar-wrap">
@@ -143,6 +157,10 @@
           <tr>
             <td>补贴资金(100岁以上)</td>
             <td>{{ form.btzjH }}</td>
+            <td>应用行政区划</td>
+            <td>{{ form.xzqhName }}</td>
+          </tr>
+          <tr>
             <td>项目描述</td>
             <td>{{ form.xmms }}</td>
           </tr>
@@ -158,6 +176,7 @@
 <script>
 import { addGlbtxm, delGlbtxm, getGlbtxm, listGlbtxm, updateGlbtxm } from "@/api/business/btgl/glbtxm";
 import { chineseOne, idCard, Regular } from '@/utils/regular'
+import { mapState } from 'vuex'
 
 export default {
   name: "Glbtxm",
@@ -184,6 +203,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openSelect: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -203,6 +223,9 @@ export default {
           { required: true, message: "项目编号不能为空", trigger: "blur" },
           { max: 18, message: '项目编号不能超过18个字符', trigger: 'blur' },
         ],
+        xzqhName: [
+          { required: true, message: "行政区划不能为空", trigger: "blur" },
+        ],
         qyrq: [
           { required: true, message: "启用日期不能为空", trigger: "blur" },
         ],
@@ -227,6 +250,9 @@ export default {
   created() {
     this.getList();
   },
+  computed: {
+    ...mapState(['user'])
+  },
   methods: {
     /** 查询补贴管理高龄补贴项目信息列表 */
     getList() {
@@ -242,6 +268,18 @@ export default {
       this.open = false;
       this.reset();
     },
+    handleNodeClick(data) {
+      if (data.code) {
+        this.form.xzqh = data.code;
+      }
+      if (data.name) {
+        this.form.xzqhName = data.name;
+      }
+      this.openSelect = false;
+    },
+    handleds() {
+      this.openSelect = true;
+    },
     cancelXq() {
       this.openXq = false;
       this.reset();
@@ -399,4 +437,13 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 @import "@/assets/styles/common/common.scss";
+
+::v-deep .itemFlex>.el-form-item__content {
+  display: flex;
+}
+
+.sxzd {
+  font-weight: 600;
+  margin: 10px 15px;
+}
 </style>

ruoyi-ui/src/views/business/xmsb/xmsbXmlx/index.vue

@@ -1,51 +1,21 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="类型名称" prop="lxmc">
-        <el-input
-          v-model="queryParams.lxmc"
-          placeholder="请输入类型名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.lxmc" placeholder="请输入类型名称" clearable @keyup.enter.native="handleQuery" />
       </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="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-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['business:xmsbXmlx:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['business:xmsbXmlx:add']">新增</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="xmsbXmlxList">
@@ -57,83 +27,36 @@
       </el-table-column>
       <el-table-column label="应用范围" align="center" prop="xzqhName">
         <template slot-scope="scope">
-          {{scope.row.xzqhName ? scope.row.xzqhName : '全省'}}
+          {{ scope.row.xzqhName ? scope.row.xzqhName : '全省' }}
         </template>
       </el-table-column>
 
       <el-table-column label="数据状态" align="center" prop="status">
         <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="0"
-            inactive-value="99"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
+          <el-switch v-model="scope.row.status" active-value="0" inactive-value="99"
+            @change="handleStatusChange(scope.row)"></el-switch>
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        fixed="right"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:xmsbXmlx:edit']"
-            >修改</el-button
-          >
-          <el-button
-          v-if="scope.row.status == '99'"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row, scope.$index)"
-            v-hasPermi="['business:xmsbXmlx:remove']"
-            >删除</el-button
-          >
-          <el-button
-            v-if="scope.row.status == '0'"
-            size="mini"
-            type="text"
-            icon="el-icon-document-copy"
-            @click="handleView(scope.row, scope.$index)"
-            v-hasPermi="['business:xmsbFjlx:list']"
-            >附件类型</el-button
-          >
-          <el-button
-            v-if="scope.row.status == '0'"
-            size="mini"
-            type="text"
-            icon="el-icon-tickets"
-            @click="handleViewForm(scope.row, scope.$index)"
-            v-hasPermi="['business:xmbdpz:list']"
-            >项目表单配置</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:xmsbXmlx:edit']">修改</el-button>
+          <el-button v-if="scope.row.status == '99'" size="mini" type="text" icon="el-icon-delete"
+            @click="handleDelete(scope.row, scope.$index)" v-hasPermi="['business:xmsbXmlx:remove']">删除</el-button>
+          <el-button v-if="scope.row.status == '0'" size="mini" type="text" icon="el-icon-document-copy"
+            @click="handleView(scope.row, scope.$index)" v-hasPermi="['business:xmsbFjlx:list']">附件类型</el-button>
+          <el-button v-if="scope.row.status == '0'" size="mini" type="text" icon="el-icon-tickets"
+            @click="handleViewForm(scope.row, scope.$index)" v-hasPermi="['business:xmbdpz:list']">项目表单配置</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"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改项目申报项目类型信息对话框 -->
-    <el-dialog
-      v-dialog-drag
-      :title="title"
-      :visible.sync="open"
-      width="500px"
-      append-to-body
-    >
+    <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-form-item label="应用行政区划" prop="zyXzqh" style="display: none">
           <el-input v-model="form.zyXzqh" placeholder="请输入应用行政区划" />
@@ -143,44 +66,34 @@
           <el-input v-model="form.lxmc" placeholder="请输入项目类型名称" />
         </el-form-item>
         <el-form-item label="是否地区专用" prop="isDqzy">
-                <el-select v-model="form.isDqzy" placeholder="请选择是否地区专用">
-                  <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
+          <el-select v-model="form.isDqzy" placeholder="请选择是否地区专用">
+            <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
 
-              <el-form-item v-if="form.isDqzy=='1'" label="应用行政区划" prop="xzqhName" class="itemFlex">
-          <el-input v-model="form.xzqhName" placeholder="请输入专用行政区划" :disabled="true"/>
-          <el-button  type="primary" @click="handleds" style="margin-left: 5px">选择行政区划</el-button>
+        <el-form-item v-if="form.isDqzy == '1'" label="应用行政区划" prop="xzqhName" class="itemFlex">
+          <el-input v-model="form.xzqhName" placeholder="请输入专用行政区划" :disabled="true" />
+          <el-button type="primary" @click="handleds" style="margin-left: 5px">选择行政区划</el-button>
         </el-form-item>
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="submitForm"
-          :loading="submitFormLoading"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <el-dialog title="行政区划选择" :visible.sync="openSelect" width="400px" append-to-body>
-        <span class="sxzd">行政区划</span>
-        <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
-        </dept-tree>
-      </el-dialog>
+      <span class="sxzd">行政区划</span>
+      <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
+      </dept-tree>
+    </el-dialog>
 
     <!-- 项目表单配置信息对话框 -->
-    <el-dialog
-      v-dialog-drag
-      :title="viewFormTitle"
-      :visible.sync="openViewForm"
-      width="800px"
-      append-to-body>
+    <el-dialog v-dialog-drag :title="viewFormTitle" :visible.sync="openViewForm" width="800px" append-to-body>
 
-      <xmbdpz :xmlxId="rowId" /> 
+      <xmbdpz :xmlxId="rowId" />
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancelViewForm">确 定</el-button>
@@ -188,21 +101,12 @@
     </el-dialog>
 
     <!-- 项目附件类型信息对话框 -->
-    <el-dialog
-      v-dialog-drag
-      :title="viewTitle"
-      :visible.sync="openView"
-      width="800px"
-      append-to-body
-    >
-      <el-form :model="viewQueryParams" ref="viewQueryForm" size="small" :inline="true" v-show="viewShowSearch" label-width="68px">
+    <el-dialog v-dialog-drag :title="viewTitle" :visible.sync="openView" width="800px" append-to-body>
+      <el-form :model="viewQueryParams" ref="viewQueryForm" size="small" :inline="true" v-show="viewShowSearch"
+        label-width="68px">
         <el-form-item label="类型名称" prop="lxmc">
-          <el-input
-            v-model="viewQueryParams.lxmc"
-            placeholder="请输入类型名称"
-            clearable
-            @keyup.enter.native="handleViewQuery"
-          />
+          <el-input v-model="viewQueryParams.lxmc" placeholder="请输入类型名称" clearable
+            @keyup.enter.native="handleViewQuery" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleViewQuery">搜索</el-button>
@@ -212,14 +116,8 @@
 
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleViewAdd"
-            v-hasPermi="['business:xmsbFjlx:add']"
-          >新增</el-button>
+          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleViewAdd"
+            v-hasPermi="['business:xmsbFjlx:add']">新增</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="viewShowSearch" @queryTable="getFjList"></right-toolbar>
       </el-row>
@@ -228,49 +126,23 @@
         <el-table-column label="类型名称" align="center" prop="lxmc" />
         <el-table-column label="数据状态" align="center" prop="status">
           <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              active-value="0"
-              inactive-value="99"
-              @change="handleViewStatusChange(scope.row)"
-            ></el-switch>
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="99"
+              @change="handleViewStatusChange(scope.row)"></el-switch>
           </template>
         </el-table-column>
 
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          fixed="right"
-        >
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleViewUpdate(scope.row)"
-              v-hasPermi="['business:xmsbFjlx:edit']"
-              >修改</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleViewDelete(scope.row, scope.$index)"
-              v-hasPermi="['business:xmsbFjlx:remove']"
-              >删除</el-button
-            >
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleViewUpdate(scope.row)"
+              v-hasPermi="['business:xmsbFjlx:edit']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleViewDelete(scope.row, scope.$index)"
+              v-hasPermi="['business:xmsbFjlx:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination
-        v-show="viewTotal > 0"
-        :total="viewTotal"
-        :page.sync="viewQueryParams.pageNum"
-        :limit.sync="viewQueryParams.pageSize"
-        @pagination="getFjList"
-      />
+      <pagination v-show="viewTotal > 0" :total="viewTotal" :page.sync="viewQueryParams.pageNum"
+        :limit.sync="viewQueryParams.pageSize" @pagination="getFjList" />
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancelView">确 定</el-button>
@@ -309,10 +181,10 @@ import {
   updateXmsbXmlx,
 } from "@/api/business/xmsb/xmsbXmlx";
 import xmbdpz from "../xmbdpz/index";
-import {addXmsbFjlx, delXmsbFjlx, changeFjStatus, getXmsbFjlx, listXmsbFjlx, updateXmsbFjlx} from "@/api/business/xmsb/xmsbFjlx";
+import { addXmsbFjlx, delXmsbFjlx, changeFjStatus, getXmsbFjlx, listXmsbFjlx, updateXmsbFjlx } from "@/api/business/xmsb/xmsbFjlx";
 import { chineseOne, idCard, Regular } from "@/utils/regular";
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 
 export default {
   name: "XmsbXmlx",
@@ -385,8 +257,8 @@ export default {
     this.getList();
   },
   computed: {
-        ...mapState(['user'])
-      },
+    ...mapState(['user'])
+  },
   methods: {
     /** 查询项目申报项目类型信息列表 */
     getList() {
@@ -399,7 +271,7 @@ export default {
     },
     getFjList() {
       this.viewLoading = true;
-      listXmsbFjlx({...this.viewQueryParams, xmlxId: this.rowId}).then((response) => {
+      listXmsbFjlx({ ...this.viewQueryParams, xmlxId: this.rowId }).then((response) => {
         this.fjList = response.rows;
         this.viewTotal = response.total;
         this.viewLoading = false;
@@ -407,17 +279,17 @@ export default {
     },
     handleNodeClick(data) {
       console.log(data)
-        if (data.code) {
-            this.form.zyXzqh = data.code;
-        }
-        if (data.name) {
-            this.form.xzqhName = data.name;
-        }
-        this.openSelect = false;
-      },
-      handleds() {
-        this.openSelect = true;
-      },
+      if (data.code) {
+        this.form.zyXzqh = data.code;
+      }
+      if (data.name) {
+        this.form.xzqhName = data.name;
+      }
+      this.openSelect = false;
+    },
+    handleds() {
+      this.openSelect = true;
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -540,17 +412,17 @@ export default {
         if (valid) {
           this.submitFormLoading = true;
           if (this.viewForm.id != null) {
-              updateXmsbFjlx(this.viewForm).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.openViewInOrUp = false;
-                this.getFjList();
-              }).finally(()=>this.submitFormLoading =false);
+            updateXmsbFjlx(this.viewForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.openViewInOrUp = false;
+              this.getFjList();
+            }).finally(() => this.submitFormLoading = false);
           } else {
             addXmsbFjlx(this.viewForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.openViewInOrUp = false;
               this.getFjList();
-            }).finally(()=>this.submitFormLoading =false);
+            }).finally(() => this.submitFormLoading = false);
           }
         }
       });
@@ -603,34 +475,34 @@ export default {
     },
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.lxmc + '"项目吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.lxmc + '"项目吗？').then(function () {
         return changeXmStatus(row.id, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "0" ? "99" : "0";
       });
     },
     handleViewStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.lxmc + '"附件类型吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.lxmc + '"附件类型吗？').then(function () {
         return changeFjStatus(row.id, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "0" ? "99" : "0";
       });
     },
     /** 删除按钮操作 */
-    handleViewDelete(row,index) {
+    handleViewDelete(row, index) {
       const ids = row.id || this.ids;
-      const xh = (this.viewQueryParams.pageNum-1)*this.viewQueryParams.pageSize + index + 1;
-      this.$modal.confirm('确认删除' + this.changeDelData(row,'id','ID值',xh) + '的记录？').then(function() {
+      const xh = (this.viewQueryParams.pageNum - 1) * this.viewQueryParams.pageSize + index + 1;
+      this.$modal.confirm('确认删除' + this.changeDelData(row, 'id', 'ID值', xh) + '的记录？').then(function () {
         return delXmsbFjlx(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 删除按钮操作 */
     handleDelete(row, index) {
@@ -656,7 +528,7 @@ export default {
           this.$modal.msgSuccess("删除成功");
           /****** sks 需要改动的地方 end ******/
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -672,11 +544,12 @@ export default {
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .itemFlex > .el-form-item__content{
-    display: flex;
-  }
-  .sxzd {
-    font-weight: 600;
-    margin: 10px 15px;
-  }
+::v-deep .itemFlex>.el-form-item__content {
+  display: flex;
+}
+
+.sxzd {
+  font-weight: 600;
+  margin: 10px 15px;
+}
 </style>