From e067629cdb8e05eeaa1caa4986033063ed5a1fda Mon Sep 17 00:00:00 2001
From: esacpe <12345678>
Date: Wed, 24 Sep 2025 21:43:12 +0800
Subject: [PATCH] =?UTF-8?q?'=E8=80=83=E8=AF=95=E7=AE=A1=E7=90=86=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/viewAndUploadDialog.vue        | 13 +--
 .../components/viewExamDetalis.vue            |  8 +-
 .../components/addTrainerDialog.vue           |  1 -
 .../components/selectTtaningDialog.vue        | 19 +++--
 .../components/uploadDataDialog.vue           | 82 +++++++++++++++++++
 .../applicantPersonnel/index.vue              | 28 ++++---
 .../components/viewInfoDialog.vue             |  4 +-
 .../personnelTraining/index.vue               | 15 ++--
 .../trainer/components/addTrainerDialog.vue   | 15 ++--
 .../trainingManagement/trainer/index.vue      |  4 +-
 10 files changed, 142 insertions(+), 47 deletions(-)
 create mode 100644 src/views/securityManagement/personnelManagement/applicantPersonnel/components/uploadDataDialog.vue

diff --git a/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue
index 4136888..350315c 100644
--- a/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue
+++ b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue
@@ -73,12 +73,13 @@ const handleClose = () => {
 const handleSubmit = async () => {
   try {
     loading.value = true
-    await FormRef.value.submit()
-    const { pxryid = "" } = formData.value
-    await qcckPost({ ...formData.value, pxryid }, `mosty/base/baxx/pxry/lrcj`)
-    proxy.$message.success('上传成绩成功')
-    emits('refresh')
-    visible.value = false
+    await FormRef.value.submit(async () => {
+      const { pxryid = "" } = formData.value
+      await qcckPost({ ...formData.value, pxryid }, `mosty/base/baxx/pxry/lrcj`)
+      proxy.$message.success('上传成绩成功')
+      emits('refresh')
+      visible.value = false
+    })
   } catch (error) {
     console.log(error)
     proxy.$message.error('上传成绩失败')
diff --git a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
index 1e9f8ba..e4f362e 100644
--- a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
+++ b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
@@ -96,8 +96,8 @@ const pageData = reactive({
     { label: "姓名", prop: "xm" },
     { label: "证件号码", prop: "sfzh" },
     { label: "联系方式", prop: "lxdh" },
-    { label: "线上培训时间", prop: "" },
-    { label: "线下培训课程", prop: "" },
+    { label: "线上培训时间", prop: "xspxsc" },
+    { label: "线下培训课程", prop: "xxpxsc" },
     { label: "考试成绩", prop: "ksfs" },
   ]
 });
@@ -113,8 +113,8 @@ const getList = async ({ id = "" }, type = '') => {
   const res = await qcckPost({
     ...pageData.pageConfiger,
     // sfcjpx: 1,
-    pxxmid: id
-   }, `/mosty-base/baxx/pxry/page`)
+    ksglid: id
+   }, `/mosty-base/baxx/ksry/list`)
   if (res) {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
index 4b156fe..59ef990 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
@@ -67,7 +67,6 @@ const formList = reactive([
   ],
   [
     { label: "体检报告", prop: "tjbg", type: "upload", limit: 3 },
-    { label: "上传资料", prop: "zl", type: "upload", limit: 3, },
   ],
   [
     { label: "无犯罪记录证明", prop: "wfzzmjl", type: "upload", limit: 1 },
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
index 1ff7add..e048c47 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
@@ -23,7 +23,7 @@ const props = defineProps({
   },
 })
 
-const emits = defineEmits(['update:modelValue'])
+const emits = defineEmits(['update:modelValue', 'refresh'])
 
 const visible = computed({
   get() {
@@ -42,34 +42,37 @@ const formData = ref({})
 
 const formList = reactive([
   [
-    { label: "培训公司", prop: "cj", type: "select", options: D_BAXX_DWLX },
+    { label: "培训公司", prop: "pxgs", type: "select", options: D_BAXX_DWLX },
   ],
 ])
 
 const rules = {
-  cj: [{ required: true, message: "请输入考试成绩", trigger: "change" }],
-  jm: [{ required: true, message: "请输上传卷面", trigger: "change" }],
+  pxgs: [{ required: true, message: "请输入考试成绩", trigger: "change" }],
 }
 
 const open = (row = {}, type = 'updata') => {
-  FormRef.value?.reset()
   visible.value = true
   disabled.value = false
   formData.value = { ...row }
 }
 
 const handleClose = () => {
+  FormRef.value?.reset()
   visible.value = false
 }
 
 const handleSubmit = async () => {
   try {
     loading.value = true
-    await FormRef.value.submit()
-    await qcckPost({ id: formData.value?.id,  }, `/mosty/base/`)
-    visible.value = false
+    await FormRef.value.submit(async () => {
+      await qcckPost({ ...formData.value  }, `/mosty-base/baxx/basq/edit`)
+      proxy.$message.success('培训公司保存成功')
+      emits('refresh')
+      visible.value = false
+    })
   } catch (error) {
     console.log(error)
+    proxy.$message.error('培训公司保存失败')
   } finally {
     loading.value = false
   }
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/uploadDataDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/uploadDataDialog.vue
new file mode 100644
index 0000000..b20d392
--- /dev/null
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/uploadDataDialog.vue
@@ -0,0 +1,82 @@
+<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, getCurrentInstance } from 'vue';
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+
+const { proxy } = getCurrentInstance();
+const { D_BAXX_DWLX } = proxy.$dict("D_BAXX_DWLX")
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+})
+
+const emits = defineEmits(['update:modelValue', 'refresh'])
+
+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: "zl",  type: "upload", limit: 3 },
+  ],
+])
+
+const rules = {
+  zl: [{ required: true, message: "请上传资料", trigger: "change" }],
+}
+
+const open = (row = {}, type = 'updata') => {
+  visible.value = true
+  disabled.value = false
+  formData.value = { ...row }
+}
+
+const handleClose = () => {
+  FormRef.value?.reset()
+  visible.value = false
+}
+
+const handleSubmit = async () => {
+  try {
+    loading.value = true
+    await FormRef.value.submit(async () => {
+      await qcckPost({ ...formData.value  }, `/mosty-base/baxx/basq/edit`)
+      proxy.$message.success('上传资料成功')
+      emits('refresh')
+      visible.value = false
+    })
+  } catch (error) {
+    console.log(error)
+    proxy.$message.error('上传资料失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+defineExpose({ open })
+</script>
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
index 14b853e..fcc830a 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
@@ -12,12 +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 #pxgs="{ row }">
+          {{ row?.pxgs === '01' ? `是` : `否` }}
+        </template>
         <template #sfpx="{ row }">
           {{ row?.sfpx === '01' ? `否` : `是` }}
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="success" @click="addEdit('upload', row)">上传资料</el-link>
+          <el-link type="success" v-if="row?.pxgs !== '01'" @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>
@@ -31,7 +34,8 @@
 
 
     <add-trainer-dialog v-model="isVisible" ref="trainerRef" @refresh="getList" />
-    <select-ttaning-dialog ref="selectTtaningRef" v-model="dialogVisible" />
+    <select-ttaning-dialog ref="selectTtaningRef" v-model="dialogVisible"  @refresh="getList" />
+    <upload-data-dialog ref="uploadDataRef" v-model="uploadVisible" @refresh="getList" />
   </div>
 </template>
 
@@ -43,13 +47,16 @@ 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 UploadDataDialog from "./components/uploadDataDialog.vue";
 import selectTtaningDialog from "./components/selectTtaningDialog.vue";
 
 const { proxy } = getCurrentInstance();
 const trainerRef = ref(null);
 const selectTtaningRef = ref(null);
+const uploadDataRef = ref(null);
 const queryFrom = ref({});
 const isVisible = ref(false);
+const uploadVisible = ref(false);
 const dialogVisible = ref(false);
 const searchBox = ref(null);
 const searchConfiger = ref([
@@ -93,7 +100,7 @@ const pageData = reactive({
     { label: "联系方式", prop: "lxdh" },
     { label: "岗位", prop: "gw" },
     { label: "申请时间", prop: "xtCjsj" },
-    { label: "是否上传资料", prop: "pxgs" },
+    { label: "是否上传资料", prop: "pxgs", showSolt: true },
     { label: "是否线上培训", prop: "sfpx", showSolt: true },
   ]
 });
@@ -110,10 +117,11 @@ const tabHeightFn = () => {
 const addEdit = (type, row) => {
   if (type === 'select') {
     selectTtaningRef.value.open(row, type);
-    return
+  } else if (type === 'upload') {
+    uploadDataRef.value.open(row, type);
+  } else {
+    trainerRef.value.open(row, type);
   }
-
-  trainerRef.value.open(row, type);
 };
 
 const onSearch = (value) => {
@@ -143,11 +151,9 @@ 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();
-    }
+    await qcckPost({ ids }, `/mosty-base/baxx/basq/remove`)
+    proxy.$modal.msgSuccess("删除成功");
+    await getList();
   } catch (error) {
     proxy.$modal.msgError("删除失败");
   }
diff --git a/src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue b/src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue
index 11f94a5..221623d 100644
--- a/src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue
+++ b/src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue
@@ -12,9 +12,9 @@
         <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="所属保安公司"></el-descriptions-item>
+        <el-descriptions-item label="所属保安公司">{{ formData.ssbags }}</el-descriptions-item>
         <el-descriptions-item label="线上培训时长">{{ formData.pxsc }}</el-descriptions-item>
-        <el-descriptions-item label="提交日期"></el-descriptions-item>
+        <el-descriptions-item label="提交日期">{{ formData.tjrq }}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>
diff --git a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
index 95d69aa..51672a6 100644
--- a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
+++ b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
@@ -35,7 +35,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';
@@ -43,6 +43,8 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import viewInfoDialog from "./components/viewInfoDialog.vue";
 
+const { proxy } = getCurrentInstance();
+const { D_BAXX_DWLX } = proxy.$dict("D_BAXX_DWLX")
 const trainerRef = ref(null);
 const queryFrom = ref({});
 const isVisible = ref(false);
@@ -63,20 +65,21 @@ const searchConfiger = ref([
   },
   {
     label: "所属保安公司",
-    prop: "",
+    prop: "ssbags",
     placeholder: "请选择所属保安公司",
-    showType: "select"
+    showType: "select",
+    options: D_BAXX_DWLX
   },
   {
     label: "提交日期",
-    prop: "",
+    prop: "tjrq",
     placeholder: "请选择提交日期",
     showType: "date"
   }
 ]);
 
 const pageData = reactive({
-  tableData: [{}],
+  tableData: [],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -94,7 +97,7 @@ const pageData = reactive({
     { label: "姓名", prop: "xm" },
     { label: "身份证号", prop: "sfzh" },
     { label: "联系方式", prop: "lxdh" },
-    { label: "所属保安公司", prop: "" },
+    { label: "所属保安公司", prop: "ssbags" },
     { label: "线上培训时长", prop: "pxsc" },
     { label: "提交日期", prop: "" },
   ]
diff --git a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
index 44b405e..fb4a82d 100644
--- a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
@@ -59,21 +59,22 @@ const formList = reactive([
     { label: "联系电话", prop: "lxdh", type: "input" },
   ],
   [
-    { label: "居住地址", prop: "", type: "input" },
-    { label: "申请时间", prop: "", type: "date" },
-    { label: "岗位", prop: "", type: "select" },
+    { label: "居住地址", prop: "jzdz", type: "input" },
+    { label: "申请时间", prop: "sqsj", type: "date" },
+    { label: "岗位", prop: "gw", type: "select" },
   ],
   [
-    { label: "所属保安公司", prop: "", type: "select" },
+    { label: "所属保安公司", prop: "ssbags", type: "select" },
   ],
   [
-    { label: "身份证正反面", prop: "", type: "upload", limit: 2 },
+    { label: "身份证正面", prop: "ryzpzm", type: "upload", limit: 1 },
+    { label: "身份证反面", prop: "ryzpfm", type: "upload", limit: 1 },
   ],
   [
-    { label: "体检报告", prop: "", type: "upload", limit: 1 },
+    { label: "体检报告", prop: "tjbg", type: "upload", limit: 1 },
   ],
   [
-    { label: "无犯罪记录证明", prop: "", type: "upload", limit: 1 },
+    { label: "无犯罪记录证明", prop: "wfzjlzm", type: "upload", limit: 1 },
   ]
 ])
 
diff --git a/src/views/securityManagement/trainingManagement/trainer/index.vue b/src/views/securityManagement/trainingManagement/trainer/index.vue
index fbee0b1..eb85710 100644
--- a/src/views/securityManagement/trainingManagement/trainer/index.vue
+++ b/src/views/securityManagement/trainingManagement/trainer/index.vue
@@ -86,8 +86,8 @@ const pageData = reactive({
     { label: "姓名", prop: "xm" },
     { label: "证件号码", prop: "sfzh" },
     { label: "联系方式", prop: "lxdh" },
-    { label: "岗位", prop: "" },
-    { label: "所属保安公司", prop: "" },
+    { label: "岗位", prop: "gw" },
+    { label: "所属保安公司", prop: "ssbags" },
   ]
 });