Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/person/rwTable.vue

@@ -26,7 +26,27 @@
         }"
       >
         <template v-for="item in data.columns">
+          <el-table-column :label="item.label" v-if="item.type == 'slot'">
+            <template #default="scope">
+              <el-button
+                size="small"
+                color="#2c40ea"
+                @click="handleEdit(scope.$index, scope.row)"
+              >
+                完成
+              </el-button>
+              <el-popconfirm
+                title="是否确定该人员不符合要求?"
+                @confirm="confirmEvent(scope.$index, scope.row)"
+              >
+                <template #reference>
+                  <el-button size="small" type="warning"> 不符合 </el-button>
+                </template>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
           <el-table-column
+            v-else
             :prop="item.property"
             :label="item.label"
             :width="item.width"
@@ -41,7 +61,26 @@
         <el-table-column prop="xzjd" label="乡镇(街道)" width="100" />
         <el-table-column prop="csq" label="村社" width="100" />
         <el-table-column prop="dz" label="地址" />
-        <el-table-column prop="jzrq" label="救助日期" width="100" /> -->
+        <el-table-column prop="jzrq" label="救助日期" width="100" />
+        <el-table-column label="操作">
+          <template #default="scope">
+            <el-button
+              size="small"
+              color="#2c40ea"
+              @click="handleEdit(scope.$index, scope.row)"
+            >
+              完成
+            </el-button>
+            <el-popconfirm
+              title="是否确定该人员不符合要求?"
+              @confirm="confirmEvent(scope.$index, scope.row)"
+            >
+              <template #reference>
+                <el-button size="small" type="warning"> 不符合 </el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="pagePart">
         <el-pagination
@@ -103,7 +142,7 @@
             :width="item.width"
               :fixed="item.fixed"
           />
-        </template>
+        </template>-->
         <!-- <el-table-column prop="index" label="序号" width="60" />
         <el-table-column prop="xm" label="姓名" width="70" />
         <el-table-column prop="sfzhm" label="身份证" width="110" />
@@ -336,7 +375,7 @@
         <!-- <el-table-column prop="ahax0004" label="申请救助" width="170" /> -->
         <!-- <el-table-column prop="ahax0011" label="银行账号" width="170" /> -->
         <!-- <el-table-column prop="azdf0005" label="家庭总人口" width="100" /> -->
-<!-- <el-table-column prop="bhax0003" label="用电户号" width="170" /> -->
+        <!-- <el-table-column prop="bhax0003" label="用电户号" width="170" /> -->
         <!-- <el-table-column prop="bhax0004" label="减免地址" width="170" /> -->
         <!-- <el-table-column prop="bhax0005" label="人员类别" width="170" /> -->
         <!-- <el-table-column prop="bhax0008" label="致贫原因" width="170" /> -->
@@ -356,7 +395,6 @@
         <el-table-column prop="dz" label="地址" />
         
         <el-table-column prop="bhax0033" label="救助日期" width="170" /> -->
-     
       </el-table>
       <div class="pagePart">
         <el-pagination
@@ -420,7 +458,7 @@ const data = reactive({
   code: "",
   xh: "",
   bm: "",
-  url:"",
+  url: "",
   pagination: {
     current: 1,
     pageSize: 20,
@@ -474,32 +512,32 @@ const columnsList = reactive({
       {
         title: "服务项目(未完成)",
         id: 1,
-        col:'columns',
-        url:'/api/ggfwyth/pg/wxsbmRyxx'
+        col: "columns",
+        url: "/api/ggfwyth/pg/wxsbmRyxx",
       },
       {
         title: "在册低保户",
         id: 2,
-        col:'columns',
-         url:'/api/ggfwyth/pg/wxsbmRyxx'
+        col: "columns",
+        url: "/api/ggfwyth/pg/wxsbmRyxx",
       },
       {
         title: "在册低保人员",
         id: 3,
-        col:'columns2',
-        url:'/api/ggfwyth/pg/zcdbry'
+        col: "columns2",
+        url: "/api/ggfwyth/pg/zcdbry",
       },
       {
         title: "新增低保人员",
         id: 4,
-        col:'columns',
-         url:'/api/ggfwyth/pg/wxsbmRyxx'
+        col: "columns",
+        url: "/api/ggfwyth/pg/wxsbmRyxx",
       },
       {
         title: "退出低保人员",
         id: 5,
-        col:'columns',
-         url:'/api/ggfwyth/pg/wxsbmRyxx'
+        col: "columns",
+        url: "/api/ggfwyth/pg/wxsbmRyxx",
       },
     ],
     columns: [
@@ -507,19 +545,18 @@ const columnsList = reactive({
         label: "序号",
         property: "index",
         width: "60",
-        fixed:'left'
+        fixed: "left",
       },
       {
         label: "姓名",
         property: "xm",
         width: "70",
-       fixed:'left'
+        fixed: "left",
       },
       {
         label: "身份证",
         property: "sfzhm",
         width: "170",
-       
       },
       {
         label: "低保证号",
@@ -550,25 +587,30 @@ const columnsList = reactive({
         property: "jzrq",
         width: "100",
       },
+      {
+        label: "操作",
+        property: "cz",
+        type: "slot",
+        width: "160",
+      },
     ],
     columns2: [
       {
         label: "序号",
         property: "index",
         width: "60",
-        fixed:'left'
+        fixed: "left",
       },
       {
         label: "姓名",
         property: "ahap0016",
         width: "70",
-        fixed:'left'
+        fixed: "left",
       },
       {
         label: "身份证",
         property: "ahap0015",
         width: "170",
-       
       },
       {
         label: "低保证号",
@@ -606,7 +648,7 @@ const columnsList = reactive({
       {
         title: "服务项目(未完成)",
         id: 1,
-        col:'columns',
+        col: "columns",
       },
     ],
     columns: [
@@ -659,7 +701,6 @@ const throttle = (func, limit) => {
 };
 
 const searchT = (val) => {
-  // console.log(val);
   if (val == "name") {
     getRegisteredDB();
   } else {
@@ -674,23 +715,23 @@ const searchT = (val) => {
 };
 
 const searchT1 = (val) => {
-  // console.log(val);
   // if (val == "name") {
   //   getRegisteredDB();
   // } else {
   //   if (search1.date == null) {
   //     throttle(getDate, 50);
   //   } else {
-  //     console.log(search);
   //   }
   // }
 };
 const onTypel = (val) => {
+  console.log(val);
+
   //切换时，直接更换表头和url,重置分页器
   chooseTitle.value = val.id;
-  data.columns=columnsList['最低生活保障'][val.col];
-  data.url=val.url;
-  data.pagination.current=1;
+  data.columns = columnsList["最低生活保障"][val.col];
+  data.url = val.url;
+  data.pagination.current = 1;
   if (val.id == 1) {
     personDetails();
   } else if (val.id == 3) {
@@ -707,6 +748,15 @@ const onTypel = (val) => {
 const getDate = () => {
   console.log("未选择时间");
 };
+// 表格操作
+const handleEdit = (index, row) => {
+  console.log(index, row);
+};
+// const handleDelete = (index, row) => {
+// };
+const confirmEvent = (index, row) => {
+  console.log(index, row);
+};
 
 const getRegisteredDB = () => {
   http
@@ -715,7 +765,6 @@ const getRegisteredDB = () => {
     )
     .then((res) => {
       if (res.code == 200) {
-        // console.log(res.data);
         data.tableData1 = res.data;
         data.pagination.total = res.count;
         const currentPage = data.pagination.current; // 当前页数
@@ -736,9 +785,6 @@ const getRegisteredDB = () => {
         ElMessage.warning({
           message: res.message,
         });
-        // router.replace({
-        //   path: "/error/403",
-        // });
       }
     });
 };
@@ -749,18 +795,15 @@ const personDetails = () => {
     )
     .then((res) => {
       if (res.code == 200) {
-        // console.log(res.data);
         data.tableData = res.data;
         data.pagination.total = res.count;
-
         const currentPage = data.pagination.current; // 当前页数
         const pageSize = data.pagination.pageSize; // 每页显示的条数
         // 为每条数据添加 index 属性，叠加当前页的偏移量
         res.data.forEach((item, index) => {
           item.index = index + 1 + (currentPage - 1) * pageSize;
         });
-        console.log(2222222222,data.tableData);
-        
+        // console.log(2222222222, data.tableData);
       } else {
         ElMessage.warning({
           message: res.message,
@@ -783,9 +826,10 @@ onMounted(() => {
   //   data.tableData = JSON.parse(routers.query.personDetails);
   data.xh = routers.query.xh;
   data.bm = routers.query.bm;
-  data.columns=columnsList['最低生活保障'][columnsList['最低生活保障'].titleList[0].col];
-  data.url=columnsList['最低生活保障'].titleList[0].url;
-  titleList=columnsList['最低生活保障'].titleList;
+  data.columns =
+    columnsList["最低生活保障"][columnsList["最低生活保障"].titleList[0].col];
+  data.url = columnsList["最低生活保障"].titleList[0].url;
+  titleList = columnsList["最低生活保障"].titleList;
   personDetails();
 });
 </script>

src/view/table_gk/gk_lysd.vue

@@ -146,7 +146,7 @@ const data = reactive({
   list2: {}, // 失业保险概况
   employmentList: [
     {
-      name: "2024年发布人力资源供求信息",
+      name: "人力资源供求信息",
       value: "0",
       img: jy1,
       dw: "次",