From 39d230ee2f4a2c731b3301f9ca811014686b4088 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sat, 7 Oct 2023 11:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=8A=A1=E5=AE=A1=E6=A0=B8&=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E5=AE=A1=E6=A0=B8=E6=B7=BB=E5=8A=A0=E7=BA=A2=E5=86=B2?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=9B=E5=8F=91=E7=A5=A8=E9=87=8D=E5=BC=80?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                                                      | 2 +-
 .../host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js  | 1 +
 .../SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ead5bf60..4b349dac 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: docker
-name: linux-amd64
+name: 北汽模塑结算项目
 
 platform:
   arch: amd64
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 75cdef8b..2d592780 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
@@ -18,6 +18,7 @@ const stateOptions = [
   { value: 6, label: "扣减进行中" },
   { value: 7, label: "撤销扣减进行中" },
   { value: 8, label: "已提交QAD" },
+  { value: 9, label: "红冲" },
 ];
 const state = { title: "状态", type: "number", input: "select", options: stateOptions };
 const state2 = Object.assign(Object.assign({}, state), {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
index a81d3104..53c0539d 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
@@ -49,7 +49,7 @@ export default {
       <template #footer>
         <span class="dialog-footer">
           <el-button type="primary" @click="show=false"> 返回 </el-button>
-          <el-button type="primary" @click="showSetupDialog" v-if="isBusiness&&data.invbillNum&&model.adJ_DETAIL.length===0&&row.invoiceState===1&&(row.state===3||row.state===4)">
+          <el-button type="primary" @click="showSetupDialog" v-if="isBusiness&&data.invbillNum&&model.adJ_DETAIL.length===0&&row.invoiceState===1&&(row.state===3||row.state===9)">
             报废重开
           </el-button>
         </span>