From c9f2dde9d5d645b753b4ec377388e9953376b9e9 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 26 Jun 2024 10:01:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SettleAccount.HttpApi.Host/wwwroot/models/_options.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
index 9546252f..eb469bfa 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
@@ -23,7 +23,7 @@ const stateOptions = [
   { value: 11, label: "扣减单生成中" },
   { value: 12, label: "发票同步中" },
   { value: 13, label: "可结退回不可结同步中" },
-  { value: 14, label: "提交QAD退回到财务审核中" },
+  { value: 14, label: "提交QAD退回到已开票中" },
 ];
 const state = { title: "状态", type: "number", input: "select", options: stateOptions };
 const state2 = Object.assign(Object.assign({}, state), {
@@ -212,7 +212,7 @@ const invState = {
     { value: 11, label: "扣减单生成中" },
     { value: 12, label: "发票同步中" },
     { value: 13, label: "可结退回不可结同步中" },
-    { value: 14, label: "提交QAD退回到财务审核中" },
+    { value: 14, label: "提交QAD退回到已开票中" },
   ],
 };
 

From bf2eafaf84fb31b51050defb162b68e322a391d1 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 26 Jun 2024 15:41:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E9=87=8D=E5=BC=80?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=87=8D=E6=96=B0=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js
index 8b81e2f3..a2cbc734 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js
@@ -51,8 +51,8 @@ export default {
         <span class="dialog-footer">
           <el-button type="primary" @click="show=false"> 返回 </el-button>
           <template v-if="isBusiness&&data.invbillNum&&model.adJ_DETAIL.length===0&&row.invoiceState===1">
-            <!-- <el-button type="primary" @click="showSetupDialog" v-if="row.state===3 || row.state===9"> 报废重开</el-button>
-            <el-button type="primary" @click="directReopen" v-if="row.state===9"> 报废重开(红冲) </el-button> -->
+            <el-button type="primary" @click="showSetupDialog" v-if="row.state===3 || row.state===9"> 报废重开</el-button>
+            <el-button type="primary" @click="directReopen" v-if="row.state===9"> 报废重开(红冲) </el-button>
           </template>
         </span>
       </template>