Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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退回到已开票中" },
   ],
 };
 

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="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="directReopen" v-if="row.state===9"> 报废重开(红冲) </el-button>
           </template>
         </span>
       </template>