diff --git a/src/api/pxzx.js b/src/api/pxzx.js
index 32110c7..06c5f7f 100644
--- a/src/api/pxzx.js
+++ b/src/api/pxzx.js
@@ -19,3 +19,59 @@ export const njryList = (data) => {
     data
   });
 };
+export const njryPage = (data) => {
+  return request({
+    url: api + "/baxx/njgl/page",
+    method: "POST",
+    data
+  });
+};
+
+// 培训公司
+// /baxx/dwgl/list
+export const dwglList = (data) => {
+  return request({
+    url: api + "/baxx/dwgl/list",
+    method: "POST",
+    data
+  });
+};
+// 修改保安培训公司
+// /baxx/njgl / edit
+export const njglEdit = (data) => {
+  return request({
+    url: api + "/baxx/njgl/edit",
+    method: "POST",
+    data
+  });
+};
+export const njryNjshPage = (data) => {
+  return request({
+    url: api + "/baxx/njry/njshPage",
+    method: "POST",
+    data
+  });
+};
+// /baxx/njry / page
+export const baxxNjryPage = (data) => {
+  return request({
+    url: api + "/baxx/njry/page",
+    method: "POST",
+    data
+  });
+};
+// /baxx/njry / edit
+export const baxxNjryEdit = (data) => {
+  return request({
+    url: api + "/baxx/njry/edit",
+    method: "POST",
+    data
+  });
+};
+export const baxxNjryNjshPage = (data) => {
+  return request({
+    url: api + "/baxx/njry/njshPage",
+    method: "POST",
+    data
+  });
+};
diff --git a/src/views/Training/AnnualInspection/components/detailForm.vue b/src/views/Training/AnnualInspection/components/detailForm.vue
index 4ae86f4..ea57a64 100644
--- a/src/views/Training/AnnualInspection/components/detailForm.vue
+++ b/src/views/Training/AnnualInspection/components/detailForm.vue
@@ -19,27 +19,33 @@ import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { ref, reactive,defineEmits,getCurrentInstance } from 'vue';
 const emit = defineEmits(["refresh"]);
 const { proxy } = getCurrentInstance();
+const props = defineProps({
+  dict: {
+    default: [[]], //二维数组
+    type: Array
+  }
+})
 const dialogForm = ref(false);
 const FormRef = ref();
 const listQuery = ref({});
-const loading = ref(false);
 
 const formList = reactive([
   [
-    { label: "姓名", prop: "name", type: "input" },
-    { label: "证件号码", prop: "idNumber", type: "input" },
-    { label: "联系电话", prop: "contactInfo", type: "input" },
+    { label: "姓名", prop: "xm", type: "input" },
+    { label: "证件号码", prop: "sfzh", type: "input" },
+    { label: "联系电话", prop: "lxdh", type: "input" },
   ],
   [
-    { label: "是否年检", prop: "isUploaded", type: "input" },
-    { label: "年检时间", prop: "inspectionTime", type: "input" },
+    { label: "是否年检", prop: "isnj", type:"select",options: props.dict.D_BZ_SF},
+    { label: "年检时间", prop: "njsj", type: "date" },
   ],
 ])
 
 
 // 初始化数据
-const init = (type, id,) => {
+const init = (type, row,) => {
   dialogForm.value = true;
+  listQuery.value=row
 };
 
 const close = () => {
diff --git a/src/views/Training/AnnualInspection/components/pxgs.vue b/src/views/Training/AnnualInspection/components/pxgs.vue
index eb91adb..de8c36f 100644
--- a/src/views/Training/AnnualInspection/components/pxgs.vue
+++ b/src/views/Training/AnnualInspection/components/pxgs.vue
@@ -1,55 +1,82 @@
 <template>
-    <div>
-        <el-dialog title="选择培训公司" v-model="dialogForm" width="400px">
-            <ul class="company-list">
-                <li :class="{'active': active == item.id}" @click="active = item.id" class="company-item one_text_detail" v-for="item in companyList" :key="item.id">{{ item.name }}</li>
-            </ul>
-            <div class="flex just-center mt10">
-                <el-button  type="primary" @click="dialogForm = false">确定</el-button>
-            </div>
-        </el-dialog>
-    </div>
+  <div>
+    <el-dialog title="选择培训公司" v-model="dialogForm" width="400px">
+      <ul class="company-list">
+        <li :class="{ 'active': active == item.id }" @click="updateActive(item)" class="company-item one_text_detail"
+          v-for="item in companyList" :key="item.id">{{ item.dwmc }}</li>
+      </ul>
+      <div class="flex just-center mt10">
+        <el-button type="primary" @click="dialogForm = false">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup>
-import { ref ,defineExpose} from 'vue';
+import { ref, defineExpose } from 'vue';
+import { dwglList, njglEdit } from '@/api/pxzx';
+
+import { ElMessage } from "element-plus";
+const props = defineProps({
+  dict: {
+    type: Object,
+    default: () => ({})
+  }
+})
 const dialogForm = ref(false);
-const companyList = ref([
-    { id: 1, name: '公司A' },
-    { id: 2, name: '公司B' },
-    { id: 3, name: '公司C' },
-]);
-
+const companyList = ref([]);
+const pxgsData = ref()
 const active = ref(null)
-
-const init = (id) => {
-    active.value = id;
-    dialogForm.value = true;
+const getList = () => {
+  dwglList({}).then(res => {
+    companyList.value = res.length > 0 ? res.filter(item => item.type == '02' || item.type == '03') : []
+  })
+}
+const updateActive = (item) => {
+  active.value = item.id;
+  njglEdit({
+    id: pxgsData.value.id,
+    pxgs: item.dwmc,
+    pxgsdm: item.id
+  }).then(res => {
+    if (res.code == 200) {
+      ElMessage.success('修改成功');
+      dialogForm.value = false;
+    }
+  })
+}
+const init = (row) => {
+  active.value = row.pxgsdm?row.pxgsdm:null;
+  pxgsData.value =row
+  dialogForm.value = true;
+  getList()
 }
 
 defineExpose({
-    init
+  init
 })
 </script>
 
 <style scoped lang="scss">
 .company-list {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
-    max-height: 40vh;
-    overflow: hidden;
-    overflow-y: auto;
-    .company-item {
-        padding: 10px;
-        cursor: pointer;
-        line-height: 20px;
-        text-align: center;
-        border-bottom: 1px solid #eee;
-    }
-    .active{
-        background: #00bfbf;
-        color: #fff;
-    }
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+  max-height: 40vh;
+  overflow: hidden;
+  overflow-y: auto;
+
+  .company-item {
+    padding: 10px;
+    cursor: pointer;
+    line-height: 20px;
+    text-align: center;
+    border-bottom: 1px solid #eee;
+  }
+
+  .active {
+    background: #00bfbf;
+    color: #fff;
+  }
 }
 </style>
diff --git a/src/views/Training/AnnualInspection/index.vue b/src/views/Training/AnnualInspection/index.vue
index 7660b35..c7b3359 100644
--- a/src/views/Training/AnnualInspection/index.vue
+++ b/src/views/Training/AnnualInspection/index.vue
@@ -1,8 +1,7 @@
 <template>
   <div>
     <div class="titleBox">
-      <PageTitle :title="['单位信息','从业人员','年检','申请人员']" @change="changeTab" v-model:active="activeTab">
-      </PageTitle>
+      <PageTitle title="年检信息" />
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
@@ -13,10 +12,13 @@
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData">
+        <template #isnj="{ row }">
+       <DictTag :options="D_BZ_SF" :value="row.isnj" />
+        </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" link @click="addEdit('detail', row.id)">详情</el-link>
-          <el-link type="primary" link @click="addEdit('pxgs', row.id)">年检</el-link>
+          <el-link type="primary" link @click="addEdit('detail', row)">详情</el-link>
+          <el-link type="primary" link @click="addEdit('pxgs', row)">年检</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -25,9 +27,9 @@
       }"></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" @refresh="getList" />
+    <DetailForm ref="detailDiloag" :dict="{D_BZ_SF}"/>
     <!-- 选择培训公司 -->
-    <Pxgs ref="pxgs"></Pxgs>
+    <Pxgs ref="pxgs" :dict="{D_BAXX_DWLX}" ></Pxgs>
   </div>
 </template>
 
@@ -39,35 +41,35 @@ import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/detailForm.vue";
 import Pxgs from "./components/pxgs.vue";
 import {getItem} from '@/utils/storage.js'
-import { cyryPage} from "@/api/pxzx.js";
+import { cyryPage,njryPage} from "@/api/pxzx.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const activeTab = ref(2)
+const { D_BZ_SF ,D_BAXX_DWLX} = proxy.$dict("D_BZ_SF","D_BAXX_DWLX");
 const detailDiloag = ref();
 const pxgs = ref();
 const searchBox = ref(); //搜索框
-const baseUrl = 'data:image/jpeg;base64,'
+
 const searchConfiger = ref([
   {
     label: "人员姓名",
-    prop: "name",
+    prop: "xm",
     showType: "input"
   },
   {
     label: "证件号码",
-    prop: "idNumber",
+    prop: "sfzh",
     showType: "input"
   },
   {
     label: "联系方式",
-    prop: "contactInfo",
+    prop: "lxdh",
     showType: "input"
   },
 ]);
 const idEntityCard=getItem('idEntityCard')
 const queryFrom = ref({});
 const pageData = reactive({
-  tableData: [{name:'张三',idNumber:'44032519900101001X',contactInfo:'13800000000',isInspected:'是',inspectionTime:'2023-08-01'}],
+  tableData: [],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -81,29 +83,24 @@ const pageData = reactive({
   },
   controlsWidth: 180,
   tableColumn: [
-    { label: "姓名", prop: "name", width: 100 },
-    { label: "证件号码", prop: "idNumber" },
-    { label: "联系方式", prop: "contactInfo" },
-    { label: "是否年检", prop: "isInspected" },
-    { label: "年检时间", prop: "inspectionTime", width: 120 }
+    { label: "姓名", prop: "xm", width: 100 },
+    { label: "证件号码", prop: "sfzh" },
+    { label: "联系方式", prop: "lxdh" },
+    { label: "是否年检", prop: "isnj" ,showSolt: true},
+    { label: "年检时间", prop: "njsj" }
   ]
 });
 onMounted(() => {
   getInfo();
   tabHeightFn();
 });
-
-const changeTab = (val) => {
-  console.log(val,'=====ll');
-}
-
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
   pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
-
+const gsId=ref('')
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
   getList();
@@ -115,8 +112,11 @@ const changeSize = (val) => {
 const getInfo = () => {
   let promes = { sfzh: idEntityCard }
   cyryPage(promes).then(res => {
-     pageData.tableData = res.records || [];
-    pageData.total = res.total;
+    const data = res.records[0] || {};
+    if (data) {
+    gsId.value=data.code
+   }
+    getList()
   }).finally(() => {
     pageData.tableConfiger.loading = false;
   })
@@ -124,30 +124,30 @@ const getInfo = () => {
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
-  // const promes = {
-  //   ...pageData.pageConfiger,
-  //   ...queryFrom.value
-  // }
+  const promes = {
+    ...pageData.pageConfiger,
+    ...queryFrom.value,
+    dwbm: gsId.value
+  }
+  njryPage(promes).then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+  }).catch((err) => {
+    console.log(err);
 
-  //
-  // let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // qcckGet(data, "/mosty-jbld/jbldzsd/selectPage").then((res) => {
-  //   pageData.tableData = res.records || [];
-  //   pageData.total = res.total;
-  //   pageData.tableConfiger.loading = false;
-  // }).catch(() => {
-  //   pageData.tableConfiger.loading = false;
-  // });
+  }).finally(() => {
+    pageData.tableConfiger.loading = false;
+  });
 };
 
 
 // 详情
-const addEdit = (type, id) => {
+const addEdit = (type, row) => {
   nextTick(() => {
     if(type == 'pxgs'){
-      pxgs.value.init(id);
+      pxgs.value.init(row);
     }else{
-      detailDiloag.value.init(type, id);
+      detailDiloag.value.init(type, row);
     }
   })
 };
diff --git a/src/views/Training/AnnualInspectionApplicants/components/detailForm.vue b/src/views/Training/AnnualInspectionApplicants/components/detailForm.vue
index 2c8b73a..50949f0 100644
--- a/src/views/Training/AnnualInspectionApplicants/components/detailForm.vue
+++ b/src/views/Training/AnnualInspectionApplicants/components/detailForm.vue
@@ -21,8 +21,15 @@
 <script setup>
 import { qcckPost , qcckGet} from "@/api/qcckApi.js";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import { ref, reactive,defineEmits,getCurrentInstance } from 'vue';
+import { ref, reactive, defineEmits, getCurrentInstance } from 'vue';
+import {baxxNjryEdit} from "@/api/pxzx.js";
 const emit = defineEmits(["refresh"]);
+const props = defineProps({
+  dict: {
+    type: Object,
+    default: () => ({})
+  }
+});
 const { proxy } = getCurrentInstance();
 const dialogForm = ref(false);
 const FormRef = ref();
@@ -33,40 +40,51 @@ const title = ref('新增');
 const rules = reactive({
   pxlx: [{ required: true, message: "请输入视频标题", trigger: "blur" }],
 });
-const formList = reactive([
-  [
-    { label: "姓名", prop: "name", type: "input" },
-    { label: "证件号码", prop: "idNumber", type: "input" },
-    { label: "联系电话", prop: "contactInfo", type: "input" },
-  ],
-  [
-    { label: "是否年检", prop: "isUploaded", type: "input" },
-    { label: "培训项目", prop: "trainingProject", type: "input" },
-    { label: "年检时间", prop: "inspectionTime", type: "input" },
-  ],
-  [
-    { label: "体检报告", prop: "inspectionReport", type: "upload" },
-    { label: "无犯罪记录证明", prop: "wfzjlzm", type: "upload" },
-    { label: "保安证原件", prop: "bazzj", type: "upload" },
-  ],
-])
+const formList = ref([])
 
 
 // 初始化数据
-const init = (type, id,) => {
+const init = (type, row) => {
   dialogForm.value = true;
   title.value = type == 'add' ? '新增' : '详情';
+  listQuery.value = row
+  formList.value =[
+  [
+    { label: "姓名", prop: "xm", type: "input" },
+    { label: "证件号码", prop: "zjhm", type: "input" },
+    { label: "联系电话", prop: "lxdh", type: "input" },
+  ],
+  [
+    { label: "是否年检", prop: "njzt", type: "select",options:props.dict.D_BZ_SF },
+    { label: "培训项目", prop: "pxxm", type: "input" },
+    { label: "年检时间", prop: "inspectionTime", type: "date" },
+  ],
+    { label: "体检报告", prop: "tjzm", type: "upload"  },
+    { label: "无犯罪记录证明", prop: "wfzzmjl", type: "upload" },
+    { label: "保安证原件", prop: "bazyj", type: "upload" },
+]
 };
 
 const save = () => {
-  FormRef.value.submit(()=>{
+  FormRef.value.submit(() => {
+    const promes = {
+      ...listQuery.value,
+      ryzp:listQuery.value.ryzp?.map(item=>item.url),
+    }
+    baxxNjryEdit(promes).then(res=>{
+        proxy.$message.success("保存成功");
+        emit("refresh");
+        close();
+    }).catch(() => {
+      loading.value = false;
+    })
     // loading.value = true;
     // let url = title.value == '新增' ? `/mosty-jbld/jbldzsd/add` : `/mosty-jbld/jbldzsd/update`;
     // qcckPost(listQuery.value, url).then(() => {
     //   loading.value = false;
       proxy.$message.success("保存成功");
     //   emit("refresh");
-      close();
+      // close();
     // }).catch(() => {
     //   loading.value = false;
     // })
diff --git a/src/views/Training/AnnualInspectionApplicants/index.vue b/src/views/Training/AnnualInspectionApplicants/index.vue
index f44eb8e..faa2ada 100644
--- a/src/views/Training/AnnualInspectionApplicants/index.vue
+++ b/src/views/Training/AnnualInspectionApplicants/index.vue
@@ -14,11 +14,16 @@
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData">
-
+<template #isUploaded="{row}">
+  {{ row.bazyj&&row.tjzm&&row.wfzzmjl?'已上传':'未上传' }}
+</template>
+<template #njzt="{row}">
+<DictTag :options="D_BZ_SF" v-model:value="row.njzt" tag></DictTag>
+</template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" link @click="addEdit('detail', row.id)">详情</el-link>
-          <el-link type="success" link   @click="addEdit('add', '')">上传资料</el-link>
+          <el-link type="primary" link @click="addEdit('detail', row)">详情</el-link>
+          <el-link type="success" link   @click="addEdit('add', row)">上传资料</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -27,7 +32,7 @@
       }"></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" @refresh="getList" />
+    <DetailForm ref="detailDiloag" :dict="{D_BZ_SF}" />
     <!-- 培训申请 -->
     <PxApllication ref="pxApllication" />
   </div>
@@ -41,8 +46,11 @@ import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/detailForm.vue";
 import PxApllication from "./components/pxApllication.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import {baxxNjryNjshPage} from '@/api/pxzx.js'
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
+const { D_BZ_SF } = proxy.$dict("D_BZ_SF");
+
 const detailDiloag = ref();
 const pxApllication = ref();
 const searchBox = ref(); //搜索框
@@ -74,9 +82,9 @@ const pageData = reactive({
     { label: "姓名", prop: "xm" },
     { label: "证件号码", prop: "zjhm" },
     { label: "联系方式", prop: "lxdh" },
-    { label: "是否上传资料", prop: "isUploaded" },
+    { label: "是否上传资料", prop: "isUploaded" ,showSolt:true},
     { label: "申请时间", prop: "sqrq", },
-    { label: "资料审核是否通过", prop: "njzt"}
+    { label: "资料审核是否通过", prop: "njzt",showSolt:true}
   ]
 });
 
@@ -105,7 +113,7 @@ const changeSize = (val) => {
 const getList = () => {
   pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  qcckPost(data, "/mosty-base/baxx/njry/queryCurrent").then((res) => {
+  baxxNjryNjshPage(data).then((res) => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
     pageData.tableConfiger.loading = false;
@@ -117,12 +125,12 @@ const getList = () => {
 
 
 // 详情
-const addEdit = (type, id) => {
+const addEdit = (type, row) => {
   nextTick(() => {
     if(type == 'pxsq'){
-      pxApllication.value.init(type, id);
+      pxApllication.value.init(type, row);
     }else{
-      detailDiloag.value.init(type, id);
+      detailDiloag.value.init(type, row);
     }
   })
 };
diff --git a/src/views/backOfficeSystem/contingencyPlan/PlanManagement/index.vue b/src/views/backOfficeSystem/contingencyPlan/PlanManagement/index.vue
index 179a6cf..4ea0419 100644
--- a/src/views/backOfficeSystem/contingencyPlan/PlanManagement/index.vue
+++ b/src/views/backOfficeSystem/contingencyPlan/PlanManagement/index.vue
@@ -77,7 +77,7 @@ const pageData = reactive({
   controlsWidth: 200,
   tableColumn: [
     { label: "编码", prop: "bm" },
-    { label: "预定等级", prop: "yadj", showSlot: true },
+    { label: "预定等级", prop: "yadj", showSolt: true },
   ]
 });
 
diff --git a/src/views/backOfficeSystem/contingencyPlan/TypeManagement/index.vue b/src/views/backOfficeSystem/contingencyPlan/TypeManagement/index.vue
index 69b243b..87dc62b 100644
--- a/src/views/backOfficeSystem/contingencyPlan/TypeManagement/index.vue
+++ b/src/views/backOfficeSystem/contingencyPlan/TypeManagement/index.vue
@@ -77,7 +77,7 @@ const pageData = reactive({
   controlsWidth: 200,
   tableColumn: [
     { label: "编码", prop: "bm" },
-    { label: "预案类型", prop: "yalx", showSlot: true },
+    { label: "预案类型", prop: "yalx", showSolt: true },
   ]
 });