Bladeren bron

打通主要流程(签名,送达,归档)

Your Name 2 jaren geleden
bovenliggende
commit
2b1c4564a6

+ 40
- 0
src/api/awardManagement/awardManagement.js Bestand weergeven

50
         method: 'post',
50
         method: 'post',
51
         data: data
51
         data: data
52
     })
52
     })
53
+}
54
+// 送达(不包含发送电子邮件)
55
+export function adjudicationService(data) {
56
+    return request({
57
+        url: '/adjudication/service',
58
+        method: 'post',
59
+        data: data
60
+    })
61
+}
62
+// 查询物流信息
63
+export function adjudicationLogistics(data) {
64
+    return request({
65
+        url: '/adjudication/logistics',
66
+        method: 'get',
67
+        params: data
68
+    })
69
+}
70
+// 签名(暂时只改案件状态)
71
+export function adjudicationSignature(data) {
72
+    return request({
73
+        url: '/adjudication/signature',
74
+        method: 'post',
75
+        data: data
76
+    })
77
+}
78
+// 归档(暂时只改案件状态)
79
+export function adjudicationCaseFile(data) {
80
+    return request({
81
+        url: '/adjudication/caseFile',
82
+        method: 'post',
83
+        data: data
84
+    })
85
+}
86
+// 用印(暂时只改案件状态)
87
+export function adjudicationStamp(data) {
88
+    return request({
89
+        url: '/adjudication/stamp',
90
+        method: 'post',
91
+        data: data
92
+    })
53
 }
93
 }

+ 3
- 2
src/views/awardManagement/components/MailawardDialog.vue Bestand weergeven

103
 </template>
103
 </template>
104
 
104
 
105
 <script>
105
 <script>
106
-import { adjudicationDelivery } from "@/api/awardManagement/awardManagement";
106
+import { adjudicationDelivery, adjudicationService } from "@/api/awardManagement/awardManagement";
107
 export default {
107
 export default {
108
   props: ["openMailawardDialog", "mailawardata"],
108
   props: ["openMailawardDialog", "mailawardata"],
109
   data() {
109
   data() {
125
       // adjudicationDelivery
125
       // adjudicationDelivery
126
       this.$refs["form"].validate((valid) => {
126
       this.$refs["form"].validate((valid) => {
127
         if (valid) {
127
         if (valid) {
128
-          adjudicationDelivery({
128
+          // adjudicationDelivery({
129
+          adjudicationService({
129
             id: this.mailawardata.id,
130
             id: this.mailawardata.id,
130
             ...this.formData,
131
             ...this.formData,
131
           })
132
           })

+ 53
- 43
src/views/awardManagement/components/expressDeliveryDialog.vue Bestand weergeven

7
       center
7
       center
8
       :distroy-on-close="true"
8
       :distroy-on-close="true"
9
     >
9
     >
10
-      <div class="deliverName">中通快递 85644454542121</div>
11
-      <el-divider></el-divider>
12
-      <el-timeline :reverse="reverse">
13
-        <el-timeline-item
14
-          v-for="(activity, index) in activities"
15
-          :key="index"
16
-          :timestamp="activity.timestamp"
17
-        >
18
-          {{ activity.content }}
19
-        </el-timeline-item>
20
-      </el-timeline>
10
+      <div class="loading" v-if="flagLoading">
11
+        <i class="el-icon-loading"></i>
12
+      </div>
13
+      <div v-else>
14
+        <div class="deliverName">
15
+          {{ applicantdelivery.company }} {{ applicantdelivery.no }}
16
+        </div>
17
+        <el-divider></el-divider>
18
+        <el-timeline :reverse="reverse">
19
+          <el-timeline-item
20
+            v-for="(activity, index) in activities"
21
+            :key="index"
22
+            :timestamp="activity.timestamp"
23
+          >
24
+            {{ activity.content }}
25
+          </el-timeline-item>
26
+        </el-timeline>
27
+      </div>
21
       <div slot="footer" class="dialog-footer">
28
       <div slot="footer" class="dialog-footer">
22
-         <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
29
+        <el-button @click="cancel" class="endbutton"
30
+          ><span>取 消</span></el-button
31
+        >
23
       </div>
32
       </div>
24
     </el-dialog>
33
     </el-dialog>
25
   </div>
34
   </div>
27
 
36
 
28
 <script>
37
 <script>
29
 export default {
38
 export default {
30
-  props: ["showDelivery"],
39
+  props: ["showDelivery", "deliveryDataArr", "flagLoading"],
31
   data() {
40
   data() {
32
     return {
41
     return {
33
       // key: value
42
       // key: value
34
       reverse: true,
43
       reverse: true,
35
-      activities: [  
36
-        {
37
-          content: "已下单 08-18 10:11",
38
-          timestamp: "已下单",
39
-        },
40
-        {
41
-          content: "已接单 08-19 10:11",
42
-          timestamp: "已接单",
43
-        },
44
-        {
45
-          content: "已发货 08-19 10:11",
46
-          timestamp: "已发货",
47
-        },
48
-        {
49
-          content: "已揽件 08-20 00:11",
50
-          timestamp: "已揽件",
51
-        },
52
-        {
53
-          content: "运输中 08-20 02:11",
54
-          timestamp: "运输中",
55
-        },
56
-        {
57
-          content: "派送中 08-22 10:11",
58
-          timestamp: "【西安市】快递已到达西安市临潼区",
59
-        },
60
-        {
61
-          content: "待取件 08-23 15:11",
62
-          timestamp: "【西安市】快递已到达菜鸟驿站",
63
-        },
64
-      ],
44
+      applicantdelivery: {}, //申请人物流信息
45
+      activities: [],
65
     };
46
     };
66
   },
47
   },
48
+  watch: {
49
+    deliveryDataArr: {
50
+      handler(val) {
51
+        if (val) {
52
+          val.forEach((item) => {
53
+            if (item.identityType == 1) {
54
+              let applicantdata = item.logisticsInfo;
55
+              this.applicantdelivery = JSON.parse(applicantdata);
56
+              this.activities = this.applicantdelivery.list
57
+              this.activities.forEach(item=>{
58
+                item.content = item.datetime;
59
+                item.timestamp = item.remark;
60
+              })
61
+            }
62
+          });
63
+        }
64
+      },
65
+    },
66
+  },
67
   methods: {
67
   methods: {
68
     cancel() {
68
     cancel() {
69
       this.$emit("closeDeliveryModel");
69
       this.$emit("closeDeliveryModel");
98
     color: #959595;
98
     color: #959595;
99
   }
99
   }
100
 }
100
 }
101
+.loading {
102
+  width: 100%;
103
+  height: 100%;
104
+  display: flex;
105
+  justify-content: center;
106
+  align-items: center;
107
+  .el-icon-loading {
108
+    font-size: 50px;
109
+  }
110
+}
101
 </style>
111
 </style>

+ 13
- 0
src/views/awardManagement/components/paymentdetailsDialog.vue Bestand weergeven

173
 import {
173
 import {
174
   verificationArbitrateRecord,
174
   verificationArbitrateRecord,
175
   checkArbitrateRecord,
175
   checkArbitrateRecord,
176
+  adjudicationSignature
176
 } from "@/api/awardManagement/awardManagement";
177
 } from "@/api/awardManagement/awardManagement";
177
 export default {
178
 export default {
178
   props: ["openDialog", "title", "flag", "detailform"],
179
   props: ["openDialog", "title", "flag", "detailform"],
305
         this.$message("成功");
306
         this.$message("成功");
306
       });
307
       });
307
     },
308
     },
309
+    // 签名
310
+    adjudicationSignatureFn(parms) {
311
+      adjudicationSignature(parms).then((res) => {
312
+        this.cancel();
313
+        this.$emit("updataList");
314
+        this.$message("成功");
315
+      })
316
+    },
308
     submitForm(parms) {
317
     submitForm(parms) {
309
       this.$refs["form"].validate((valid) => {
318
       this.$refs["form"].validate((valid) => {
310
         if (valid) {
319
         if (valid) {
325
               agreeOrNotCheck: 2,
334
               agreeOrNotCheck: 2,
326
               arbitrateRecord: this.arbitrateRecord,
335
               arbitrateRecord: this.arbitrateRecord,
327
             });
336
             });
337
+          } else if (parms == 3) {
338
+            this.adjudicationSignatureFn({
339
+              id: this.form.id,
340
+            });
328
           }
341
           }
329
         }
342
         }
330
       });
343
       });

+ 29
- 11
src/views/awardManagement/listofAwards.vue Bestand weergeven

51
                         v-hasPermi="['monitor:online:forceLogout']">签名</el-button>
51
                         v-hasPermi="['monitor:online:forceLogout']">签名</el-button>
52
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showaffixModel(scope.row, 4)"
52
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showaffixModel(scope.row, 4)"
53
                         v-hasPermi="['monitor:online:forceLogout']">用印申请</el-button>
53
                         v-hasPermi="['monitor:online:forceLogout']">用印申请</el-button>
54
-                    <el-button size="mini" type="text" icon="el-icon-truck" @click="showDeliveryModel(scope.row, 4)"
54
+                        <!-- v-if="scope.row.caseStatus > 15" -->
55
+                    <el-button size="mini" type="text" icon="el-icon-truck" v-if="scope.row.caseStatus > 15" @click="showDeliveryModel(scope.row, 4)"
55
                         v-hasPermi="['monitor:online:forceLogout']">快递信息</el-button>
56
                         v-hasPermi="['monitor:online:forceLogout']">快递信息</el-button>
56
                         <!-- v-if="scope.row.caseStatus == 15"   送达裁决书 -->
57
                         <!-- v-if="scope.row.caseStatus == 15"   送达裁决书 -->
57
-                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15"  @click="showMailaward(scope.row)"
58
+                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15" @click="showMailaward(scope.row)"
58
                         v-hasPermi="['monitor:online:forceLogout']">送达裁决书</el-button>
59
                         v-hasPermi="['monitor:online:forceLogout']">送达裁决书</el-button>
59
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 16" @click="showCasefilingModel(scope.row, 6)"
60
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 16" @click="showCasefilingModel(scope.row, 6)"
60
                         v-hasPermi="['monitor:online:forceLogout']">案件归档</el-button>
61
                         v-hasPermi="['monitor:online:forceLogout']">案件归档</el-button>
90
         <!-- 快递信息页面 -->
91
         <!-- 快递信息页面 -->
91
         <expressDeliveryDialog
92
         <expressDeliveryDialog
92
         :showDelivery="showDelivery"
93
         :showDelivery="showDelivery"
94
+        :deliveryDataArr="deliveryDataArr"
93
         @closeDeliveryModel="closeDeliveryModel"
95
         @closeDeliveryModel="closeDeliveryModel"
96
+        :flagLoading="flagLoading"
94
         ></expressDeliveryDialog>
97
         ></expressDeliveryDialog>
95
     </div>
98
     </div>
96
 </template>
99
 </template>
99
 import {
102
 import {
100
     caseApplicationList,
103
     caseApplicationList,
101
     caseApplicationDetail,
104
     caseApplicationDetail,
105
+    adjudicationLogistics,
106
+    adjudicationCaseFile,
107
+    adjudicationStamp
102
 } from "@/api/awardManagement/awardManagement";
108
 } from "@/api/awardManagement/awardManagement";
103
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
109
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
104
 import mailawardDialog from './components/MailawardDialog.vue';
110
 import mailawardDialog from './components/MailawardDialog.vue';
138
             openMailawardDialog: false,  //送达裁决书页面
144
             openMailawardDialog: false,  //送达裁决书页面
139
             mailawardata: {},   //裁决书送达界面数据
145
             mailawardata: {},   //裁决书送达界面数据
140
             showDelivery: false, //快递信息弹框
146
             showDelivery: false, //快递信息弹框
147
+            deliveryDataArr: [],//快递信息数据
148
+            flagLoading: true,
141
         };
149
         };
142
     },
150
     },
143
     created() {
151
     created() {
198
         showaffixModel(row) {
206
         showaffixModel(row) {
199
             this.$modal.confirm('是否进行用印申请?')
207
             this.$modal.confirm('是否进行用印申请?')
200
                 .then(function () {
208
                 .then(function () {
201
-                //   return changeJobStatus(row.jobId, row.status);
209
+                  return adjudicationStamp({id:row.id});
202
             })
210
             })
203
             .then(() => {
211
             .then(() => {
204
-            //   this.$modal.msgSuccess(text + "成功");
212
+                this.getList(this.queryParams);
213
+                this.$modal.msgSuccess("用印成功!");
205
             })
214
             })
206
             .catch(function () {
215
             .catch(function () {
207
-            //   row.status = row.status === "0" ? "1" : "0";
208
             });
216
             });
209
         },
217
         },
210
         // 快递信息弹框
218
         // 快递信息弹框
211
         showDeliveryModel(row) {
219
         showDeliveryModel(row) {
212
             console.log(row,'快递');
220
             console.log(row,'快递');
213
             this.showDelivery = true
221
             this.showDelivery = true
222
+            this.getadjudicationLogistics({id:row.id})
214
         },
223
         },
215
         closeDeliveryModel() {
224
         closeDeliveryModel() {
216
             this.showDelivery = false
225
             this.showDelivery = false
217
         },
226
         },
227
+        // 查询物流信息
228
+        getadjudicationLogistics(val) {
229
+            this.flagLoading = true;
230
+            adjudicationLogistics(val).then((res) => {
231
+                this.deliveryDataArr = res.data
232
+                this.flagLoading = false
233
+            })
234
+        },
218
         // 案件归档
235
         // 案件归档
219
-        showCasefilingModel() {
236
+        showCasefilingModel(row) {
220
             this.$modal.confirm('是否确认立即进行案件扫描?').then(
237
             this.$modal.confirm('是否确认立即进行案件扫描?').then(
221
-                function () {}
238
+                function () {
239
+                    return adjudicationCaseFile({id:row.id})
240
+                }
222
             ).then(() => {
241
             ).then(() => {
223
-
224
-            }).catch(function () {
225
-
226
-            })
242
+                this.getList(this.queryParams);
243
+                this.$modal.msgSuccess("归档成功!");
244
+            }).catch(function () {})
227
         },
245
         },
228
         // 送达裁决书弹框
246
         // 送达裁决书弹框
229
         showMailaward(row) {
247
         showMailaward(row) {

+ 1
- 1
src/views/caseFiling/archiveList.vue Bestand weergeven

147
     };
147
     };
148
   },
148
   },
149
   created() {
149
   created() {
150
-    this.queryParams.caseStatusList = [16];
150
+    this.queryParams.caseStatusList = [17];
151
     this.getList(this.queryParams);
151
     this.getList(this.queryParams);
152
   },
152
   },
153
   methods: {
153
   methods: {

+ 1
- 1
src/views/caseManagement/caseList.vue Bestand weergeven

194
             icon="el-icon-s-check"
194
             icon="el-icon-s-check"
195
             @click="courtconfirmationRow(scope.row)"
195
             @click="courtconfirmationRow(scope.row)"
196
             v-if="scope.row.caseStatus == 6"
196
             v-if="scope.row.caseStatus == 6"
197
-            v-hasPermi="['monitor:online:forceLogout']"
197
+            v-hasPermi="['caseManagement:caseList:commit']"
198
             >组庭确认</el-button
198
             >组庭确认</el-button
199
           >
199
           >
200
           <el-button
200
           <el-button

+ 2
- 2
src/views/paymentManagement/components/paymentdetailsDialog.vue Bestand weergeven

14
         <el-form-item label="案件标的:" prop="caseSubjectAmount">
14
         <el-form-item label="案件标的:" prop="caseSubjectAmount">
15
           <el-input v-model="form.caseSubjectAmount" />
15
           <el-input v-model="form.caseSubjectAmount" />
16
         </el-form-item>
16
         </el-form-item>
17
-        <el-form-item label="缴费人:" prop="caseNum">
18
-          <el-input v-model="form.caseNum" placeholder="" />
17
+        <el-form-item label="缴费人:" prop="applicantName">
18
+          <el-input v-model="form.applicantName" placeholder="" />
19
         </el-form-item>
19
         </el-form-item>
20
         <el-form-item label="缴费金额:" prop="feePayable">
20
         <el-form-item label="缴费金额:" prop="feePayable">
21
           <el-input v-model="form.feePayable" />
21
           <el-input v-model="form.feePayable" />

+ 1
- 0
vue.config.js Bestand weergeven

12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13
 
13
 
14
 const API = 'http://121.40.189.20:9001'  //测试
14
 const API = 'http://121.40.189.20:9001'  //测试
15
+// const API = 'http://192.168.3.18:9001'  //B
15
 // const API = 'http://192.168.3.77:8080' //Q
16
 // const API = 'http://192.168.3.77:8080' //Q
16
 
17
 
17
 // vue.config.js 配置说明
18
 // vue.config.js 配置说明