Merge remote-tracking branch 'origin/master'

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;

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)) {
+      if (this.$isBlank(this.inputQuery.invoiceDate)) {
-        this.$message.error("备注不能为空！");
+        this.$message.error("日期不能为空！");
         return;
       }
       this.inputQuery.list = this.invoiceRow;

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();