Merge branch 'master' of http://61.139.16.27:26684/maojiacai/ba_web

package-lock.json

@@ -1174,11 +1174,6 @@
     },
     "@element-plus/icons-vue": {
       "version": "2.3.2",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.3.2.tgz",
-      "integrity": "sha512-OzIuTaIfC8QXEPmJvB4Y4kw34rSXdCJzxcD1kFStBvr8bK6X1zQAYDo0CNMjojnfTqRQCJ0I7prlErcoRiET2A==",
-      "requires": {}
-=======
       "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.2.tgz",
       "integrity": "sha512-OzIuTaIfC8QXEPmJvB4Y4kw34rSXdCJzxcD1kFStBvr8bK6X1zQAYDo0CNMjojnfTqRQCJ0I7prlErcoRiET2A=="
     },
@@ -1203,29 +1198,6 @@
       "version": "0.2.10",
       "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.10.tgz",
       "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
-    },
-    "@floating-ui/core": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
-      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
-      "requires": {
-        "@floating-ui/utils": "^0.2.10"
-      }
-    },
-    "@floating-ui/dom": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
-      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
-      "requires": {
-        "@floating-ui/core": "^1.7.3",
-        "@floating-ui/utils": "^0.2.10"
-      }
-    },
-    "@floating-ui/utils": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
-      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="
     },
     "@fullcalendar/common": {
       "version": "5.11.2",
@@ -1487,11 +1459,7 @@
     },
     "@popperjs/core": {
       "version": "npm:@sxzz/popperjs-es@2.11.7",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
     },
     "@samverschueren/stream-to-observable": {
@@ -1674,20 +1642,12 @@
     },
     "@types/lodash": {
       "version": "4.17.20",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.20.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA=="
     },
     "@types/lodash-es": {
       "version": "4.17.12",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "requires": {
         "@types/lodash": "*"
@@ -1779,11 +1739,7 @@
     },
     "@types/web-bluetooth": {
       "version": "0.0.16",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
     },
     "@types/webpack": {
@@ -2490,11 +2446,7 @@
     },
     "@vueuse/core": {
       "version": "9.13.0",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-9.13.0.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==",
       "requires": {
         "@types/web-bluetooth": "^0.0.16",
@@ -2506,27 +2458,18 @@
         "vue-demi": {
           "version": "0.14.10",
           "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg=="
-          "requires": {}
         }
       }
     },
     "@vueuse/metadata": {
       "version": "9.13.0",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.13.0.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ=="
     },
     "@vueuse/shared": {
       "version": "9.13.0",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-9.13.0.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==",
       "requires": {
         "vue-demi": "*"
@@ -2535,8 +2478,7 @@
         "vue-demi": {
           "version": "0.14.10",
           "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg=="
-          "requires": {}
         }
       }
     },
@@ -5162,11 +5104,7 @@
     },
     "dayjs": {
       "version": "1.11.18",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.18.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA=="
     },
     "debug": {
@@ -5726,11 +5664,7 @@
     },
     "element-plus": {
       "version": "2.11.3",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.11.3.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.11.3.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-769xsjLR4B9Vf9cl5PDXnwTEdmFJvMgAkYtthdJKPhjVjU3hdAwTJ+gXKiO+PUyo2KWFwOYKZd4Ywh6PHfkbJg==",
       "requires": {
         "@ctrl/tinycolor": "^3.4.1",
@@ -14844,14 +14778,6 @@
       "integrity": "sha512-ctG5mynJIyGLFBhS2JpzXmBWT3JRXwzMm5AoANUmBlbZHTruct1xQF2OKM/mfJv6tSfqCcEfgH8rGCAY5ca83Q==",
       "dev": true
     },
-<<<<<<< HEAD
-=======
-    "vue-demi": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
-      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg=="
-    },
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
     "vue-eslint-parser": {
       "version": "7.11.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",

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) => {

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 ||

src/views/login/oatuh_login.vue

@@ -3,25 +3,23 @@
 <script setup>
 import { ref, onMounted } from "vue";
 import { useStore } from "vuex";
-import { useRouter,useRoute } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
-import {
+import { setItem, getItem, removeItem } from "@/utils/storage";
-  setItem,
-  getItem,
-  removeItem
-} from "@/utils/storage";
 const loginDialog = ref(false);
 const deptList = ref([]);
+const url = ref("/");
 const store = useStore();
 const router = useRouter();
 function redirectAuth() {
   // 从路由参数中获取token
   const route = useRoute();
   let token = route.query.token || null;
+  url.value = route.query.url || "/";
 
   if (token != null) {
     token = token.replace(/\ +/g, "");
-    setItem("SSOTOKEN", token)
+    setItem("SSOTOKEN", token);
-    handleLogin({ token: token});
+    handleLogin({ token: token });
   } else {
     window.location.href = `http://155.240.22.188:9020`;
   }
@@ -29,14 +27,9 @@ function redirectAuth() {
 
 const handleLogin = (e) => {
   store.dispatch("user/oatuhLogin", e).then((res) => {
-    const FounderUrl = getItem("FounderUrl") || '/';
-    console.log(FounderUrl,"FounderUrl");
-
     // 登录后操作
     if (res.deptList.length === 1) {
-      // window.location.href = FounderUrl
+      router.push(url.value);
-      removeItem("FounderUrl");
-      router.push(FounderUrl);
     } else {
       deptList.value = [...res.deptList];
       loginDialog.value = true;

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

@@ -56,6 +56,12 @@ const rules = {
 const open = (row = {}, type = 'updata') => {
   visible.value = true
   disabled.value = false
+
+  const fieldsToSplit = ['kszp'];
+  fieldsToSplit.forEach(field => {
+    row[field] = typeof row[field] === 'string' ? row[field].split(',') : [];
+  });
+
   formData.value = { ...row }
   if (type === 'updata') {
     title.value = '上传成绩'
@@ -71,11 +77,14 @@ const handleClose = () => {
 }
 
 const handleSubmit = async () => {
+  let params = { ...formData.value }
+  params.kszp = params.kszp ? params.kszp.join(','):''
+
   try {
     loading.value = true
     await FormRef.value.submit(async () => {
-      const { pxryid = "" } = formData.value
+      const { pxryid = "" } = params
-      await qcckPost({ ...formData.value, pxryid }, `mosty/base/baxx/pxry/lrcj`)
+      await qcckPost({ ...params, pxryid }, `mosty/base/baxx/pxry/lrcj`)
       proxy.$message.success('上传成绩成功')
       emits('refresh')
       visible.value = false

src/views/securityManagement/examManagement/index.vue

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

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

@@ -9,9 +9,9 @@
     </div>
     <div class="cntinfo">
       <FormMessage ref="FormRef" :disabled="disabled" v-model="formData" :rules="rules" :formList="formList" :labelWidth='120'>
-        <!-- <template #xtCjsj>
+        <template #xtCjsj>
-          <el-input v-model="formData.xtCjsj" placeholder="请输入申请时间" />
+          <el-date-picker type="datetime" v-model="formData.xtCjsj" placeholder="请输入申请时间" />
-        </template> -->
+        </template>
       </FormMessage>
     </div>
   </div>
@@ -60,7 +60,7 @@ const formList = reactive([
   ],
   [
     { label: "居住地址", prop: "jzdz", type: "input" },
-    { label: "申请时间", prop: "xtCjsj", type: "date" },
+    { label: "申请时间", prop: "xtCjsj", type: "slot" },
     { label: "岗位", prop: "gw", type: "select", options: D_BAXX_GWLX },
   ],
   [
@@ -131,6 +131,14 @@ const close = () => {
 const open = (row = {}, type = 'add') => {
   disabled.value = false
   dialogVisible.value = true
+
+  const fieldsToSplit = ['ryzpzm', 'ryzpfm', 'tjbg', 'wfzzmjl'];
+  fieldsToSplit.forEach(field => {
+    row[field] = typeof row[field] === 'string'
+      ? row[field].split(',')
+      : row[field];
+  });
+
   formData.value = { ...row }
   if (type === 'add') {
     title.value = '新增申请人员'
@@ -147,7 +155,16 @@ const save = () => {
   FormRef.value.submit(() => {
     loading.value = true;
     const url = !formData.value?.id ? `/mosty-base/baxx/basq/add` : `/mosty-base/baxx/basq/edit`;
-    qcckPost(formData.value, url).then(() => {
+
+    const params = { ...formData.value }
+    const fieldsToSplit = ['ryzpzm', 'ryzpfm', 'tjbg', 'wfzzmjl'];
+    fieldsToSplit.forEach(field => {
+      params[field] = params[field]
+        ? params[field].join(',')
+        : '';
+    });
+
+    qcckPost(params, url).then(() => {
       loading.value = false;
       proxy.$message.success("保存成功");
       emits("refresh");

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

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

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

@@ -89,8 +89,14 @@ const close = () => {
 const open = (row = {}, type = 'add') => {
   dialogVisible.value = true
   disabled.value = false
-  row.tp = row.tp ? row.tp.split(','):[]
+
-  row.bazzp = row.bazzp ? row.bazzp.split(','):[]
+  const fieldsToSplit = ['tp', 'bazzp'];
+  fieldsToSplit.forEach(field => {
+    row[field] = typeof row[field] === 'string'
+      ? row[field].split(',')
+      : row[field];
+  });
+
   formData.value = { ...row }
   if (type === 'add') {
     title.value = '新增从业人员'

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

@@ -87,7 +87,7 @@ const pageData = reactive({
   },
   total: 0,
   pageConfiger: {
-    sfcjpx: 0, // 是否参加培训
+    sfxxpx: '02', // 是否参加培训
     pageSize: 20,
     pageCurrent: 1
   },

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

@@ -99,6 +99,14 @@ const close = () => {
 const open = (row = {}, type = 'add') => {
   disabled.value = false
   dialogVisible.value = true
+
+  const fieldsToSplit = ['sfzzm', 'sfzfm', 'tjbg', 'fzjlzm'];
+  fieldsToSplit.forEach(field => {
+    row[field] = typeof row[field] === 'string'
+      ? row[field].split(',')
+      : [];
+  });
+
   formData.value = { ...row }
   if (type === 'add') {
     title.value = '新增从业人员'
@@ -111,10 +119,18 @@ const open = (row = {}, type = 'add') => {
 }
 
 const save = () => {
+  const params = { ...formData.value }
+  const fieldsToSplit = ['sfzzm', 'sfzfm', 'tjbg', 'fzjlzm'];
+  fieldsToSplit.forEach(field => {
+    params[field] = params[field]
+      ? params[field].join(',')
+      : '';
+  });
+
   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(() => {
+    qcckPost(params, url).then(() => {
       loading.value = false;
       proxy.$message.success("保存成功");
       emits("refresh");

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>
@@ -73,7 +73,7 @@ const searchConfiger = ref([
 ]);
 
 const pageData = reactive({
-  tableData: [{}],
+  tableData: [],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -119,7 +119,8 @@ const getList = async () => {
     pageData.tableConfiger.loading = true;
     const res = await qcckPost({
       ...pageData.pageConfiger,
-      ...queryFrom.value
+      ...queryFrom.value,
+      sfxxpx: '01'
     }, `/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,
+      sfxxpx: '02'
+    }, "/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("是否确认删除该培训人员？")

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()

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

@@ -73,6 +73,7 @@ const pageData = reactive({
   total: 0,
   tableHeight: 300,
   pageConfiger: {
+    sfxxpx: '02',
     pageSize: 10,
     pageCurrent: 1
   },

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>
+          <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
+  nextTick(() => {
-  dialogVisible.value = true
+    disabled.value = false
-  formData.value = { ...row }
+    dialogVisible.value = true
-  title.value = '保安考试申请'
+    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(() => {
+    qcckPost({ ksdz, ksfs, kskssj, ksxq, id }, `mosty-base/baxx/pxxm/sqks`).then(() => {
-      loading.value = false;
+      qcckPost({
-      proxy.$message.success("申请考试成功");
+        ...formData.value,
-      emits("refresh");
+        ksryList: pageData.tableData,
-      close();
+        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>
 

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

@@ -114,6 +114,15 @@ const close = () => {
 const open = (row = {}, type = 'add') => {
   disabled.value = false
   dialogVisible.value = true
+
+  // 统一处理所有需拆分的字段
+  const fieldsToSplit = ['cszp', 'frSfzZm', 'frSfzFm', 'fzrSfzZm', 'fzrSfzFm', 'yyzzzp', 'jyxkz'];
+  fieldsToSplit.forEach(field => {
+    row[field] = typeof row[field] === 'string'
+      ? row[field].split(',')
+      : row[field];
+  });
+
   formData.value = { ...row }
   if (type === 'view') {
     title.value = '查看详情'

src/views/securityManagement/unitInformation/index.vue

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

vue.config.js

@@ -9,7 +9,7 @@ const serverHost = "http://192.168.1.32:8066";//波哥
 // const serverHost = "http://47.108.232.77:9537";//波哥
 // const serverHost = "http://127.0.0.1:8006"
 module.exports = {
-  publicPath: "./",
+  publicPath: "/bagl/",
   outputDir: "ab",
   assetsDir: "static",
   lintOnSave: false, //process.env.NODE_ENV === 'development',