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

src/api/awardManagement/awardManagement.js

@@ -67,10 +67,17 @@ export function adjudicationLogistics(data) {
         params: data
     })
 }
-// 签名(暂时只改案件状态)
-export function adjudicationSignature(data) {
+// // 签名(暂时只改案件状态)
+// export function adjudicationSignature(data) {
+//     return request({
+//         url: '/adjudication/signature',
+//         method: 'post',
+//         data: data
+//     })
+// }
+export function selectSignUrl(data) {
     return request({
-        url: '/adjudication/signature',
+        url: '/caseApplication/selectSignUrl',
         method: 'post',
         data: data
     })
@@ -84,9 +91,17 @@ export function adjudicationCaseFile(data) {
     })
 }
 // 用印(暂时只改案件状态)
-export function adjudicationStamp(data) {
+// export function adjudicationStamp(data) {
+//     return request({
+//         url: '/adjudication/stamp',
+//         method: 'post',
+//         data: data
+//     })
+// }
+
+export function selectSealUrl(data) {
     return request({
-        url: '/adjudication/stamp',
+        url: '/caseApplication/selectSealUrl',
         method: 'post',
         data: data
     })

src/views/awardManagement/listofAwards.vue

@@ -89,7 +89,9 @@ import {
     caseApplicationDetail,
     adjudicationLogistics,
     adjudicationCaseFile,
-    adjudicationStamp
+    adjudicationStamp,
+    selectSignUrl,
+    selectSealUrl
 } from "@/api/awardManagement/awardManagement";
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
 import mailawardDialog from './components/MailawardDialog.vue';
@@ -140,7 +142,7 @@ export default {
         this.getList(this.queryParams);
     },
     methods: {
-        updataList(){
+        updataList() {
             this.getList(this.queryParams);
         },
         /** 搜索按钮操作 */
@@ -164,20 +166,27 @@ export default {
         },
         // model框显示
         showModel(row, type) {
-            this.getDetail({ id: row.id });
-            this.openDialog = true;
+
             switch (type) {
                 case 1:
+                    this.getDetail({ id: row.id });
+                    this.openDialog = true;
                     this.title = "核验裁决书";
                     this.flag = 1;
                     break;
                 case 2:
+                    this.getDetail({ id: row.id });
+                    this.openDialog = true;
                     this.title = "审核裁决书";
                     this.flag = 2;
                     break;
                 case 3:
-                    this.title = "裁决书签名";
-                    this.flag = 3;
+                    // this.title = "裁决书签名";
+                    // this.flag = 3;
+                    selectSignUrl({ id: row.id }).then(res => {
+                        let url = res.data.signUrl;
+                        window.open(url)
+                    })
                     break;
                 default:
                     break;
@@ -191,20 +200,24 @@ export default {
         showaffixModel(row) {
             this.$modal.confirm('是否进行用印申请？')
                 .then(function () {
-                  return adjudicationStamp({id:row.id});
-            })
-            .then(() => {
-                this.getList(this.queryParams);
-                this.$modal.msgSuccess("用印成功！");
-            })
-            .catch(function () {
-            });
+                    // return adjudicationStamp({ id: row.id });
+                    selectSealUrl({ id: row.id }).then(res => {
+                        let url = res.data.sealUrl;
+                        window.open(url)
+                    })
+                })
+                // .then(() => {
+                //     this.getList(this.queryParams);
+                //     this.$modal.msgSuccess("用印成功！");
+                // })
+                .catch(function () {
+                });
         },
         // 快递信息弹框
         showDeliveryModel(row) {
-            console.log(row,'快递');
+            console.log(row, '快递');
             this.showDelivery = true
-            this.getadjudicationLogistics({id:row.id})
+            this.getadjudicationLogistics({ id: row.id })
         },
         closeDeliveryModel() {
             this.showDelivery = false
@@ -221,12 +234,12 @@ export default {
         showCasefilingModel(row) {
             this.$modal.confirm('是否确认立即进行案件扫描？').then(
                 function () {
-                    return adjudicationCaseFile({id:row.id})
+                    return adjudicationCaseFile({ id: row.id })
                 }
             ).then(() => {
                 this.getList(this.queryParams);
                 this.$modal.msgSuccess("归档成功！");
-            }).catch(function () {})
+            }).catch(function () { })
         },
         // 送达裁决书弹框
         showMailaward(row) {

src/views/caseManagement/caseList.vue

@@ -526,14 +526,6 @@ export default {
       this.loading = true;
       caseApply(val).then((response) => {
         this.dataList = response.rows;
-        // this.dataList.forEach((item) => {
-        //   if (item.arbitratMethod == 1) {
-        //     item.arbitratMethod = "视频仲裁";
-        //   }
-        //   if (item.arbitratMethod == 2) {
-        //     item.arbitratMethod = "书面仲裁";
-        //   }
-        // });
         this.total = response.total;
         this.loading = false;
       });