Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/dialog/dialog.vue

@@ -115,7 +115,12 @@ watch(
     data.columns = props.columns;
   }
 );
-
+watch(
+ () => props.tableData,
+(newVal, oldVal) => {
+ data.tableData = props.tableData;
+ }
+);
 // 使用生命钩子
 onMounted(() => {
   dialogShow.value = props.dialogShow;

src/view/sy.vue

@@ -161,15 +161,24 @@
       <div class="flex1" style="margin-top: 10px">
         <div class="yd_title left_3"></div>
         <div class="left_3_1">
-          <div class="left_3_1_item" @click="showDialog('就业培训')">
+          <div
+            class="left_3_1_item"
+            @click="showDialog('就业培训', '/api/ggfwyth/jypxList')"
+          >
             <div>{{ data.employmentService.jypx }}</div>
             <div>就业培训</div>
           </div>
-          <div class="left_3_1_item" @click="showDialog('就业见习服务')">
+          <div
+            class="left_3_1_item"
+            @click="showDialog('就业见习服务', '/api/ggfwyth/jyjxfwList')"
+          >
             <div>{{ data.employmentService.jyjxfw }}</div>
             <div>就业见习服务</div>
           </div>
-          <div class="left_3_1_item" @click="showDialog('就业援助')">
+          <div
+            class="left_3_1_item"
+            @click="showDialog('就业援助', '/api/ggfwyth/jyyzList')"
+          >
             <div>{{ data.employmentService.jyyz }}</div>
             <div>就业援助</div>
           </div>
@@ -434,8 +443,19 @@
       @close="close"
       @handle="handlePagination"
     >
-      <template #yxstatus="{ currentCol, currentData }">
+      <template #pxkssj="{ currentCol, currentData }">
-        <div>-------------</div>
+        <div>
+          {{ currentData.pxkssj.slice(0, 4) }}-{{
+            currentData.pxkssj.slice(4, 6)
+          }}-{{ currentData.pxkssj.slice(6, 8) }}
+        </div>
+      </template>
+      <template #pxjssj="{ currentCol, currentData }">
+        <div>
+          {{ currentData.pxjssj.slice(0, 4) }}-{{
+            currentData.pxjssj.slice(4, 6)
+          }}-{{ currentData.pxjssj.slice(6, 8) }}
+        </div>
       </template>
     </Dialog>
   </div>
@@ -472,209 +492,138 @@ const columnss = reactive({
   就业培训: [
     {
       label: "姓名",
-      property: "name",
+      property: "xm",
     },
     {
       label: "单位",
-      property: "name",
+      property: "szdw",
     },
     {
       label: "职业",
-      property: "name",
+      property: "zy",
     },
     {
       label: "承办机构",
-      property: "name",
+      property: "pxcbjg",
     },
     {
       label: "培训班名称",
-      property: "name",
+      property: "pxbmc",
     },
     {
       label: "培训开始时间",
-      property: "name",
+      property: "pxkssj",
+      type: "slot",
     },
     {
       label: "培训结束时间",
-      property: "name",
+      property: "pxjssj",
+      type: "slot",
     },
   ],
   就业见习服务: [
     {
       label: "见习岗位名称",
-      property: "name",
+      property: "jxgwmc",
-      width: "150",
     },
     {
       label: "单位名称",
-      property: "name",
+      property: "dwmc",
-      width: "150",
     },
     {
       label: "岗位类型",
-      property: "name",
+      property: "gwlx",
-      width: "150",
     },
     {
       label: "接受人数",
-      property: "name",
+      property: "kjsrs",
-      width: "150",
     },
     {
       label: "见习地点",
-      property: "name",
+      property: "jxszd",
-      width: "150",
     },
     {
       label: "见习月数",
-      property: "name",
+      property: "njxys",
-      width: "150",
     },
     {
       label: "学历要求",
-      property: "name",
+      property: "xlyq",
-      width: "150",
     },
     {
       label: "专业",
-      property: "name",
+      property: "zy",
-      width: "150",
     },
     {
       label: "有效状态",
-      property: "yxstatus",
+      property: "yxzt",
-      type: "slot",
     },
   ],
   就业援助: [
     {
       label: "姓名",
-      property: "name",
+      property: "xm",
-      width: "150",
     },
     {
       label: "人员类别",
-      property: "name",
+      property: "rylb",
-      width: "150",
     },
     {
       label: "就失业状态",
-      property: "name",
+      property: "jsyzt",
-      width: "150",
     },
     {
       label: "优先指数",
-      property: "name",
+      property: "yxzs",
-      width: "150",
     },
     {
       label: "是否已帮扶",
-      property: "name",
+      property: "sfybf",
-      width: "150",
     },
     {
       label: "失业登记时间",
-      property: "name",
+      property: "sydjsj",
-      width: "150",
     },
     {
       label: "失业登记管辖地",
-      property: "name",
+      property: "sydjgxd",
-      width: "150",
     },
     {
       label: "户籍地",
-      property: "name",
+      property: "hjd",
     },
     {
       label: "居住地",
-      property: "name",
+      property: "jzd",
     },
     {
       label: "帮扶时间",
-      property: "name",
+      property: "bfsj",
     },
   ],
 });
 const tableType = reactive({
+  url: "",
   title: "",
   columns: [],
-  data: [
+  data: [],
-    {
-      date: "2016-05-02",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-04",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-01",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-03",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-  ],
-});
-const tabledata = reactive({
-  就业培训: [
-    {
-      date: "2016-05-02",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-04",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-  ],
-  就业见习服务: [
-    {
-      date: "2016-05-02",
-      name: "张三",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-04",
-      name: "李四",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-  ],
-  就业援助: [
-    {
-      date: "2016-05-02",
-      name: "1",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-04",
-      name: "2",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-  ],
 });
 // 表格分页
 const pagination = reactive({
   total: 100,
-  pageSize: 20,
+  pageSize: 10,
   currentPage: 1,
 });
 const handlePagination = (current) => {
-  console.log(current);
+  pagination.currentPage = current;
+  getTable(tableType.url, pagination.currentPage);
 };
-const showDialog = (title) => {
+const showDialog = (title, url) => {
-  dialogShow.value = true;
   tableType.title = title;
-  tableType.data = tabledata[title];
+  tableType.url = url;
   tableType.columns = columnss[title];
   pagination.currentPage = 1;
+  getTable(url, pagination.currentPage);
 };
 
 const close = () => {
@@ -1175,6 +1124,18 @@ const getData = async () => {
     }
   });
 };
+//获取表格数据
+const getTable = (url, currentPage) => {
+  http
+    .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
+    .then((res) => {
+      if (res.code == 200) {
+        tableType.data = res.data;
+        pagination.total = res.count;
+        dialogShow.value = true;
+      }
+    });
+};
 onBeforeMount(async () => {
   getData();
 });
@@ -2187,7 +2148,6 @@ onBeforeMount(async () => {
   }
 }
 
-
 ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td {
   background-color: #2f4b74;
 }