From fd4af566a4e2ed97ea9f9c4cc0e920136086e9a5 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Mon, 8 May 2023 11:37:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E5=90=8E=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 86a9ce2..36ce51b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -98,7 +98,7 @@ service.interceptors.response.use(res => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
             Cookies.remove()
-            location.href = process.env.VUE_APP_CONTEXT_PATH + "index";       
+            location.href = process.env.VUE_APP_CONTEXT_PATH;       
           })
         }).catch(() => {
           isRelogin.show = false;

From 229e79d1e74b52f548367618635126761c71f786 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 8 May 2023 13:03:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=91=E7=A5=A8=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceCkeck.vue        | 8 ++++----
 src/views/inout/InvoiceRegistration.vue | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index aef041a..5abd0bf 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -349,7 +349,7 @@ export default {
           { required: true, message: "请输入发票编码", trigger: "blur" },
         ],
         price: [{ required: true, message: "请输入发票价格", trigger: "blur" }],
-        remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
+        invoiceDate: [{ required: true, message: "请输入备注", trigger: "blur" }],
       },
       certFileUrl: "",
       Upinvoice: false,
@@ -473,7 +473,7 @@ export default {
   components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
   methods: {
     onSubmit() {
-      if (this.invoiceRow.length == 0) {
+      if (this.invoiceRow == null) {
         this.$message.error("请选择要登记的物资! ");
         return false;
       }
@@ -493,8 +493,8 @@ export default {
         this.$message.error("发票价格不能为空！");
         return;
       }
-      if (this.$isBlank(this.inputQuery.remark)) {
-        this.$message.error("备注不能为空！");
+      if (this.$isBlank(this.inputQuery.invoiceDate)) {
+        this.$message.error("日期不能为空！");
         return;
       }
       this.inputQuery.list = this.invoiceRow;
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 3702053..8840a96 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -196,7 +196,7 @@
         </el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" :disabled="scope.row.checkStatus==1" size="small" @click.native.stop="determine(scope.row)">确认</el-button>
+            <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small" @click.native.stop="determine(scope.row)">确认</el-button>
             <el-button
               type="text"
               size="small"
@@ -547,6 +547,7 @@ export default {
   name: "IoCheckSuccessOrder",
   data() {
     return {
+      savebillno:null,
       invoiceRow:[],
       inputInv:[],
       checkInvoice:false,
@@ -726,11 +727,16 @@ export default {
       this.getList();
     },
     InvoiceRegister1(row){
+      this.savebillno=row.billNo
       this.inputInv=row;
       this.checkInvoice=true;
     },
     closecheckInvoice(){
       this.checkInvoice=false;
+      this.getList();
+      this.currentRow.billNo=this.savebillno;
+      this.bizQuery.orderIdFk=this.savebillno;
+      this.codeQuery.orderIdFk=this.savebillno;
       this.getCodeDetailList();
       this.getBizDetailListInv();