Merge branch 'dev_20241202_xukangle' into develop

@@ -339,7 +339,7 @@ onMounted(() => {
         </template>
         </template>
         <template #default="scope" v-else-if="item.type == 'text_btn'">
         <template #default="scope" v-else-if="item.type == 'text_btn'">
           <span v-if="scope.row[item.field] != null" :class="[
           <span v-if="scope.row[item.field] != null" :class="[
-            (item.getName(scope) === '--' || item.getName(scope) === null) ? '' : 'text_btn',
+            (item.getName?.(scope) === '--' || item.getName?.(scope) === null) ? '' : 'text_btn',
             item.class,
             item.class,
             scope.row.cellClass,
             scope.row.cellClass,
           ]"
           ]"
@@ -375,7 +375,7 @@ onMounted(() => {
         <template #default="scope" v-else-if="item.type == 'approveTag'">
         <template #default="scope" v-else-if="item.type == 'approveTag'">
           <el-tag v-if="scope.row[item.field]" :type="tagType(scope.row.approveVO, 'approveState')">{{
           <el-tag v-if="scope.row[item.field]" :type="tagType(scope.row.approveVO, 'approveState')">{{
             tagMethod(scope.row.approveVO, 'approveState')
             tagMethod(scope.row.approveVO, 'approveState')
-          }}</el-tag>
+            }}</el-tag>
           <span v-else>{{ '--' }}</span>
           <span v-else>{{ '--' }}</span>
         </template>
         </template>
         <template #default="scope" v-else-if="item.type == 'tooltip'">
         <template #default="scope" v-else-if="item.type == 'tooltip'">

@@ -271,10 +271,12 @@ const tableSwitchChange = (val, scope, field) => {
           message: res.msg,
           message: res.msg,
         });
         });
         getTableData();
         getTableData();
+        getListingCountData();
         reject(false)
         reject(false)
       }
       }
     }).catch(() => {
     }).catch(() => {
       getTableData();
       getTableData();
+      getListingCountData();
       reject(false)
       reject(false)
     })
     })
   })
   })
@@ -334,6 +336,7 @@ const tableBtnClick = (scope, btn) => {
         if (res.code == '00000') {
         if (res.code == '00000') {
           ElMessage.success('删除成功')
           ElMessage.success('删除成功')
           getTableData();
           getTableData();
+          getListingCountData();
         } else {
         } else {
           ElMessage.error(res.msg)
           ElMessage.error(res.msg)
         }
         }
@@ -356,6 +359,7 @@ const tableBtnClick = (scope, btn) => {
         if (res.code == '00000') {
         if (res.code == '00000') {
           ElMessage.success('撤销成功！')
           ElMessage.success('撤销成功！')
           getTableData();
           getTableData();
+          getListingCountData();
         } else {
         } else {
           ElMessage.error(res.msg)
           ElMessage.error(res.msg)
         }
         }
@@ -554,6 +558,7 @@ const passSubmit = () => {
           ElMessage.success('审批通过！')
           ElMessage.success('审批通过！')
           dialogVisible.value = false;
           dialogVisible.value = false;
           getTableData();
           getTableData();
+          getListingCountData();
         } else {
         } else {
           ElMessage.error(res.msg)
           ElMessage.error(res.msg)
         }
         }
@@ -605,6 +610,7 @@ const rejectSubmit = async () => {
           ElMessage.success('驳回成功！')
           ElMessage.success('驳回成功！')
           dialogVisible.value = false;
           dialogVisible.value = false;
           getTableData();
           getTableData();
+          getListingCountData();
         } else {
         } else {
           ElMessage.error(res.msg)
           ElMessage.error(res.msg)
         }
         }