Ver código fonte

Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

hhlxayunmei 2 anos atrás
pai
commit
7deeff6083

+ 2
- 2
src/views/caseManagement/components/caseentryDialog.vue Ver arquivo

851
       return window.location.origin + "/API/evidence/upload";
851
       return window.location.origin + "/API/evidence/upload";
852
     },
852
     },
853
     handlePreview(file) {
853
     handlePreview(file) {
854
-      if (file.certificatePath) {
854
+      if (file && file.response.data.annexName) {
855
         window.open(
855
         window.open(
856
-          window.location.origin + "/API" + file.certificatePath,
856
+          window.location.origin + "/API" + file.response.data.annexName,
857
           "_blank"
857
           "_blank"
858
         );
858
         );
859
       } else {
859
       } else {

+ 3
- 2
src/views/caseManagement/components/payDialog.vue Ver arquivo

71
     selectCaseApplicationConfirmFn(parms) {
71
     selectCaseApplicationConfirmFn(parms) {
72
       selectCaseApplicationConfirm(parms).then(res => {
72
       selectCaseApplicationConfirm(parms).then(res => {
73
         console.log(res, this.form, "KKKKKKKKKKKKKKKKKKKK");
73
         console.log(res, this.form, "KKKKKKKKKKKKKKKKKKKK");
74
-        if(res.data.paymentStatus == 1){
74
+        if(res && res.data && res.data.paymentStatus == 1){
75
           clearInterval(this.timer);
75
           clearInterval(this.timer);
76
-          this.openPay = false;
76
+          // this.openPay = false;
77
+          this.payCancel()
77
           this.$message({
78
           this.$message({
78
           message: "缴费成功",
79
           message: "缴费成功",
79
           type: "success",
80
           type: "success",

+ 1
- 1
src/views/paymentManagement/components/paymentdetailsDialog.vue Ver arquivo

64
     };
64
     };
65
   },
65
   },
66
   watch: {
66
   watch: {
67
-    openDialog: {
67
+    detailform: {
68
       handler(val) {
68
       handler(val) {
69
         if (val) {
69
         if (val) {
70
           setTimeout(() => {
70
           setTimeout(() => {