'单位信息、从业人员管理、申请人员、申请人员、保安待培训人员管理、保安培训项目管理、保安考试管理页面对接处理'

2025-09-23 18:03:42 +08:00
parent 446099015c
commit c23bcb30df
24 changed files with 504 additions and 313 deletions
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
@ -55,32 +55,66 @@ const dialogVisible = computed({
 const formList = reactive([
  [
    { label: "姓名", prop: "xm", type: "input" },
-    { label: "证件号码", prop: "sfzh", type: "input"},
+    { label: "证件号码", prop: "zjhm", type: "input"},
    { label: "联系电话", prop: "lxdh", type: "input" },
  ],
  [
    { label: "居住地址", prop: "jzdz", type: "input" },
-    { label: "申请时间", prop: "rzsj", type: "date" },
-    { label: "岗位", prop: "ssbmdm", type: "select" },
+    { label: "申请时间", prop: "xtCjsj", type: "date" },
+    { label: "岗位", prop: "gw", type: "input" },
  ],
  [
-    { label: "身份证正反面", prop: "ssbmdm", type: "upload", limit: 2 },
+    { label: "身份证正面", prop: "ryzpzm", type: "upload", limit: 1 },
+    { label: "身份证反面", prop: "ryzpfm", type: "upload", limit: 1 },
  ],
  [
-    { label: "体检报告", prop: "ssbmdm", type: "upload", limit: 1 },
+    { label: "体检报告", prop: "", type: "upload", limit: 1 },
  ],
  [
-    { label: "无犯罪记录证明", prop: "ssbmdm", type: "upload", limit: 1 },
+    { label: "无犯罪记录证明", prop: "wfzzmjl", type: "upload", limit: 1 },
  ]
 ])

 const rules = {
  xm: [{ required: true, message: "请输入姓名", trigger: "change" }],
-  sfzh: [{ required: true, message: "请输入证件号码", trigger: "change" }],
-  lxdh: [{ required: true, message: "请输入联系电话", trigger: "change" }],
+  zjhm: [
+    { required: true, message: "请输入证件号码", trigger: "change" },
+    {
+      validator: (rule, value, callback) => {
+        if (!value) {
+          callback()
+        } else {
+          const reg = /^(\d{15}|\d{17}[\dXx])$/;
+          if (!reg.test(value)) {
+            callback(new Error("请输入正确的身份证号码"))
+          } else {
+            callback()
+          }
+        }
+      }
+    }
+  ],
+  lxdh: [
+    { required: true, message: "请输入联系电话", trigger: "change" },
+    {
+      validator: (rule, value, callback) => {
+        if (!value) {
+          callback()
+        } else {
+          const reg = /^1[34578]\d{9}$/
+          if (!reg.test(value)) {
+            callback(new Error("请输入正确的手机号"))
+          } else {
+            callback()
+          }
+        }
+      }
+    }
+  ],
  jzdz: [{ required: true, message: "请输入居住地址", trigger: "change" }],
  rzsj: [{ required: true, message: "请选择入职时间", trigger: "change" }],
  pxgs: [{ required: true, message: "请选择所属保安公司", trigger: "change" }],
+  gw: [{ required: true, message: "请输入岗位", trigger: "change" }],
 }

 const formData = ref({})
@ -103,10 +137,11 @@ const open = (row = {}, type = 'add') => {
  }
 }

+// 新增、编辑
 const save = () => {
  FormRef.value.submit(() => {
    loading.value = true;
-    const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`;
+    const url = !formData.value?.id ? `/mosty-base/baxx/basq/add` : `/mosty-base/baxx/basq/edit`;
    qcckPost(formData.value, url).then(() => {
      loading.value = false;
      proxy.$message.success("保存成功");
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
@ -1,7 +1,7 @@
 <template>
  <div>
    <div class="titleBox">
-      <page-title title="培训人员管理" />
+      <page-title title="申请人员" />
      <el-button type="primary" @click="addEdit('add')">新增</el-button>
    </div>
    <!-- 搜索 -->
@ -12,12 +12,12 @@
    <div class="tabBox">
      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
-        <template #bxxLx="{ row }">
-          <DictTag :value="row.bxxLx" :tag="false" :options="D_BZ_BXDLX" />
+        <template #sfpx="{ row }">
+          {{ row?.sfpx === '01' ? `否` : `是` }}
        </template>
        <!-- 操作 -->
        <template #controls="{ row }">
-          <el-link type="primary" @click="addEdit('upload', row)">上传资料</el-link>
+          <el-link type="success" @click="addEdit('upload', row)">上传资料</el-link>
          <el-link type="danger" @click="handleDelete([row.id])">删除</el-link>
          <el-link type="warning" @click="addEdit('view', row)">详情</el-link>
          <el-link type="primary" @click="addEdit('select', row)">提交培训公司</el-link>
@ -36,7 +36,7 @@
 </template>

 <script setup>
-import { onMounted, reactive, ref } from "vue";
+import { getCurrentInstance, onMounted, reactive, ref } from "vue";
 import MyTable from '@/components/aboutTable/MyTable.vue';
 import Pages from '@/components/aboutTable/Pages.vue';
 import Search from '@/components/aboutTable/Search.vue';
@ -45,13 +45,13 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import AddTrainerDialog from "./components/addTrainerDialog.vue";
 import selectTtaningDialog from "./components/selectTtaningDialog.vue";

+const { proxy } = getCurrentInstance();
 const trainerRef = ref(null);
 const selectTtaningRef = ref(null);
 const queryFrom = ref({});
 const isVisible = ref(false);
 const dialogVisible = ref(false);
 const searchBox = ref(null);
-const D_BZ_BXDLX = ref([]);
 const searchConfiger = ref([
  {
    label: "人员姓名",
@ -61,7 +61,7 @@ const searchConfiger = ref([
  },
  {
    label: "证件号码",
-    prop: "sfzh",
+    prop: "zjhm",
    placeholder: "请输入证件号码",
    showType: "input"
  },
@ -89,12 +89,12 @@ const pageData = reactive({
  controlsWidth: 180,
  tableColumn: [
    { label: "姓名", prop: "xm" },
-    { label: "证件号码", prop: "sfzh" },
+    { label: "证件号码", prop: "zjhm" },
    { label: "联系方式", prop: "lxdh" },
-    { label: "岗位", prop: "bxds", showSolt: true },
-    { label: "申请时间", prop: "pxgs" },
+    { label: "岗位", prop: "gw" },
+    { label: "申请时间", prop: "xtCjsj" },
    { label: "是否上传资料", prop: "pxgs" },
-    { label: "是否线上培训", prop: "pxgs" },
+    { label: "是否线上培训", prop: "sfpx", showSolt: true },
  ]
 });

@ -128,7 +128,7 @@ const getList = async () => {
    const res = await qcckPost({
      ...pageData.pageConfiger,
      ...queryFrom.value
-    }, `/mosty-base/baxx/pxry/page`)
+    }, `/mosty-base/baxx/basq/page`)

    if(res) {
      pageData.tableData = res.records || [];
@ -139,6 +139,20 @@ const getList = async () => {
  }
 }

+const handleDelete = async (ids) => {
+  await proxy.$modal.confirm("是否确认删除该培训人员？")
+
+  try {
+    const res = await qcckDelete({ ids }, `/mosty-base/baxx/basq/delete`)
+    if (res) {
+      proxy.$modal.msgSuccess("删除成功");
+      await getList();
+    }
+  } catch (error) {
+    proxy.$modal.msgError("删除失败");
+  }
+}
+
 onMounted(() => {
  tabHeightFn();
  getList();
@ -146,9 +160,5 @@ onMounted(() => {
 </script>

 <style scoped lang="scss">
-::v-deep {
-  .el-dialog__header {
-    background: transparent !important;
-  }
-}
+
 </style>
--- a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
@ -9,11 +9,9 @@
    </div>
    <div class="cntinfo">
      <FormMessage ref="FormRef" :disabled="disabled" v-model="formData" :rules="rules" :formList="formList" :labelWidth='120'>
-        <!-- <template #zb>
-          <el-input v-model="formData.zb" placeholder="请选择巡逻路线">
-            <template #append><el-button type="primary" @click="chackLat">开始绘制</el-button></template>
-          </el-input>
-        </template> -->
+        <template #lzsj>
+          <el-input v-model="formData.lzsj" disabled placeholder="请选择离职时间"></el-input>
+        </template>
      </FormMessage>
    </div>
  </div>
@ -25,6 +23,7 @@ import { qcckPost } from "@/api/qcckApi.js";
 import FormMessage from '@/components/aboutTable/FormMessage.vue'

 const { proxy } = getCurrentInstance()
+const { D_BZ_WHCD } = proxy.$dict("D_BZ_WHCD");
 const title = ref('新增从业人员')
 const loading = ref(false)
 const disabled = ref(false)
@ -35,10 +34,6 @@ const props = defineProps({
    type: Boolean,
    default: false
  },
-  dic: {
-    type: Object,
-    default: () => ({})
-  }
 })

 const emits = defineEmits(['update:modelValue'])
@ -61,39 +56,74 @@ const formList = reactive([
  ],
  [
    { label: "入职时间", prop: "rzsj", type: "date" },
-    { label: "离职时间", prop: "lzsj", type: "input" },
-    { label: "文化程度", prop: "ssbmdm", type: "select" },
+    { label: "离职时间", prop: "lzsj", type: "slot" },
+    { label: "文化程度", prop: "whcd", type: "select", options: D_BZ_WHCD },
    { label: "资格证编号", prop: "zgzbh", type: "input" },
  ],
  [
    { label: "资格证类型", prop: "zgzlx", type: "input" },
    { label: "资格证起始日期", prop: "zgzKssj", type: "date" },
    { label: "资格证截至日期", prop: "zgzJssj", type: "date" },
-    { label: "岗位", prop: "ssbmdm", type: "input" },
+    { label: "岗位", prop: "gw", type: "input" },
  ],
  [
-    { label: "外派单位", prop: "ssbmdm", type: "input" },
+    { label: "外派单位", prop: "wpdw", type: "input" },
  ],
-  { label: "从业人员照片", prop: "ssbmdm", type: "upload" },
+  { label: "从业人员照片", prop: "", type: "upload", limit: 2 },
  { label: "保安证件", prop: "bazzp", type: "upload", limit: 1 },
 ])

 const rules = {
  xm: [{ required: true, message: "请输入姓名", trigger: "change" }],
-  sfzh: [{ required: true, message: "请输入证件号码", trigger: "change" }],
-  lxdh: [{ required: true, message: "请输入联系电话", trigger: "change" }],
+  sfzh: [
+    { required: true, message: "请输入证件号码", trigger: "change" },
+    {
+      validator: (rule, value, callback) => {
+        if (!value) {
+          callback()
+        } else {
+          const reg = /^(\d{15}|\d{17}[\dXx])$/;
+          if (!reg.test(value)) {
+            callback(new Error("请输入正确的身份证号码"))
+          } else {
+            callback()
+          }
+        }
+      }
+    }
+  ],
+  lxdh: [
+    { required: true, message: "请输入联系电话", trigger: "change" },
+    {
+      validator: (rule, value, callback) => {
+        if (!value) {
+          callback()
+        } else {
+          const reg = /^1[34578]\d{9}$/
+          if (!reg.test(value)) {
+            callback(new Error("请输入正确的手机号"))
+          } else {
+            callback()
+          }
+        }
+      }
+    }
+  ],
  jzdz: [{ required: true, message: "请输入居住地址", trigger: "change" }],
  rzsj: [{ required: true, message: "请选择入职时间", trigger: "change" }],
  zgzbh: [{ required: true, message: "请输入资格证编号", trigger: "change" }],
-
+  gw: [{ required: true, message: "请输入岗位", trigger: "change" }],
+  wpdw: [{ required: true, message: "请输入外派单位", trigger: "change" }],
  zgzlx: [{ required: true, message: "请输入资格证类型", trigger: "change" }],
  zgzKssj: [{ required: true, message: "请选择资格证起始日期", trigger: "change" }],
  zgzJssj: [{ required: true, message: "请选择资格证截至日期", trigger: "blur" }],
+  whcd: [{ required: true, message: "请选择文化程度", trigger: "change" }],
 }

 const formData = ref({})

 const close = () => {
+  FormRef.value?.reset();
  dialogVisible.value = false
 }

--- a/src/views/securityManagement/personnelManagement/practitioner/index.vue
+++ b/src/views/securityManagement/personnelManagement/practitioner/index.vue
@ -12,18 +12,15 @@
    <div class="tabBox">
      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
-        <template #bxxLx="{ row }">
-          <DictTag :value="row.bxxLx" :tag="false" :options="D_BZ_BXDLX" />
-        </template>
-        <template #bxds="{ row }">
-          <div>{{ row.bxds?.length }}</div>
+        <template #sflz="{ row }">
+          <DictTag :value="row.sflz" :tag="false" :options="D_BZ_SF" />
        </template>
        <!-- 操作 -->
        <template #controls="{ row }">
          <el-link type="primary" @click="addEdit('edit', row)">编辑</el-link>
          <el-link type="danger" @click="handleDelete([row.id])">删除</el-link>
          <el-link type="warning" @click="addEdit('view', row)">详情</el-link>
-          <el-link type="primary" @click="handleXfrw(row)">离职</el-link>
+          <el-link v-if="!row.sflz || row.sflz === 0" type="primary" @click="handleResignation(row)">离职</el-link>
        </template>
      </MyTable>
      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@ -37,7 +34,7 @@
 </template>

 <script setup>
-import { onMounted, reactive, ref } from "vue";
+import { onMounted, reactive, ref, getCurrentInstance } from "vue";
 import MyTable from '@/components/aboutTable/MyTable.vue';
 import Pages from '@/components/aboutTable/Pages.vue';
 import Search from '@/components/aboutTable/Search.vue';
@ -45,11 +42,12 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import AddPractitionerDialog from "./components/addPractitionerDialog.vue";

+const { proxy } = getCurrentInstance();
+const { D_BZ_SF } = proxy.$dict("D_BZ_SF");
 const addPractitionerRef = ref(null);
 const queryFrom = ref({});
 const isVisible = ref(false);
 const searchBox = ref(null);
-const D_BZ_BXDLX = ref([]);
 const searchConfiger = ref([
  {
    label: "人员姓名",
@ -71,9 +69,10 @@ const searchConfiger = ref([
  },
  {
    label: "是否在职",
-    prop: "ssbmdm",
+    prop: "sflz",
    placeholder: "请选择是否在职",
-    showType: "select"
+    showType: "select",
+    options: D_BZ_SF
  }
 ]);

@ -95,10 +94,10 @@ const pageData = reactive({
    { label: "姓名", prop: "xm" },
    { label: "证件号码", prop: "sfzh" },
    { label: "联系方式", prop: "lxdh" },
-    { label: "岗位", prop: "bxds", showSolt: true },
+    { label: "岗位", prop: "gw" },
    { label: "入职时间", prop: "rzsj" },
-    { label: "外派单位", prop: "controls", },
-    { label: "是否在职", prop: "controls" },
+    { label: "外派单位", prop: "wpdw", },
+    { label: "是否在职", prop: "sflz", showSolt: true },
  ]
 });

@ -121,6 +120,32 @@ const onSearch = (value) => {
  getList();
 }

+// 离职
+const handleResignation = async ({ xm = '', id = "" }) => {
+  await proxy.$modal.confirm(`是否确认处理${xm}离职吗？`)
+
+  try {
+    await qcckPost({ id, sflz: 1 }, "/mosty-base/baxx/cyry/szlzzt")
+    proxy.$modal.msgSuccess("离职成功");
+    await getList();
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+// 删除
+const handleDelete = async (ids) => {
+  await proxy.$modal.confirm("是否确认删除该从业人员？")
+
+  try {
+    await qcckPost({ ids }, "/mosty-base/baxx/cyry/remove")
+    proxy.$modal.msgSuccess("删除成功");
+    getList();
+  } catch (error) {
+    console.log(error)
+  }
+};
+
 const getList = async () => {
  try {
    pageData.tableConfiger.loading = true;