From fc09387617c1e33093687e305951462d62148e58 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 9 Jun 2023 09:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                         |  4 ++--
 src/views/inout/InvoiceCkeck.vue        | 11 +++++-----
 src/views/inout/InvoiceRegistration.vue | 27 +++++++++++++------------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/.env.production b/.env.production
index 864fdc9..d22932e 100644
--- a/.env.production
+++ b/.env.production
@@ -7,7 +7,7 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API =  'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
 
@@ -15,7 +15,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
-VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
 # 文明懂
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index fde0998..7c07973 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -342,7 +342,7 @@ export default {
 
       corpLoading: false,
       fromOptions: [],
-
+      invoiceLoading: false,
       formName: 1,
       formMap: {
         1: "发票登记",
@@ -525,6 +525,7 @@ export default {
     postInvoice() {
       insertInvoice(this.inputQuery)
         .then((response) => {
+          this.closeDialog();
           if (response.code === 20000) {
             this.statusCode = response.code;
             this.getOrderDetails();
@@ -536,10 +537,10 @@ export default {
           this.$message.error(response.message);
         });
 
-      // 加状态
-      updateorderBiz(this.inputQuery.list).then((res) => {
-        this.closeDialog();
-      });
+      // // 加状态
+      // updateorderBiz(this.inputQuery.list).then((res) => {
+      //   this.closeDialog();
+      // });
     },
 
     getInputFocus(event) {
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 66f2c8a..f97450e 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -142,15 +142,15 @@
                 :default-sort="defaultSort"
                 @sort-change="handleSortChange">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="登记状态" prop="checkStatus" width="100">
+        <el-table-column label="登记状态" prop="invoiceStatus" width="100">
           <template slot-scope="scope">
-            <el-tag type="danger" v-if="scope.row.allCout==0">
+            <el-tag type="danger" v-if="scope.row.invoiceStatus==0">
               未登记
             </el-tag>
-            <el-tag type="warning" v-if="scope.row.partCount>0 && scope.row.allCout>0">
+            <el-tag type="warning" v-if="scope.row.invoiceStatus==1 ">
               未全部登记
             </el-tag>
-            <el-tag type="success" v-if="scope.row.partCount == 0 && scope.row.allCout>0">
+            <el-tag type="success" v-if="scope.row.invoiceStatus == 2 ">
               全部登记
             </el-tag>
           </template>
@@ -164,11 +164,11 @@
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
                          sortable="custom"
-                         :sort-orders="['ascending', 'descending']"  >
+                         :sort-orders="['ascending', 'descending']">
         </el-table-column>
         <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip
                          sortable="custom"
-                         :sort-orders="['ascending', 'descending']" >
+                         :sort-orders="['ascending', 'descending']">
         </el-table-column>
 
         <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
@@ -340,7 +340,7 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
-        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+        <el-table v-loading="invoiceLoading" :data="bizDetailList" style="width: 100%" border
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
@@ -684,6 +684,7 @@ export default {
       bizTotal: 0,
       invTotal: 0,
       bizDetailLoading: false,
+      invoiceLoading: false,
       bizDetailList: [],
       codeQuery: {
         orderIdFk: null,
@@ -836,7 +837,7 @@ export default {
           deleteById(row)
             .then((response) => {
               if (response.code == 20000) {
-                if(response.data.length == 0){
+                if (response.data.length == 0) {
                   this.getList();
                 }
                 this.getBizDetailListInv(this.subRow);
@@ -972,7 +973,7 @@ export default {
           for (var i = 0; i < invlist1.length; i++) {
             if (invlist1[i].code == 1000000) {
               this.invList.push(invlist1[i]);
-              this.filterQuery.invCode=invlist1[i].code;
+              this.filterQuery.invCode = invlist1[i].code;
             }
           }
 
@@ -1019,7 +1020,7 @@ export default {
       }
       this.codeQuery.orderIdFk = this.currentRow.billNo;
       this.codeDetailLoading = true;
-      this.codeDetailList=[];
+      this.codeDetailList = [];
       filterBizOrderList(this.codeQuery).then((res) => {
         this.codeDetailLoading = false;
         if (res.code === 20000) {
@@ -1055,7 +1056,7 @@ export default {
         this.$message.error("请先选择需要查询的单据！")
         return;
       }
-      this.bizDetailLoading = true;
+      this.invoiceLoading = true;
       this.bizQuery.orderIdFk = this.currentRow.billNo;
       if (row != null) {
         this.bizQuery.orderIdFk = row.orderIdFk;
@@ -1064,7 +1065,7 @@ export default {
         //this.bizQuery.bizIdFk = row.id;
       }
       filterListInvoice(this.bizQuery).then((res) => {
-        this.bizDetailLoading = false;
+        this.invoiceLoading = false;
         if (res.code === 20000) {
           this.bizDetailList = res.data.list || [];
           this.invTotal = res.data.total || 0;
@@ -1074,7 +1075,7 @@ export default {
           this.invTotal = 0;
         }
       }).catch((error) => {
-        this.bizDetailLoading = false;
+        this.invoiceLoading = false;
         this.$message.error(error.message);
         this.bizDetailList = [];
         this.invTotal = 0;