Merge branch 'master' of http://git.keao.tech/SupplyChain/front

front-vue/src/views/service/bill/addBill.vue

@@ -969,8 +969,8 @@ export default {
         allAmount() {
             var strarr = [0.0];
             for (let i in this.fileList) {
-                if (this.fileList[i]["ziiCheckStt"] == "1") {
-                strarr.push(this.fileList[i]["ziiAmount"]);
+            if ( this.fileList[i]["ziiCheckStt"] == "1" &&  !!(this.fileList[i]["ziiAmount"])) {
+                    strarr.push(this.fileList[i]["ziiAmount"]);
                 }
             }
             return (Math.round(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果

front-vue/src/views/service/bill/billAdd.vue

@@ -649,7 +649,12 @@ export default {
             if ("0" == type) {
                 this.invoice.ziiTotalAmount = e.target.value;
             } else if ("1" == type) {
-                this.invoice.ziiAmount = e.target.value;
+                if(e.target.value){
+                   this.invoice.ziiAmount = e.target.value;
+                }else{
+                   this.invoice.ziiAmount=="0.0"; 
+                }
+               
             }
         },
         //表格置灰
@@ -979,11 +984,11 @@ export default {
         allAmount() {
             var strarr = [0.0];
             for (let i in this.fileList) {
-                // if (this.fileList[i]["ziiCheckStt"] == "1") {
-                strarr.push(this.fileList[i]["ziiAmount"]);
-                // }
+                if ( this.fileList[i]["ziiCheckStt"] == "1" &&  !!(this.fileList[i]["ziiAmount"])) {
+                    strarr.push(this.fileList[i]["ziiAmount"]);
+                }
             }
-            return (Math.round(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
+               return (Math.round(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
         },
         // 提交
         submit() {

front-vue/src/views/service/bill/billDetail.vue

@@ -345,7 +345,7 @@ export default {
         allAmount() {
             var strarr = [0.00];
             for (let i in this.fileList) {
-                if (this.fileList[i]["ziiCheckStt"] == "1") {
+             if ( this.fileList[i]["ziiCheckStt"] == "1" &&  !!(this.fileList[i]["ziiAmount"])) {
                     strarr.push(this.fileList[i]["ziiAmount"]);
                 }
             }

front-vue/src/views/service/bill/billEdit.vue

@@ -1041,8 +1041,8 @@ export default {
         allAmount() {
             var strarr = [0.0];
             for (let i in this.fileList) {
-                if (this.fileList[i]["ziiCheckStt"] == "1") {
-                strarr.push(this.fileList[i]["ziiAmount"]);
+            if ( this.fileList[i]["ziiCheckStt"] == "1" &&  !!(this.fileList[i]["ziiAmount"])) {
+                    strarr.push(this.fileList[i]["ziiAmount"]);
                 }
             }
             return (Math.round(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果

front-vue/src/views/service/bill/editBill.vue

@@ -1307,9 +1307,9 @@ export default {
     allAmount() {
       var strarr = [0.0];
       for (let i in this.fileList) {
-        if (this.fileList[i]["ziiCheckStt"] == "1") {
-           strarr.push(this.fileList[i]["ziiAmount"]);
-        }
+        if ( this.fileList[i]["ziiCheckStt"] == "1" &&  !!(this.fileList[i]["ziiAmount"])) {
+                    strarr.push(this.fileList[i]["ziiAmount"]);
+                }
       }
       return (Math.round(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
       // return this.handleInput(eval(strarr.join("+"))); //结果

front-vue/src/views/service/credit/billDetail.vue

@@ -427,9 +427,9 @@ export default {
     allAmount() {
       var strarr = [0.0];
       for (let i in this.fileList) {
-        if (this.fileList[i]["ziiCheckStt"] == "1") {
-          strarr.push(this.fileList[i]["ziiAmount"]);
-        }
+       if ( this.fileList[i]["ziiCheckStt"] == "1" &&  !!(this.fileList[i]["ziiAmount"])) {
+                    strarr.push(this.fileList[i]["ziiAmount"]);
+                }
       }
       return (Math.round(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
       // return this.handleInput(eval(strarr.join("+"))); //结果

front-vue/src/views/service/credit/goFinance.vue

@@ -1316,13 +1316,16 @@ export default {
                     //self.$router.push({ path: "/Bill/financeRecord"});
                     //self.cancel();
                     let queryStamped = {};
-                    queryStamped.zfrId = this.zfrId
+                    console.log(self,"self")
+                    console.log(self.zfrId,"zfrId")
+                    queryStamped.zfrId = self.zfrId
                     const load = self.$loading({
                         lock: true,
                         text: "Loading",
                         background: "rgba(0, 0, 0,0)",
                     });
                     listStamped(queryStamped).then((response) => {
+                        console.log(response,"response")
                         if (response.data) {
                             self.pdfFileList = response.data.list;
                         }

front-vue/src/views/service/financeRecord/addFinanceRecord.vue

@@ -292,6 +292,7 @@ import {
     updateChargeStatus,
     listChargeStatus,
     cancelContract,
+    listStamped
 } from "@/api/service/financeRecord/record";
 import {
     listFinanceInf
@@ -322,8 +323,7 @@ import {
     sendMessage,
     checkCode,
     faceAuth,
-    checkFaceAuth,
-    listStamped
+    checkFaceAuth
 } from "@/api/service/credit/message";
 import {
     cfcaProjectNo,
@@ -1311,7 +1311,6 @@ export default {
             self.zcFinanceInf.zfrId = self.zfrId;
             contractSigning(self.zcFinanceInf)
                 .then((response) => {
-                    debugger;
                     loading.close();
                     self.msgSuccess("盖章成功");
                     if (self.zfpAuthType == "02") {
@@ -1325,13 +1324,18 @@ export default {
                     //关闭预览合同
                     //self.closePdfShow();
                     let queryStamped = {};
-                    queryStamped.zfrId = this.zfrId
+                    console.log(self,"self")
+                    console.log(self.zfrId,"zfrId")
+                    queryStamped.zfrId = self.zfrId
+                    debugger;
+                    
                     const load = self.$loading({
                         lock: true,
                         text: "Loading",
                         background: "rgba(0, 0, 0,0)",
                     });
                     listStamped(queryStamped).then((response) => {
+                          console.log(response)
                         load.close();
                         if (response.data) {
                             this.pdfFileList = response.data.list;

front-vue/src/views/service/financeRecord/recordSeal.vue

@@ -1587,7 +1587,7 @@ export default {
           //关闭预览合同
           //self.closePdfShow();
           let queryStamped = {};
-          queryStamped.zfrId = this.zfrId
+          queryStamped.zfrId = self.zfrId
           const load = self.$loading({
             lock: true,
             text: "Loading",

front-vue/src/views/system/accInf/accInfDetail.vue

@@ -175,9 +175,9 @@ export default {
       var y = date.getFullYear();
       var m = date.getMonth() + 1;
       m = m < 10 ? ('0' + m) : m;
-      var d = date.getDate();
+      var d = date.getDate() + 1;
       d = d < 10 ? ('0' + d) : d;
-      const time = y+ m+ (d +1)
+      const time = y+ m+ d 
       return time;
     },
     //查询本企业电子账户