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

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

@@ -41,7 +41,7 @@ const formData = ref({})
 
 const formList = reactive([
   [
-    { label: "成绩", prop: "ksfs", type: "input" },
+    { label: "成绩", prop: "kscj", type: "input" },
   ],
   [
     { label: "卷面", prop: "kszp", type: "upload", limit: 3 },

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

@@ -30,9 +30,9 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link v-if="!visible && row?.ksfs >= 60" @click="handleCertificate(row)">申请证件</el-link>
+          <el-link v-if="!visible && row?.kscj >= 60" @click="handleCertificate(row)">申请证件</el-link>
           <template v-if="visible && row?.ksfs ==='01'">
-            <el-link v-if="!row?.ksfs" type="primary" @click="addEdit('updata', row)">上传成绩</el-link>
+            <el-link v-if="!row?.kscj" type="primary" @click="addEdit('updata', row)">上传成绩</el-link>
             <el-link v-else type="primary" @click="addEdit('view', row)">查看成绩</el-link>
           </template>
         </template>
@@ -97,9 +97,9 @@ const pageData = reactive({
     { label: "姓名", prop: "xm" },
     { label: "证件号码", prop: "sfzh" },
     { label: "联系方式", prop: "lxdh" },
-    { label: "线上培训时间", prop: "xxpxsc", showSolt: true },
-    { label: "线下培训课程", prop: "xxpxkc" },
-    { label: "考试成绩", prop: "ksfs" },
+    { label: "线上培训时间", prop: "xspxsc", showSolt: true },
+    { label: "线下培训课程", prop: "xxpxsc" },
+    { label: "考试成绩", prop: "kscj" },
   ]
 });
 
@@ -112,13 +112,10 @@ const close = () => {
 // 根据项目id获取培训人员
 const getList = async ({ id = "" }, type = '') => {
   const res = await qcckPost({
-    ...pageData.pageConfiger,
-    // sfcjpx: 1,
-    // ksglid: id
+    pxxmid: id
    }, `/mosty-base/baxx/ksry/list`)
   if (res) {
-    pageData.tableData = res.records || [];
-    pageData.total = res.total;
+    pageData.tableData = res || [];
     if (!type) emits("refresh");
   }
 }

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

@@ -132,7 +132,7 @@ const pageData = reactive({
     { label: "证件号码", prop: "sfzh" },
     { label: "联系号码", prop: "lxdh" },
     { label: "线上培训时长", prop: "pxsc", showSolt: true },
-    { label: "所属单位", prop: "lxdw" },
+    { label: "所属单位", prop: "ssbags" },
   ]
 });
 

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

@@ -42,10 +42,6 @@
           <el-link type="warning" @click="addEdit('updata', row)">删除</el-link>
         </template>
       </MyTable>
-      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
-        ...pageData.pageConfiger,
-        total: pageData.total
-      }" />
 
     </div>
   </div>
@@ -138,14 +134,10 @@ const getbaInfo = async ({ id = '' }) => {
 // 根据项目id获取培训人员
 const getList = async ({ id = "" }) => {
   const res = await qcckPost({
-    ...pageData.pageConfiger,
     pxxmid: id
-   }, `/mosty-base/baxx/pxry/page`)
+   }, `/mosty-base/baxx/pxkc/pxryList`)
   if (res) {
-    console.log(res);
-
-    pageData.tableData = res.records || [];
-    pageData.total = res.total;
+    pageData.tableData = res || [];
   }
 }
 
@@ -154,7 +146,7 @@ const open = (row = {}, type = 'view') => {
   dialogVisible.value = true
   formData.value = { ...row }
   if (type === 'view') {
-    title.value = '保安线下考试详情'
+    title.value = '保安培训项目详情'
     visible.value = true
     getbaInfo(row)
     getPxkcList(row)
@@ -162,16 +154,6 @@ const open = (row = {}, type = 'view') => {
   }
 }
 
-
-const changeNo = (val) => {
-  pageData.pageConfiger.pageNum = val;
-  getList();
-};
-const changeSize = (val) => {
-  pageData.pageConfiger.pageSize = val;
-  getList();
-};
-
 const save = () => {
   FormRef.value.submit(() => {
     loading.value = true;

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

@@ -14,6 +14,10 @@
           <span>{{ row.pxsc }}h</span>
         </template>
       </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
 
       <template #footer>
         <el-button @click="handleClose">取 消</el-button>
@@ -26,6 +30,7 @@
 <script setup>
 import { computed, ref, reactive, getCurrentInstance, watchEffect } from 'vue';
 import { qcckPost } from "@/api/qcckApi.js";
+import Pages from '@/components/aboutTable/Pages.vue';
 import MyTable from '@/components/aboutTable/MyTable.vue';
 
 const { proxy } = getCurrentInstance()
@@ -84,7 +89,7 @@ watchEffect(() => {
   pageData.tableConfiger.defaultSelectKeys = props.defaultSelectKeys
 })
 
-const open = async () => {
+const getList = async () => {
   pageData.tableConfiger.loading = true;
 
   try {
@@ -95,13 +100,25 @@ const open = async () => {
     if (res) {
       pageData.tableData = res.records || []
       pageData.total = res.total
-      visible.value = true
     }
 
   } finally {
     pageData.tableConfiger.loading = false
   }
 }
+const open = async () => {
+  await getList()
+  visible.value = true
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageNum = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
 
 const handleClose = () => {
   selectList.value = []