信息查询中的社区养老机构和养老机构的从业人员

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

@@ -0,0 +1,770 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <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="100px">
+          <el-form-item label="员工姓名" prop="xm">
+            <el-input
+              v-model="queryParams.xm"
+              placeholder="请输入姓名"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="证件号码" prop="sfzhm">
+            <el-input
+              v-model="queryParams.sfzhm"
+              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="zzzt" v-show="!isJg">
+            <el-select v-model="queryParams.zzzt" placeholder="请选择在职状态">
+              <el-option
+                v-for="dict in dict.type.CZ001"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="岗位类型" prop="gwlx" v-show="!isJg">
+            <el-select v-model="queryParams.gwlx" placeholder="请选择岗位类型">
+              <el-option
+                v-for="dict in dict.type.CH062"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="职业类型" prop="zylx">
+            <el-select v-model="queryParams.zylx" placeholder="请选择职业类型" clearable>
+              <el-option
+                v-for="dict in dict.type.CH061"
+                :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-row :gutter="10" class="mb8">
+
+          <el-col :span="10" style="color: rgb(247, 132, 119);">
+            从业人员查询数据范围为：正常营业{{isJg?'养老机构':'社区养老服务机构和设施'}}的在职员工
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              v-hasPermi="['business:ygJbxx:export']"
+              @click="handleExport"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="ygJbxxList">
+          <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="xm"/>
+          <el-table-column label="证件号码" align="center" prop="sfzhm" width="180"/>
+          <el-table-column label="性别" align="center" prop="xb">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.C0007" :value="scope.row.xb"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="电话" align="center" prop="lxdh"/>
+          <el-table-column label="学历" align="center" prop="whcd">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.C0008" :value="scope.row.whcd"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="岗位类型" align="center" prop="gwlx">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CH062" :value="scope.row.gwlx"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="职业类型" align="center" prop="zylx">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CH061" :value="scope.row.zylx"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="在职状态" align="center" prop="zzzt">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CZ001" :value="scope.row.zzzt"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="入职单位所在区划" align="center" prop="szxzqhName"/>
+          <el-table-column label="入职单位名称" align="center" prop="jgmc"/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="is_Component">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @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">
+            <template slot-scope="scope">
+              <slot name='one' :value="scope.row">
+
+              </slot>
+            </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="1400px" append-to-body v-if="open">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="170px">
+        <div class="formFlex">
+          <el-form-item label="员工姓名" prop="xm" class="formWidth">
+            <el-input v-model="form.xm" placeholder="请输入姓名"/>
+          </el-form-item>
+          <el-form-item label="证件类型" prop="sfzlx" class="formWidth">
+            <el-select v-model="form.sfzlx" placeholder="请选择身份证件类型" @change="changeZjlx(form.sfzlx)">
+              <el-option
+                v-for="dict in dict.type.C0015"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="证件号码" prop="sfzhm" class="formWidth">
+            <el-input v-model="form.sfzhm" placeholder="请输入公民身份证件号码" @input="changeSfzhm(form.sfzhm)"/>
+          </el-form-item>
+        </div>
+        <div class="formFlex">
+          <el-form-item label="性别" prop="xb" class="formWidth">
+            <el-select v-model="form.xb" placeholder="请选择性别">
+              <el-option
+                v-for="dict in dict.type.C0007"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="出生日期" prop="csrq" class="formWidth">
+            <el-date-picker clearable
+                            v-model="form.csrq"
+                            type="date"
+                            value-format="yyyyMMdd"
+                            placeholder="请选择出生日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="学历" prop="whcd" class="formWidth">
+            <el-select v-model="form.whcd" placeholder="请选择文化程度">
+              <el-option
+                v-for="dict in dict.type.C0008"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="formFlex">
+          <el-form-item label="部门" prop="shbn" class="formWidth">
+            <BizDict :value="form.shbn" :parmar="parmarBmxx" @changeData="changeBmxx"
+                     :para1="this.user.userData.jgId"></BizDict>
+          </el-form-item>
+          <el-form-item label="职务" prop="zw" class="formWidth">
+            <el-input v-model="form.zw" placeholder="请输入职务"/>
+          </el-form-item>
+          <el-form-item label="手机号码" prop="lxdh" class="formWidth">
+            <el-input v-model="form.lxdh" placeholder="请输入手机号码"/>
+          </el-form-item>
+        </div>
+        <div class="formFlex">
+          <el-form-item label="岗位类型" prop="gwlx" class="formWidth">
+            <el-select v-model="form.gwlx" placeholder="请选择岗位类型">
+              <el-option
+                v-for="dict in dict.type.CH062"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="职业类型" prop="zylx" class="formWidth">
+            <el-select v-model="form.zylx" placeholder="请选择职业类型" @change="changeZylx(form.zylx)">
+              <el-option
+                v-for="dict in dict.type.CH061"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="职业类型其他" prop="zylxQt" class="formWidth">
+            <el-input v-model="form.zylxQt" :disabled="isOther" placeholder="请输入其它职业类型"/>
+          </el-form-item>
+        </div>
+        <div class="formFlex">
+          <el-form-item label="是否有护理人员等级证书" class="formWidth">
+            <el-radio-group v-model="form.isHlyyzs" :disabled="isYH" @change="changeIsHlyyzs(form.isHlyyzs)">
+              <el-radio
+                v-for="dict in dict.type.CZ035"
+                :key="dict.value"
+                :label="dict.value"
+              >{{dict.label}}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="护理员等级" prop="hlydj" class="formWidth">
+            <el-select v-model="form.hlydj" placeholder="请选择护理员等级" :disabled="isYH||isYHZ">
+              <el-option
+                v-for="dict in dict.type.CH020"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否缴纳社保" prop="isJnsb" class="formWidth">
+            <el-select v-model="form.isJnsb" 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>
+        </div>
+        <div class="formFlex">
+          <el-form-item label="在职状态" prop="zzzt" class="formWidth">
+            <el-select v-model="form.zzzt" placeholder="请选择在职状态" @change="changeZzzt(form.zzzt)">
+              <el-option
+                v-for="dict in dict.type.CZ001"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="离职/退休日期" prop="lzsj" class="formWidth">
+            <el-date-picker
+              :disabled="isZZ"
+              v-model="form.lzsj"
+              type="date"
+              value-format="yyyyMMdd"
+              placeholder="请选择离职/退休日期">
+            </el-date-picker>
+          </el-form-item>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!--详细-->
+    <el-dialog v-dialog-drag title="从业人员详细信息" :visible.sync="openXQ" width="1200px" :append-to-body="true"
+               custom-class="custom">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="基本信息" name="first">
+          <table>
+            <tr>
+              <td>从业人员姓名：</td>
+              <td>{{dataDetails.xm}}</td>
+              <td>性别：</td>
+              <td>{{translateDict('C0007',dataDetails.xb)}}</td>
+              <td>出生日期：</td>
+              <td>{{dataDetails.csrq?special(dataDetails.csrq):''}}</td>
+            </tr>
+            <tr>
+              <td>手机号码：</td>
+              <td>{{dataDetails.lxdh}}</td>
+              <td>证件类型：</td>
+              <td>{{translateDict('C0015',dataDetails.sfzlx)}}</td>
+              <td>证件号码：</td>
+              <td>{{dataDetails.sfzhm}}</td>
+            </tr>
+            <tr>
+              <td>岗位类型：</td>
+              <td>{{translateDict('CH062',dataDetails.gwlx)}}</td>
+              <td>职务：</td>
+              <td>{{dataDetails.zw}}</td>
+              <td>学历：</td>
+              <td>{{translateDict('C0008',dataDetails.whcd)}}</td>
+            </tr>
+            <tr>
+              <td>是否有护理员等级证书：</td>
+              <td>{{translateDict('CZ035',dataDetails.isHlyyzs)}}</td>
+              <td>护理员等级：</td>
+              <td>{{translateDict('CH020',dataDetails.hlydj)}}</td>
+              <td>职业类型：</td>
+              <td>{{translateDict('CH061',dataDetails.zylx)}}</td>
+            </tr>
+            <tr>
+              <td>职业类型其他：</td>
+              <td>{{dataDetails.zylxQt}}</td>
+              <td>所属部门：</td>
+              <td>{{dataDetails.zzmc}}</td>
+              <td>在职状态：</td>
+              <td>{{translateDict('CZ001',dataDetails.zzzt)}}</td>
+            </tr>
+            <tr>
+              <td>离职/退休日期：</td>
+              <td>{{dataDetails.lzsj?special(dataDetails.lzsj):''}}</td>
+              <td>是否缴纳社保：</td>
+              <td>{{translateDict('CZ035',dataDetails.isJnsb)}}</td>
+            </tr>
+          </table>
+        </el-tab-pane>
+        <el-tab-pane label="补贴信息" name="second">
+          <ygjbxxtable :oldId="dataDetails.id" :isComponent="false">
+
+          </ygjbxxtable>
+        </el-tab-pane>
+        <el-tab-pane label="处罚信息" name="three">
+          <ygcfxxtable :oldId="dataDetails.id" :isComponent="false">
+
+          </ygcfxxtable>
+        </el-tab-pane>
+        <el-tab-pane label="奖励信息" name="four">
+          <ygjlxxtable :oldId="dataDetails.id" :isComponent="false">
+
+          </ygjlxxtable>
+        </el-tab-pane>
+        <el-tab-pane label="资质信息" name="five">
+          <ygzzxxtable :oldId="dataDetails.id" :isComponent="false">
+          </ygzzxxtable>
+        </el-tab-pane>
+        <el-tab-pane label="从业经历" name="six">
+          <ygcyjltable :oldId="dataDetails.id" :isComponent="false">
+
+          </ygcyjltable>
+        </el-tab-pane>
+        <el-tab-pane label="培训经历" name="seven">
+          <ygpxjltable :oldId="dataDetails.id" :isComponent="false">
+
+          </ygpxjltable>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { listYgJbxx, getYgJbxx } from '@/api/business/fwjggl/yggl/ygJbxx'
+  import { Regular, chineseOne, idCard } from '@/utils/regular'
+  import { Constant } from '@/utils/constant'
+  import { mapState } from 'vuex'
+  import ygjbxxtable from './tableBtxx'
+  import ygzzxxtable from './tableZzxx'
+  import ygcfxxtable from './tableCfxx'
+  import ygjlxxtable from './tableJlxx'
+  import ygcyjltable from './tableCyjl'
+  import ygpxjltable from './tablePxjl'
+
+  export default {
+    name: 'YgJbxx',
+    dicts: ['C0008', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020'],
+    data() {
+      return {
+        // 楼宇
+        parmarBmxx: {
+          dictType: 'bmxx'
+        },
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        items: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 基本信息表格数据
+        ygJbxxList: [],
+        dataDetails: {},
+        // 弹出层标题
+        title: '',
+        // 是否显示弹出层
+        open: false,
+        openXQ: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          xm: null,
+          sjbmid: null,
+          sfzlx: null,
+          sfzhm: null,
+          xb: null,
+          lxdh: null,
+          shbn: null,
+          zzmc: null,
+          zzzt: null,
+          zylx: null,
+          gwlx: null,
+          isHlyyzs: null,
+          hlydj: null,
+          gqHlydj: null,
+          zw: null,
+          jgId: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          xm: [
+            { required: true, message: '姓名不能为空', trigger: 'blur' }
+          ],
+          sfzlx: [
+            { required: true, message: '证件类型不能为空', trigger: 'blur' }
+          ],
+          sfzhm: [
+            { required: true, message: '证件号码不能为空', trigger: 'blur' }
+          ],
+          csrq: [
+            { required: true, message: '出生日期不能为空', trigger: 'blur' }
+          ],
+          xb: [
+            { required: true, message: '性别不能为空', trigger: 'change' }
+          ],
+          lxdh: [
+            { required: true, message: '手机号码不能为空', trigger: 'blur' },
+            { pattern: Regular.Mobile, message: '手机号码格式不对', trigger: 'blur' }
+          ],
+          whcd: [
+            { required: true, message: '文化程度不能为空', trigger: 'change' }
+          ],
+          shbn: [
+            { required: true, message: '所属部门不能为空', trigger: 'blur' }
+          ],
+          zw: [
+            { required: true, message: '职务不能为空', trigger: 'change' }
+          ],
+          zzzt: [
+            { required: true, message: '在职状态不能为空', trigger: 'change' }
+          ],
+          zylx: [
+            { required: true, message: '职业类型不能为空', trigger: 'change' }
+          ],
+          zzmc: [
+            { required: true, message: '职业类型不能为空', trigger: 'change' }
+          ],
+          zylxQt: [
+            // {required: true, message: "职业类型其他不能为空", trigger: "change"}
+          ],
+          hlydj: [
+            // {required: true, message: "护理员等级不能为空", trigger: "change"}
+          ],
+          gwlx: [
+            { required: true, message: '所属部门不能为空', trigger: 'change' }
+          ],
+          isJnsb: [
+            { required: true, message: '是否缴纳社保不能为空', trigger: 'change' }
+          ],
+          lzsj: [
+            // {required: true, message: "离职/退休日期不能为空", trigger: "change"}
+          ]
+        },
+        isOther: true,
+        isYH: true,
+        isYHZ: true,
+        isZZ: true,
+        activeName: 'first'
+      }
+    },
+    created() {
+      if(this.isJg)
+      {
+        this.queryParams.createUserType='01'
+      }else
+      {
+        this.queryParams.createUserType='02'
+      }
+      this.getList();
+    },
+    components: {
+      ygjbxxtable: ygjbxxtable,
+      ygzzxxtable: ygzzxxtable,
+      ygcfxxtable: ygcfxxtable,
+      ygjlxxtable: ygjlxxtable,
+      ygcyjltable: ygcyjltable,
+      ygpxjltable: ygpxjltable
+    },
+    props: {
+      isComponent: {
+        type: Boolean,
+        default: true
+      },
+      //是否是机构，false是社区养老机构,true是养老机构
+      isJg:{
+        type: Boolean,
+        default: true
+      }
+    },
+    computed: {
+      ...mapState(['user']),
+      is_Component() {
+        return this.isComponent
+      }
+    },
+    methods: {
+      // 节点单击事件
+      handleNodeClick(data) {
+        this.queryParams.xzqhId = data.code
+        this.handleQuery()
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs['form'].validate(valid => {
+          if (valid) {
+            this.submitFormLoading = true
+          }
+        })
+      },
+      changeSfzhm(value) {
+        if (this.form.sfzlx == Constant.IDTYPE) {
+          if (value.length == 18) {
+            this.form.csrq = value.substr(6, 8)
+            this.form.xb = Number(value.substr(16, 1)) % 2 == 0 ? Constant.woman : Constant.man
+          }
+        }
+      },
+      checkJbxxForm() {
+        if (this.form.sfzlx == Constant.IDTYPE) {
+          if (this.form.csrq !== this.form.sfzhm.substr(6, 8)) {
+            return true
+          }
+          const xb = Number(this.form.sfzhm.substr(16, 1)) % 2 == 0 ? Constant.woman : Constant.man
+          if (this.form.xb !== xb) {
+            return true
+          }
+        }
+        return false
+      },
+      translateDict(type, value) {
+        return this.selectDictLabel(this.dict.type[type], value)
+      },
+      changeZzzt(value) {
+        if (value == Constant.IS) {
+          this.isZZ = true
+          this.form.lzsj = null
+          this.rules.lzsj = []
+        } else {
+          this.isZZ = false
+          this.rules.lzsj = [
+            { required: true, message: '离职/退休日期不能为空', trigger: 'change' }
+          ]
+        }
+      },
+      changeZjlx(value) {
+        if (value == Constant.IDTYPE) {
+          this.rules.sfzhm = [
+            { required: true, message: '证件号码不能为空', trigger: 'blur' },
+            { validator: idCard, trigger: 'blur' }
+          ]
+        } else {
+          this.rules.sfzhm = [
+            { required: true, message: '证件号码不能为空', trigger: 'blur' }
+          ]
+        }
+      },
+      changeZylx(value) {
+        if (value == Constant.OLDTYPEOther) {
+          this.isOther = false
+          this.rules.zylxQt = [
+            { required: true, message: '职业类型其他不能为空', trigger: 'change' }
+          ]
+        } else {
+          this.isOther = true
+          this.form.zylxQt = null
+          this.rules.zylxQt = []
+        }
+        if (value == Constant.IDTYPE) {
+          this.form.isHlyyzs = '1'
+          this.isYH = false
+          this.isYHZ = false
+          this.rules.hlydj = [
+            { required: true, message: '护理员等级不能为空', trigger: 'change' }
+          ]
+        } else {
+          this.isYH = true
+          this.form.isHlyyzs = '0'
+          this.form.hlydj = null
+          this.rules.hlydj = []
+        }
+      },
+      changeIsHlyyzs(value) {
+        if (value == '1') {
+          this.isYHZ = false
+          this.rules.hlydj = [
+            { required: true, message: '护理员等级不能为空', trigger: 'change' }
+          ]
+        } else {
+          this.isYHZ = true
+          this.form.hlydj = null
+          this.rules.hlydj = []
+        }
+      },
+      // 这是部门信息
+      changeBmxx(bmData, list) {
+        this.form.shbn = bmData
+        if (list) {
+          this.form.zzmc = list.label
+        }
+        // this.queryParams.shbn = bmData;
+      },
+      /** 查询基本信息列表 */
+      getList() {
+        this.loading = true
+        listYgJbxx(this.queryParams).then(response => {
+          this.ygJbxxList = response.rows
+          this.total = response.total
+          this.loading = false
+        })
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false
+        this.reset()
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          sjbmid: null,
+          id: null,
+          xm: null,
+          sfzlx: null,
+          sfzhm: null,
+          csrq: null,
+          xb: null,
+          lxdh: null,
+          whcd: null,
+          shbn: null,
+          zzmc: null,
+          zzzt: null,
+          lzsj: null,
+          zylx: null,
+          zylxQt: null,
+          gwlx: null,
+          isHlyyzs: '0',
+          isJnsb: null,
+          hlydj: null,
+          gqHlydj: null,
+          jgId: null,
+          zw: null,
+          state: null
+        }
+        this.isOther = true
+        this.isYH = true
+        this.isYHZ = true
+        this.isZZ = true
+        this.resetForm('form')
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1
+        this.getList()
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm('queryForm')
+        this.handleQuery()
+      },
+      handleDetails(row) {
+        this.activeName = 'first'
+        getYgJbxx(row.id).then(response => {
+          this.dataDetails = response.data
+          this.openXQ = true
+        })
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('business/fwjggl/ygJbxx/export', {
+          ...this.queryParams
+        }, `ygJbxx_${new Date().getTime()}.xlsx`)
+      }
+    }
+  }
+</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;
+  }
+
+  .formFlex {
+    display: flex;
+    width: 100%;
+  }
+
+  .formWidth {
+    width: 32%;
+    display: flex !important;
+  }
+
+  .formFlex ::v-deep .el-form-item__content {
+    width: 50%;
+  }
+
+  ::v-deep .custom > .el-dialog__body {
+    height: 850px;
+  }
+</style>

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

@@ -0,0 +1,17 @@
+<template>
+   <cyry :isJg="false"></cyry>
+</template>
+
+<script>
+  import cyry from './commonality/index'
+  export default {
+    name: 'index',
+    components: {
+      cyry: cyry,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/yggl/ygBtxx/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          补贴信息
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-export default {
-  name: "YgBtxx",
-  components: {
-    ygjbxx:ygjbxx,
-    ygjbxxtable:ygjbxxtable
-  },
-   data(){
-    return{
-      title:'培训经历信息',
-      open:false,
-      oldId:null,
-    }
-   },
-  methods:{
-    handleDetailed(id){
-      this.open=true;
-      this.oldId=id;
-      // console.log(this.oldId,'this.oldId');
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/yggl/ygCfxx/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          处罚信息
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgCfxx",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'处罚信息',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/yggl/ygCyjl/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          从业经历
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgCyjl",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'从业经历',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/yggl/ygJbxx/index.vue

@@ -1,716 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="员工姓名" prop="xm">
-        <el-input
-          v-model="queryParams.xm"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="证件号码" prop="sfzhm">
-        <el-input
-          v-model="queryParams.sfzhm"
-          placeholder="请输入公民身份证件号码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="职业类型" prop="zylx">
-        <el-select v-model="queryParams.zylx" placeholder="请选择职业类型" clearable>
-          <el-option
-            v-for="dict in dict.type.CH061"
-            :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-row :gutter="10" class="mb8" v-if="is_Component">
-      <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>
-
-    <el-table v-loading="loading" :data="ygJbxxList">
-      <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="xm"/>
-      <el-table-column label="证件号码" align="center" prop="sfzhm" width="180"/>
-      <el-table-column label="性别" align="center" prop="xb">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.C0007" :value="scope.row.xb"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="电话" align="center" prop="lxdh"/>
-      <el-table-column label="学历" align="center" prop="whcd">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.C0008" :value="scope.row.whcd"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="岗位类型" align="center" prop="gwlx">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CH062" :value="scope.row.gwlx"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="职业类型" align="center" prop="zylx">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CH061" :value="scope.row.zylx"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="在职状态" align="center" prop="zzzt">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ001" :value="scope.row.zzzt"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="入职单位所在区划" align="center" prop="szxzqhName"/>
-      <el-table-column label="入职单位名称" align="center" prop="jgmc"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="is_Component">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @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">
-        <template slot-scope="scope">
-        <slot name= 'one' :value="scope.row">
-
-        </slot>
-        </template>
-      </el-table-column>
-
-    </el-table>
-
-    <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="1400px" append-to-body v-if="open" >
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="170px">
-        <div class="formFlex">
-          <el-form-item label="员工姓名" prop="xm" class="formWidth">
-            <el-input v-model="form.xm" placeholder="请输入姓名"/>
-          </el-form-item>
-          <el-form-item label="证件类型" prop="sfzlx" class="formWidth">
-            <el-select v-model="form.sfzlx" placeholder="请选择身份证件类型"  @change="changeZjlx(form.sfzlx)">
-              <el-option
-                v-for="dict in dict.type.C0015"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="证件号码" prop="sfzhm" class="formWidth">
-            <el-input v-model="form.sfzhm" placeholder="请输入公民身份证件号码" @input="changeSfzhm(form.sfzhm)"/>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="性别" prop="xb" class="formWidth">
-            <el-select v-model="form.xb" placeholder="请选择性别">
-              <el-option
-                v-for="dict in dict.type.C0007"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="出生日期" prop="csrq" class="formWidth">
-            <el-date-picker clearable
-                            v-model="form.csrq"
-                            type="date"
-                            value-format="yyyyMMdd"
-                            placeholder="请选择出生日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="学历" prop="whcd" class="formWidth">
-            <el-select v-model="form.whcd" placeholder="请选择文化程度">
-              <el-option
-                v-for="dict in dict.type.C0008"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="部门" prop="shbn" class="formWidth">
-            <BizDict :value="form.shbn" :parmar="parmarBmxx" @changeData="changeBmxx"
-                     :para1="this.user.userData.jgId"></BizDict>
-          </el-form-item>
-          <el-form-item label="职务" prop="zw" class="formWidth">
-            <el-input v-model="form.zw" placeholder="请输入职务"/>
-          </el-form-item>
-          <el-form-item label="手机号码" prop="lxdh" class="formWidth">
-            <el-input v-model="form.lxdh" placeholder="请输入手机号码"/>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="岗位类型" prop="gwlx" class="formWidth">
-            <el-select v-model="form.gwlx" placeholder="请选择岗位类型">
-              <el-option
-                v-for="dict in dict.type.CH062"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="职业类型" prop="zylx" class="formWidth">
-            <el-select v-model="form.zylx" placeholder="请选择职业类型" @change="changeZylx(form.zylx)">
-              <el-option
-                v-for="dict in dict.type.CH061"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="职业类型其他" prop="zylxQt" class="formWidth">
-            <el-input v-model="form.zylxQt" :disabled="isOther" placeholder="请输入其它职业类型"/>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="是否有护理人员等级证书" class="formWidth">
-            <el-radio-group v-model="form.isHlyyzs" :disabled="isYH" @change="changeIsHlyyzs(form.isHlyyzs)">
-              <el-radio
-                v-for="dict in dict.type.CZ035"
-                :key="dict.value"
-                :label="dict.value"
-              >{{dict.label}}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="护理员等级" prop="hlydj" class="formWidth">
-            <el-select v-model="form.hlydj" placeholder="请选择护理员等级" :disabled="isYH||isYHZ">
-              <el-option
-                v-for="dict in dict.type.CH020"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否缴纳社保" prop="isJnsb" class="formWidth">
-            <el-select v-model="form.isJnsb" 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>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="在职状态" prop="zzzt" class="formWidth">
-            <el-select v-model="form.zzzt" placeholder="请选择在职状态" @change="changeZzzt(form.zzzt)" >
-              <el-option
-                v-for="dict in dict.type.CZ001"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="离职/退休日期" prop="lzsj" class="formWidth" >
-            <el-date-picker
-                            :disabled="isZZ"
-                            v-model="form.lzsj"
-                            type="date"
-                            value-format="yyyyMMdd"
-                            placeholder="请选择离职/退休日期">
-            </el-date-picker>
-          </el-form-item>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--详细-->
-    <el-dialog v-dialog-drag title="从业人员详细信息" :visible.sync="openXQ" width="1200px" :append-to-body="true" custom-class="custom">
-      <el-tabs v-model="activeName" type="card">
-        <el-tab-pane label="基本信息" name="first">
-      <table>
-      <tr>
-        <td>从业人员姓名：</td>
-        <td>{{dataDetails.xm}}</td>
-        <td>性别：</td>
-        <td>{{translateDict('C0007',dataDetails.xb)}}</td>
-        <td>出生日期：</td>
-        <td>{{dataDetails.csrq?special(dataDetails.csrq):''}}</td>
-      </tr>
-      <tr>
-        <td>手机号码：</td>
-        <td>{{dataDetails.lxdh}}</td>
-        <td>证件类型：</td>
-        <td>{{translateDict('C0015',dataDetails.sfzlx)}}</td>
-        <td>证件号码：</td>
-        <td>{{dataDetails.sfzhm}}</td>
-      </tr>
-      <tr>
-        <td>岗位类型：</td>
-        <td>{{translateDict('CH062',dataDetails.gwlx)}}</td>
-        <td>职务：</td>
-        <td>{{dataDetails.zw}}</td>
-        <td>学历：</td>
-        <td>{{translateDict('C0008',dataDetails.whcd)}}</td>
-      </tr>
-      <tr>
-        <td>是否有护理员等级证书：</td>
-        <td>{{translateDict('CZ035',dataDetails.isHlyyzs)}}</td>
-        <td>护理员等级：</td>
-        <td>{{translateDict('CH020',dataDetails.hlydj)}}</td>
-        <td>职业类型：</td>
-        <td>{{translateDict('CZ035',dataDetails.zylx)}}</td>
-      </tr>
-      <tr>
-        <td>职业类型其他：</td>
-        <td>{{dataDetails.zylxQt}}</td>
-        <td>所属部门：</td>
-        <td>{{dataDetails.zzmc}}</td>
-        <td>在职状态：</td>
-        <td>{{translateDict('CZ001',dataDetails.zzzt)}}</td>
-      </tr>
-      <tr>
-        <td>离职/退休日期：</td>
-        <td>{{dataDetails.lzsj?special(dataDetails.lzsj):''}}</td>
-        <td>是否缴纳社保：</td>
-        <td>{{translateDict('CZ035',dataDetails.isJnsb)}}</td>
-      </tr>
-    </table>
-        </el-tab-pane>
-        <el-tab-pane label="补贴信息" name="second">
-          <ygjbxxtable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygjbxxtable>
-        </el-tab-pane>
-        <el-tab-pane label="处罚信息" name="three">
-          <ygcfxxtable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygcfxxtable>
-        </el-tab-pane>
-        <el-tab-pane label="奖励信息" name="four">
-          <ygjlxxtable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygjlxxtable>
-        </el-tab-pane>
-        <el-tab-pane label="资质信息" name="five">
-          <ygzzxxtable :oldId="dataDetails.id" :isComponent="false">
-          </ygzzxxtable>
-        </el-tab-pane>
-        <el-tab-pane label="从业经历" name="six">
-          <ygcyjltable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygcyjltable>
-        </el-tab-pane>
-        <el-tab-pane label="培训经历" name="seven">
-          <ygpxjltable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygpxjltable>
-        </el-tab-pane>
-      </el-tabs>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import {listYgJbxx, getYgJbxx} from "@/api/business/fwjggl/yggl/ygJbxx";
-  import {Regular,chineseOne, idCard} from '@/utils/regular';
-  import {Constant} from '@/utils/constant';
-  import {mapState} from "vuex";
-  import ygjbxxtable from "../ygBtxx/table";
-  import ygzzxxtable from "../ygZzxx/table";
-  import ygcfxxtable from "../ygCfxx/table";
-  import ygjlxxtable from "../ygJlxx/table";
-  import ygcyjltable from "../ygCyjl/table";
-  import ygpxjltable from "../ygPxjl/table";
-  export default {
-    name: "YgJbxx",
-    dicts: ['C0008', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020'],
-    data() {
-      return {
-        // 楼宇
-        parmarBmxx: {
-          dictType: 'bmxx',
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        items: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 基本信息表格数据
-        ygJbxxList: [],
-        dataDetails:{},
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        openXQ:false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          xm: null,
-          sjbmid: null,
-          sfzlx: null,
-          sfzhm: null,
-          xb: null,
-          lxdh: null,
-          shbn: null,
-          zzmc: null,
-          zzzt: null,
-          zylx: null,
-          gwlx: null,
-          isHlyyzs: null,
-          hlydj: null,
-          gqHlydj: null,
-          zw: null,
-          jgId: null,
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          xm: [
-            {required: true, message: "姓名不能为空", trigger: "blur"}
-          ],
-          sfzlx:[
-            {required: true, message: "证件类型不能为空", trigger: "blur"}
-          ],
-          sfzhm: [
-            {required: true, message: "证件号码不能为空", trigger: "blur"}
-          ],
-          csrq: [
-            {required: true, message: "出生日期不能为空", trigger: "blur"}
-          ],
-          xb: [
-            {required: true, message: "性别不能为空", trigger: "change"}
-          ],
-          lxdh: [
-            {required: true, message: "手机号码不能为空", trigger: "blur"},
-            {pattern: Regular.Mobile, message: "手机号码格式不对", trigger: "blur"}
-          ],
-          whcd: [
-            {required: true, message: "文化程度不能为空", trigger: "change"}
-          ],
-          shbn: [
-            {required: true, message: "所属部门不能为空", trigger: "blur"}
-          ],
-          zw: [
-            {required: true, message: "职务不能为空", trigger: "change"}
-          ],
-          zzzt: [
-            {required: true, message: "在职状态不能为空", trigger: "change"}
-          ],
-          zylx: [
-            {required: true, message: "职业类型不能为空", trigger: "change"}
-          ],
-          zzmc: [
-            {required: true, message: "职业类型不能为空", trigger: "change"}
-          ],
-          zylxQt:[
-            // {required: true, message: "职业类型其他不能为空", trigger: "change"}
-          ],
-          hlydj:[
-            // {required: true, message: "护理员等级不能为空", trigger: "change"}
-          ],
-          gwlx: [
-            {required: true, message: "所属部门不能为空", trigger: "change"}
-          ],
-          isJnsb: [
-            {required: true, message: "是否缴纳社保不能为空", trigger: "change"}
-          ],
-          lzsj:[
-            // {required: true, message: "离职/退休日期不能为空", trigger: "change"}
-          ]
-        },
-        isOther:true,
-        isYH:true,
-        isYHZ:true,
-        isZZ:true,
-        activeName: 'first',
-      };
-    },
-    created() {
-      this.getList();
-    },
-    components: {
-      ygjbxxtable:ygjbxxtable,
-      ygzzxxtable:ygzzxxtable,
-      ygcfxxtable:ygcfxxtable,
-      ygjlxxtable:ygjlxxtable,
-      ygcyjltable:ygcyjltable,
-      ygpxjltable:ygpxjltable
-    },
-    props: {
-      isComponent: {
-        type: Boolean,
-        default: true
-      },
-    },
-    computed: {
-      ...mapState(["user"]),
-      is_Component(){
-        return this.isComponent;
-      }
-    },
-    methods: {
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.submitFormLoading = true;
-          }
-        });
-      },
-      changeSfzhm(value){
-        if (this.form.sfzlx == Constant.IDTYPE) {
-          if (value.length == 18) {
-            this.form.csrq = value.substr(6,8);
-            this.form.xb = Number(value.substr(16, 1))%2==0? Constant.woman:Constant.man;
-          }
-        }
-      },
-      checkJbxxForm() {
-        if (this.form.sfzlx == Constant.IDTYPE) {
-          if (this.form.csrq !== this.form.sfzhm.substr(6,8)) {
-            return true;
-          }
-          const xb = Number(this.form.sfzhm.substr(16, 1))%2==0? Constant.woman:Constant.man;
-          if (this.form.xb !== xb) {
-            return true;
-          }
-        }
-        return false;
-      },
-      translateDict(type,value){
-        return this.selectDictLabel(this.dict.type[type], value)
-      },
-      changeZzzt(value){
-        if (value == Constant.IS){
-          this.isZZ=true;
-          this.form.lzsj=null;
-          this.rules.lzsj=[];
-        }else {
-          this.isZZ=false;
-          this.rules.lzsj=[
-            {required: true, message: "离职/退休日期不能为空", trigger: "change"}
-          ];
-        }
-      },
-      changeZjlx(value){
-        if (value == Constant.IDTYPE) {
-          this.rules.sfzhm = [
-            {required: true, message: "证件号码不能为空", trigger: "blur"},
-            { validator: idCard, trigger: 'blur' }
-          ];
-        } else {
-          this.rules.sfzhm = [
-            {required: true, message: "证件号码不能为空", trigger: "blur"},
-          ];
-        }
-      },
-      changeZylx(value){
-        if(value == Constant.OLDTYPEOther){
-           this.isOther=false;
-          this.rules.zylxQt=[
-            {required: true, message: "职业类型其他不能为空", trigger: "change"}
-          ];
-        }else {
-          this.isOther=true;
-          this.form.zylxQt=null;
-          this.rules.zylxQt=[];
-        }
-        if(value == Constant.IDTYPE){
-          this.form.isHlyyzs= "1";
-          this.isYH=false;
-          this.isYHZ=false;
-          this.rules.hlydj=[
-            {required: true, message: "护理员等级不能为空", trigger: "change"}
-          ];
-        }else {
-          this.isYH=true;
-          this.form.isHlyyzs= "0";
-          this.form.hlydj=null;
-          this.rules.hlydj=[];
-        }
-      },
-      changeIsHlyyzs(value){
-        if(value=='1')
-        {
-          this.isYHZ=false;
-          this.rules.hlydj=[
-            {required: true, message: "护理员等级不能为空", trigger: "change"}
-          ];
-        }else {
-          this.isYHZ=true;
-          this.form.hlydj=null;
-          this.rules.hlydj=[];
-        }
-      },
-      // 这是部门信息
-      changeBmxx(bmData,list) {
-        this.form.shbn = bmData;
-        if(list) {
-          this.form.zzmc = list.label;
-        }
-        // this.queryParams.shbn = bmData;
-      },
-      /** 查询基本信息列表 */
-      getList() {
-        this.loading = true;
-        listYgJbxx(this.queryParams).then(response => {
-          this.ygJbxxList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          sjbmid: null,
-          id: null,
-          xm: null,
-          sfzlx: null,
-          sfzhm: null,
-          csrq: null,
-          xb: null,
-          lxdh: null,
-          whcd: null,
-          shbn: null,
-          zzmc: null,
-          zzzt: null,
-          lzsj: null,
-          zylx: null,
-          zylxQt: null,
-          gwlx: null,
-          isHlyyzs: "0",
-          isJnsb: null,
-          hlydj: null,
-          gqHlydj: null,
-          jgId: null,
-          zw: null,
-          createTimeStr: null,
-          createUserId: null,
-          createBy: null,
-          createUnit: null,
-          createUnitName: null,
-          updateTimeStr: null,
-          updateUserId: null,
-          updateBy: null,
-          updateUnit: null,
-          updateUnitName: null,
-          state: null
-        };
-        this.isOther=true;
-        this.isYH=true;
-        this.isYHZ=true;
-        this.isZZ=true;
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      handleDetails(row){
-        this.activeName= 'first';
-        getYgJbxx(row.id).then(response => {
-          this.dataDetails=response.data;
-          this.openXQ=true;
-        });
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('business/fwjggl/ygJbxx/export', {
-          ...this.queryParams
-        }, `ygJbxx_${new Date().getTime()}.xlsx`)
-      }
-    }
-  };
-</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;
-  }
-  .formFlex {
-    display: flex;
-    width: 100%;
-  }
-
-  .formWidth {
-    width: 32%;
-    display: flex !important;
-  }
-  .formFlex ::v-deep .el-form-item__content{
-    width: 50%;
-  }
-  ::v-deep .custom > .el-dialog__body {
-    height: 850px;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/yggl/ygJlxx/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          奖励信息
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgJlxx",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'奖励信息',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/yggl/ygPxjl/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          培训经历
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgPxjl",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'培训经历信息',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/sqyljg/yggl/ygZzxx/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          资质信息
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgZzxx",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'资质信息',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/cyry/index.vue

@@ -0,0 +1,17 @@
+<template>
+   <cyry></cyry>
+</template>
+
+<script>
+  import cyry from '../../sqyljg/cyry/commonality/index'
+  export default {
+    name: 'index',
+    components: {
+      cyry: cyry,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygBtxx/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          补贴信息
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-export default {
-  name: "YgBtxx",
-  components: {
-    ygjbxx:ygjbxx,
-    ygjbxxtable:ygjbxxtable
-  },
-   data(){
-    return{
-      title:'培训经历信息',
-      open:false,
-      oldId:null,
-    }
-   },
-  methods:{
-    handleDetailed(id){
-      this.open=true;
-      this.oldId=id;
-      // console.log(this.oldId,'this.oldId');
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygBtxx/table.vue

@@ -1,218 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row  class="mb8" v-if="is_Component">
-    </el-row>
-    <el-table v-loading="loading" :data="ygBtxxList" height="620">
-      <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="btlx">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CH022" :value="scope.row.btlx"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="补贴金额（元）" align="center" prop="btje"/>
-      <el-table-column label="接受补贴日期" align="center" prop="btrq" width="180">
-        <template slot-scope="scope">
-          <span>{{ special(scope.row.btrq) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="补贴标准" align="center" prop="btbz" :show-overflow-tooltip="true"/>
-    </el-table>
-
-    <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-form ref="form" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="补贴类型" prop="btlx">
-          <el-select v-model="form.btlx" placeholder="请选择补贴类型">
-            <el-option
-              v-for="dict in dict.type.CH022"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="补贴金额（元）" prop="btje">
-          <number v-model.sync="form.btje" placeholder="补贴金额" :min="0" :max="99999999" :precision="2"/>
-        </el-form-item>
-        <el-form-item label="接受补贴日期" prop="btrq">
-          <el-date-picker clearable
-                          v-model="form.btrq"
-                          type="date"
-                          value-format="yyyyMMdd"
-                          placeholder="请选择接受补贴日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="补贴标准" prop="btbz">
-          <el-input v-model="form.btbz" type="textarea" maxlength="50" show-word-limit  placeholder="请输入内容"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import {listYgBtxx} from "@/api/business/fwjggl/yggl/ygBtxx";
-  export default {
-    name: "YgBtxxTable",
-    dicts: ['CH022'],
-    props: {
-      oldId: {
-        type: String,
-        default: null
-      },
-      isComponent: {
-        type: Boolean,
-        default: true
-      },
-    },
-    computed: {
-      is_Component(){
-        return this.isComponent;
-      }
-    },
-    watch:{
-      oldId: {
-        deep: true,
-        handler(val) {
-            console.log(val,'val');
-            if(val!==null)
-            {
-              this.cyryId=val;
-              this.getList();
-            }
-        }
-      }
-    },
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        submitFormLoading: false,
-        // 选中数组
-        ids: [],
-        items: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 补贴信息表格数据
-        ygBtxxList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          // cyryId: null,
-          id: null,
-          jgId: null,
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          btlx: [
-            {required: true, message: "补贴类型不能为空", trigger: "change"}
-          ],
-          btje: [
-            {required: true, message: "补贴金额不能为空", trigger: "blur"}
-          ],
-          btrq: [
-            {required: true, message: "接受补贴日期不能为空", trigger: "blur"}
-          ],
-          btbz: [
-            { max: 50, message: '补贴标准不能超过50个字符', trigger: 'blur'}
-          ],
-        },
-        cyryId:null,
-      };
-    },
-    mounted() {
-      this.cyryId=this.oldId;
-      this.getList();
-    },
-    methods: {
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.submitFormLoading = true;
-          }
-        });
-      },
-      /** 查询补贴信息列表 */
-      getList() {
-        this.loading = true;
-        listYgBtxx({...this.queryParams,cyryId:this.cyryId}).then(response => {
-          this.ygBtxxList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.submitFormLoading =false;
-        this.form = {
-          btlx: null,
-          btje: null,
-          btrq: null,
-          btbz: null,
-          // cyryId: null,
-          id: null,
-          jgId: null,
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('organization/ygBtxx/export', {
-          ...this.queryParams
-        }, `ygBtxx_${new Date().getTime()}.xlsx`)
-      }
-    }
-  }
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor.el-input{
-    width: 100%;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygCfxx/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          处罚信息
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgCfxx",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'处罚信息',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygCfxx/table.vue

@@ -1,203 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <el-table v-loading="loading" :data="ygCfxxList" height="620">
-      <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="cfsj" width="180">
-        <template slot-scope="scope">
-          <span>{{ special(scope.row.cfsj) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="处罚原因" align="center" prop="cfyl" />
-      <el-table-column label="处罚内容" align="center" prop="cfnr" />
-      <el-table-column label="处罚单位名称" align="center" prop="cfdwmc" />
-    </el-table>
-
-    <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-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="处罚单位名称" prop="cfdwmc">
-          <el-input v-model="form.cfdwmc" placeholder="请输入处罚单位名称" />
-        </el-form-item>
-        <el-form-item label="处罚日期" prop="cfsj">
-          <el-date-picker clearable
-            v-model="form.cfsj"
-            type="date"
-            value-format="yyyyMMdd"
-            placeholder="请选择处罚日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="处罚原因" prop="cfyl">
-          <el-input v-model="form.cfyl" type="textarea" maxlength="100" show-word-limit placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="处罚内容" prop="cfnr">
-          <el-input v-model="form.cfnr" type="textarea" maxlength="200" show-word-limit placeholder="请输入内容" />
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listYgCfxx} from "@/api/business/fwjggl/yggl/ygCfxx";
-
-export default {
-  name: "YgCfxx",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      submitFormLoading: false,
-      // 选中数组
-      ids: [],
-      items : [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 处罚信息表格数据
-      ygCfxxList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        cyryId: null,
-        id: null,
-        jgId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        cfsj: [
-          { required: true, message: "处罚日期不能为空", trigger: "blur" }
-        ],
-        cfdwmc: [
-          { required: true, message: "处罚单位名称不能为空", trigger: "blur" },
-          { max: 72, message: '处罚单位名称不能超过72个字符', trigger: 'blur'}
-        ],
-        cfyl: [
-          { max: 100, message: '处罚原因不能超过100个字符', trigger: 'blur'}
-        ],
-      },
-      cyryId:null,
-    };
-  },
-  props: {
-    oldId: {
-      type: String,
-      default: null
-    },
-    isComponent: {
-      type: Boolean,
-      default: true
-    },
-  },
-  computed: {
-    is_Component(){
-      return this.isComponent;
-    }
-  },
-  watch:{
-    oldId: {
-      deep: true,
-      handler(val) {
-        console.log(val,'val');
-        if(val!==null)
-        {
-          this.cyryId=val;
-          this.getList();
-        }
-      }
-    }
-  },
-  created() {
-    this.cyryId=this.oldId;
-    this.getList();
-  },
-  methods: {
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.submitFormLoading = true;
-        }
-      });
-    },
-    /** 查询处罚信息列表 */
-    getList() {
-      this.loading = true;
-      listYgCfxx({...this.queryParams,cyryId:this.cyryId}).then(response => {
-        this.ygCfxxList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.submitFormLoading =false;
-      this.form = {
-        cfsj: null,
-        cfyl: null,
-        cfnr: null,
-        cfdwmc: null,
-        id: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('organization/ygCfxx/export', {
-        ...this.queryParams
-      }, `ygCfxx_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor.el-input{
-    width: 100%;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygCyjl/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          从业经历
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgCyjl",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'从业经历',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygCyjl/table.vue

@@ -1,241 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <el-table v-loading="loading" :data="ygCyjlList" height="620">
-      <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="dwmc" />
-      <el-table-column label="职业类型" align="center" prop="zylx">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CH061" :value="scope.row.zylx"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="其它职业类型" align="center" prop="qtZylx" />
-      <el-table-column label="入职日期" align="center" prop="rzsj" width="180">
-        <template slot-scope="scope">
-          <span>{{ special(scope.row.rzsj) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="离职日期" align="center" prop="lzsj" width="180">
-        <template slot-scope="scope">
-          <span>{{ special(scope.row.lzsj) }}</span>
-        </template>
-      </el-table-column>
-      <!--<el-table-column label="从业人员主键标识" align="center" prop="cyryId" />-->
-    </el-table>
-
-    <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-form ref="form" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="单位名称" prop="dwmc">
-          <el-input v-model="form.dwmc" placeholder="请输入单位名称" />
-        </el-form-item>
-        <el-form-item label="职业类型" prop="zylx">
-          <el-select v-model="form.zylx" placeholder="请选择职业类型" @change="changeZylx(form.zylx)">
-            <el-option
-              v-for="dict in dict.type.CH061"
-              :key="dict.value"
-              :label="dict.label"
-:value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="其它职业类型" prop="qtZylx">
-          <el-input v-model="form.qtZylx" :disabled="isOther" placeholder="请输入其它职业类型" />
-        </el-form-item>
-        <el-form-item label="入职日期" prop="rzsj">
-          <el-date-picker clearable
-            v-model="form.rzsj"
-            type="date"
-            value-format="yyyyMMdd"
-            placeholder="请选择入职日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="离职日期" prop="lzsj">
-          <el-date-picker clearable
-            v-model="form.lzsj"
-            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="submitForm" :loading="submitFormLoading">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listYgCyjl } from "@/api/business/fwjggl/yggl/ygCyjl";
-import {Constant} from '@/utils/constant';
-export default {
-  name: "YgCyjl",
-  dicts: ['CH061'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      submitFormLoading: false,
-      // 选中数组
-      ids: [],
-      items : [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 从业经历表格数据
-      ygCyjlList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dwmc: null,
-        zylx: null,
-        rzsj: null,
-        lzsj: null,
-        id: null,
-        jgId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dwmc: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
-          { max: 100, message: '单位名称不能超过100个字符', trigger: 'blur'}
-        ],
-        qtZylx:[
-          { max: 50, message: '其它职业类型不能超过50个字符', trigger: 'blur'}
-        ],
-      },
-      cyryId:null,
-      isOther:true
-    };
-  },
-  props: {
-    oldId: {
-      type: String,
-      default: null
-    },
-    isComponent: {
-      type: Boolean,
-      default: true
-    },
-  },
-  computed: {
-    is_Component(){
-      return this.isComponent;
-    }
-  },
-  watch:{
-    oldId: {
-      deep: true,
-      handler(val) {
-        if(val!==null)
-        {
-          this.cyryId=val;
-          this.getList();
-        }
-      }
-    }
-  },
-  mounted() {
-    this.cyryId=this.oldId;
-    this.getList();
-  },
-  methods: {
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.submitFormLoading = true;
-        }
-      });
-    },
-    changeZylx(value){
-      if(value == Constant.OLDTYPEOther){
-        this.isOther=false;
-        this.rules.qtZylx=[
-          {required: true, message: "其它职业类型不能为空", trigger: "change"},
-          { max: 50, message: '其它职业类型不能超过50个字符', trigger: 'blur'}
-        ];
-      }else {
-        this.isOther=true;
-        this.form.qtZylx=null;
-        this.rules.qtZylx=[
-          { max: 50, message: '其它职业类型不能超过50个字符', trigger: 'blur'}
-        ];
-      }
-    },
-    /** 查询从业经历列表 */
-    getList() {
-      this.loading = true;
-      listYgCyjl({...this.queryParams,cyryId:this.cyryId}).then(response => {
-        this.ygCyjlList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.submitFormLoading =false;
-      this.form = {
-        dwmc: null,
-        zylx: null,
-        qtZylx: null,
-        rzsj: null,
-        lzsj: null,
-        cyryId: null,
-        id: null,
-        jgId: null,
-      };
-      this.isOther=true;
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor.el-input{
-    width: 100%;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygJbxx/index.vue

@@ -1,716 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="员工姓名" prop="xm">
-        <el-input
-          v-model="queryParams.xm"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="证件号码" prop="sfzhm">
-        <el-input
-          v-model="queryParams.sfzhm"
-          placeholder="请输入公民身份证件号码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="职业类型" prop="zylx">
-        <el-select v-model="queryParams.zylx" placeholder="请选择职业类型" clearable>
-          <el-option
-            v-for="dict in dict.type.CH061"
-            :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-row :gutter="10" class="mb8" v-if="is_Component">
-      <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>
-
-    <el-table v-loading="loading" :data="ygJbxxList">
-      <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="xm"/>
-      <el-table-column label="证件号码" align="center" prop="sfzhm" width="180"/>
-      <el-table-column label="性别" align="center" prop="xb">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.C0007" :value="scope.row.xb"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="电话" align="center" prop="lxdh"/>
-      <el-table-column label="学历" align="center" prop="whcd">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.C0008" :value="scope.row.whcd"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="岗位类型" align="center" prop="gwlx">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CH062" :value="scope.row.gwlx"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="职业类型" align="center" prop="zylx">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CH061" :value="scope.row.zylx"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="在职状态" align="center" prop="zzzt">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ001" :value="scope.row.zzzt"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="入职单位所在区划" align="center" prop="szxzqhName"/>
-      <el-table-column label="入职单位名称" align="center" prop="jgmc"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="is_Component">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @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">
-        <template slot-scope="scope">
-        <slot name= 'one' :value="scope.row">
-
-        </slot>
-        </template>
-      </el-table-column>
-
-    </el-table>
-
-    <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="1400px" append-to-body v-if="open" >
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="170px">
-        <div class="formFlex">
-          <el-form-item label="员工姓名" prop="xm" class="formWidth">
-            <el-input v-model="form.xm" placeholder="请输入姓名"/>
-          </el-form-item>
-          <el-form-item label="证件类型" prop="sfzlx" class="formWidth">
-            <el-select v-model="form.sfzlx" placeholder="请选择身份证件类型"  @change="changeZjlx(form.sfzlx)">
-              <el-option
-                v-for="dict in dict.type.C0015"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="证件号码" prop="sfzhm" class="formWidth">
-            <el-input v-model="form.sfzhm" placeholder="请输入公民身份证件号码" @input="changeSfzhm(form.sfzhm)"/>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="性别" prop="xb" class="formWidth">
-            <el-select v-model="form.xb" placeholder="请选择性别">
-              <el-option
-                v-for="dict in dict.type.C0007"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="出生日期" prop="csrq" class="formWidth">
-            <el-date-picker clearable
-                            v-model="form.csrq"
-                            type="date"
-                            value-format="yyyyMMdd"
-                            placeholder="请选择出生日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="学历" prop="whcd" class="formWidth">
-            <el-select v-model="form.whcd" placeholder="请选择文化程度">
-              <el-option
-                v-for="dict in dict.type.C0008"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="部门" prop="shbn" class="formWidth">
-            <BizDict :value="form.shbn" :parmar="parmarBmxx" @changeData="changeBmxx"
-                     :para1="this.user.userData.jgId"></BizDict>
-          </el-form-item>
-          <el-form-item label="职务" prop="zw" class="formWidth">
-            <el-input v-model="form.zw" placeholder="请输入职务"/>
-          </el-form-item>
-          <el-form-item label="手机号码" prop="lxdh" class="formWidth">
-            <el-input v-model="form.lxdh" placeholder="请输入手机号码"/>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="岗位类型" prop="gwlx" class="formWidth">
-            <el-select v-model="form.gwlx" placeholder="请选择岗位类型">
-              <el-option
-                v-for="dict in dict.type.CH062"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="职业类型" prop="zylx" class="formWidth">
-            <el-select v-model="form.zylx" placeholder="请选择职业类型" @change="changeZylx(form.zylx)">
-              <el-option
-                v-for="dict in dict.type.CH061"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="职业类型其他" prop="zylxQt" class="formWidth">
-            <el-input v-model="form.zylxQt" :disabled="isOther" placeholder="请输入其它职业类型"/>
-          </el-form-item>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="是否有护理人员等级证书" class="formWidth">
-            <el-radio-group v-model="form.isHlyyzs" :disabled="isYH" @change="changeIsHlyyzs(form.isHlyyzs)">
-              <el-radio
-                v-for="dict in dict.type.CZ035"
-                :key="dict.value"
-                :label="dict.value"
-              >{{dict.label}}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="护理员等级" prop="hlydj" class="formWidth">
-            <el-select v-model="form.hlydj" placeholder="请选择护理员等级" :disabled="isYH||isYHZ">
-              <el-option
-                v-for="dict in dict.type.CH020"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否缴纳社保" prop="isJnsb" class="formWidth">
-            <el-select v-model="form.isJnsb" 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>
-        </div>
-        <div class="formFlex">
-          <el-form-item label="在职状态" prop="zzzt" class="formWidth">
-            <el-select v-model="form.zzzt" placeholder="请选择在职状态" @change="changeZzzt(form.zzzt)" >
-              <el-option
-                v-for="dict in dict.type.CZ001"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="离职/退休日期" prop="lzsj" class="formWidth" >
-            <el-date-picker
-                            :disabled="isZZ"
-                            v-model="form.lzsj"
-                            type="date"
-                            value-format="yyyyMMdd"
-                            placeholder="请选择离职/退休日期">
-            </el-date-picker>
-          </el-form-item>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--详细-->
-    <el-dialog v-dialog-drag title="从业人员详细信息" :visible.sync="openXQ" width="1200px" :append-to-body="true" custom-class="custom">
-      <el-tabs v-model="activeName" type="card">
-        <el-tab-pane label="基本信息" name="first">
-      <table>
-      <tr>
-        <td>从业人员姓名：</td>
-        <td>{{dataDetails.xm}}</td>
-        <td>性别：</td>
-        <td>{{translateDict('C0007',dataDetails.xb)}}</td>
-        <td>出生日期：</td>
-        <td>{{dataDetails.csrq?special(dataDetails.csrq):''}}</td>
-      </tr>
-      <tr>
-        <td>手机号码：</td>
-        <td>{{dataDetails.lxdh}}</td>
-        <td>证件类型：</td>
-        <td>{{translateDict('C0015',dataDetails.sfzlx)}}</td>
-        <td>证件号码：</td>
-        <td>{{dataDetails.sfzhm}}</td>
-      </tr>
-      <tr>
-        <td>岗位类型：</td>
-        <td>{{translateDict('CH062',dataDetails.gwlx)}}</td>
-        <td>职务：</td>
-        <td>{{dataDetails.zw}}</td>
-        <td>学历：</td>
-        <td>{{translateDict('C0008',dataDetails.whcd)}}</td>
-      </tr>
-      <tr>
-        <td>是否有护理员等级证书：</td>
-        <td>{{translateDict('CZ035',dataDetails.isHlyyzs)}}</td>
-        <td>护理员等级：</td>
-        <td>{{translateDict('CH020',dataDetails.hlydj)}}</td>
-        <td>职业类型：</td>
-        <td>{{translateDict('CZ035',dataDetails.zylx)}}</td>
-      </tr>
-      <tr>
-        <td>职业类型其他：</td>
-        <td>{{dataDetails.zylxQt}}</td>
-        <td>所属部门：</td>
-        <td>{{dataDetails.zzmc}}</td>
-        <td>在职状态：</td>
-        <td>{{translateDict('CZ001',dataDetails.zzzt)}}</td>
-      </tr>
-      <tr>
-        <td>离职/退休日期：</td>
-        <td>{{dataDetails.lzsj?special(dataDetails.lzsj):''}}</td>
-        <td>是否缴纳社保：</td>
-        <td>{{translateDict('CZ035',dataDetails.isJnsb)}}</td>
-      </tr>
-    </table>
-        </el-tab-pane>
-        <el-tab-pane label="补贴信息" name="second">
-          <ygjbxxtable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygjbxxtable>
-        </el-tab-pane>
-        <el-tab-pane label="处罚信息" name="three">
-          <ygcfxxtable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygcfxxtable>
-        </el-tab-pane>
-        <el-tab-pane label="奖励信息" name="four">
-          <ygjlxxtable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygjlxxtable>
-        </el-tab-pane>
-        <el-tab-pane label="资质信息" name="five">
-          <ygzzxxtable :oldId="dataDetails.id" :isComponent="false">
-          </ygzzxxtable>
-        </el-tab-pane>
-        <el-tab-pane label="从业经历" name="six">
-          <ygcyjltable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygcyjltable>
-        </el-tab-pane>
-        <el-tab-pane label="培训经历" name="seven">
-          <ygpxjltable :oldId="dataDetails.id" :isComponent="false">
-
-          </ygpxjltable>
-        </el-tab-pane>
-      </el-tabs>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import {listYgJbxx, getYgJbxx} from "@/api/business/fwjggl/yggl/ygJbxx";
-  import {Regular,chineseOne, idCard} from '@/utils/regular';
-  import {Constant} from '@/utils/constant';
-  import {mapState} from "vuex";
-  import ygjbxxtable from "../ygBtxx/table";
-  import ygzzxxtable from "../ygZzxx/table";
-  import ygcfxxtable from "../ygCfxx/table";
-  import ygjlxxtable from "../ygJlxx/table";
-  import ygcyjltable from "../ygCyjl/table";
-  import ygpxjltable from "../ygPxjl/table";
-  export default {
-    name: "YgJbxx",
-    dicts: ['C0008', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020'],
-    data() {
-      return {
-        // 楼宇
-        parmarBmxx: {
-          dictType: 'bmxx',
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        items: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 基本信息表格数据
-        ygJbxxList: [],
-        dataDetails:{},
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        openXQ:false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          xm: null,
-          sjbmid: null,
-          sfzlx: null,
-          sfzhm: null,
-          xb: null,
-          lxdh: null,
-          shbn: null,
-          zzmc: null,
-          zzzt: null,
-          zylx: null,
-          gwlx: null,
-          isHlyyzs: null,
-          hlydj: null,
-          gqHlydj: null,
-          zw: null,
-          jgId: null,
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          xm: [
-            {required: true, message: "姓名不能为空", trigger: "blur"}
-          ],
-          sfzlx:[
-            {required: true, message: "证件类型不能为空", trigger: "blur"}
-          ],
-          sfzhm: [
-            {required: true, message: "证件号码不能为空", trigger: "blur"}
-          ],
-          csrq: [
-            {required: true, message: "出生日期不能为空", trigger: "blur"}
-          ],
-          xb: [
-            {required: true, message: "性别不能为空", trigger: "change"}
-          ],
-          lxdh: [
-            {required: true, message: "手机号码不能为空", trigger: "blur"},
-            {pattern: Regular.Mobile, message: "手机号码格式不对", trigger: "blur"}
-          ],
-          whcd: [
-            {required: true, message: "文化程度不能为空", trigger: "change"}
-          ],
-          shbn: [
-            {required: true, message: "所属部门不能为空", trigger: "blur"}
-          ],
-          zw: [
-            {required: true, message: "职务不能为空", trigger: "change"}
-          ],
-          zzzt: [
-            {required: true, message: "在职状态不能为空", trigger: "change"}
-          ],
-          zylx: [
-            {required: true, message: "职业类型不能为空", trigger: "change"}
-          ],
-          zzmc: [
-            {required: true, message: "职业类型不能为空", trigger: "change"}
-          ],
-          zylxQt:[
-            // {required: true, message: "职业类型其他不能为空", trigger: "change"}
-          ],
-          hlydj:[
-            // {required: true, message: "护理员等级不能为空", trigger: "change"}
-          ],
-          gwlx: [
-            {required: true, message: "所属部门不能为空", trigger: "change"}
-          ],
-          isJnsb: [
-            {required: true, message: "是否缴纳社保不能为空", trigger: "change"}
-          ],
-          lzsj:[
-            // {required: true, message: "离职/退休日期不能为空", trigger: "change"}
-          ]
-        },
-        isOther:true,
-        isYH:true,
-        isYHZ:true,
-        isZZ:true,
-        activeName: 'first',
-      };
-    },
-    created() {
-      this.getList();
-    },
-    components: {
-      ygjbxxtable:ygjbxxtable,
-      ygzzxxtable:ygzzxxtable,
-      ygcfxxtable:ygcfxxtable,
-      ygjlxxtable:ygjlxxtable,
-      ygcyjltable:ygcyjltable,
-      ygpxjltable:ygpxjltable
-    },
-    props: {
-      isComponent: {
-        type: Boolean,
-        default: true
-      },
-    },
-    computed: {
-      ...mapState(["user"]),
-      is_Component(){
-        return this.isComponent;
-      }
-    },
-    methods: {
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.submitFormLoading = true;
-          }
-        });
-      },
-      changeSfzhm(value){
-        if (this.form.sfzlx == Constant.IDTYPE) {
-          if (value.length == 18) {
-            this.form.csrq = value.substr(6,8);
-            this.form.xb = Number(value.substr(16, 1))%2==0? Constant.woman:Constant.man;
-          }
-        }
-      },
-      checkJbxxForm() {
-        if (this.form.sfzlx == Constant.IDTYPE) {
-          if (this.form.csrq !== this.form.sfzhm.substr(6,8)) {
-            return true;
-          }
-          const xb = Number(this.form.sfzhm.substr(16, 1))%2==0? Constant.woman:Constant.man;
-          if (this.form.xb !== xb) {
-            return true;
-          }
-        }
-        return false;
-      },
-      translateDict(type,value){
-        return this.selectDictLabel(this.dict.type[type], value)
-      },
-      changeZzzt(value){
-        if (value == Constant.IS){
-          this.isZZ=true;
-          this.form.lzsj=null;
-          this.rules.lzsj=[];
-        }else {
-          this.isZZ=false;
-          this.rules.lzsj=[
-            {required: true, message: "离职/退休日期不能为空", trigger: "change"}
-          ];
-        }
-      },
-      changeZjlx(value){
-        if (value == Constant.IDTYPE) {
-          this.rules.sfzhm = [
-            {required: true, message: "证件号码不能为空", trigger: "blur"},
-            { validator: idCard, trigger: 'blur' }
-          ];
-        } else {
-          this.rules.sfzhm = [
-            {required: true, message: "证件号码不能为空", trigger: "blur"},
-          ];
-        }
-      },
-      changeZylx(value){
-        if(value == Constant.OLDTYPEOther){
-           this.isOther=false;
-          this.rules.zylxQt=[
-            {required: true, message: "职业类型其他不能为空", trigger: "change"}
-          ];
-        }else {
-          this.isOther=true;
-          this.form.zylxQt=null;
-          this.rules.zylxQt=[];
-        }
-        if(value == Constant.IDTYPE){
-          this.form.isHlyyzs= "1";
-          this.isYH=false;
-          this.isYHZ=false;
-          this.rules.hlydj=[
-            {required: true, message: "护理员等级不能为空", trigger: "change"}
-          ];
-        }else {
-          this.isYH=true;
-          this.form.isHlyyzs= "0";
-          this.form.hlydj=null;
-          this.rules.hlydj=[];
-        }
-      },
-      changeIsHlyyzs(value){
-        if(value=='1')
-        {
-          this.isYHZ=false;
-          this.rules.hlydj=[
-            {required: true, message: "护理员等级不能为空", trigger: "change"}
-          ];
-        }else {
-          this.isYHZ=true;
-          this.form.hlydj=null;
-          this.rules.hlydj=[];
-        }
-      },
-      // 这是部门信息
-      changeBmxx(bmData,list) {
-        this.form.shbn = bmData;
-        if(list) {
-          this.form.zzmc = list.label;
-        }
-        // this.queryParams.shbn = bmData;
-      },
-      /** 查询基本信息列表 */
-      getList() {
-        this.loading = true;
-        listYgJbxx(this.queryParams).then(response => {
-          this.ygJbxxList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          sjbmid: null,
-          id: null,
-          xm: null,
-          sfzlx: null,
-          sfzhm: null,
-          csrq: null,
-          xb: null,
-          lxdh: null,
-          whcd: null,
-          shbn: null,
-          zzmc: null,
-          zzzt: null,
-          lzsj: null,
-          zylx: null,
-          zylxQt: null,
-          gwlx: null,
-          isHlyyzs: "0",
-          isJnsb: null,
-          hlydj: null,
-          gqHlydj: null,
-          jgId: null,
-          zw: null,
-          createTimeStr: null,
-          createUserId: null,
-          createBy: null,
-          createUnit: null,
-          createUnitName: null,
-          updateTimeStr: null,
-          updateUserId: null,
-          updateBy: null,
-          updateUnit: null,
-          updateUnitName: null,
-          state: null
-        };
-        this.isOther=true;
-        this.isYH=true;
-        this.isYHZ=true;
-        this.isZZ=true;
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      handleDetails(row){
-        this.activeName= 'first';
-        getYgJbxx(row.id).then(response => {
-          this.dataDetails=response.data;
-          this.openXQ=true;
-        });
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('business/fwjggl/ygJbxx/export', {
-          ...this.queryParams
-        }, `ygJbxx_${new Date().getTime()}.xlsx`)
-      }
-    }
-  };
-</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;
-  }
-  .formFlex {
-    display: flex;
-    width: 100%;
-  }
-
-  .formWidth {
-    width: 32%;
-    display: flex !important;
-  }
-  .formFlex ::v-deep .el-form-item__content{
-    width: 50%;
-  }
-  ::v-deep .custom > .el-dialog__body {
-    height: 850px;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygJlxx/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          奖励信息
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgJlxx",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'奖励信息',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygJlxx/table.vue

@@ -1,195 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <el-table v-loading="loading" :data="ygJlxxList" height="620">
-       <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="jlsj" width="180">
-        <template slot-scope="scope">
-          <span>{{ special(scope.row.jlsj) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="奖励原因" align="center" prop="jlyy" />
-      <el-table-column label="奖励内容" align="center" prop="jlnr" />
-      <el-table-column label="奖励单位名称" align="center" prop="jldwmc" />
-    </el-table>
-
-    <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-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="奖励单位名称" prop="jldwmc">
-          <el-input v-model="form.jldwmc" placeholder="请输入奖励单位名称" />
-        </el-form-item>
-        <el-form-item label="奖励日期" prop="jlsj">
-          <el-date-picker clearable
-            v-model="form.jlsj"
-            type="date"
-            value-format="yyyyMMdd"
-            placeholder="请选择奖励日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="奖励原因" prop="jlyy">
-          <el-input v-model="form.jlyy" type="textarea" maxlength="200" show-word-limit placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="奖励内容" prop="jlnr">
-          <el-input v-model="form.jlnr" type="textarea" maxlength="200" show-word-limit placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listYgJlxx } from "@/api/organization/yggl/ygJlxx";
-
-export default {
-  name: "YgJlxx",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      submitFormLoading: false,
-      // 选中数组
-      ids: [],
-      items : [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 奖励信息表格数据
-      ygJlxxList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        cyryId: null,
-        id: null,
-        jgId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        jlsj: [
-          { required: true, message: "奖励日期不能为空", trigger: "blur" }
-        ],
-        jldwmc: [
-          { required: true, message: "奖励单位名称不能为空", trigger: "blur" },
-          { max: 120, message: '奖励单位名称不能超过120个字符', trigger: 'blur'}
-        ],
-      },
-      cyryId:null,
-    };
-  },
-  props: {
-    oldId: {
-      type: String,
-      default: null
-    },
-    isComponent: {
-      type: Boolean,
-      default: true
-    },
-  },
-  computed: {
-    is_Component(){
-      return this.isComponent;
-    }
-  },
-  watch:{
-    oldId: {
-      deep: true,
-      handler(val) {
-        if(val!==null)
-        {
-          this.cyryId=val;
-          this.getList();
-        }
-      }
-    }
-  },
-  created() {
-    this.cyryId=this.oldId;
-    this.getList();
-  },
-  methods: {
-    /** 查询奖励信息列表 */
-    getList() {
-      this.loading = true;
-      listYgJlxx({...this.queryParams,cyryId:this.cyryId}).then(response => {
-        this.ygJlxxList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.submitFormLoading =false;
-      this.form = {
-        jlsj: null,
-        jlyy: null,
-        jlnr: null,
-        jldwmc: null,
-        cyryId: null,
-        id: null,
-        jgId: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.submitFormLoading = true;
-        }
-      });
-    },
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor.el-input{
-    width: 100%;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygPxjl/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          培训经历
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgPxjl",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'培训经历信息',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygPxjl/table.vue

@@ -1,275 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-table v-loading="loading" :data="ygPxjlList" height="620">
-      <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="pxjgmc"/>
-      <el-table-column label="培训班名称" align="center" prop="pxbmc"/>
-      <el-table-column label="培训日期" align="center" prop="pxsj" width="180">
-        <template slot-scope="scope">
-          <span>{{ special(scope.row.pxsj) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="培训内容" align="center" prop="pxnr"/>
-      <el-table-column label="是否享受培训补贴" align="center" prop="isXspxbt">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ035" :value="scope.row.isXspxbt"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="培训补贴金额" align="center" prop="pxbtje"/>
-    </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-
-    <!--添加或修改培训经历对话框-->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="培训机构名称" prop="pxjgmc">
-          <el-input v-model="form.pxjgmc" placeholder="请输入培训机构名称"/>
-        </el-form-item>
-        <el-form-item label="培训日期" prop="pxsj">
-          <el-date-picker clearable
-                          v-model="form.pxsj"
-                          type="date"
-                          value-format="yyyyMMdd"
-                          placeholder="请选择培训日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="培训班名称" prop="pxbmc">
-          <el-input v-model="form.pxbmc" placeholder="请输入培训班名称"/>
-        </el-form-item>
-        <el-form-item label="是否享受培训补贴" prop="isXspxbt">
-          <el-select v-model="form.isXspxbt" placeholder="请选择是否享受培训补贴" @change="changeIsXspxbt(form.isXspxbt)">
-            <el-option
-              v-for="dict in dict.type.CZ035"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="培训补贴金额" prop="pxbtje">
-          <number v-model.sync="form.pxbtje" placeholder="培训补贴金额" :disabled="isBZ" :min="0" :max="99999999" :precision="2"/>
-        </el-form-item>
-        <el-form-item label="培训内容" prop="pxnr">
-          <el-input v-model="form.pxnr" type="textarea" maxlength="1000"  placeholder="请输入培训内容"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="bz">
-          <el-input v-model="form.bz" type="textarea" maxlength="1000" show-word-limit placeholder="请输入内容"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import {listYgPxjl} from "@/api/business/fwjggl/yggl/ygPxjl";
-  import {mapState} from "vuex";
-
-  export default {
-    name: "YgPxjl",
-    dicts: ['CZ035', 'C0008', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020'],
-    data() {
-      return {
-        parmarBmxx: {
-          dictType: 'bmxx',
-        },
-        para1: "",
-        outerVisible: false,
-        innerVisible: false,
-        // 遮罩层
-        loading: true,
-        submitFormLoading: false,
-        // 选中数组
-        ids: [],
-        items: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 基本信息表格数据 --CH
-        ygJbxxList: [],
-        // 培训经历表格数据
-        ygPxjlList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          cyryId: null,
-          jgId: null,
-        },
-        // 员工基本信息-查询参数--CH
-        ygJbxxQueryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          xm: null,
-          sjbmid: null,
-          sfzlx: null,
-          sfzhm: null,
-          xb: null,
-          lxdh: null,
-          shbn: null,
-          zzmc: null,
-          zzzt: null,
-          zylx: null,
-          gwlx: null,
-          isHlyyzs: null,
-          hlydj: null,
-          gqHlydj: null,
-          zw: null,
-          jgId: null,
-        },
-
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          pxjgmc: [
-            { required: true, message: "培训机构名称不能为空", trigger: "blur" },
-            { max: 120, message: '培训机构名称不能超过120个字符', trigger: 'blur'}
-          ],
-          pxbmc: [
-            { required: true, message: "培训班名称不能为空", trigger: "blur" },
-            { max: 100, message: '培训班名称不能超过100个字符', trigger: 'blur'}
-          ],
-          pxsj: [
-            {required: true, message: "培训日期不能为空", trigger: "blur"}
-          ],
-          pxnr: [
-            {required: true, message: "培训内容不能为空", trigger: "blur"}
-          ],
-          isXspxbt: [
-            { required: true, message: "是否享受培训补贴不能为空", trigger: "change" },
-          ],
-          pxbtje:[]
-        },
-        cyryId:null,
-        isBZ:true,
-      };
-    },
-    props: {
-      oldId: {
-        type: String,
-        default: null
-      },
-      isComponent: {
-        type: Boolean,
-        default: true
-      },
-    },
-    computed: {
-      is_Component(){
-        return this.isComponent;
-      }
-    },
-    watch:{
-      oldId: {
-        deep: true,
-        handler(val) {
-          if(val!==null)
-          {
-            this.cyryId=val;
-            this.getList();
-          }
-        }
-      }
-    },
-    mounted() {
-      this.cyryId=this.oldId;
-      this.getList();
-    },
-    methods: {
-      changeIsXspxbt(value){
-          if(value=='1'){
-            this.isBZ=false;
-            this.rules.pxbtje=[
-              {required: true, message: "是否享受培训补贴不能为空", trigger: "blur"}
-            ];
-          }else {
-            this.isBZ=true;
-            this.form.pxbtje=undefined;
-            this.rules.pxbtje=[];
-          }
-      },
-      /** 查询培训经历列表 */
-      getList() {
-        this.loading = true;
-        listYgPxjl({...this.queryParams,cyryId:this.cyryId}).then(response => {
-          this.ygPxjlList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.submitFormLoading =false;
-        this.form = {
-          id: null,
-          pxjgmc: null,
-          pxsj: null,
-          pxbmc: null,
-          isXspxbt: null,
-          pxbtje: undefined,
-          pxnr: null,
-          bz: null,
-        };
-        this.isBZ=true;
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.submitFormLoading = true;
-          }
-        });
-      },
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select {
-    width: 100%;
-  }
-
-  .el-date-editor.el-input {
-    width: 100%;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygZzxx/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <ygjbxx :isComponent="false">
-      <template   v-slot:one = 'slotonevalue' >
-        <el-button size="mini" type="text" @click="handleDetailed(slotonevalue.value.id)">
-          资质信息
-        </el-button>
-      </template>
-    </ygjbxx>
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" custom-class="custom">
-      <ygjbxxtable :oldId="oldId">
-
-      </ygjbxxtable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import ygjbxx from "../ygJbxx/index";
-  import ygjbxxtable from "./table";
-  export default {
-    name: "YgZzxx",
-    components: {
-      ygjbxx:ygjbxx,
-      ygjbxxtable:ygjbxxtable
-    },
-    data(){
-      return{
-        title:'资质信息',
-        open:false,
-        oldId:null,
-      }
-    },
-    methods:{
-      handleDetailed(id){
-        this.open=true;
-        this.oldId=id;
-        // console.log(this.oldId,'this.oldId');
-      }
-    }
-  };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .custom > .el-dialog__body {
-    height: 750px;
-    padding: 0;
-  }
-</style>

ruoyi-ui/src/views/business/xxcx/fwjg/yljg/yggl/ygZzxx/table.vue

@@ -1,213 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <el-table v-loading="loading" :data="ygZzxxList" height="620">
-      <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="zsmc" />
-      <el-table-column label="证书编号" align="center" prop="zsbh" />
-      <el-table-column label="证书获取日期" align="center" prop="zsrq" width="180">
-        <template slot-scope="scope">
-          <span>{{ special(scope.row.zsrq) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="证书颁发单位" align="center" prop="zsdw" />
-      <el-table-column label="证书有效期(年)" align="center" prop="zsnx" />
-      <el-table-column label="备注" align="center" prop="bz" />
-    </el-table>
-
-    <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="550px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="证书(资质)名称" prop="zsmc">
-          <el-input v-model="form.zsmc" placeholder="请输入证书(资质)名称" />
-        </el-form-item>
-        <el-form-item label="证书编号" prop="zsbh">
-          <el-input v-model="form.zsbh" placeholder="请输入证书编号" />
-        </el-form-item>
-        <el-form-item label="证书获取日期" prop="zsrq">
-          <el-date-picker clearable
-            v-model="form.zsrq"
-            type="date"
-            value-format="yyyyMMdd"
-            placeholder="请选择证书获取日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="证书颁发单位" prop="zsdw">
-          <el-input v-model="form.zsdw" placeholder="请输入证书颁发单位" />
-        </el-form-item>
-        <el-form-item label="证书有效期(年)" prop="zsnx">
-          <number v-model.sync="form.zsnx" placeholder="证书有效期" :precision="0"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="bz">
-          <el-input v-model="form.bz" type="textarea"  maxlength="300" show-word-limit placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listYgZzxx, getYgZzxx, delYgZzxx, addYgZzxx, updateYgZzxx } from "@/api/business/fwjggl/yggl/ygZzxx";
-import { validateMoney } from '@/utils/regular';
-export default {
-  name: "YgZzxx",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      submitFormLoading: false,
-      // 选中数组
-      ids: [],
-      items : [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 资质信息表格数据
-      ygZzxxList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        id: null,
-        jgId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        zsmc: [
-          { required: true, message: "证书(资质)名称不能为空", trigger: "blur" },
-          { max: 72, message: '证书名称或者资质名称不能超过72个字符', trigger: 'blur'}
-        ],
-        zsbh: [
-          { required: true, message: "证书编号不能为空", trigger: "blur" },
-          { max: 50, message: '证书编号不能超过50个字符', trigger: 'blur'}
-        ],
-        zsrq: [
-          { required: true, message: "证书获取日期不能为空", trigger: "blur" }
-        ],
-        zsnx:[
-          { validator: validateMoney, trigger: "blur" }
-        ],
-        zsdw: [
-          { max: 50, message: '证书颁发单位不能超过50个字符', trigger: 'blur'}
-        ],
-      },
-      cyryId:null,
-    };
-  },
-  props: {
-    oldId: {
-      type: String,
-      default: null
-    },
-    isComponent: {
-      type: Boolean,
-      default: true
-    },
-  },
-  computed: {
-    is_Component(){
-      return this.isComponent;
-    }
-  },
-  watch:{
-    oldId: {
-      deep: true,
-      handler(val) {
-        if(val!==null)
-        {
-          this.cyryId=val;
-          this.getList();
-        }
-      }
-    }
-  },
-  mounted() {
-    this.cyryId=this.oldId;
-    this.getList();
-  },
-  methods: {
-    /** 查询资质信息列表 */
-    getList() {
-      this.loading = true;
-      listYgZzxx({...this.queryParams,cyryId:this.cyryId}).then(response => {
-        this.ygZzxxList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.submitFormLoading =false;
-      this.form = {
-        zsmc: null,
-        zsbh: null,
-        zsrq: null,
-        zsdw: null,
-        zsnx: undefined,
-        bz: null,
-        id: null,
-        jgId: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.submitFormLoading = true;
-        }
-      });
-    },
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor.el-input{
-    width: 100%;
-  }
-</style>

ruoyi-ui/src/views/organization/yggl/ygJbxx/index.vue

@@ -344,7 +344,7 @@
         <td>护理员等级：</td>
         <td>{{translateDict('CH020',dataDetails.hlydj)}}</td>
         <td>职业类型：</td>
-        <td>{{translateDict('CZ035',dataDetails.zylx)}}</td>
+        <td>{{translateDict('CH061',dataDetails.zylx)}}</td>
       </tr>
       <tr>
         <td>职业类型其他：</td>