From 48280be82714b0c877afd7359cff334ba23adde7 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 9 Jun 2023 09:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=9B=B8=E5=85=B3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=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        | 46 +++++++++++++++----------
 src/views/inout/InvoiceRegistration.vue | 17 ++++-----
 3 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/.env.production b/.env.production
index 4257bf1b..6357dc1f 100644
--- a/.env.production
+++ b/.env.production
@@ -8,7 +8,7 @@ ENV = 'production'
 
 
 #林纪裕cd
-# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5003/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
 
@@ -25,7 +25,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 0ad3bc2d..0604724e 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -484,18 +484,10 @@ export default {
   components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
   methods: {
     onSubmit() {
-      if (this.invoiceRow == null || this.invoiceRow.length==0) {
+      if (this.invoiceRow == null) {
         this.$message.error("请选择要登记的物资! ");
         return false;
       }
-      // if (this.$isBlank(this.inputQuery.machineNo)) {
-      //   this.$message.error("机械编码不能为空！");
-      //   return;
-      // }
-      // if (this.$isBlank(this.inputQuery.invoiceCode)) {
-      //   this.$message.error("发票代码不能为空！");
-      //   return;
-      // }
       if (this.$isBlank(this.inputQuery.invoiceEncode)) {
         this.$message.error("发票编码不能为空！");
         return;
@@ -509,17 +501,34 @@ export default {
         return;
       }
       this.inputQuery.list = this.invoiceRow;
-      let mount=0;
-      for(var i=0;i<this.invoiceRow.length;i++){
-        mount+=this.invoiceRow[i].amount
+      let mount = 0;
+      for (var i = 0; i < this.invoiceRow.length; i++) {
+        mount += this.invoiceRow[i].amount
       }
-      if(mount  != this.inputQuery.price){
-        this.$message.error("价格不匹配！");
+      if (mount != this.inputQuery.price) {
+        this.$confirm("价格不匹配，是否确定提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.postInvoice();
+          })
+          .catch(() => {
+          });
         return;
+      } else {
+        this.postInvoice();
       }
+
+
+    },
+
+    postInvoice() {
       insertInvoice(this.inputQuery)
         .then((response) => {
           if (response.code === 20000) {
+            this.closeDialog();
             this.statusCode = response.code;
             this.getOrderDetails();
           } else {
@@ -530,12 +539,13 @@ 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) {
       event.currentTarget.select();
     },
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 3a7df040..296b7308 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -151,15 +151,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>
@@ -354,7 +354,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>
@@ -705,6 +705,7 @@ export default {
       bizTotal: 0,
       invTotal: 0,
       bizDetailLoading: false,
+      invoiceLoading:false,
       bizDetailList: [],
       codeQuery: {
         orderIdFk: null,
@@ -1074,7 +1075,7 @@ export default {
         this.$message.error("请先选择需要查询的单据！")
         return;
       }
-      this.bizDetailLoading = true;
+      this.invoiceLoading = true;
       if (row != null) {
         this.bizQuery.orderIdFk = row.orderIdFk;
         this.bizQuery.batchNo = row.batchNo;
@@ -1082,7 +1083,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;
@@ -1092,7 +1093,7 @@ export default {
           this.invTotal = 0;
         }
       }).catch((error) => {
-        this.bizDetailLoading = false;
+        this.invoiceLoading = false;
         this.$message.error(error.message);
         this.bizDetailList = [];
         this.invTotal = 0;