'新增页面'

src/router/index.js

@@ -316,14 +316,34 @@ export const publicRoutes = [
         },
       },
       {
-        path: "/practitioner",
+        path: "/personnelManagement",
-        name: "practitioner",
+        name: "personnelManagement",
-        component: () =>
-          import("@/views/securityManagement/practitioner/index"),
         meta: {
-          title: "从业人员管理",
+          title: "人员管理",
           icon: "personnel"
         },
+        children: [
+          {
+            path: "/personnelManagement/practitioner",
+            name: "practitioner",
+            component: () =>
+              import("@/views/securityManagement/personnelManagement/practitioner/index"),
+            meta: {
+              title: "从业人员管理",
+              icon: "personnel"
+            },
+          },
+          {
+            path: "/personnelManagement/applicantPersonnel",
+            name: "applicantPersonnel",
+            component: () =>
+              import("@/views/securityManagement/personnelManagement/applicantPersonnel/index"),
+            meta: {
+              title: "申请人员",
+              icon: "personnel"
+            }
+          },
+        ]
       },
       {
         path: "/trainingManagement",
@@ -362,7 +382,7 @@ export const publicRoutes = [
               title: "保安培训项目管理",
               icon: "personnel"
             }
-          }
+          },
         ]
       },
       {

src/styles/index.scss

@@ -99,7 +99,7 @@ div:focus {
 
 ::v-deep {
   .el-input__inner, .el-input__inner:hover, .el-input__inner:focus {
-    // border: none;
+    border: none !important;
     box-shadow: none;
     background-color: transparent;
   }

src/views/Training/AnnualInspection/index.vue

@@ -40,7 +40,6 @@ import DetailForm from "./components/detailForm.vue";
 import Pxgs from "./components/pxgs.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
-import { el } from "element-plus/es/locale.mjs";
 const { proxy } = getCurrentInstance();
 const activeTab = ref(2)
 const detailDiloag = ref();
@@ -153,4 +152,4 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-</style>
+</style>

src/views/login/index.vue

@@ -5,20 +5,32 @@
         <h3 class="title">用户登录</h3>
       </div>
       <el-form-item prop="userName">
-        <span class="svg-container">
+        <el-input placeholder="请输入账号" name="userName" type="text" v-model="loginForm.userName">
-          <svg-icon icon="user" />
+          <template #prepend>
-        </span>
+             <span class="svg-container">
-        <el-input placeholder="请输入账号" name="userName" type="text" v-model="loginForm.userName" />
+              <svg-icon icon="user" />
+            </span>
+          </template>
+        </el-input>
       </el-form-item>
 
       <el-form-item prop="password1">
-        <span class="svg-container">
+        <!-- <span class="svg-container">
           <svg-icon icon="password" />
-        </span>
+        </span> -->
-        <el-input placeholder="请输入密码" name="password" :type="passwordType" v-model="loginForm.password" />
+        <el-input placeholder="请输入密码" name="password" :type="passwordType" v-model="loginForm.password">
-        <span class="show-pwd">
+          <template #prepend>
-          <svg-icon @click="onChangePwdType" :icon="passwordType === 'password' ? 'eye' : 'eye-open'" />
+             <span class="svg-container">
-        </span>
+              <svg-icon icon="password" />
+            </span>
+          </template>
+          <template #append>
+            <span class="show-pwd">
+              <svg-icon @click="onChangePwdType" :icon="passwordType === 'password' ? 'eye' : 'eye-open'" />
+            </span>
+          </template>
+        </el-input>
+
       </el-form-item>
 
       <el-form-item v-if="isShowKaptCha" prop="kaptcha">
@@ -191,22 +203,15 @@ $cursor: #fff;
       color: #454545;
     }
 
-    &::v-deep .el-input {
+    ::v-deep {
-      display: inline-block;
+      .el-input__wrapper, .el-input-group__append, .el-input-group__prepend {
-      height: 47px;
+        background-color: transparent !important;
-      width: 85%;
+        box-shadow: none !important;
-
-      input {
-        background: transparent;
-        border: 0px;
-        -webkit-appearance: none;
-        border-radius: 0px;
-        padding: 12px 5px 12px 15px;
-        color: $light_gray;
-        height: 47px;
-        caret-color: $cursor;
       }
     }
+    &::v-deep .el-input {
+      height: 44px;
+    }
   }
 
   .tips {

src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue

@@ -0,0 +1,138 @@
+<template>
+  <div class="dialog" v-if="dialogVisible">
+    <div class="head_box">
+      <span class="title">{{ title }}</span>
+      <div>
+        <el-button v-if="!disabled" size="small" @click="save" type="primary" :loading="loading">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </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> -->
+      </FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, reactive, getCurrentInstance } from 'vue'
+import { qcckPost } from "@/api/qcckApi.js";
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+
+const { proxy } = getCurrentInstance()
+const title = ref('新增培训人员')
+const loading = ref(false)
+const disabled = ref(false)
+const FormRef = ref(null)
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dic: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const emits = defineEmits(['update:modelValue'])
+
+const dialogVisible = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emits('update:modelValue', val)
+  }
+})
+
+const formList = reactive([
+  [
+    { label: "姓名", prop: "xm", type: "input" },
+    { label: "证件号码", prop: "sfzh", type: "select", options: props.dic.D_BZ_BXDLX },
+    { label: "联系电话", prop: "lxdh", type: "input" },
+  ],
+  [
+    { label: "居住地址", prop: "jzdz", type: "input" },
+    { label: "申请时间", prop: "rzsj", type: "date" },
+    { label: "岗位", prop: "ssbmdm", type: "select" },
+  ],
+  [
+    { label: "身份证正反面", prop: "ssbmdm", type: "upload", limit: 2 },
+  ],
+  [
+    { label: "体检报告", prop: "ssbmdm", type: "upload", limit: 1 },
+  ],
+  [
+    { label: "无犯罪记录证明", prop: "ssbmdm", type: "upload", limit: 1 },
+  ]
+])
+
+const rules = {
+  xm: [{ required: true, message: "请输入姓名", trigger: "change" }],
+  sfzh: [{ required: true, message: "请输入证件号码", trigger: "change" }],
+  lxdh: [{ required: true, message: "请输入联系电话", trigger: "change" }],
+  jzdz: [{ required: true, message: "请输入居住地址", trigger: "change" }],
+  rzsj: [{ required: true, message: "请选择入职时间", trigger: "change" }],
+  pxgs: [{ required: true, message: "请选择所属保安公司", trigger: "change" }],
+}
+
+const formData = ref({})
+
+const close = () => {
+  dialogVisible.value = false
+}
+
+const open = (row = {}, type = 'add') => {
+  disabled.value = false
+  dialogVisible.value = true
+  formData.value = { ...row }
+  if (type === 'add') {
+    title.value = '新增申请人员'
+  } else if (type === 'upload') {
+    title.value = '上传资料'
+  } else {
+    disabled.value = true
+    title.value = '查看详情'
+  }
+}
+
+const save = () => {
+  FormRef.value.submit(() => {
+    loading.value = true;
+    const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`;
+    qcckPost(formData.value, url).then(() => {
+      loading.value = false;
+      proxy.$message.success("保存成功");
+      emits("refresh");
+      close();
+    }).catch(() => {
+      loading.value = false;
+    })
+  });
+}
+
+defineExpose({ open })
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+
+.cntinfo{
+  height: calc(100% - 70px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.mapBox {
+  width: 100%;
+  height: 400px;
+  overflow: hidden;
+}
+</style>

src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue

@@ -0,0 +1,77 @@
+<template>
+  <el-dialog class="dialogWerapper" width="30%" v-model="modelValue" :title="title" @close="handleClose">
+    <form-message ref="FormRef" :disabled="disabled" v-model="formData" :rules="rules" :formList="formList" />
+
+    <template #footer>
+      <el-button type="primary" v-if="!disabled" :loading="loading" @click="handleSubmit">确定</el-button>
+      <el-button @click="handleClose">取消</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { computed, ref, reactive } from 'vue';
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+})
+
+const emits = defineEmits(['update:modelValue'])
+
+const visible = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emits('update:modelValue', val)
+  }
+})
+
+const title = ref('选择培训公司')
+const loading = ref(false)
+const disabled = ref(false)
+const FormRef = ref(null)
+const formData = ref({})
+
+const formList = reactive([
+  [
+    { label: "培训公司", prop: "cj", type: "select" },
+  ],
+])
+
+const rules = {
+  cj: [{ required: true, message: "请输入考试成绩", trigger: "change" }],
+  jm: [{ required: true, message: "请输上传卷面", trigger: "change" }],
+}
+
+const open = (row = {}, type = 'updata') => {
+  FormRef.value?.reset()
+  visible.value = true
+  disabled.value = false
+  formData.value = { ...row }
+}
+
+const handleClose = () => {
+  visible.value = false
+}
+
+const handleSubmit = () => {
+  try {
+    loading.value = true
+    FormRef.value.submit(res => {
+      console.log(res)
+      visible.value = false
+    })
+  } catch (error) {
+    console.log(error)
+  } finally {
+    loading.value = false
+  }
+}
+
+defineExpose({ open })
+</script>

src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue

@@ -0,0 +1,154 @@
+<template>
+  <div>
+    <div class="titleBox">
+      <page-title title="培训人员管理" />
+      <el-button type="primary" @click="addEdit('add')">新增</el-button>
+    </div>
+    <!-- 搜索 -->
+    <div ref="searchBox">
+      <Search :searchArr="searchConfiger" @submit="onSearch"></Search>
+    </div>
+    <!-- 表格 -->
+    <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 #controls="{ row }">
+          <el-link type="primary" @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>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+
+
+    <add-trainer-dialog v-model="isVisible" ref="trainerRef" @refresh="getList" />
+    <select-ttaning-dialog ref="selectTtaningRef" v-model="dialogVisible" />
+  </div>
+</template>
+
+<script setup>
+import { 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';
+import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import AddTrainerDialog from "./components/addTrainerDialog.vue";
+import selectTtaningDialog from "./components/selectTtaningDialog.vue";
+
+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: "人员姓名",
+    prop: "xm",
+    placeholder: "请输入人员姓名",
+    showType: "input"
+  },
+  {
+    label: "证件号码",
+    prop: "sfzh",
+    placeholder: "请输入证件号码",
+    showType: "input"
+  },
+  {
+    label: "联系电话",
+    prop: "lxdh",
+    placeholder: "请输入联系电话",
+    showType: "input"
+  },
+]);
+
+const pageData = reactive({
+  tableData: [{}],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 10,
+    pageCurrent: 1
+  },
+  controlsWidth: 180,
+  tableColumn: [
+    { label: "姓名", prop: "xm" },
+    { label: "证件号码", prop: "sfzh" },
+    { label: "联系方式", prop: "lxdh" },
+    { label: "岗位", prop: "bxds", showSolt: true },
+    { label: "申请时间", prop: "pxgs" },
+    { label: "是否上传资料", prop: "pxgs" },
+    { label: "是否线上培训", prop: "pxgs" },
+  ]
+});
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight =
+    window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+
+const addEdit = (type, row) => {
+  if (type === 'select') {
+    selectTtaningRef.value.open(row, type);
+    return
+  }
+
+  trainerRef.value.open(row, type);
+};
+
+const onSearch = (value) => {
+  queryFrom.value = value
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+}
+
+const getList = async () => {
+  try {
+    pageData.tableConfiger.loading = true;
+    const res = await qcckPost({
+      ...pageData.pageConfiger,
+      ...queryFrom.value
+    }, `/mosty-base/baxx/pxry/page`)
+
+    if(res) {
+      pageData.tableData = res.records || [];
+      pageData.total = res.total;
+    }
+  } finally {
+    pageData.tableConfiger.loading = false;
+  }
+}
+
+onMounted(() => {
+  tabHeightFn();
+  getList();
+});
+</script>
+
+<style scoped lang="scss">
+::v-deep {
+  .el-dialog__header {
+    background: transparent !important;
+  }
+}
+</style>

src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue

@@ -101,12 +101,14 @@ const close = () => {
 
 const open = (row = {}, type = 'add') => {
   dialogVisible.value = true
+  disabled.value = false
   formData.value = { ...row }
   if (type === 'add') {
     title.value = '新增从业人员'
   } else if (type === 'edit') {
     title.value = '编辑从业人员'
   } else {
+    disabled.value = true
     title.value = '查看详情'
   }
 }

src/views/securityManagement/personnelManagement/practitioner/index.vue

@@ -78,7 +78,7 @@ const searchConfiger = ref([
 ]);
 
 const pageData = reactive({
-  tableData: [],
+  tableData: [{}],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,

src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue

@@ -3,7 +3,7 @@
     <div class="head_box">
       <span class="title">{{ title }}</span>
       <div>
-        <el-button size="small" @click="save" type="primary" :loading="loading">保存</el-button>
+        <!-- <el-button size="small" @click="save" type="primary" :loading="loading">保存</el-button> -->
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
@@ -28,6 +28,18 @@
         <el-descriptions-item label="场所负责人联系方式">{{ formData.ssbmdm }}</el-descriptions-item>
         <el-descriptions-item label="场所负责人居住地址">{{ formData.ssbmdm }}</el-descriptions-item>
         <el-descriptions-item label="场所负责人身份证号">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安服务公司名称" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人身份证号码">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人联系方式">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安人员数量">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所面积" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="营业执照照片">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="武装押运证书">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="备案编号">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="备案机构名称">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="经营许可证号码">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="经营许可证发证机构">{{ formData.ssbmdm }}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>
@@ -37,7 +49,6 @@
 import { ref, computed, reactive, getCurrentInstance } from 'vue'
 import { qcckPost } from "@/api/qcckApi.js";
 import MyTable from '@/components/aboutTable/MyTable.vue';
-// import viewAndUploadDialog from './viewAndUploadDialog.vue';
 
 const { proxy } = getCurrentInstance()
 const title = ref('保安培训项目新增')
@@ -104,7 +115,7 @@ const open = (row = {}, type = 'add') => {
   dialogVisible.value = true
   formData.value = { ...row }
   if (type === 'view') {
-    title.value = '保安线下考试详情'
+    title.value = '查看详情'
     visible.value = true
   } else if (type === 'edit') {
     title.value = '保安证申请'
@@ -144,8 +155,7 @@ defineExpose({ open })
 
 .cntinfo {
   padding: 2rem 12rem 0rem 12rem;
-  height: calc(100% - 70px);
+  height: calc(100% - 270px);
-  overflow: hidden;
   overflow-y: auto;
 }
 

src/views/securityManagement/unitInformation/index.vue

@@ -2,7 +2,6 @@
   <div>
     <div class="titleBox">
       <page-title title="单位管理" />
-      <el-button type="primary" @click="addEdit('add', row)">新增</el-button>
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
@@ -20,9 +19,7 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link type="primary" @click="addEdit('view', row)">详情</el-link>
-          <el-link type="danger" @click="handleDelete([row.id])">删除</el-link>
-          <el-link type="warning" @click="handleXfrw(row)">下发任务</el-link>
         </template>
       </MyTable>
 
@@ -30,6 +27,8 @@
         ...pageData.pageConfiger,
         total: pageData.total
       }"></Pages>
+
+      <ViewDetailsDialog ref="detailsRef" v-model="visible" />
     </div>
   </div>
 </template>
@@ -40,10 +39,12 @@ import MyTable from '@/components/aboutTable/MyTable.vue';
 import Pages from '@/components/aboutTable/Pages.vue';
 import Search from '@/components/aboutTable/Search.vue';
 import PageTitle from '@/components/aboutTable/PageTitle.vue';
-import viewDetailsDialog from "./components/viewDetailsDialog.vue";
+import ViewDetailsDialog from "./components/viewDetailsDialog.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 
+const visible = ref(false);
 const searchBox = ref(null);
+const detailsRef = ref(null);
 const D_BZ_BXDLX = ref([]);
 const searchConfiger = ref([
   {
@@ -107,6 +108,9 @@ const getList = async () => {
   }
 };
 
+const addEdit = (type, row) => {
+  detailsRef.value.open(row, type);
+}
 
 onMounted(() => {
   tabHeightFn();