From 5007c2413e54ee08ab9f1c15e786b00e5fd3ef2c Mon Sep 17 00:00:00 2001
From: esacpe <12345678>
Date: Thu, 25 Sep 2025 18:01:31 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AE=89=E5=9F=B9?=
 =?UTF-8?q?=E8=AE=AD=E9=A1=B9=E7=9B=AE'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/aboutTable/FormMessage.vue     |  4 +-
 src/components/aboutTable/Pages.vue           |  1 -
 .../personnelTraining/index.vue               |  2 +-
 .../trainingManagement/trainer/index.vue      | 22 +++++++-
 .../components/prejectDetailsDialog.vue       |  1 -
 .../components/selectPersonnelDialog.vue      |  1 +
 .../components/viewProjectDetailsDialog.vue   | 56 ++++++++++++-------
 7 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/src/components/aboutTable/FormMessage.vue b/src/components/aboutTable/FormMessage.vue
index 6b19eb2..2610166 100644
--- a/src/components/aboutTable/FormMessage.vue
+++ b/src/components/aboutTable/FormMessage.vue
@@ -46,7 +46,7 @@
           <el-date-picker v-else-if="item.type === 'daterange'" v-model="searchObj[item.prop]" type="daterange"
             unlink-panels :range-separator="item.rangeSeparator" :start-placeholder="item.startPlaceholder"
             :end-placeholder="item.endPlaceholder" :shortcuts="item.shortcuts" value-format="YYYY-MM-DD" />
-          <el-date-picker v-else-if="item.type == 'datetime'" v-model="searchObj[item.prop]" type="datetime"
+          <el-date-picker v-else-if="item.type == 'datetime'" v-model="searchObj[item?.prop]" type="datetime"
             value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" />
           <el-date-picker v-else-if="item.type === 'date'" v-model="searchObj[item.prop]" type="date"
             :placeholder="item.placeholder" :shortcuts="item.shortcuts" value-format="YYYY-MM-DD">
@@ -150,7 +150,7 @@ const handleNum = (val) => {
 watch(() => props.modelValue, (newVal) => {
   listQuery.value = newVal; //赋值
   console.log(newVal,'===newVal');
-  
+
 }, { immediate: true, deep: true });
 
 watch(() => listQuery.value, (newVal) => {
diff --git a/src/components/aboutTable/Pages.vue b/src/components/aboutTable/Pages.vue
index 032f0a1..2c5758b 100644
--- a/src/components/aboutTable/Pages.vue
+++ b/src/components/aboutTable/Pages.vue
@@ -8,7 +8,6 @@
 -->
 <template>
   <div class="fenye" :style="{ top: tableHeight + 'px' }">
-    {{ pageData.configer }}
     <el-pagination
       :current-page="
         pageData.configer.currentPage ||
diff --git a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
index 72bd688..1731f13 100644
--- a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
+++ b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
@@ -87,7 +87,7 @@ const pageData = reactive({
   },
   total: 0,
   pageConfiger: {
-    sfcjpx: 0, // 是否参加培训
+    sfcjpx: 1, // 是否参加培训
     pageSize: 20,
     pageCurrent: 1
   },
diff --git a/src/views/securityManagement/trainingManagement/trainer/index.vue b/src/views/securityManagement/trainingManagement/trainer/index.vue
index 29f1024..b5b3069 100644
--- a/src/views/securityManagement/trainingManagement/trainer/index.vue
+++ b/src/views/securityManagement/trainingManagement/trainer/index.vue
@@ -20,7 +20,7 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="success">提交培训</el-link>
+          <el-link type="success" @click="handleSubmitTraining(row)">提交培训</el-link>
           <el-link type="danger" @click="handleDelete([row.id])">删除</el-link>
           <el-link type="primary" @click="addEdit('view', row)">详情</el-link>
         </template>
@@ -119,7 +119,8 @@ const getList = async () => {
     pageData.tableConfiger.loading = true;
     const res = await qcckPost({
       ...pageData.pageConfiger,
-      ...queryFrom.value
+      ...queryFrom.value,
+      sfcjpx: 0
     }, `/mosty-base/baxx/pxry/page`)
 
     if(res) {
@@ -131,6 +132,23 @@ const getList = async () => {
   }
 }
 
+// 提交培训
+const handleSubmitTraining = async (row) => {
+  await proxy.$modal.confirm("是否确认提交该人员进行待培训？")
+
+  try {
+    await qcckPost({
+      ...row,
+      sfcjpx: 1
+    }, "/mosty-base/baxx/pxry/edit")
+    proxy.$modal.msgSuccess("提交培训成功");
+    await getList();
+  } catch (error) {
+    proxy.$modal.msgError("提交培训失败");
+    console.log(error)
+  }
+};
+
 // 删除
 const handleDelete = async (ids) => {
   await proxy.$modal.confirm("是否确认删除该培训人员？")
diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue
index 3150880..9614ecc 100644
--- a/src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue
+++ b/src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue
@@ -51,7 +51,6 @@
 import { ref, computed, reactive, getCurrentInstance } from 'vue'
 import { qcckPost } from "@/api/qcckApi.js";
 import MyTable from '@/components/aboutTable/MyTable.vue';
-import Pages from "@/components/aboutTable/Pages.vue"
 import Upload from "@/components/MyComponents/Upload/index.vue"
 
 const { proxy } = getCurrentInstance()
diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue
index 36c0bf8..1b153a3 100644
--- a/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue
+++ b/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue
@@ -73,6 +73,7 @@ const pageData = reactive({
   total: 0,
   tableHeight: 300,
   pageConfiger: {
+    sfcjpx: 1,
     pageSize: 10,
     pageCurrent: 1
   },
diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue
index dffc1d2..654261b 100644
--- a/src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue
+++ b/src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue
@@ -9,7 +9,9 @@
     </div>
     <div class="cntinfo">
       <form-message ref="formRef" v-model="formData" :rules="rules" :formList="formList" label-width="120px">
-
+        <template #kskssj="{ row }">
+          <el-date-picker v-model="formData.kskssj" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="考试时间" style="width: 100%;" />
+        </template>
       </form-message>
       <div class="table-title" @click="hanbleClickSelect">考试人员 <el-icon size="20px" style="top: 4px;" color="green"><CirclePlusFilled /></el-icon> </div>
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn"
@@ -17,17 +19,17 @@
       >
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="warning" @click="addEdit('updata', row)">删除</el-link>
+          <el-link type="warning" @click="handleDelItem(row)">删除</el-link>
         </template>
       </MyTable>
     </div>
 
-    <select-personnel-dialog ref="selectPersonnelRef" v-model="visible" @change="handleChange" />
+    <select-personnel-dialog ref="selectPersonnelRef" :default-select-keys="defaultSelectKeys" v-model="visible" @change="handleChange" />
   </div>
 </template>
 
 <script setup>
-import { ref, computed, reactive, getCurrentInstance } from 'vue'
+import { ref, computed, reactive, getCurrentInstance, nextTick } from 'vue'
 import { qcckPost } from "@/api/qcckApi.js";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import MyTable from '@/components/aboutTable/MyTable.vue';
@@ -40,7 +42,6 @@ const loading = ref(false)
 const disabled = ref(false)
 const formRef = ref(null)
 const visible = ref(false)
-const viewAndUploadRef = ref(null)
 
 const props = defineProps({
   modelValue: {
@@ -87,10 +88,14 @@ const pageData = reactive({
   ]
 });
 
+const defaultSelectKeys = computed(() => {
+  return pageData.tableData?.map(i => i.id)
+})
+
 const formList = reactive([
   [
     { label: "培训项目名称", prop: "xmmc", type: "input" },
-    { label: "考试时间", prop: "kskssj", type: "date"},
+    { label: "考试时间", prop: "kskssj", type: "slot" },
   ],
   [
     { label: "考试辖区", prop: "ksxq", type: "input" },
@@ -112,25 +117,42 @@ const rules = {
 const formData = ref({})
 
 const close = () => {
+  formRef.value.reset()
+  pageData.tableData = []
   dialogVisible.value = false
 }
 
 const open = (row = {}) => {
-  disabled.value = false
-  dialogVisible.value = true
-  formData.value = { ...row }
-  title.value = '保安考试申请'
+  nextTick(() => {
+    disabled.value = false
+    dialogVisible.value = true
+    formData.value = { ...row }
+    title.value = '保安考试申请'
+  })
+}
+
+const handleDelItem = (row) => {
+    const index = pageData.tableData.findIndex(item => item.id === row.id)
+    pageData.tableData.splice(index, 1)
 }
 
 const save = () => {
   if (pageData.tableData.length === 0) return proxy.$message.warning('请选择考试人员')
+
+  const { ksdz, ksfs, kskssj, ksxq, id } = formData.value
   formRef.value.submit(() => {
     loading.value = true;
-    qcckPost(formData.value, `mosty-base/baxx/pxxm/sqks`).then(() => {
-      loading.value = false;
-      proxy.$message.success("申请考试成功");
-      emits("refresh");
-      close();
+    qcckPost({ ksdz, ksfs, kskssj, ksxq, id }, `mosty-base/baxx/pxxm/sqks`).then(() => {
+      qcckPost({
+        ...formData.value,
+        ksryList: pageData.tableData,
+        kssj: `${formData.value?.jssj} 00:00:00`
+      }, `mosty-base/baxx/ksgl/add`).then(() => {
+        loading.value = false;
+        proxy.$message.success("申请考试成功");
+        emits("refresh");
+        close();
+      })
     }).catch(() => {
       loading.value = false;
     })
@@ -146,10 +168,6 @@ const handleChange = (val) => {
     pageData.tableData = [...pageData.tableData, ...val]?.filter((i, index, arr) => arr?.findIndex(s => i?.id === s?.id) === index)
 }
 
-const addEdit = (type, row) => {
-  viewAndUploadRef.value?.open(row, type)
-}
-
 defineExpose({ open })
 </script>