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

src/view/person/rwTable.vue

@@ -491,7 +491,7 @@ const routers = useRoute();
 const chooseTitle = ref(1);
 const visible = ref(false); //提示确认框
 const nonCompliance = ref(""); //不符合原因
-const chooseBfh = ref(0);//提示确认框显示
+const chooseBfh = ref(0); //提示确认框显示
 const search1 = reactive({
   name: "",
   date: "",
@@ -618,7 +618,7 @@ const columnsList = reactive({
         title: "新增低保人员",
         id: 4,
         col: "columns4",
-        url: "",
+        url: "/api/ggfwyth/pg/zcdbry",
       },
       {
         title: "退出低保人员",
@@ -782,23 +782,23 @@ const columnsList = reactive({
       },
       {
         label: "姓名",
-        property: "ahap0016",
+        property: "xm",
         width: "70",
         fixed: "left",
       },
       {
         label: "身份证",
-        property: "ahap0015",
+        property: "sfzhm",
         width: "170",
       },
       {
         label: "低保证号",
-        property: "ahax0003",
+        property: "jzzh",
         width: "210",
       },
       {
         label: "联系电话",
-        property: "azdf0011",
+        property: "sjhm",
         width: "170",
       },
       {
@@ -817,7 +817,7 @@ const columnsList = reactive({
       },
       {
         label: "救助日期",
-        property: "bhax0033",
+        property: "jzrq",
         width: "100",
       },
     ],
@@ -924,9 +924,9 @@ const onTypel = (val) => {
   chooseTitle.value = val.id;
   data.columns = columnsList["最低生活保障"][val.col];
   data.url = val.url;
-  // data.pagination[val.id].current = 1;
-  // data.pagination2.total = 0;
-  // data.pagination2.current = 1;
+  search1.name = ""
+  search1.date = ""
+  search1.date1 = ""
   if (val.id == 1) {
     data.tableData1 = [];
     personDetails();
@@ -938,7 +938,7 @@ const onTypel = (val) => {
     getRegisteredDB();
   } else if (val.id == 4) {
     data.tableData4 = [];
-    // getRegisteredDB();
+    getRegisteredDB();
   } else if (val.id == 5) {
     data.tableData5 = [];
     getRegisteredDB();
@@ -1001,7 +1001,7 @@ const getRegisteredDB = () => {
     .then((res) => {
       if (res.code == 200) {
         const { value } = chooseTitle;
-        if ([2, 3, 5].includes(value)) {
+        if ([2, 3, 4, 5].includes(value)) {
           console.log(value);
           data[`tableData${value}`] = res.data;
           data[`pagination${value}`].total = res.count; // 动态获取 total

src/view/sy_table.vue

@@ -75,17 +75,17 @@
               />
               <el-table-column
                 prop="targetValue2"
-                label="半年度预计 完成值"
+                label="目前完成值(县)"
                 align="center"
               />
               <el-table-column
                 prop="targetValue3"
-                label="半年度预计   全市排名"
+                label="省、市排名"
                 align="center"
               />
               <el-table-column
                 prop="targetValue4"
-                label="是否已达年度 目标"
+                label="指标情况"
                 align="center"
               />
               <el-table-column