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

src/assets/css/layout.scss

@@ -1,4 +1,4 @@
-header {
+.headerWrapper {
   height: 88px;
   background: url('~@/assets/images/top.png') no-repeat center center;
   background-size: 100% 100%;

src/layout/components/Header.vue

@@ -1,5 +1,5 @@
 <template>
-  <header>
+  <header class="headerWrapper">
     <div class="logo flex align-center" @click="goToHome"><img width="45" class="mr10" src="@/assets/images/jinghui.png" alt="">保安管理</div>
     <div class="right">
       <div><img src="@/assets/images/peo.png" /></div>

src/views/Training/SecurityQuestionBank/components/detailForm.vue

@@ -26,24 +26,34 @@ const FormRef = ref();
 const loading = ref(false);
 const listQuery = ref({});
 const openType = ref("")
+
+const props = defineProps({
+  dict: {
+    type: Object,
+    default: () => {}
+  },
+})
+
 const rules = reactive({
-  spbt: [{ required: true, message: "请输入视频标题", trigger: "blur" }],
+  tm: [{ required: true, message: "请输入题目", trigger: "blur" }],
+  type: [{ required: true, message: "请选择题型", trigger: "blur" }],
 });
+
 const formList = reactive([
   [
-    { label: "题型", prop: "tx", type: "select",options: [{label:'单选题',value:'1'},{label:'多选题',value:'2'},{label:'判断题',value:'3'}] },
+    { label: "题型", prop: "type", type: "select", options: [{label:'单选题',value:'1'},{label:'多选题',value:'2'},{label:'判断题',value:'3'}] },
     { label: "题目", prop: "tm", type: "input" },
   ],
   [
-    { label: "选项A", prop: "a", type: "input" },
+    { label: "选项A", prop: "optionA", type: "input" },
-    { label: "选项B", prop: "b", type: "input" },
+    { label: "选项B", prop: "optionB", type: "input" },
   ],
   [
-    { label: "选项C", prop: "c", type: "input" },
+    { label: "选项C", prop: "optionC", type: "input" },
-    { label: "选项D", prop: "d", type: "input" },
+    { label: "选项D", prop: "optionD", type: "input" },
   ],
   [
-    { label: "选项E", prop: "e", type: "input" },
+    { label: "选项E", prop: "optionE", type: "input" },
     { label: "答案", prop: "dw", type: "input" }
   ],
 ])
@@ -59,18 +69,19 @@ const init = (type, id,) => {
 
 const save = () => {
   FormRef.value.submit(()=>{
-    // loading.value = true;
+    loading.value = true;
-    // let url = title.value == '新增' ? `/mosty-jbld/jbldzsd/add` : `/mosty-jbld/jbldzsd/update`;
+    let url = title.value == '新增' ? `/mosty-base/baxx/tkgl/addd` : `/mosty-base/baxx/tkgl/edit`;
-    // qcckPost(listQuery.value, url).then(() => {
+    qcckPost(listQuery.value, url).then(() => {
-    //   loading.value = false;
+      loading.value = false;
       proxy.$message.success("保存成功");
-    //   emit("refresh");
+      emit("refresh");
       close();
-    // }).catch(() => {
+    }).catch(() => {
-    //   loading.value = false;
+      loading.value = false;
-    // })
+    })
   });
 }
+
 const close = () => {
   dialogForm.value = false;
   FormRef.value.reset()

src/views/Training/SecurityQuestionBank/index.vue

@@ -19,7 +19,9 @@
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData">
-
+        <template #type="{ row }">
+          <DictTag :value="row.type" :tag="false" :options="D_BAXX_KTLX" />
+        </template>
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-link type="primary" link @click="addEdit('edit', row.id)">编辑</el-link>
@@ -33,7 +35,7 @@
       }"></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" @refresh="getList" />
+    <DetailForm ref="detailDiloag" @refresh="getList" :dict="{ D_BAXX_KTLX }" />
   </div>
 </template>
 
@@ -46,13 +48,15 @@ import DetailForm from "./components/detailForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
+
+const { D_BAXX_KTLX } = proxy.$dict("D_BAXX_KTLX")
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 const baseUrl = 'data:image/jpeg;base64,'
 const searchConfiger = ref([
   {
     label: "题目",
-    prop: "questionContent",
+    prop: "tm",
     placeholder: "请输入题目",
     showType: "input"
   },
@@ -74,8 +78,8 @@ const pageData = reactive({
   },
   controlsWidth: 180,
   tableColumn: [
-    { label: "题型", prop: "questionType"},
+    { label: "题型", prop: "type", showSolt: true },
-    { label: "题目", prop: "questionContent" },
+    { label: "题目", prop: "tm" },
     { label: "选项A", prop: "optionA" },
     { label: "选项B", prop: "optionB" },
     { label: "选项C", prop: "optionC" },
@@ -108,26 +112,26 @@ const changeSize = (val) => {
 
 // 获取列表
 const getList = () => {
-  // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
-  // let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // qcckGet(data, "/mosty-jbld/jbldzsd/selectPage").then((res) => {
+  qcckGet(data, "/mosty-base/baxx/tkgl/page").then((res) => {
-  //   pageData.tableData = res.records || [];
+    pageData.tableData = res.records || [];
-  //   pageData.total = res.total;
+    pageData.total = res.total;
-  //   pageData.tableConfiger.loading = false;
+    pageData.tableConfiger.loading = false;
-  // }).catch(() => {
+  }).catch(() => {
-  //   pageData.tableConfiger.loading = false;
+    pageData.tableConfiger.loading = false;
-  // });
+  });
 };
 
 
 // 删除
-const handleDelete = (id) => {
+const handleDelete = (ids) => {
-  // proxy.$modal.confirm("是否确认删除该值守点？").then(() => {
+  proxy.$modal.confirm("是否确认删除该题目？").then(() => {
-  //   qcckPost({ id }, "/mosty-jbld/jbldzsd/delete").then(() => {
+    qcckPost({ ids }, "/mosty-base/baxx/tkgl/remove").then(() => {
-  //     proxy.$modal.msgSuccess("删除成功");
+      proxy.$modal.msgSuccess("删除成功");
-  //     getList();
+      getList();
-  //   });
+    });
-  // });
+  });
 };
 
 // 详情
@@ -151,4 +155,4 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-</style>
+</style>

src/views/Training/SecurityTrainingVideo/components/detailForm.vue

@@ -26,39 +26,42 @@ const FormRef = ref();
 const loading = ref(false);
 const listQuery = ref({});
 const openType = ref("")
+
 const rules = reactive({
   spbt: [{ required: true, message: "请输入视频标题", trigger: "blur" }],
+  fjid: [{ required: true, message: "请上传视频附件", trigger: "blur" }],
 });
+
 const formList = reactive([
   [
     { label: "视频标题", prop: "spbt", type: "input" },
   ],
   [
-    { label: "附件", prop: "fjdz", type: "upload"},
+    { label: "附件", prop: "fjid", type: "upload"},
   ],
 ])
 
 
 // 初始化数据
-const init = (type, id,) => {
+const init = (type, row = {}) => {
   dialogForm.value = true;
-   openType.value = type;
+  openType.value = type;
   title.value = type == "add" ? "新增" : "编辑";
-  if(id) getDateById(id)
+  listQuery.value = { ...row }
 };
 
 const save = () => {
   FormRef.value.submit(()=>{
-    // loading.value = true;
+    loading.value = true;
-    // let url = title.value == '新增' ? `/mosty-jbld/jbldzsd/add` : `/mosty-jbld/jbldzsd/update`;
+    let url = title.value == '新增' ? `/mosty-base/baxx/sok/add` : `/mosty-base/baxx/sok/edit`;
-    // qcckPost(listQuery.value, url).then(() => {
+    qcckPost(listQuery.value, url).then(() => {
-    //   loading.value = false;
+      loading.value = false;
       proxy.$message.success("保存成功");
-    //   emit("refresh");
+      emit("refresh");
       close();
-    // }).catch(() => {
+    }).catch(() => {
-    //   loading.value = false;
+      loading.value = false;
-    // })
+    })
   });
 }
 const close = () => {

src/views/Training/SecurityTrainingVideo/index.vue

@@ -21,8 +21,8 @@
         @chooseData="chooseData">
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" link @click="addEdit('edit', row.id)">编辑</el-link>
+          <el-link type="primary" link @click="addEdit('edit', row)">编辑</el-link>
-          <el-link type="primary" link @click="addEdit('detail', row.id)">详情</el-link>
+          <el-link type="primary" link @click="addEdit('detail', row)">详情</el-link>
           <el-link type="danger" link @click="handleDelete(row.id)">删除</el-link>
         </template>
       </MyTable>
@@ -100,32 +100,32 @@ const changeSize = (val) => {
 
 // 获取列表
 const getList = () => {
-  // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
-  // let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // qcckGet(data, "/mosty-jbld/jbldzsd/selectPage").then((res) => {
+  qcckPost(data, "/mosty-base/baxx/sok/page").then((res) => {
-  //   pageData.tableData = res.records || [];
+    pageData.tableData = res.records || [];
-  //   pageData.total = res.total;
+    pageData.total = res.total;
-  //   pageData.tableConfiger.loading = false;
+    pageData.tableConfiger.loading = false;
-  // }).catch(() => {
+  }).catch(() => {
-  //   pageData.tableConfiger.loading = false;
+    pageData.tableConfiger.loading = false;
-  // });
+  });
 };
 
 
 // 删除
-const handleDelete = (id) => {
+const handleDelete = (ids) => {
-  // proxy.$modal.confirm("是否确认删除该值守点？").then(() => {
+  proxy.$modal.confirm("是否确认删除该视频？").then(() => {
-  //   qcckPost({ id }, "/mosty-jbld/jbldzsd/delete").then(() => {
+    qcckPost({ ids }, "/mosty-base/baxx/sok/remove").then(() => {
-  //     proxy.$modal.msgSuccess("删除成功");
+      proxy.$modal.msgSuccess("删除成功");
-  //     getList();
+      getList();
-  //   });
+    });
-  // });
+  });
 };
 
 // 详情
-const addEdit = (type, id) => {
+const addEdit = (type, row = {}) => {
   nextTick(() => {
-    detailDiloag.value.init(type, id);
+    detailDiloag.value.init(type, row);
   })
 };
 
@@ -143,4 +143,4 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-</style>
+</style>

src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="dialogWerapper" v-model="modelValue" :title="title" @close="handleClose">
+  <el-dialog class="dialogWerapper" width="40%" v-model="modelValue" :title="title" @close="handleClose">
     <form-message ref="FormRef" :disabled="disabled" v-model="formData" :rules="rules" :formList="formList" />
 
     <template #footer>

src/views/securityManagement/examManagement/components/viewExamDetalis.vue

@@ -9,13 +9,13 @@
     </div>
     <div class="cntinfo">
       <template v-if="visible">
-        <el-descriptions column="2" border>
+        <el-descriptions column="2" border label-width="120px">
-        <el-descriptions-item label="培训项目名称">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="培训项目名称">{{ formData.xmmc }}</el-descriptions-item>
-        <el-descriptions-item label="考试时间">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="考试时间">{{ formData.kssj }}</el-descriptions-item>
-        <el-descriptions-item label="考试辖区">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="考试辖区">{{ formData.ksxq }}</el-descriptions-item>
-        <el-descriptions-item label="考试地址">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="考试地址">{{ formData.ksdz }}</el-descriptions-item>
-        <el-descriptions-item label="监考民警">{{ formData.rzsj }}</el-descriptions-item>
+        <el-descriptions-item label="监考民警">{{ formData.jkmj }}</el-descriptions-item>
-        <el-descriptions-item label="考试方式">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="考试方式">{{ formData.ksfs }}</el-descriptions-item>
       </el-descriptions>
       </template>
 

src/views/securityManagement/examManagement/index.vue

@@ -48,13 +48,13 @@ const D_BZ_BXDLX = ref([]);
 const searchConfiger = ref([
   {
     label: "培训项目名称",
-    prop: "xm",
+    prop: "xmmc",
     placeholder: "请输入培训项目名称",
     showType: "input"
   },
   {
     label: "考试时间",
-    prop: "sfzh",
+    prop: "kssj",
     placeholder: "请选择考试时间",
     showType: "date"
   },
@@ -75,11 +75,11 @@ const pageData = reactive({
   },
   controlsWidth: 180,
   tableColumn: [
-    { label: "培训项目名称", prop: "xm" },
+    { label: "培训项目名称", prop: "xmmc" },
-    { label: "考试时间", prop: "sfzh" },
+    { label: "考试时间", prop: "kssj" },
-    { label: "监考民警", prop: "sfzh" },
+    { label: "监考民警", prop: "jkmj" },
-    { label: "考试地址", prop: "sfzh" },
+    { label: "考试地址", prop: "ksdz" },
-    { label: "考试方式", prop: "lxdh" },
+    { label: "考试方式", prop: "ksfs" },
   ]
 });
 
@@ -108,7 +108,7 @@ const getList = async () => {
     const res = await qcckPost({
       ...pageData.pageConfiger,
       ...queryFrom.value
-    }, `/mosty-base/baxx/pxry/page`)
+    }, `/mosty-base/baxx/ksgl/page`)
 
     if(res) {
       pageData.tableData = res.records || [];

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: "xtCjsj", type: "date" },
-    { label: "岗位", prop: "ssbmdm", type: "select" },
+    { 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" }],
+  zjhm: [
-  lxdh: [{ required: true, message: "请输入联系电话", trigger: "change" }],
+    { 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("保存成功");

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 }">
+        <template #sfpx="{ row }">
-          <DictTag :value="row.bxxLx" :tag="false" :options="D_BZ_BXDLX" />
+          {{ 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: "gw" },
-    { label: "申请时间", prop: "pxgs" },
+    { 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>

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>
+        <template #lzsj>
-          <el-input v-model="formData.zb" placeholder="请选择巡逻路线">
+          <el-input v-model="formData.lzsj" disabled placeholder="请选择离职时间"></el-input>
-            <template #append><el-button type="primary" @click="chackLat">开始绘制</el-button></template>
+        </template>
-          </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: "lzsj", type: "slot" },
-    { label: "文化程度", prop: "ssbmdm", type: "select" },
+    { 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" }],
+  sfzh: [
-  lxdh: [{ required: true, message: "请输入联系电话", trigger: "change" }],
+    { 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
 }
 

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 }">
+        <template #sflz="{ row }">
-          <DictTag :value="row.bxxLx" :tag="false" :options="D_BZ_BXDLX" />
+          <DictTag :value="row.sflz" :tag="false" :options="D_BZ_SF" />
-        </template>
-        <template #bxds="{ row }">
-          <div>{{ row.bxds?.length }}</div>
         </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: "wpdw", },
-    { label: "是否在职", prop: "controls" },
+    { 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;

src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue

@@ -8,13 +8,13 @@
       </div>
     </div>
     <div class="cntinfo">
-      <el-descriptions column="2" border>
+      <el-descriptions column="2" border label-width="120px">
         <el-descriptions-item label="姓名">{{ formData.xm }}</el-descriptions-item>
         <el-descriptions-item label="身份证号">{{ formData.sfzh }}</el-descriptions-item>
         <el-descriptions-item label="联系电话">{{ formData.lxdh }}</el-descriptions-item>
-        <el-descriptions-item label="所属保安公司">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="所属保安公司"></el-descriptions-item>
-        <el-descriptions-item label="线上培训时长">{{ formData.rzsj }}</el-descriptions-item>
+        <el-descriptions-item label="线上培训时长">{{ formData.pxsc }}</el-descriptions-item>
-        <el-descriptions-item label="提交日期">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="提交日期"></el-descriptions-item>
       </el-descriptions>
     </div>
   </div>

src/views/securityManagement/trainingManagement/personnelTraining/index.vue

@@ -59,13 +59,13 @@ const searchConfiger = ref([
   },
   {
     label: "所属保安公司",
-    prop: "sfzh",
+    prop: "",
     placeholder: "请选择所属保安公司",
     showType: "select"
   },
   {
     label: "提交日期",
-    prop: "sfzh",
+    prop: "",
     placeholder: "请选择提交日期",
     showType: "date"
   }
@@ -81,6 +81,7 @@ const pageData = reactive({
   },
   total: 0,
   pageConfiger: {
+    sfcjpx: 0, // 是否参加培训
     pageSize: 10,
     pageCurrent: 1
   },
@@ -89,9 +90,9 @@ const pageData = reactive({
     { label: "姓名", prop: "xm" },
     { label: "身份证号", prop: "sfzh" },
     { label: "联系方式", prop: "lxdh" },
-    { label: "所属保安公司", prop: "pxgs" },
+    { label: "所属保安公司", prop: "" },
-    { label: "线上培训时长", prop: "pxgs" },
+    { label: "线上培训时长", prop: "pxsc" },
-    { label: "提交日期", prop: "pxgs" },
+    { label: "提交日期", prop: "" },
   ]
 });
 
@@ -114,6 +115,20 @@ const onSearch = (value) => {
   getList();
 }
 
+// 删除
+const handleDelete = async (ids) => {
+  await proxy.$modal.confirm("是否确认删除该培训人员？")
+
+  try {
+    await qcckPost({ ids }, "/mosty-base/baxx/pxry/remove")
+    proxy.$modal.msgSuccess("删除成功");
+    await getList();
+  } catch (error) {
+    proxy.$modal.msgError("删除失败");
+    console.log(error)
+  }
+};
+
 const getList = async () => {
   try {
     pageData.tableConfiger.loading = true;

src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue

@@ -59,21 +59,21 @@ const formList = reactive([
     { label: "联系电话", prop: "lxdh", type: "input" },
   ],
   [
-    { label: "居住地址", prop: "jzdz", type: "input" },
+    { label: "居住地址", prop: "", type: "input" },
-    { label: "申请时间", prop: "rzsj", type: "date" },
+    { label: "申请时间", prop: "", type: "date" },
-    { label: "岗位", prop: "ssbmdm", type: "select" },
+    { label: "岗位", prop: "", type: "select" },
   ],
   [
-    { label: "所属保安公司", prop: "pxgs", type: "select" },
+    { label: "所属保安公司", prop: "", type: "select" },
   ],
   [
-    { label: "身份证正反面", prop: "ssbmdm", type: "upload", limit: 2 },
+    { label: "身份证正反面", prop: "", type: "upload", limit: 2 },
   ],
   [
-    { label: "体检报告", prop: "ssbmdm", type: "upload", limit: 1 },
+    { label: "体检报告", prop: "", type: "upload", limit: 1 },
   ],
   [
-    { label: "无犯罪记录证明", prop: "ssbmdm", type: "upload", limit: 1 },
+    { label: "无犯罪记录证明", prop: "", type: "upload", limit: 1 },
   ]
 ])
 

src/views/securityManagement/trainingManagement/trainer/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <div class="titleBox">
-      <page-title title="培训人员管理" />
+      <page-title title="培训人员" />
-      <el-button type="primary" @click="addEdit('add', row)">新增</el-button>
+      <!-- <el-button type="primary" @click="addEdit('add', row)">新增</el-button> -->
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
@@ -17,10 +17,9 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link type="success">提交培训</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('view', row)">详情</el-link>
-          <el-link type="primary" @click="handleXfrw(row)">离职</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -34,7 +33,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';
@@ -42,6 +41,7 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import AddTrainerDialog from "./components/addTrainerDialog.vue";
 
+const { proxy } = getCurrentInstance()
 const trainerRef = ref(null);
 const queryFrom = ref({});
 const isVisible = ref(false);
@@ -69,7 +69,7 @@ const searchConfiger = ref([
 ]);
 
 const pageData = reactive({
-  tableData: [],
+  tableData: [{}],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -86,8 +86,8 @@ const pageData = reactive({
     { label: "姓名", prop: "xm" },
     { label: "证件号码", prop: "sfzh" },
     { label: "联系方式", prop: "lxdh" },
-    { label: "岗位", prop: "bxds", showSolt: true },
+    { label: "岗位", prop: "" },
-    { label: "所属保安公司", prop: "pxgs" },
+    { label: "所属保安公司", prop: "" },
   ]
 });
 
@@ -127,6 +127,20 @@ const getList = async () => {
   }
 }
 
+// 删除
+const handleDelete = async (ids) => {
+  await proxy.$modal.confirm("是否确认删除该培训人员？")
+
+  try {
+    await qcckPost({ ids }, "/mosty-base/baxx/pxry/remove")
+    proxy.$modal.msgSuccess("删除成功");
+    await getList();
+  } catch (error) {
+    proxy.$modal.msgError("删除失败");
+    console.log(error)
+  }
+};
+
 onMounted(() => {
   tabHeightFn();
   getList();

src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue

@@ -9,11 +9,11 @@
         </div>
 
         <div class="cntBox">
-            <el-form :model="formData" ref="FormRef" label-width="120px">
+            <el-form :model="formData" ref="FormRef" label-width="120px" :rules="rules">
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="培训项目名称" prop="pxxm" style="width: 100%;">
+                        <el-form-item label="培训项目名称" prop="xmmc" style="width: 100%;">
-                            <el-input v-model="formData.pxxm" placeholder="请输入培训项目名称" style="width: 100%;"></el-input>
+                            <el-input v-model="formData.xmmc" placeholder="请输入培训项目名称" style="width: 100%;"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -27,13 +27,13 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="培训开始时间" prop="pxksrq" style="width: 100%;">
+                        <el-form-item label="培训开始时间" prop="kssj" style="width: 100%;">
-                            <el-date-picker v-model="formData.pxksrq" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请输入培训开始时间" style="width: 100%;" />
+                            <el-date-picker v-model="formData.kssj" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请输入培训开始时间" style="width: 100%;" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="培训结束时间" prop="pxjsrq" style="width: 100%;">
+                        <el-form-item label="培训结束时间" prop="jssj" style="width: 100%;">
-                            <el-date-picker v-model="formData.pxjsrq" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请输入培训结束时间" style="width: 100%;" />
+                            <el-date-picker v-model="formData.jssj" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请输入培训结束时间" style="width: 100%;" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -41,7 +41,7 @@
                 <!-- 人员 -->
                 <el-row class="peoRow" v-for="(item, index) in formData.courceList" :key="index">
                     <el-col :span="12">
-                        <el-form-item label="培训日期" prop="pxrq" style="width: 100%;">
+                        <el-form-item label="培训日期" :prop="`courceList[${index}].pxrq`" style="width: 100%;" :rules="rules.pxrq">
                             <el-date-picker v-model="item.pxrq" type="date" value-format="YYYY-MM-DD" placeholder="请输入培训日期" style="width: 100%;" />
                         </el-form-item>
                     </el-col>
@@ -51,26 +51,26 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="课程名称" prop="pxkcxm" style="width: 100%;">
+                        <el-form-item label="课程名称" :prop="`courceList[${index}].kcmc`" style="width: 100%;" :rules="rules.kcmc">
-                            <el-input v-model="item.pxkcxm" placeholder="请输入课程名称" style="width: 100%;"></el-input>
+                            <el-input v-model="item.kcmc" placeholder="请输入课程名称" style="width: 100%;"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="组织单位" prop="pxzcdw" style="width: 100%;">
+                        <el-form-item label="组织单位" :prop="`courceList[${index}].zzdw`" style="width: 100%;" :rules="rules.zzdw">
-                            <el-input v-model="item.pxzcdw" placeholder="请输入组织单位" style="width: 100%;"></el-input>
+                            <el-input v-model="item.zzdw" placeholder="请输入组织单位" style="width: 100%;"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="授课教员" prop="pxfcy" style="width: 100%;">
+                        <el-form-item label="授课教员" :prop="`courceList[${index}].skjy`" style="width: 100%;" :rules="rules.skjy">
-                            <el-select v-model="item.pxfcy" placeholder="请选择授课教员" style="width: 100%;">
+                            <el-select v-model="item.skjy" placeholder="请选择授课教员" style="width: 100%;">
                                 <el-option label="张三" value="张三"></el-option>
                                 <el-option label="李四" value="李四"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="培训内容" prop="pxnc" style="width: 100%;">
+                        <el-form-item label="培训内容" :prop="`courceList[${index}].pxnc`" style="width: 100%;" :rules="rules.pxnr">
-                            <el-input v-model="item.pxnc" placeholder="请输入培训内容" style="width: 100%;"></el-input>
+                            <el-input v-model="item.pxnr" placeholder="请输入培训内容" style="width: 100%;"></el-input>
                         </el-form-item>
                     </el-col>
                     <span class="deleteIncon" @click.stop="delItem(item,index)">
@@ -106,6 +106,8 @@ const formData = ref({
         pxnc: '', //培训内容
     }] //课程
 })
+
+const FormRef = ref(null)
 const pageData = reactive({
   tableData: [{xm: '张三', sfzh: '123456789012345678', lxdh: '13800000000'}],
   keyCount: 0,
@@ -129,6 +131,19 @@ const pageData = reactive({
   ]
 });
 
+const rules = {
+  xmmc: [{ required: true, message: "请输入培训项目名称", trigger: "change" }],
+  pxdz: [{ required: true, message: "请输入培训地址", trigger: "change" }],
+  xxdz: [{ required: true, message: "请输入详细地址", trigger: "change" }],
+  kssj: [{ required: true, message: "请输入培训开始时间", trigger: "change" }],
+  jssj: [{ required: true, message: "请输入培训结束时间", trigger: "change" }],
+  pxrq: [{ required: true, message: "请输入培训日期", trigger: "change" }],
+  kcmc: [{ required: true, message: "请输入课程名称", trigger: "change" }],
+  zzdw: [{ required: true, message: "请输入组织单位", trigger: "change" }],
+  skjy: [{ required: true, message: "请选择授课教员", trigger: "change" }],
+  pxnr: [{ required: true, message: "请输入培训内容", trigger: "change" }]
+}
+
 const addItem = () => {
     formData.value.courceList.push({
         pxkcxm: '', //课程名称
@@ -151,6 +166,12 @@ const close = () => {
     showDialog.value = false
 }
 
+const save = async () => {
+  FormRef.value.validate((valid) => {
+
+  })
+}
+
 defineExpose({
     init
 })

src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue

@@ -8,23 +8,27 @@
       </div>
     </div>
     <div class="cntinfo">
-      <el-descriptions column="2" border>
+      <el-descriptions column="2" border label-width="120px">
-        <el-descriptions-item label="培训项目名称">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="培训项目名称">{{ formData.xmmc }}</el-descriptions-item>
-        <el-descriptions-item label="培训地址">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="培训地址">{{ formData.pxdz }}</el-descriptions-item>
-        <el-descriptions-item label="详情地址">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="详细地址">{{ formData.xxdz }}</el-descriptions-item>
-        <el-descriptions-item label="培训开始时间">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="培训开始时间">{{ formData.kssj }}</el-descriptions-item>
-        <el-descriptions-item label="培训结束时间">{{ formData.rzsj }}</el-descriptions-item>
+        <el-descriptions-item label="培训结束时间">{{ formData.jssj }}</el-descriptions-item>
       </el-descriptions>
 
-      <el-descriptions column="2" border class="label">
+      <el-descriptions column="2" border class="label" label-width="120px">
-        <el-descriptions-item label="培训日期">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="培训日期">{{ courseInfo.pxrq }}</el-descriptions-item>
-        <el-descriptions-item label="培训时间">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="培训时间">{{ courseInfo.pxsj }}</el-descriptions-item>
-        <el-descriptions-item label="课程名称">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="课程名称">{{ courseInfo.kcmc }}</el-descriptions-item>
-        <el-descriptions-item label="组织单位">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="组织单位">{{ courseInfo.zzdw }}</el-descriptions-item>
-        <el-descriptions-item label="授课教员">{{ formData.rzsj }}</el-descriptions-item>
+        <el-descriptions-item label="授课教员">{{ courseInfo.skjy }}</el-descriptions-item>
-        <el-descriptions-item label="培训内容">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="培训内容">{{ courseInfo.pxnr }}</el-descriptions-item>
-        <el-descriptions-item label="已培训人员" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="已培训人员" :span="2">{{ courseInfo.ypxry }}</el-descriptions-item>
-        <el-descriptions-item label="培训照片" :span="2"></el-descriptions-item>
+        <el-descriptions-item label="培训照片" :span="2">
+          <div class="imgWrapper">
+            <Upload v-model="courseInfo.pxzp" />
+          </div>
+        </el-descriptions-item>
       </el-descriptions>
 
       <!-- <el-descriptions title="考试人员" column="2" border class="mt20"> -->
@@ -39,7 +43,6 @@
       </MyTable>
       <!-- </el-descriptions> -->
 
-      <!-- <view-and-upload-dialog ref="viewAndUploadRef" v-model="viewAndUploadVisible" /> -->
     </div>
   </div>
 </template>
@@ -48,7 +51,7 @@
 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';
+import Upload from "@/components/MyComponents/Upload/index.vue"
 
 const { proxy } = getCurrentInstance()
 const title = ref('保安培训项目详情')
@@ -56,8 +59,6 @@ const loading = ref(false)
 const disabled = ref(false)
 const FormRef = ref(null)
 const visible = ref(true)
-const viewAndUploadRef = ref(null)
-const viewAndUploadVisible = ref(false)
 
 const props = defineProps({
   modelValue: {
@@ -106,11 +107,20 @@ const pageData = reactive({
 });
 
 const formData = ref({})
+const courseInfo = ref({})
 
 const close = () => {
   dialogVisible.value = false
 }
 
+// 获取保安信息培训课程管理详情
+const getbaInfo = async () => {
+  const res = await qcckPost({}, `/mosty-base/baxx/pxkc/getInfo/${id}`)
+  if (res) {
+    courseInfo.value = res
+  }
+}
+
 const open = (row = {}, type = 'view') => {
   disabled.value = false
   dialogVisible.value = true
@@ -118,6 +128,7 @@ const open = (row = {}, type = 'view') => {
   if (type === 'view') {
     title.value = '保安线下考试详情'
     visible.value = true
+    getbaInfo()
   } else if (type === 'edit') {
     title.value = '保安证申请'
     visible.value = false
@@ -139,9 +150,6 @@ const save = () => {
   });
 }
 
-// const addEdit = (type, row) => {
-//   viewAndUploadRef.value?.open(row, type)
-// }
 
 defineExpose({ open })
 </script>
@@ -149,6 +157,26 @@ defineExpose({ open })
 <style lang="scss" scoped>
 @import "@/assets/css/layout.scss";
 
+.dialog {
+  ::v-deep {
+    .imgWrapper {
+      display: flex;
+
+      .el-upload-list__item {
+        height: 80px;
+        width: 90%;
+      }
+
+      .form-item-box {
+        width: auto !important;
+      }
+    }
+    .el-upload--picture-card, .el-upload-list--picture-card .el-upload-list__item-actions span+span {
+      display: none !important;
+    }
+  }
+}
+
 .label {
   margin-top: 20px;
   color: #000;

src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue

@@ -8,13 +8,15 @@
       </div>
     </div>
     <div class="cntinfo">
-      <el-descriptions column="2" border>
+      <el-descriptions column="2" border label-width="120px">
-        <el-descriptions-item label="培训项目名称">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="培训项目名称">{{ formData.xmmc }}</el-descriptions-item>
-        <el-descriptions-item label="考试时间">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="考试时间">{{ formData.kskssj }}</el-descriptions-item>
-        <el-descriptions-item label="考试辖区">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="考试辖区">{{ formData.ksxq }}</el-descriptions-item>
-        <el-descriptions-item label="考试地址">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="考试地址">{{ formData.ksdz }}</el-descriptions-item>
-        <el-descriptions-item label="监考民警">{{ formData.rzsj }}</el-descriptions-item>
+        <el-descriptions-item label="监考民警">{{ formData.jkrxm }}</el-descriptions-item>
-        <el-descriptions-item label="考试方式">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="考试方式">
+           <DictTag :value="formData.ksfs" :tag="false" :options="D_BAXX_KSFS" />
+        </el-descriptions-item>
       </el-descriptions>
 
       <!-- <el-descriptions title="考试人员" column="2" border class="mt20"> -->
@@ -29,7 +31,6 @@
       </MyTable>
       <!-- </el-descriptions> -->
 
-      <!-- <view-and-upload-dialog ref="viewAndUploadRef" v-model="viewAndUploadVisible" /> -->
     </div>
   </div>
 </template>
@@ -38,16 +39,15 @@
 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 { D_BAXX_KSFS } = proxy.$dict("D_BAXX_KSFS");
 const title = ref('保安培训项目新增')
 const loading = ref(false)
 const disabled = ref(false)
 const FormRef = ref(null)
 const visible = ref(true)
 const viewAndUploadRef = ref(null)
-const viewAndUploadVisible = ref(false)
 
 const props = defineProps({
   modelValue: {

src/views/securityManagement/trainingManagement/trainingProject/index.vue

@@ -55,13 +55,13 @@ const D_BZ_BXDLX = ref([]);
 const searchConfiger = ref([
   {
     label: "培训项目名称",
-    prop: "xm",
+    prop: "xmmc",
     placeholder: "请输入培训项目名称",
     showType: "input"
   },
   {
     label: "培训开始时间",
-    prop: "sfzh",
+    prop: "kssj",
     placeholder: "请选择培训开始时间",
     showType: "date"
   },
@@ -82,11 +82,11 @@ const pageData = reactive({
   },
   controlsWidth: 180,
   tableColumn: [
-    { label: "培训项目名称", prop: "xm" },
+    { label: "培训项目名称", prop: "xmmc" },
-    { label: "培训开始时间", prop: "sfzh" },
+    { label: "培训开始时间", prop: "kssj" },
-    { label: "培训结束时间", prop: "sfzh" },
+    { label: "培训结束时间", prop: "jssj" },
-    { label: "培训公司", prop: "sfzh" },
+    { label: "培训公司", prop: "pxgs" },
-    { label: "培训地址", prop: "lxdh" },
+    { label: "培训地址", prop: "pxdz" },
   ]
 });
 
@@ -121,7 +121,7 @@ const getList = async () => {
     const res = await qcckPost({
       ...pageData.pageConfiger,
       ...queryFrom.value
-    }, `/mosty-base/baxx/pxry/page`)
+    }, `/mosty-base/baxx/pxxm/page`)
 
     if(res) {
       pageData.tableData = res.records || [];

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

@@ -8,56 +8,74 @@
       </div>
     </div>
     <div class="cntinfo">
-      <el-descriptions column="2" border>
+      <el-descriptions column="3" border label-width="180px">
-        <el-descriptions-item label="单位名称(营业执照登记名称)">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="单位名称(营业执照登记名称)">{{ formData.dwmc }}</el-descriptions-item>
-        <el-descriptions-item label="统一社会信用代码">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="统一社会信用代码">{{ formData.xydm }}</el-descriptions-item>
-        <el-descriptions-item label="保安单位类型">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="娱乐场所图片" :rowspan="4">
-        <el-descriptions-item label="场所名称">{{ formData.jzdz }}</el-descriptions-item>
+          <div class="imgWrapper">
-        <el-descriptions-item label="场所代码">{{ formData.rzsj }}</el-descriptions-item>
+            <Upload v-model="formData.cszp" />
-        <el-descriptions-item label="场所联系电话">{{ formData.ssbmdm }}</el-descriptions-item>
+          </div>
-        <el-descriptions-item label="经营状况">{{ formData.ssbmdm }}</el-descriptions-item>
+        </el-descriptions-item>
-        <el-descriptions-item label="开业日期">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安单位类型">{{ formData.type }}</el-descriptions-item>
-        <el-descriptions-item label="单位注册地址" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所名称">{{ formData.csmc }}</el-descriptions-item>
-        <el-descriptions-item label="场所经营地址" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所代码">{{ formData.csdm }}</el-descriptions-item>
-        <el-descriptions-item label="法定代表人">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所联系电话">{{ formData.csLxdh }}</el-descriptions-item>
-        <el-descriptions-item label="法定代表人证件号码">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="经营状况">{{ formData.jyzk }}</el-descriptions-item>
-        <el-descriptions-item label="经营法定代表人联系电话">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="开业日期">{{ formData.kyrq }}</el-descriptions-item>
-        <el-descriptions-item label="经营法定代表人居住地址">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="单位注册地址" :span="3">{{ formData.zcdz }}</el-descriptions-item>
-        <el-descriptions-item label="场所负责人">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所经营地址" :span="3">{{ formData.csjydz }}</el-descriptions-item>
-        <el-descriptions-item label="场所负责人身份证号">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="法定代表人">{{ formData.fdrXm }}</el-descriptions-item>
-        <el-descriptions-item label="场所负责人联系方式">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="法定代表人证件号码">{{ formData.fdrSfzh }}</el-descriptions-item>
-        <el-descriptions-item label="场所负责人居住地址">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="法定代表人照片" :rowspan="2">
-        <el-descriptions-item label="场所负责人身份证号">{{ formData.ssbmdm }}</el-descriptions-item>
+          <div class="imgWrapper">
-        <el-descriptions-item label="保安服务公司名称" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+            <Upload v-model="formData.frSfzZm" disabled />
-        <el-descriptions-item label="保安负责人">{{ formData.ssbmdm }}</el-descriptions-item>
+            <Upload v-model="formData.frSfzFm" disabled />
-        <el-descriptions-item label="保安负责人身份证号码">{{ formData.ssbmdm }}</el-descriptions-item>
+          </div>
-        <el-descriptions-item label="保安负责人联系方式">{{ formData.ssbmdm }}</el-descriptions-item>
+        </el-descriptions-item>
-        <el-descriptions-item label="保安人员数量">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="经营法定代表人联系电话">{{ formData.fdrLxdh }}</el-descriptions-item>
-        <el-descriptions-item label="场所面积" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="经营法定代表人居住地址">{{ formData.fdrJzdz }}</el-descriptions-item>
-        <el-descriptions-item label="营业执照照片">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所负责人">{{ formData.fzrXm }}</el-descriptions-item>
-        <el-descriptions-item label="武装押运证书">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所负责人身份证号">{{ formData.fzrSfzh }}</el-descriptions-item>
-        <el-descriptions-item label="备案编号">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所负责人照片" :rowspan="2">
-        <el-descriptions-item label="备案机构名称">{{ formData.ssbmdm }}</el-descriptions-item>
+          <div class="imgWrapper">
-        <el-descriptions-item label="经营许可证号码">{{ formData.ssbmdm }}</el-descriptions-item>
+            <Upload v-model="formData.fzrSfzZm" disabled />
-        <el-descriptions-item label="经营许可证发证机构">{{ formData.ssbmdm }}</el-descriptions-item>
+            <Upload v-model="formData.fzrSfzFm" disabled />
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="场所负责人联系方式">{{ formData.fzrLxdh }}</el-descriptions-item>
+        <el-descriptions-item label="场所负责人居住地址">{{ formData.fzrJzdz }}</el-descriptions-item>
+        <el-descriptions-item label="保安服务公司名称" :span="3">{{ formData.bagsMc }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人">{{ formData.bagsFzrXm }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人身份证号码">{{ formData.bagsFzrSfzh }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人联系方式">{{ formData.bagsFzrLxdh }}</el-descriptions-item>
+        <el-descriptions-item label="保安人员数量">{{ formData.bagsRysl }}</el-descriptions-item>
+        <el-descriptions-item label="场所面积" :span="3">{{ formData.csmj }}</el-descriptions-item>
+        <el-descriptions-item label="营业执照照片" :span="1.5">
+          <div class="imgWrapper">
+            <Upload v-model="formData.yyzzzp" />
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="武装押运证书" :span="1.5">
+          <div class="imgWrapper">
+            <Upload v-model="formData.jyxkz" />
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="备案编号">{{ formData.babh }}</el-descriptions-item>
+        <el-descriptions-item label="备案机构名称">{{ formData.bamc }}</el-descriptions-item>
+        <el-descriptions-item label="经营许可证编号">{{ formData.jyxkzBh }}</el-descriptions-item>
+        <el-descriptions-item label="经营许可证发证机构">{{ formData.jyxkzBfjg }}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, computed, reactive, getCurrentInstance } from 'vue'
+import { ref, computed, reactive } from 'vue'
-import { qcckPost } from "@/api/qcckApi.js";
+import Upload from "@/components/MyComponents/Upload/index.vue"
-import MyTable from '@/components/aboutTable/MyTable.vue';
 
-const { proxy } = getCurrentInstance()
 const title = ref('保安培训项目新增')
-const loading = ref(false)
 const disabled = ref(false)
-const FormRef = ref(null)
 const visible = ref(true)
-const viewAndUploadRef = ref(null)
-const viewAndUploadVisible = ref(false)
 
 const props = defineProps({
   modelValue: {
@@ -81,29 +99,6 @@ const dialogVisible = computed({
   }
 })
 
-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: "sfzh" },
-    { label: "所属单位", prop: "lxdh" },
-  ]
-});
-
 const formData = ref({})
 
 const close = () => {
@@ -123,31 +118,31 @@ 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`;
-    qcckPost(formData.value, url).then(() => {
-      loading.value = false;
-      proxy.$message.success("保存成功");
-      emits("refresh");
-      close();
-    }).catch(() => {
-      loading.value = false;
-    })
-  });
-}
-
-const addEdit = (type, row) => {
-  viewAndUploadRef.value?.open(row, type)
-}
-
 defineExpose({ open })
 </script>
 
 <style lang="scss" scoped>
 @import "@/assets/css/layout.scss";
 
+.dialog {
+  ::v-deep {
+    .imgWrapper {
+      display: flex;
+
+      .el-upload-list__item {
+        height: 80px;
+        width: 90%;
+      }
+      .form-item-box {
+        width: auto !important;
+      }
+    }
+    .el-upload--picture-card, .el-upload-list--picture-card .el-upload-list__item-actions span+span {
+      display: none !important;
+    }
+  }
+}
+
 .label {
   margin-top: 20px;
   color: #000;
@@ -155,7 +150,7 @@ defineExpose({ open })
 
 .cntinfo {
   padding: 2rem 12rem 0rem 12rem;
-  height: calc(100% - 270px);
+  height: calc(100% - 170px);
   overflow-y: auto;
 }
 

src/views/securityManagement/unitInformation/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <div class="titleBox">
-      <page-title title="单位管理" />
+      <page-title title="单位信息" />
     </div>
- 
+
     <!-- 表格 -->
     <div class="tabBox">
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
@@ -34,7 +34,6 @@
 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 PageTitle from '@/components/aboutTable/PageTitle.vue';
 import ViewDetailsDialog from "./components/viewDetailsDialog.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
@@ -59,10 +58,10 @@ const pageData = reactive({
   },
   controlsWidth: 180,
   tableColumn: [
-    { label: "单位名称", prop: "bxxMc" },
+    { label: "单位名称", prop: "dwmc" },
-    { label: "信用代码", prop: "ssbm" },
+    { label: "信用代码", prop: "xydm" },
-    { label: "场所名称", prop: "bxxLx", showSolt: true },
+    { label: "场所名称", prop: "csmc" },
-    { label: "场所电话", prop: "bxds", showSolt: true }
+    { label: "场所电话", prop: "csLxdh" }
   ]
 });
 
@@ -75,10 +74,11 @@ const tabHeightFn = () => {
   };
 };
 
+
 const getList = async () => {
   try {
     pageData.tableConfiger.loading = true;
-    const res = await qcckGet({
+    const res = await qcckPost({
     ...pageData.pageConfiger,
     }, `/mosty-base/baxx/dwgl/page`)
 

vue.config.js

@@ -5,8 +5,8 @@ function resolve(dir) {
 }
 // const serverHost = "http://192.168.1.98:8006";//毛毛
 // const serverHost = "http://192.168.1.32:8066";//波哥
-const serverHost = "http://192.168.0.231:8006"//线上
+// const serverHost = "http://192.168.0.231:8006"//线上
-// const serverHost = "http://47.108.232.77:9537";//波哥
+const serverHost = "http://47.108.232.77:9537";//波哥
 // const serverHost = "http://127.0.0.1:8006"
 module.exports = {
   publicPath: "./",