From e45b864be312916cdda0917e5de1d650670a0385 Mon Sep 17 00:00:00 2001
From: lcw <1878680531@qq.com>
Date: Thu, 15 Jan 2026 12:16:53 +0800
Subject: [PATCH] lcw

---
 .../ChooseList/ChooseNJBAY/index.vue          | 14 +++++-----
 src/components/steps.vue                      |  4 +--
 src/views/Training/securityNjgl/index.vue     |  5 ++--
 .../securityNjsp/components/addSp.vue         |  2 +-
 .../securityNjsp/components/detailForm.vue    | 12 ++++-----
 .../components/trainingCompany.vue            |  9 +++++--
 src/views/Training/securityNjsp/index.vue     |  5 +++-
 .../components/detailForm.vue                 | 14 +++++-----
 .../Training/trainingCompanyNjgl/index.vue    | 10 +++----
 .../components/addForm.vue                    | 26 ++++++++++++++-----
 vue.config.js                                 |  5 ++--
 11 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/src/components/ChooseList/ChooseNJBAY/index.vue b/src/components/ChooseList/ChooseNJBAY/index.vue
index 64e4ac7..8266441 100644
--- a/src/components/ChooseList/ChooseNJBAY/index.vue
+++ b/src/components/ChooseList/ChooseNJBAY/index.vue
@@ -95,7 +95,7 @@ watch(()=>props.modelValue, (val) => {
     nextTick(() => {
       getListData();
     });
-  } 
+  }
 },{immediate: true});
 
 const keyid = (row) => {
@@ -104,14 +104,14 @@ const keyid = (row) => {
 
 // 列表数据
 const getListData = () => {
-  let params = { 
+  let params = {
     ...listQuery,
-    pxgsShzt: "1",//培训公司已通过
+    // pxgsShzt: "1",//培训公司已通过
     sptz: "1",//已送培
-    ssbakk:userInfo.pxgs,
-    ssbakkId:userInfo.pxgsid,
+    sptzCompanyName:userInfo.pxgs,
+    sptzCompanyId:userInfo.pxgsid,
     pxgsShzt:'1',//保安公司已通过
-    
+
   }
   loading.value = true;
   qcckPost(params,"/mosty-base/bans/njxx/page").then((res) => {
@@ -184,7 +184,7 @@ const handleSelectionChange = (val) => {
   if (props.data.Single && val.length > 1) {
     let del_row = val.shift();
     multipleUserRef.value.toggleRowSelection(del_row, false);
-  } 
+  }
   multipleSelectionUser.value = val;
 };
 
diff --git a/src/components/steps.vue b/src/components/steps.vue
index 4fec028..63e0755 100644
--- a/src/components/steps.vue
+++ b/src/components/steps.vue
@@ -25,7 +25,7 @@
                     :class="{ 'status-pending': dataForm.pxgsShzt == 0, 'status-pass': dataForm.pxgsShzt == 1, 'status-reject': dataForm.pxgsShzt == 2 }">{{
                       dataForm.pxgsShzt == 0 ? '待审核' : dataForm.pxgsShzt == 1 ? '通过' : '驳回' }}</span>
                 </div>
-                <div v-if="dataForm.pxgsShsj == 2" class="reject-reason">
+                <div v-if="dataForm.pxgsShzt == 2" class="reject-reason">
                   <span class="reject-label">驳回原因：</span>
                   <span>{{ dataForm.pxgsBhyy || '未审核' }}</span>
                 </div>
@@ -40,7 +40,7 @@
                     :class="{ 'status-pending': dataForm.gonganShzt == 0, 'status-pass': dataForm.gonganShzt == 1, 'status-reject': dataForm.gonganShzt == 2 }">{{
                       dataForm.gonganShzt == 0 ? '待审核' : dataForm.gonganShzt == 1 ? '通过' : '驳回' }}</span>
                 </div>
-                <div v-if="dataForm.gonganShsj == 2" class="reject-reason">
+                <div v-if="dataForm.gonganShzt == 2" class="reject-reason">
                   <span class="reject-label">驳回原因：</span>
                   <span>{{ dataForm.gonganBhyy || '未审核' }}</span>
                 </div>
diff --git a/src/views/Training/securityNjgl/index.vue b/src/views/Training/securityNjgl/index.vue
index c0db7ef..f115971 100644
--- a/src/views/Training/securityNjgl/index.vue
+++ b/src/views/Training/securityNjgl/index.vue
@@ -162,9 +162,10 @@ const getList = () => {
   const promes = {
     ...pageData.pageConfiger,
     ...queryFrom.value,
-    ssbakk:userInfo.pxgs,
-  ssbakkId:userInfo.pxgsid
+  ssbakk:userInfo.pxgs,
+    ssbakkId:userInfo.pxgsid,
   }
+
   qcckPost(promes,'/mosty-base/bans/njxx/page').then(res => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
diff --git a/src/views/Training/securityNjsp/components/addSp.vue b/src/views/Training/securityNjsp/components/addSp.vue
index 44fac6d..80cbf94 100644
--- a/src/views/Training/securityNjsp/components/addSp.vue
+++ b/src/views/Training/securityNjsp/components/addSp.vue
@@ -81,7 +81,7 @@ const trainingCompany=ref()
 const onBatchAudit = (val) => {
     if (ids.value.length === 0) return ElMessage.warning("请选择要送培的人员");
     proxy.$modal.confirm("是否确认送培？").then(() => {
-    let params = {  ids:ids.value ,...val}
+      let params = { ids: ids.value, ...val }
     qcckPost(params,'/mosty-base/bans/njxx/sendTraining').then(res=>{
       ElMessage.success("送培成功");
       emit('refresh');
diff --git a/src/views/Training/securityNjsp/components/detailForm.vue b/src/views/Training/securityNjsp/components/detailForm.vue
index 7e4b4aa..5851e18 100644
--- a/src/views/Training/securityNjsp/components/detailForm.vue
+++ b/src/views/Training/securityNjsp/components/detailForm.vue
@@ -6,12 +6,12 @@
     </div>
     <div class="cntinfo">
       <!-- 标签 -->
-      <ul class="tag-box">
-        <li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'">
+      <!-- <ul class="tag-box">
+        <li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'"> -->
           <!-- 0-待审核 1-通过 2-驳回 -->
-          {{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
+          <!-- {{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
         </li>
-      </ul>
+      </ul> -->
       <!-- 内容描述 -->
       <el-descriptions class="desc" :column="3" border label-width="200px">
         <el-descriptions-item label="保安公司名称">{{ detail.ssbakk }}</el-descriptions-item>
@@ -97,7 +97,7 @@
 <script setup>
 import { ref, defineEmits } from 'vue';
 const emit = defineEmits(["refresh"]);
-const baseUrl = '/bagl/mosty-base/minio/image/download'
+const baseUrl = '/bagl/mosty-base/minio/image/download/'
 const props = defineProps({
   dic: {
     default: [[]], //二维数组
@@ -173,7 +173,7 @@ defineExpose({ init })
        color: #0072FF;
       border: 5px solid #0072FF;
     }
-  } 
+  }
 }
 
 .desc {
diff --git a/src/views/Training/securityNjsp/components/trainingCompany.vue b/src/views/Training/securityNjsp/components/trainingCompany.vue
index e568dfc..e26abd4 100644
--- a/src/views/Training/securityNjsp/components/trainingCompany.vue
+++ b/src/views/Training/securityNjsp/components/trainingCompany.vue
@@ -16,6 +16,7 @@
 
 <script setup>
 import { qcckPost } from "@/api/qcckApi.js";
+import { ElMessage } from "element-plus";
 import { ref, reactive, defineExpose, getCurrentInstance, defineEmits } from 'vue'
 const visible = ref(false);
 const dataList = ref()
@@ -38,9 +39,13 @@ const init = () => {
   })
 }
 const onBatchAudit = () => {
-  const data=dataList.value.find(item=>item.ssbakkId===dataValue.value)
-  emit('onBatchAudit', data)
+  const data = dataList.value.find(item => item.companyId === dataValue.value)
+  if (data) {
+   emit('onBatchAudit', data)
   close()
+  } else {
+    ElMessage.warning("请选择培训公司")
+}
 }
 const close = () => {
   visible.value = false;
diff --git a/src/views/Training/securityNjsp/index.vue b/src/views/Training/securityNjsp/index.vue
index 56fc20d..78e84f3 100644
--- a/src/views/Training/securityNjsp/index.vue
+++ b/src/views/Training/securityNjsp/index.vue
@@ -16,6 +16,9 @@
         @chooseData="chooseData">
         <template #sptz="{ row }">
            <DictTag :value="row.sptz" :tag="false" :options="D_BA_SPZT" />
+        </template>
+                <template #whcd="{ row }">
+           <DictTag :value="row.whcd" :tag="false" :options="D_BZ_WHCD" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
@@ -96,7 +99,7 @@ const pageData = reactive({
     { label: "姓名", prop: "xm" },
     { label: "身份证号码", prop: "sfzhm",showOverflowTooltip: true },
     { label: "电话", prop: "dh" },
-    { label: "文化程度", prop: "whcd" },
+    { label: "文化程度", prop: "whcd", showSolt: true },
     { label: "证书编号", prop: "zsbh", showOverflowTooltip: true },
     { label: "服务行业", prop: "fwxymc" },
     { label: "入职时间", prop: "rzsj" },
diff --git a/src/views/Training/trainingCompanyNjgl/components/detailForm.vue b/src/views/Training/trainingCompanyNjgl/components/detailForm.vue
index 9b7102a..5165dd9 100644
--- a/src/views/Training/trainingCompanyNjgl/components/detailForm.vue
+++ b/src/views/Training/trainingCompanyNjgl/components/detailForm.vue
@@ -6,12 +6,12 @@
     </div>
     <div class="cntinfo">
       <!-- 标签 -->
-      <ul class="tag-box">
-        <li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'">
+      <!-- <ul class="tag-box">
+        <li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'"> -->
           <!-- 0-待审核 1-通过 2-驳回 -->
-          {{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
+          <!-- {{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
         </li>
-      </ul>
+      </ul> -->
       <!-- 内容描述 -->
        <el-descriptions class="desc" :column="3" border label-width="200px">
         <el-descriptions-item label="保安公司名称">{{ detail.ssbakk }}</el-descriptions-item>
@@ -100,7 +100,7 @@ import { ref, computed, defineEmits, getCurrentInstance,defineProps } from 'vue'
 import { qcckPost } from "@/api/qcckApi.js";
 const emit = defineEmits(["refresh"]);
 const { proxy } = getCurrentInstance();
-const baseUrl = '/bagl/mosty-base/minio/image/download'
+const baseUrl = '/bagl/mosty-base/minio/image/download/'
 const props = defineProps({
   dic: {
     default: [[]], //二维数组
@@ -118,7 +118,7 @@ const init = (type, row,) => {
     let zj = res.sfzzfmj.split(',');
     res.sfzzm = [zj[0]];
     res.sfzfm = [zj[1]];
-    detail.value = res || {};  
+    detail.value = res || {};
   })
 };
 
@@ -174,7 +174,7 @@ defineExpose({ init })
        color: #0072FF;
       border: 5px solid #0072FF;
     }
-  } 
+  }
 }
 
 .desc {
diff --git a/src/views/Training/trainingCompanyNjgl/index.vue b/src/views/Training/trainingCompanyNjgl/index.vue
index bea2e3f..130717a 100644
--- a/src/views/Training/trainingCompanyNjgl/index.vue
+++ b/src/views/Training/trainingCompanyNjgl/index.vue
@@ -48,7 +48,7 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/detailForm.vue";
-import Steps from "./components/steps.vue";
+import Steps from "@/components/steps.vue";
 import ShForm from "./components/shForm.vue";
 import {getItem} from '@/utils/storage.js'
 import { qcckPost } from "@/api/qcckApi.js";
@@ -63,7 +63,7 @@ const shForm = ref();
 const searchBox = ref(); //搜索框
 const selectedRows = ref([]);
 const searchConfiger = ref([
-  
+
   {
     label: "姓名",
     prop: "xm",
@@ -133,9 +133,9 @@ const getList = () => {
   const promes = {
     ...pageData.pageConfiger,
     ...queryFrom.value,
-    ssbakk:userInfo.pxgs,
-    ssbakkId:userInfo.pxgsid,
-    pxgsShzt:'1',//保安公司已通过
+   sptzCompanyName:userInfo.pxgs,
+    sptzCompanyId:userInfo.pxgsid,
+    // pxgsShzt:'1',//保安公司已通过
     sptz:'1',//已送培
   }
   qcckPost(promes,'/mosty-base/bans/njxx/page').then((res) => {
diff --git a/src/views/Training/trainingCompanyNjsp/components/addForm.vue b/src/views/Training/trainingCompanyNjsp/components/addForm.vue
index 451d97a..481f5cd 100644
--- a/src/views/Training/trainingCompanyNjsp/components/addForm.vue
+++ b/src/views/Training/trainingCompanyNjsp/components/addForm.vue
@@ -100,7 +100,7 @@
             { label: "签到状态", prop: "qdztdm",showSolt: true },
             { label: "签到时间", prop: "qdsj" },
         ]
-}); 
+});
 
 const init = (type, row) => {
     visible.value = true
@@ -111,7 +111,13 @@ const init = (type, row) => {
         qcckPost({},'/mosty-base/bans/pxqd-item/getDetailInfo/'+row.id).then(res=>{
             formData.value = { ...res }
             delete formData.value.personAndNjxxList;
-            pageData.tableData = res.personAndNjxxList || [];
+          pageData.tableData = res.personAndNjxxList.map(item => {
+              return {
+                ...item,
+                ssbakkId: item.bakkid,
+                ssbakk: item.bakkmc,
+              }
+            }) || [];
         })
     }
 }
@@ -120,7 +126,6 @@ const openPeoList = () => {
     if(disabled.value) return;
     shoewList.value = true;
 }
-
 // 删除
 const deleteItem = (row) => {
     pageData.tableData = pageData.tableData.filter(it=>it.id != row.id);
@@ -133,8 +138,15 @@ const choosedList = (list) => {
 }
 
 const save = () => {
-    FormRef.value.submit((val) => {
-        let data = { pxqdItem:{ ...val } ,pxqdPersons:pageData.tableData }
+  FormRef.value.submit((val) => {
+    const tableData = pageData.tableData.map(item => {
+      return {
+        ...item,
+        bakkid: item.ssbakkId,
+        bakkmc: item.ssbakk,
+      }
+    })
+    let data = { pxqdItem: { ...val }, pxqdPersons: tableData }
         qcckPost(data,'/mosty-base/bans/pxqd-item/addWithPersons').then(res=>{
             ElMessage.success('保存成功');
             emit('refresh')
@@ -142,7 +154,7 @@ const save = () => {
             close()
         })
     })
-   
+
 }
 const close = () => {
     FormRef.value?.reset();
@@ -159,4 +171,4 @@ defineExpose({
     padding: 20px 10px;
     box-sizing: border-box;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/vue.config.js b/vue.config.js
index 3dc57ab..c651dc8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,8 +6,9 @@ function resolve(dir) {
 // const serverHost = "http://192.168.1.98:8006";//毛毛
 // const serverHost = "http://192.168.1.32:8066";//波哥
 // const serverHost = "http://192.168.0.231:8006"//线上
-const serverHost = "http://47.108.232.77:9537";//波哥
+// const serverHost = "http://47.108.232.77:9537";//波哥
 // const serverHost = "http://127.0.0.1:8006"
+const serverHost = 'https://lam.clcud.com:1443';
 module.exports = {
   publicPath: "./",
   outputDir: "ab",
@@ -39,7 +40,7 @@ module.exports = {
           proxyReq.setHeader("Connection", "Keep-Alive"); //设置长连接
         }
       },
-      '/mosty-base': {
+      '/bagl/mosty-base': {
         target: serverHost, // 后端服务器地址
         changeOrigin: true, // 允许跨域
         secure: false, // 如果是https，需要设置为false