From 39177fbd7da329b8ce3beb451cb291b0d6fb6268 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Fri, 26 Sep 2025 16:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/aboutTable/MyTable.vue         |  79 +++++-----
 src/layout/components/Header.vue              |   1 -
 src/store/index.js                            |   6 -
 src/store/modules/user.js                     |  52 ++-----
 src/views/login/index.vue                     |  83 +++++-----
 .../components/addTrainerDialog.vue           |  93 ++---------
 .../components/selectTtaningDialog.vue        | 145 ++++++++++--------
 .../applicantPersonnel/index.vue              |  51 ++----
 .../practitioner/index.vue                    |  25 +--
 .../trainingManagement/trainer/index.vue      |  58 ++-----
 10 files changed, 220 insertions(+), 373 deletions(-)

diff --git a/src/components/aboutTable/MyTable.vue b/src/components/aboutTable/MyTable.vue
index e82d6ed..243dc36 100644
--- a/src/components/aboutTable/MyTable.vue
+++ b/src/components/aboutTable/MyTable.vue
@@ -1,17 +1,24 @@
 <template>
-  <div style="width: 100%">
+  <div style="width: 100%" :class="getConfiger.showSelectType === 'radio' ? 'tabBoxRadio' : ''">
     <!-- hasChildren要在tableData中定义表示当前行有没有下一级 children要在tableData中定义表示下一级的数据-->
-    <el-table ref="multipleTableRef" :data="tableData" @selection-change="handleSelectionChange"
-      @current-change="handleCurrentChange" @row-click="singleElection" :row-key="getConfiger.rowKey"
-      :border="getConfiger.border" :default-expand-all="getConfiger.defaultExpandAll" :stripe="getConfiger.stripe"
-      :height="tableHeight" v-loading="tableConfiger.loading" :lazy="getConfiger.lazy" :load="load"
-      :tree-props="treePros" style="width: 100%" :header-cell-class-name="() => 'HeadBgColor'"
+    <el-table 
+      ref="multipleTableRef" 
+      :data="tableData" 
+      @selection-change="handleSelectionChange"
+      :row-key="getConfiger.rowKey" 
+      :border="getConfiger.border" 
+      :default-expand-all="getConfiger.defaultExpandAll"
+      :stripe="getConfiger.stripe" 
+      :height="tableHeight" 
+      v-loading="tableConfiger.loading" 
+      :lazy="getConfiger.lazy"
+      :load="load" 
+      :tree-props="treePros" 
+      style="width: 100%" 
+      :header-cell-class-name="() => 'HeadBgColor'"
       :highlight-current-row="getConfiger.showSelectType === 'radio'"
       :row-style="{ height: getConfiger.rowHeight === 'auto' ? getConfiger.rowHeight : getConfiger.rowHeight + 'px' }">
-      <el-table-column type="selection" width="55" v-if="getConfiger.showSelectType === 'checkBox'" />
-      <el-table-column width="55" v-else-if="getConfiger.showSelectType === 'radio'" #default="{ row }">
-        <el-radio class="radio" v-model="getConfiger.radioChoose" :label="row[getConfiger.rowKey]">&nbsp;</el-radio>
-      </el-table-column>
+      <el-table-column style="width: 55px" type="selection" width="55" v-if="getConfiger.showSelectType" :class="getConfiger.showSelectType === 'radio' ? 'tabBoxRadio' : ''" />
       <el-table-column type="index" label="序号" v-if="getConfiger.showIndex" width="60" :align="getConfiger?.align" />
       <el-table-column v-for="(item, index) in tableColumn" :align="getConfiger?.align" :prop="item.prop" :key="index"
         :label="item.label" :width="item.width" style="width: 100%; font-size: 14px"
@@ -25,11 +32,12 @@
           {{ row[item.prop] }}
         </template>
       </el-table-column>
+
       <!-- 操作 -->
       <el-table-column v-if="getConfiger.haveControls" :fixed="fixed" :label="getConfiger.controls"
         :width="controlsWidth" :align="getConfiger?.align">
         <template #default="scope">
-          <slot name="controls" v-bind="scope" :index="scope.$index"></slot>
+          <slot name="controls" v-bind="scope"></slot>
         </template>
       </el-table-column>
     </el-table>
@@ -58,7 +66,7 @@ const props = defineProps({
     default: 180
   },
   tableHeight: {
-    type: Number
+    type: Number || String
   },
   treePros: {
     type: Object,
@@ -95,8 +103,6 @@ let getConfiger = reactive({
 });
 watchEffect(() => {
   getConfiger = { ...getConfiger, ...props.tableConfiger };
-  console.log(getConfiger,'getConfiger');
-  
   setDefaultChoose();
 });
 onMounted(() => {
@@ -104,19 +110,16 @@ onMounted(() => {
 });
 // 可选的时候选择的数据
 const handleSelectionChange = (val) => {
-  emit("chooseData", val);
-};
-// 单选的时候选择的数据
-const handleCurrentChange = (val) => {
-  currentRow.value = val;
-  emit("chooseData", val);
-};
-const singleElection = (val) => {
-  if (getConfiger.showSelectType === "radio") {
-    getConfiger.radioChoose = val[getConfiger.rowKey];
+  if (getConfiger.showSelectType === 'radio' && val.length > 1) {
+    let del_row = val.shift();
+    multipleTableRef.value.toggleRowSelection(del_row, false);
+    currentRow.value = val;
+    emit("chooseData", val);
+  } else {
     emit("chooseData", val);
   }
 };
+
 // 懒加载数据的方法
 const load = (date, treeNode, resolve) => {
   setTimeout(() => {
@@ -140,29 +143,27 @@ const load = (date, treeNode, resolve) => {
 function setDefaultChoose() {
   nextTick(() => {
     // 多选的默认选中
-    if (
-      props.tableConfiger.defaultSelectKeys?.length > 0 &&
-      props.tableConfiger.showSelectType === "checkBox"
-    ) {
+    if (props.tableConfiger.defaultSelectKeys?.length > 0 && props.tableConfiger.showSelectType === "checkBox") {
       props.tableData.forEach((item) => {
-        if (
-          props.tableConfiger.defaultSelectKeys.findIndex(
-            (v) => v === item[props.tableConfiger.rowKey]
-          ) > -1
-        ) {
+        if (props.tableConfiger.defaultSelectKeys.findIndex((v) => v === item[props.tableConfiger.rowKey]) > -1) {
           multipleTableRef.value.toggleRowSelection(item, true);
         }
       });
       // 单选的默认选中
-    } else if (
-      props.tableConfiger.defaultSelectKeys &&
-      props.tableConfiger.defaultSelectKeys?.length > 0 &&
-      props.tableConfiger.showSelectType === "radio"
-    ) {
+    } else if (props.tableConfiger.defaultSelectKeys && props.tableConfiger.defaultSelectKeys?.length > 0 && props.tableConfiger.showSelectType === "radio") {
       getConfiger.radioChoose = props.tableConfiger.defaultSelectKeys[0];
     }
   });
 }
 </script>
-<style lang="scss">
+
+<style lang="scss"></style>
+<style>
+.tabBoxRadio .el-checkbox__inner {
+  border-radius: 50% !important;
+}
+
+.tabBoxRadio .el-table__header-wrapper .el-checkbox {
+  display: none;
+}
 </style>
diff --git a/src/layout/components/Header.vue b/src/layout/components/Header.vue
index 97af757..a9b9420 100644
--- a/src/layout/components/Header.vue
+++ b/src/layout/components/Header.vue
@@ -37,7 +37,6 @@ const router = useRouter();
 onMounted(() => {
   deptName.value = localStorage.getItem("deptId") ? JSON.parse(localStorage.getItem("deptId"))[0].deptName : ''
 })
-
 const active = ref("");
 onMounted(() => {
   //登陆用户信息
diff --git a/src/store/index.js b/src/store/index.js
index dacd621..500b68d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,12 +9,6 @@ import display from './modules/display';
 import getters from './getters';
 
 export default createStore({
-  // state: {
-  // },
-  // mutations: {
-  // },
-  // actions: {
-  // },
   getters,
   modules: {
     user,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c771b48..ddb0696 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,32 +1,10 @@
-import {
-  login,
-  getUserInfo,
-  getKaptcha,
-  refreshToken,
-  loginOut,
-  Fzlogin
-} from "@/api/sys";
-import {
-  unifiedLogin
-} from "@/api/user-manage";
+import {login,getUserInfo,getKaptcha,refreshToken,loginOut,Fzlogin } from "@/api/sys";
+import { unifiedLogin } from "@/api/user-manage";
 import Base64 from "base-64";
-import {
-  setItem,
-  getItem,
-  removeAllItem
-} from "@/utils/storage";
-import {
-  TOKEN
-} from "@/constant";
-import router, {
-  resetRouter
-} from "@/router";
-import {
-  setTimeStamp
-} from "@/utils/auth";
-import {
-  TAGS_VIEW
-} from "@/constant/index.js";
+import { setItem, getItem, removeAllItem } from "@/utils/storage";
+import { TOKEN } from "@/constant";
+import router, { resetRouter } from "@/router";
+import { setTimeStamp } from "@/utils/auth";
 export default {
   namespaced: true,
   state: () => ({
@@ -84,18 +62,9 @@ export default {
      *登录请求动作
      */
     login(ctx, userInfo) {
-      const {
-        userName,
-        password,
-        kaptcha
-      } = userInfo;
+      const { userName, password, kaptcha  } = userInfo;
       return new Promise((resolve, reject) => {
-        login({
-          userName,
-          password: Base64.encode(password),
-          kaptcha
-        })
-          .then((data) => {
+        login({ userName, password: Base64.encode(password), kaptcha  }).then((data) => {
             if (data.deptList.length === 1) {
               this.commit("user/setToken", data.jwtToken);
               this.commit("user/setDeptId", data.deptList);
@@ -110,10 +79,7 @@ export default {
               setItem("idEntityCard", data.idEntityCard);
               this.commit("user/setUserInfo", {
                 token: data.jwtToken,
-                permission: {
-                  buttonPermission: ["removeTest", "viewTest"],
-                  menus: data.menuCodeSet
-                },
+                permission: { buttonPermission: ["removeTest", "viewTest"],menus: data.menuCodeSet },
                 menuList: data.menuList,
                 deptList: data.deptList
               });
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c4ec179..fc32e6e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -15,9 +15,6 @@
       </el-form-item>
 
       <el-form-item prop="password1">
-        <!-- <span class="svg-container">
-          <svg-icon icon="password" />
-        </span> -->
         <el-input placeholder="请输入密码" name="password" :type="passwordType" v-model="loginForm.password">
           <template #prepend>
              <span class="svg-container">
@@ -48,8 +45,7 @@
 
       <!---登录按钮-->
       <el-form-item style="height: 49px" v-if="!loginDialog">
-        <el-button @click="handleLogin" type="primary" style="width: 520px; height: 49px" :loading="loading"
-          native-type="submit">登录</el-button>
+        <el-button @click="handleLogin" type="primary" style="width: 520px; height: 49px" :loading="loading" native-type="submit">登录</el-button>
       </el-form-item>
 
       <el-form-item class="choosedept-wrap" v-if="loginDialog">
@@ -68,6 +64,7 @@ export default {
 };
 </script>
 <script setup>
+import { qcckPost } from "@/api/qcckApi.js";
 import { setItem } from "@/utils/storage";
 import { ElNotification } from "element-plus";
 import * as MOSTY from "@/components/MyComponents/index";
@@ -100,19 +97,14 @@ const loginRules = ref({
   kaptcha: [{ required: true, trigger: "blur", message: "验证码为必填项" }]
 });
 
-const handleClose = () => { };
 const refreshToken = (e) => {
-  store
-    .dispatch("user/refreshToken", { deptId: e, jwtToken: authorization.value })
-    .then((res) => {
-      loading.value = false;
-      store.commit("user/setDeptId", e);
-      // window.location.href = '/'// 登录后操作
-      router.push("/");
-    })
-    .catch(() => {
-      loading.value = false;
-    });
+  store.dispatch("user/refreshToken", { deptId: e, jwtToken: authorization.value }).then((res) => {
+    loading.value = false;
+    store.commit("user/setDeptId", e);
+    router.push("/");
+  }).catch(() => {
+    loading.value = false;
+  });
 };
 // 处理密码框文本显示状态
 const passwordType = ref("password");
@@ -131,41 +123,38 @@ const router = useRouter();
 const handleLogin = () => {
   loginFromRef.value.validate((valid) => {
     if (!valid) return false;
-    // setItem("token", "1255555888");
-    // setItem("isOatuh", 0);
-    // router.push("/");
     loading.value = true;
-    store
-      .dispatch("user/login", loginForm.value)
-      .then((res) => {
-        loading.value = false;
-        // 登录后操作;
-        if (res.deptList.length === 1) {
-          window.location.href = "/";
-        } else {
-          deptList.value = [...res.deptList];
-          loginDialog.value = true;
-          authorization.value = res.jwtToken;
-          ElNotification({
-            title: "提示",
-            message: "请选择部门",
-            duration: 3000
-          });
-        }
-      })
-      .catch(() => {
-        loading.value = false;
-      });
+    store.dispatch("user/login", loginForm.value).then((res) => {
+      loading.value = false;
+      if (res.deptList.length === 1) {
+        getSfzhByGsid(res.idEntityCard)
+      } else {
+        deptList.value = [...res.deptList];
+        loginDialog.value = true;
+        authorization.value = res.jwtToken;
+        ElNotification({ title: "提示", message: "请选择部门", duration: 3000});
+      }
+    }).catch(() => {
+      loading.value = false;
+    });
   });
 };
-const logout = () => {
-  store.dispatch("user/logout");
-};
+const getSfzhByGsid = (sfzh) => {
+ qcckPost({ sfzh }, "/mosty-base/baxx/cyry/queryBySfzh").then(res=>{
+  if(!res) {
+    ElNotification({ title: "提示", message: "无访问权限", duration: 3000});
+    store.dispatch("user/logout");
+  }else{
+    let obj = { sfzh:res.sfzh , xm:res.xm , pxgs:res.pxgs , pxgsid:res.pxgsid }
+    setItem("userInfo", JSON.stringify(obj));
+    window.location.href = "/";
+  }
+ })
+}
+
 onMounted(() => { });
 const getKaptchaImg = () => {
-  const res =
-    `${process.env.VUE_APP_GATEWAY_BASE_URL}/mosty-base/kaptcha?date=` +
-    new Date();
+  const res = `${process.env.VUE_APP_GATEWAY_BASE_URL}/mosty-base/kaptcha?date=` + new Date();
   kaptchaUrl.value = res;
 };
 </script>
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
index e18b20f..a6a71a7 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
@@ -18,40 +18,25 @@
 </template>
 
 <script setup>
-import { ref, computed, reactive, getCurrentInstance } from 'vue'
+import * as rule from "@/utils/rules.js";
+import { ref, reactive, getCurrentInstance } from 'vue'
 import { qcckPost } from "@/api/qcckApi.js";
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
-
 const { proxy } = getCurrentInstance()
 const { D_BAXX_GWLX } = proxy.$dict("D_BAXX_GWLX")
-
 const title = ref('新增培训人员')
 const loading = ref(false)
 const disabled = ref(false)
 const FormRef = ref(null)
-
 const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    default: false
-  },
   dic: {
     type: Object,
     default: () => ({})
   }
 })
-
-const emits = defineEmits(['update:modelValue', 'refresh'])
-
-const dialogVisible = computed({
-  get() {
-    return props.modelValue
-  },
-  set(val) {
-    emits('update:modelValue', val)
-  }
-})
-
+const formData = ref({})
+const dialogVisible = ref(false)
+const emits = defineEmits(['refresh'])
 const formList = reactive([
   [
     { label: "姓名", prop: "xm", type: "input" },
@@ -74,80 +59,34 @@ const formList = reactive([
     { label: "无犯罪记录证明", prop: "wfzzmjl", type: "upload", limit: 1 },
   ]
 ])
-
 const rules = {
   ryzpzm: [{ required: true, message: "请上传身份证正面", trigger: "change" }],
   ryzpfm: [{ required: true, message: "请上传身份证反面", trigger: "change" }],
   tjbg: [{ required: true, message: "请上传体检报告", trigger: "change" }],
   wfzzmjl: [{ required: true, message: "请上传无犯罪记录证明", trigger: "change" }],
   xm: [{ required: true, message: "请输入姓名", trigger: "change" }],
-  zjhm: [
-    { 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()
-          }
-        }
-      }
-    }
-  ],
+  ...rule.phoneRule({ validator: true,message: "请输入联系电话",require: true }, "lxdh"), // 是否必填 是否进行校验`
+  ...rule.identityCardRule({ validator: true,message: "请输入身份证号" ,require: true}, "zjhm"), // 是否必填 是否进行校验
   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({})
-
 const close = () => {
   FormRef.value?.reset()
-  dialogVisible.value = false
+  dialogVisible.value = false;
 }
 
 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];
+    row[field] = typeof row[field] === 'string' ? row[field].split(',') : row[field];
   });
-
   formData.value = { ...row }
-  if (type === 'add') {
-    title.value = '新增申请人员'
-  } else if (type === 'upload') {
-    title.value = '上传资料'
-  } else {
-    disabled.value = true
-    title.value = '查看详情'
-  }
+  title.value = type === 'add' ? '新增申请人员' : (type === 'upload' ? '上传资料' : '查看详情')
+  disabled.value = title.value === '查看详情' ?  true : false;
+  dialogVisible.value = true;
 }
 
 // 新增、编辑
@@ -155,15 +94,9 @@ const save = () => {
   FormRef.value.submit(() => {
     loading.value = true;
     const url = !formData.value?.id ? `/mosty-base/baxx/basq/add` : `/mosty-base/baxx/basq/edit`;
-
     const params = { ...formData.value }
     const fieldsToSplit = ['ryzpzm', 'ryzpfm', 'tjbg', 'wfzzmjl'];
-    fieldsToSplit.forEach(field => {
-      params[field] = params[field]
-        ? params[field].join(',')
-        : '';
-    });
-
+    fieldsToSplit.forEach(field => { params[field] = params[field] ? params[field].join(',') : ''; });
     qcckPost(params, url).then(() => {
       loading.value = false;
       proxy.$message.success("保存成功");
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
index cc05518..69e29eb 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
@@ -1,82 +1,101 @@
 <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" />
-
+  <el-dialog class="dialogWerapper" width="80%" v-model="visibleDialog" title="选择公司" @close="handleClose">
+    <div>
+      <MyTable 
+        :tableData="pageData.tableData" 
+        :tableColumn="pageData.tableColumn" 
+        :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" 
+        :tableConfiger="pageData.tableConfiger" 
+        :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData"
+      >
+      </MyTable>
+    </div>
     <template #footer>
-      <el-button type="primary" v-if="!disabled" :loading="loading" @click="handleSubmit">确定</el-button>
-      <el-button @click="handleClose">取消</el-button>
+      <div class="flex just-center">
+        <el-button type="primary" :loading="loading" @click="handleSubmit">确定</el-button>
+        <el-button @click="handleClose">取消</el-button>
+      </div>
     </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";
-
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import { ref, reactive,getCurrentInstance } from 'vue';
+import { qcckPost } from "@/api/qcckApi.js";
+const emits = defineEmits(['refresh']);
 const { proxy } = getCurrentInstance();
-const { D_BAXX_DWLX } = proxy.$dict("D_BAXX_DWLX")
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    default: false
+const visibleDialog = ref(false);
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "radio",
+    loading: false,
+    haveControls:false
   },
-})
-
-const emits = defineEmits(['update:modelValue', 'refresh'])
-
-const visible = computed({
-  get() {
-    return props.modelValue
+  tableHeight:500,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
   },
-  set(val) {
-    emits('update:modelValue', val)
-  }
-})
+  controlsWidth: 180,
+  tableColumn: [
+    { label: "单位名称", prop: "dwmc" },
+    { label: "信用代码", prop: "xydm" },
+    { label: "场所名称", prop: "csmc" },
+    { label: "场所电话", prop: "csLxdh" }
+  ]
+});
 
-const title = ref('选择培训公司')
-const loading = ref(false)
-const disabled = ref(false)
-const FormRef = ref(null)
 const formData = ref({})
-
-const formList = reactive([
-  [
-    { label: "培训公司", prop: "pxgs", type: "select", options: D_BAXX_DWLX },
-  ],
-])
-
-const rules = {
-  pxgs: [{ required: true, message: "请选择培训公司", trigger: "change" }],
-}
-
-const open = (row = {}, type = 'updata') => {
-  visible.value = true
-  disabled.value = false
-  formData.value = { ...row }
-}
-
+const loading = ref(false)
 const handleClose = () => {
-  FormRef.value?.reset()
-  visible.value = false
+  formData.value = {};
+  visibleDialog.value = false;
+}
+
+const chooseData = (row) => {
+  formData.value.pxgsdm =  row[0].id;
+  formData.value.pxgsid =  row[0].id;
+  formData.value.pxgs = row[0].dwmc;
 }
 
 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
-  }
+  if(!formData.value.pxgsid) return proxy.$message.error('请选择公司');
+  loading.value = true;
+  let data = { ...formData.value }
+  data.sfzh = data.zjhm;
+  await qcckPost(data, `/mosty-base/baxx/basq/edit`)
+  await qcckPost(data, `/mosty-base/baxx/pxry/add`)
+  loading.value = false
+  proxy.$message.success('培训公司保存成功')
+  emits('refresh')
+  handleClose()
 }
 
-defineExpose({ open })
+function open(row) {
+  pageData.keyCount++;
+  formData.value = row;
+  visibleDialog.value = true;
+  getList();
+}
+
+function getList () {
+  pageData.tableConfiger.loading = true;
+  qcckPost({ }, "/mosty-base/baxx/dwgl/list").then((res) => {
+    let arr = res || []
+    pageData.tableData = arr.filter(item => item.type == '02')
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
+}
+
+defineExpose({
+  open
+})
 </script>
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
index 01198eb..76eb54e 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
@@ -19,14 +19,14 @@
           {{ row?.sfpx === '01' ? `否` : `是` }}
         </template>
         <template #gw="{ row }">
-          <DictTag :value="row.gw" :options="D_BAXX_GWLX" />
+          <DictTag :value="row.gw" :tag="false" :options="D_BAXX_GWLX" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
           <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>
+          <el-link type="primary" @click="addEdit('select', row)" v-if="!row.pxgsdm">提交培训公司</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -34,10 +34,8 @@
         total: pageData.total
       }"></Pages>
     </div>
-
-
     <add-trainer-dialog v-model="isVisible" ref="trainerRef" @refresh="getList" />
-    <select-ttaning-dialog ref="selectTtaningRef" v-model="dialogVisible"  @refresh="getList" />
+    <select-ttaning-dialog ref="selectTtaningRef" @refresh="getList" />
   </div>
 </template>
 
@@ -46,18 +44,16 @@ 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';
-import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import { qcckPost } from "@/api/qcckApi.js";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import AddTrainerDialog from "./components/addTrainerDialog.vue";
 import selectTtaningDialog from "./components/selectTtaningDialog.vue";
-
 const { proxy } = getCurrentInstance();
 const { D_BAXX_GWLX } = proxy.$dict("D_BAXX_GWLX")
 const trainerRef = ref(null);
-const selectTtaningRef = ref(null);
+const selectTtaningRef = ref();
 const queryFrom = ref({});
 const isVisible = ref(false);
-const dialogVisible = ref(false);
 const searchBox = ref(null);
 const searchConfiger = ref([
   {
@@ -107,8 +103,7 @@ const pageData = reactive({
 
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight =
-    window.innerHeight - searchBox.value.offsetHeight - 250;
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };
@@ -116,7 +111,7 @@ const tabHeightFn = () => {
 
 const addEdit = (type, row) => {
   if (type === 'select') {
-    selectTtaningRef.value.open(row, type);
+    selectTtaningRef.value.open(row);
   } else {
     trainerRef.value.open(row, type);
   }
@@ -129,38 +124,26 @@ const onSearch = (value) => {
 }
 
 const getList = async () => {
-  try {
-    pageData.tableConfiger.loading = true;
-    const res = await qcckPost({
-      ...pageData.pageConfiger,
-      ...queryFrom.value
-    }, `/mosty-base/baxx/basq/page`)
-
-    if(res) {
-      pageData.tableData = res.records || [];
-      pageData.total = res.total;
-    }
-  } finally {
-    pageData.tableConfiger.loading = false;
-  }
+  pageData.tableConfiger.loading = true;
+  let data = { ...pageData.pageConfiger, ...queryFrom.value }
+  const res = await qcckPost(data, `/mosty-base/baxx/basq/page`)
+  pageData.tableData = res.records || [];
+  pageData.total = res.total;
+  pageData.tableConfiger.loading = false;
 }
 
 const handleDelete = async (ids) => {
   await proxy.$modal.confirm("是否确认删除该培训人员？")
-
-  try {
-    await qcckPost({ idList: ids }, `/mosty-base/baxx/basq/remove`)
-    proxy.$modal.msgSuccess("删除成功");
-    await getList();
-  } catch (error) {
-    proxy.$modal.msgError("删除失败");
-  }
+  await qcckPost({ idList: ids }, `/mosty-base/baxx/basq/remove`)
+  proxy.$modal.msgSuccess("删除成功");
+  await getList();
 }
 
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
   getList();
 };
+
 const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
   getList();
diff --git a/src/views/securityManagement/personnelManagement/practitioner/index.vue b/src/views/securityManagement/personnelManagement/practitioner/index.vue
index 653e19b..b3a5c07 100644
--- a/src/views/securityManagement/personnelManagement/practitioner/index.vue
+++ b/src/views/securityManagement/personnelManagement/practitioner/index.vue
@@ -13,10 +13,10 @@
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
         <template #sflz="{ row }">
-          <DictTag :value="row.newSflz" :options="D_BZ_SF" />
+          <span>{{ row.sflz == 1 ? '离职' : '在职' }}</span>
         </template>
         <template #gw="{ row }">
-          <DictTag :value="row.gw" :options="D_BAXX_GWLX" />
+          <DictTag :value="row.gw" :tag="false" :options="D_BAXX_GWLX" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
@@ -150,21 +150,12 @@ const handleDelete = async (ids) => {
 };
 
 const getList = async () => {
-  try {
-    pageData.tableConfiger.loading = true;
-    const res = await qcckPost({
-      ...pageData.pageConfiger,
-      ...queryFrom.value
-    }, `/mosty-base/baxx/cyry/page`)
-
-    if(res) {
-      // 处理sflz为null默认为0
-      pageData.tableData = res.records?.map(i => ({ ...i, newSflz: i?.sflz === null ? 0 : i.sflz })) || [];
-      pageData.total = res.total;
-    }
-  } finally {
-    pageData.tableConfiger.loading = false;
-  }
+  pageData.tableConfiger.loading = true;
+  let params = { ...pageData.pageConfiger, ...queryFrom.value }
+  const res = await qcckPost(params, `/mosty-base/baxx/cyry/page`)
+  pageData.tableData = res.records || []
+  pageData.total = res.total;
+  pageData.tableConfiger.loading = false;
 }
 
 const changeNo = (val) => {
diff --git a/src/views/securityManagement/trainingManagement/trainer/index.vue b/src/views/securityManagement/trainingManagement/trainer/index.vue
index 34887b0..f570f83 100644
--- a/src/views/securityManagement/trainingManagement/trainer/index.vue
+++ b/src/views/securityManagement/trainingManagement/trainer/index.vue
@@ -13,10 +13,7 @@
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
         <template #gw="{ row }">
-          <DictTag :value="row.gw" :options="D_BAXX_GWLX" />
-        </template>
-        <template #ssbags="{ row }">
-          <DictTag :value="row.ssbags" :options="D_BAXX_DWLX" />
+          <DictTag :value="row.gw" :tag="false" :options="D_BAXX_GWLX" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
@@ -91,14 +88,13 @@ const pageData = reactive({
     { label: "证件号码", prop: "sfzh" },
     { label: "联系方式", prop: "lxdh" },
     { label: "岗位", prop: "gw", showSolt: true },
-    { label: "所属保安公司", prop: "ssbags", showSolt: true },
+    { label: "所属保安公司", prop: "pxgs" },
   ]
 });
 
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight =
-    window.innerHeight - searchBox.value.offsetHeight - 250;
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };
@@ -115,52 +111,28 @@ const onSearch = (value) => {
 }
 
 const getList = async () => {
-  try {
-    pageData.tableConfiger.loading = true;
-    const res = await qcckPost({
-      ...pageData.pageConfiger,
-      ...queryFrom.value,
-      sfxxpx: '01'
-    }, `/mosty-base/baxx/pxry/page`)
-
-    if(res) {
-      pageData.tableData = res.records || [];
-      pageData.total = res.total;
-    }
-  } finally {
-    pageData.tableConfiger.loading = false;
-  }
+  pageData.tableConfiger.loading = true;
+  let params = { ...pageData.pageConfiger, ...queryFrom.value, sfxxpx: '01' }
+  const res = await qcckPost(params, `/mosty-base/baxx/pxry/page`)
+  pageData.tableData = res.records || [];
+  pageData.total = res.total;
+  pageData.tableConfiger.loading = false;
 }
 
 // 提交培训
 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)
-  }
+  await qcckPost({ ...row, sfxxpx: '02' }, "/mosty-base/baxx/pxry/edit")
+  proxy.$modal.msgSuccess("提交培训成功");
+  await getList();
 };
 
 // 删除
 const handleDelete = async (ids) => {
   await proxy.$modal.confirm("是否确认删除该培训人员？")
-
-  try {
-    await qcckPost({ idList: ids }, "/mosty-base/baxx/pxry/remove")
-    proxy.$modal.msgSuccess("删除成功");
-    await getList();
-  } catch (error) {
-    proxy.$modal.msgError("删除失败");
-    console.log(error)
-  }
+  await qcckPost({ idList: ids }, "/mosty-base/baxx/pxry/remove")
+  proxy.$modal.msgSuccess("删除成功");
+  await getList();
 };
 
 const changeNo = (val) => {