From 5e78e0029b0bd0146a387778b0e525c4ea0c2ed4 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 18 Nov 2025 17:16:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=B7=AE=E6=8A=A5=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/away/index.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/away/index.vue b/src/views/away/index.vue
index 1b0c142..a35b668 100644
--- a/src/views/away/index.vue
+++ b/src/views/away/index.vue
@@ -310,6 +310,12 @@ export default {
     MultiExamineList
   },
   data() {
+    // {
+                    //   ((this.$moment().diff(this.$moment(row.end_date), 'days') <= 30) || (row.FLOWSTATUS.expense.getStatus() === 1))
+                    //     ? (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.expense.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.expense.getStatus()) || '待申请' }</span>)
+                    //     : (<span style='color: red'>超时未办理</span>)
+                    // }
+                    // <br/>
     return {
       flowConfig: [],
       isShowOaModal: false,
@@ -428,12 +434,6 @@ export default {
               customFn: row => {
                 return (
                   <div>
-                    {
-                      ((this.$moment().diff(this.$moment(row.end_date), 'days') <= 30) || (row.FLOWSTATUS.expense.getStatus() === 1))
-                        ? (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.expense.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.expense.getStatus()) || '待申请' }</span>)
-                        : (<span style='color: red'>超时未办理</span>)
-                    }
-                    <br/>
                     {
                       (row.FLOWSTATUS.expense.getStatus() !== 2 && row.FLOWSTATUS.expense.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => {
                         this.toOaDetail('expense', row)
@@ -565,8 +565,9 @@ export default {
       }
     },
     isAuthCanExpense() {
+    // (this.$moment().diff(this.$moment(row.end_date), 'days') > 30) && 
       return function(row) {
-        return (this.$moment().diff(this.$moment(row.end_date), 'days') > 30) && this.$store.state.user.adminId === 1 && !row.can_expenses
+        return this.$store.state.user.adminId === 1 && !row.can_expenses
       }
     }
   },
@@ -780,7 +781,8 @@ export default {
           flowStatus.away.setExecutable(true)
         }
         flowStatus.expense.setStatus(chuchaibaoxiao?.flow_status ?? 2)
-        if (chuchai?.flow_status === 1 && (!chuchaibaoxiao || chuchaibaoxiao.flow_stauts === 2) && (this.$moment().diff(this.$moment(item.end_date), 'days') <= 30 || item.can_expenses)) {
+        // && (this.$moment().diff(this.$moment(item.end_date), 'days') <= 30 || item.can_expenses)
+        if (chuchai?.flow_status === 1 && (!chuchaibaoxiao || chuchaibaoxiao.flow_stauts === 2)) {
           flowStatus.expense.setExecutable(true)
         }