更新

src/views/Training/trainingCompanyNjsp/index.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="titleBox">
       <PageTitle title="年检签到">
-        <el-button type="primary" @click="onBatchAudit">新增</el-button>
+        <el-button type="primary" @click="onBatchAudit('add',null)">新增</el-button>
       </PageTitle>
     </div>
     <!-- 搜索 -->
@@ -19,8 +19,8 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" link @click="addEdit('RefSteap', row)">审核流程</el-link>
-          <el-link type="primary" link @click="addEdit('detail', row)">详情</el-link>
+          <el-link type="primary" link @click="dendDep(row)">上报分局</el-link>
+          <el-link type="primary" link @click="onBatchAudit('detail', row)">详情</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -29,9 +29,7 @@
       }"></Pages>
     </div>
     <!-- 新增 -->
-    <AddForm ref="addFormRef"></AddForm>
-    <!-- 详情 -->
-    <DetailForm ref="detailDiloag" :dict="{D_BZ_SF}"/>
+    <AddForm ref="addFormRef" @refresh="getList" :dic="{D_BZ_WHCD}"></AddForm>
     <!-- 审核流程 -->
     <Steps ref="RefSteap" ></Steps>
   </div>
@@ -43,15 +41,13 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import AddForm from "./components/addForm.vue";
-import DetailForm from "./components/detailForm.vue";
 import Steps from "./components/steps.vue";
 import {getItem} from '@/utils/storage.js'
 import { qcckPost } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 import { ElMessage } from "element-plus";
 const { proxy } = getCurrentInstance();
-const { D_BA_SHZT,D_BA_SPZT } = proxy.$dict("D_BA_SHZT",'D_BA_SPZT');
-const detailDiloag = ref();
+const { D_BZ_WHCD,D_BA_SPZT } = proxy.$dict("D_BZ_WHCD",'D_BA_SPZT');
 const RefSteap = ref();
 const addFormRef = ref();
 const shForm = ref();
@@ -60,7 +56,7 @@ const selectedRows = ref([]);
 const searchConfiger = ref([
   {
     label: "培训项目名称",
-    prop: "pxxm",
+    prop: "pxxmmc",
     showType: "input"
   },
   {
@@ -85,25 +81,27 @@ const pageData = reactive({
   },
   controlsWidth: 180,
   tableColumn: [
-    { label: "培训项目名称", prop: "ssbakk",showOverflowTooltip: true },
-    { label: "培训地址", prop: "sptzCompanyName", showOverflowTooltip: true },
-    { label: "培训开始时间", prop: "njnf"},
-    { label: "培训结束时间", prop: "xm" },
-    { label: "组织单位", prop: "sfzhm",showOverflowTooltip: true },
-    { label: "培训内容", prop: "dh" },
-    { label: "培训人员", prop: "whcd" },
-    { label: "已签到人员", prop: "zsbh", showOverflowTooltip: true },
-    { label: "未签到人员", prop: "fwxymc" },
+    { label: "培训项目名称", prop: "pxxmmc",showOverflowTooltip: true },
+    { label: "培训地址", prop: "zzdw", showOverflowTooltip: true },
+    { label: "培训开始时间", prop: "pxkssj"},
+    { label: "培训结束时间", prop: "pxjssj" },
+    { label: "组织单位", prop: "zzdw",showOverflowTooltip: true },
+    { label: "培训内容", prop: "pxnr" },
+    { label: "培训人员", prop: "totalPersonCount" },
+    { label: "已签到人员", prop: "checkedInPersonCount", showOverflowTooltip: true },
+    { label: "未签到人员", prop: "notCheckedInPersonCount" },
     { label: "是否上报分县局", prop: "rzsj" },
   ]
 });
 onMounted(() => {
-  // getList();
+  getList();
   tabHeightFn();
 });
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
+  queryFrom.value.pxkssjStart = val.pxsj ? val.pxsj[0]:'';
+  queryFrom.value.pxkssjEnd = val.pxsj ? val.pxsj[1]:'';
   pageData.pageConfiger.pageNum = 1;
   getList();
 };
@@ -122,10 +120,11 @@ const getList = () => {
     ...pageData.pageConfiger,
     ...queryFrom.value,
   }
-  qcckPost(promes,'/mosty-base/bans/njxx/listForSendTraining').then((res) => {
+  delete promes.pxsj;
+  qcckPost(promes,'/mosty-base/bans/pxqd-item/page').then((res) => {
     pageData.tableData = res.records || []
     pageData.total = res.total;
-     pageData.tableConfiger.loading = false;
+    pageData.tableConfiger.loading = false;
   }).catch((err) => {
      pageData.tableConfiger.loading = false;
   })
@@ -135,23 +134,14 @@ const chooseData = (rows) => {
   selectedRows.value = Array.isArray(rows) ? rows : [];
 };
 
-const onBatchAudit = () => {
-  addFormRef.value.init();
+const onBatchAudit = (type, row) => {
+  addFormRef.value.init(type, row);
 };
 
 
 // 详情
-const addEdit = (type, row) => {
-  nextTick(() => {
-    if(type == 'RefSteap'){
-      RefSteap.value.init(row);
-    }else if(type == 'shForm'){
-      shForm.value.init(row);
-    }
-    else{
-      detailDiloag.value.init(type, row);
-    }
-  })
+const dendDep = (row) => {
+  RefSteap.value.init(row);
 };