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

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

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

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

@@ -312,7 +312,7 @@
 
             <!--预览-->
             <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-                <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
+                <img :src="wordUrl" v-if="show" width='950px' height='500px'/>
                 <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
             </el-dialog>
             <el-dialog
@@ -387,6 +387,7 @@ import AddBill from "@/views/service/bill/addBill";
 import EditBill from "@/views/service/bill/editBill";
 import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
 import {contractSigning} from "@/api/service/credit/message";
+import { listCompanyHandler } from "@/api/common/companyHandler";
 import { amtformat } from "@/utils/amtCommon";
 import pdfShow from "./pdfShow";
 import Cookies from 'js-cookie';
@@ -1380,6 +1381,9 @@ export default {
                         text: 'Loading',
                         background: 'rgba(0, 0, 0,0)'
                     });
+                    
+  listCompanyHandler().then((response) => {
+        if (response.data == true) {
             contractSigning(this.form).then((response) => {
                 loading.close();
                 const zfiId = this.$route.params && this.$route.params.zfiId;
@@ -1409,6 +1413,14 @@ export default {
             }).catch((response) => {
                 loading.close();
             });
+               } else {
+                 loading.close();
+             this.$message({
+                        message: "此操作需经办人权限,请确认您是否是经办人",
+                        type: 'warning'
+                    });
+        }
+      });
     },
       //去融资
     goFinance(){

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

@@ -292,7 +292,7 @@
             </el-dialog>
             <!--预览-->
             <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-                <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
+                <img :src="wordUrl" v-if="show" width='950px' height='500px'/>
                 <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
             </el-dialog>
             <el-dialog

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

@@ -384,6 +384,7 @@ import pdfShow from "./pdfShow";
 import DetailBill from "@/views/service/credit/billDetail";
 import {contractSigning} from "@/api/service/credit/message";
 import { listFinanceInf } from "@/api/common/financeInf";
+import { listCompanyHandler } from "@/api/common/companyHandler";
 import { amtformat } from "@/utils/amtCommon";
 import Cookies from 'js-cookie';
 export default {
@@ -1277,6 +1278,8 @@ export default {
                         text: 'Loading',
                         background: 'rgba(0, 0, 0,0)'
                     });
+    listCompanyHandler().then((response) => {
+        if (response.data == true) {
             contractSigning(this.form).then((response) => {
                 loading.close();
                 const zfiId = this.$route.params && this.$route.params.zfiId;
@@ -1306,6 +1309,14 @@ export default {
             }).catch((response) => {
                 loading.close();
             });
+           } else {
+                loading.close();
+             this.$message({
+                  message: "此操作需经办人权限,请确认您是否是经办人",
+                  type: 'warning'
+              });
+          }
+       });
     },
      //去融资
     goFinance(){

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

@@ -881,6 +881,9 @@ export default {
             spinner: "el-icon-loading",
             background: "rgba(0, 0, 0, 0.7)",
           });
+            listCompanyHandler().then((response) => {
+        if (response.data == true) {
+
           addRecord(this.form)
             .then((response) => {
               loading.close();
@@ -893,6 +896,14 @@ export default {
             .catch((response) => {
               loading.close();
             });
+              } else {
+              loading.close();
+              this.$message({
+                message: "此操作需经办人权限,请确认您是否是经办人",
+                type: "warning",
+              });
+            }
+          });
         }
       });
     },
@@ -1277,7 +1288,10 @@ export default {
             }
           });
         } else {
-          this.$message.error("此操作需经办人权限,请确认您是否是经办人");
+               this.$message({
+                        message: "此操作需经办人权限,请确认您是否是经办人",
+                        type: 'warning'
+                    });
         }
       });
     },

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

@@ -1312,7 +1312,10 @@ export default {
             }
           });
         } else {
-          this.$message.error("此操作需经办人权限,请确认您是否是经办人");
+              this.$message({
+                        message: "此操作需经办人权限,请确认您是否是经办人",
+                        type: 'warning'
+                    });
         }
       });
     },