Browse Source

我的链属解绑,核心企业开立流程等bug解决

cuixq 4 năm trước cách đây
mục cha
commit
0c3bb208ff

+ 5 - 3
front-vue/src/components/SignSuccess/index.vue

@@ -38,6 +38,9 @@
 </template>
 
 <script>
+import {
+    amtformat
+} from "@/utils/amtCommon";
 export default {
   name: "SignSuccess",
   props: {
@@ -47,9 +50,7 @@ export default {
     },
     financeSignForm: {
       type: Object,
-      default () {
-        return {}
-      }
+      default: () => ({zfiAmount:0.00}),
     }
   },
   computed: {
@@ -66,6 +67,7 @@ export default {
     },
     /* 金额展示 */
     handleInput(str) {
+      console.log(str,"000000000")
       return amtformat(str, 2, ".", ",");
     },
     /* //  将数字金额转换为大写金额 */

+ 4 - 1
front-vue/src/views/service/credit/addInformation.vue

@@ -284,7 +284,9 @@
             </pdf-shows>
         </el-dialog>
         <!--去融资-->
+        <div v-if="goShow">
         <sign-success :goShow="goShow" :financeSignForm="financeSignForm" @goFinance="goFinance" @cancelGo="cancelGo"></sign-success>
+        </div>
     </el-tab-pane>
     <el-tab-pane label="签署合同">
       <el-row class="zap-form" type="flex">
@@ -364,7 +366,7 @@ export default {
             rules: {
 
             },
-            financeSignForm: {},
+            financeSignForm: {zfiAmount:0.00},
             // 是否显示弹出层
             open: false,
             openAddBill: false,
@@ -1375,6 +1377,7 @@ export default {
                             if (response.data.validity) {
                                 this.financeSignForm.validity = response.data.validity;
                             }
+                            console.log(this.financeSignForm,"this.financeSignForm===========")
                             this.goShow = true;
                         });
                     }).catch((response) => {

+ 10 - 0
front-vue/src/views/service/credit/credit.vue

@@ -1661,6 +1661,16 @@ export default {
                 listStatisticalAmount(this.queryParams).then(response => {
                     this.ysxAmount = response.data.ysxAmount;
                 })
+                listStatisticalAmount(this.queryParams).then(response => {
+                    this.allAmount = response.data.allAmount;
+                    this.klzAllAmount = response.data.klzAmount;
+                    this.ysxAllAmount = response.data.ysxAmount;
+                    this.rzzAllAmount = response.data.rzzAmount;
+                    this.yrzAllAmount = response.data.yrzAmount;
+                    this.yjjAllAmount = response.data.yjjAmount;
+                    this.yjsAllAmount = response.data.yjsAmount;
+                    this.ygqAllAmount = response.data.ygqAmount;
+                })
                 return Promise.resolve(response)
             }).catch((response) => {
                 this.loading = false;

+ 5 - 20
front-vue/src/views/service/rel/companyRel.vue

@@ -1317,6 +1317,7 @@ export default {
         },
         /** 解绑按钮操作 */
         handleDelete(row) {
+            console.log("解绑1")
             const launchScrId = row.launchScrId || this.ids;
             if (row.launchCompanyId == this.loginId) {
                 const scyName = row.receiveScyName;
@@ -1327,21 +1328,15 @@ export default {
                     })
                     .then(function () {
                         return delRel(launchScrId);
-                    })
-                    .then(() => {
+                    }).then(() => {
                         this.msgSuccess("解绑成功");
                         this.getUser();
                         this.getSpare();
                         this.getCompanyList();
-                    })
-                    .catch(() => {
-                        this.$message({
-                            type: "warning",
-                            message: "已取消解绑"
-                        });
                     });
             } else if (row.launchReceiveScrCompanyId == this.loginId) {
                 const scyName = row.launchScyName;
+                       console.log("解绑4")
                 this.$confirm('是否确认解绑与"' + scyName + '"的链属关系?', "警告", {
                         confirmButtonText: "确定",
                         cancelButtonText: "取消",
@@ -1355,17 +1350,12 @@ export default {
                         this.getUser();
                         this.getSpare();
                         this.getCompanyList();
-                    })
-                    .catch(() => {
-                        this.$message({
-                            type: "warning",
-                            message: "已取消解绑"
-                        });
                     });
             }
         },
         /* 解绑链属企业信息数据 */
         handleSpareDelete(row) {
+                 console.log("解绑6")
             const scpId = row.scpId || this.ids;
             const scpName = row.scpName;
             this.$confirm('是否确认解绑"' + scpName + '"的信息?', "警告", {
@@ -1377,16 +1367,11 @@ export default {
                     return removeSpare(scpId);
                 })
                 .then(() => {
+                       console.log("解绑7")
                     this.msgSuccess("解绑成功");
                     this.getUser();
                     this.getSpare();
                     this.getCompanyList();
-                })
-                .catch(() => {
-                    this.$message({
-                        type: "warning",
-                        message: "已取消解绑"
-                    });
                 });
         },
 

+ 4 - 3
front-vue/src/views/system/company/certification.vue

@@ -662,6 +662,7 @@ export default {
             title: "",
             // 是否显示弹出层
             open: false,
+            openBindSuccess: false,
             //银行
             bankList: [],
             yyzzImageUrl: "",
@@ -777,7 +778,6 @@ export default {
             value2: "",
             value3: "",
             repeatToken: getRepeatToken(),
-            openBindSuccess: true
         };
     },
     created() {
@@ -1642,7 +1642,7 @@ export default {
                     this.updateTime =
                         aData.getFullYear() + "-" + (aData.getMonth() + 1) + "-" + aData.getDate();
 
-                    this.openBindSuccess = ture
+                    this.openBindSuccess = true;
 
                 }
 
@@ -1700,9 +1700,10 @@ export default {
                 .catch((response) => {
                     this.loading.close();
                 });
+           this.openBindSuccess = false;
         },
         handleCancel () {
-          this.openBindSuccess = false
+          this.openBindSuccess = false;
           this.loading.close()
         },
         handleAvatarSuccess(res, file) {