Explorar o código

Merge remote-tracking branch 'origin/stable' into stable

xuzhancheng hai 1 día
pai
achega
517e947f4e

+ 5 - 5
yudao-ui-admin-vue3/src/views/pressure2/expenseReminderManagement/index.vue

@@ -329,7 +329,7 @@ const columns = ref<SmartTableColumn[]>([
     width: '50px',
     fieldProps: {
       align: 'center',
-      selectable: (row: Recordable) => row.paymentStatus === 0 && row.payerContact
+      selectable: (row: Recordable) => row.noTaxPaymentStatus === 0 && row.payerContact
     }
   },
   {
@@ -343,7 +343,7 @@ const columns = ref<SmartTableColumn[]>([
     render: (row, _value) => {
       return (
         <>
-          {row.paymentStatus === 0 && (
+          {row.noTaxPaymentStatus === 0 && (
             <>
               <el-button type="primary" link onClick={() => handleReminder(row)}>
                 催缴
@@ -361,7 +361,7 @@ const columns = ref<SmartTableColumn[]>([
     }
   },
   {
-    prop: 'paymentStatus',
+    prop: 'noTaxPaymentStatus',
     label: '结算状态',
     fieldProps: {
       align: 'center',
@@ -758,7 +758,7 @@ const notPaymentStatusNum = computed(() => {
   }, 0)
 })
 const getNotPaymentStatus = () => {
-  FetchApis.getList({ paymentStatus: 0, feeType: 100 }).then((res) => {
+  FetchApis.getList({ noTaxPaymentStatus: 0, feeType: 100 }).then((res) => {
     notPaymentStatusCount.value = res.total || 0
   })
 }
@@ -1112,7 +1112,7 @@ onMounted(() => {
   smartTableRef.value?.setSearchForm(searchFormData.value)
   const routerQuery = route.query || {}
   if(Object.entries(routerQuery).length){
-    smartTableRef.value?.setSearchForm({ paymentStatus: 0, ...routerQuery })
+    smartTableRef.value?.setSearchForm({ noTaxPaymentStatus: 0, ...routerQuery })
   }
   getList()
 })