Sfoglia il codice sorgente

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

hanchaobo 2 anni fa
parent
commit
397ccdff56

+ 176
- 168
api/handlecase/index.js Vedi File

@@ -1,179 +1,187 @@
1
-import request from '@/utils/request'
2
-
3
-// 查询被申请人案件列表
4
-export function respondentList(data) {
5
-	return request({
6
-		'url': '/evidence/all',
7
-		method: 'get',
8
-		params: data
9
-	})
10
-}
11
-// 查询详情
12
-export function respondentDetail(data) {
13
-	return request({
14
-		'url': `/evidence/${data}`,
15
-		method: 'get',
16
-	})
17
-}
18
-// 查询仲裁员列表
19
-export function arbitratorList(data) {
20
-	return request({
21
-		'url': `/caseApplication/listMediator`,
22
-		method: 'get',
23
-		params: data
24
-	})
25
-}
26
-// 确认证据
27
-export function evidenceConfirm() {
28
-	return request({
29
-		'url': `/evidence/confirm`,
30
-		method: 'put',
31
-	})
32
-}
33
-// 案件质证
34
-export function evidenceCrossexami(data) {
35
-	return request({
36
-		'url': `/evidence/crossexami`,
37
-		method: 'post',
38
-		data: data
39
-	})
40
-}
41
-// 查询物流信息
42
-export function logistics(data) {
43
-	return request({
44
-		'url': `/adjudication/logistics`,
45
-		method: 'get',
46
-		data: data
47
-	})
48
-}
49
-// 查询案件列表
50
-export function caseApplicationList(data) {
51
-	return request({
52
-		'url': `/caseApplication/list`,
53
-		method: 'get',
54
-		params: data
55
-	})
56
-}
57
-// 调解系统查看相关案件
58
-export function caseApplicationTj(data) {
59
-	return request({
60
-		'url': `/caseApplication/list`,
61
-		method: 'get',
62
-		params: data
63
-	})
64
-}
65
-// 调解系统查看相关案件详情
66
-export function selectById(data) {
67
-	return request({
68
-		'url': `/caseApplication/selectById`,
69
-		method: 'get',
70
-		params: data
71
-	})
72
-}
73
-// 调解系统选择仲裁员时间
74
-export function updateBooking(data) {
75
-	return request({
76
-		'url': `/caseApplication/updateBooking`,
77
-		method: 'post',
78
-		data: data
79
-	})
80
-}
81
-// 查询按钮列表
82
-export function queryCaseFlowInfo(data) {
83
-	return request({
84
-		'url': `/case/flow/queryCaseFlowInfo`,
85
-		method: 'post',
86
-		data: data
87
-	})
88
-}
89
-
90
-// 根据机构id查询模板
91
-export function getTemplate(data) {
92
-	return request({
93
-		url: `/deptIdentify/getTemplate`,
94
-		method: 'get',
95
-		params: data
96
-	})
97
-}
98
-
99
-// 根据身份证获取生日和性别
100
-export function getInfoByIdCard(query) {
101
-	return request({
102
-		url: '/caseApplication/getInfoByIdCard',
103
-		method: 'get',
104
-		params: query
105
-	})
106
-}
107
-
108
-/** 新增案件 */
109
-export function caseApplicationInsert(data) {
110
-	return request({
111
-		url: '/caseApplication/insert',
112
-		method: 'post',
113
-		data: data
114
-	})
115
-}
116
-// 修改立案申请接口
117
-export function updateComfire(data) {
118
-	return request({
119
-		url: "/caseApplication/update",
120
-		method: "post",
121
-		data: data,
122
-	})
123
-}
124
-//提交案件
125
-export function caseAppSubmit(data) {
126
-	return request({
127
-		url: '/caseApplication/submit',
128
-		method: 'post',
129
-		data: data
130
-	})
131
-}
132
-/** 根据id查询案件信息 */
133
-export function caseApplicationSelectById(data) {
134
-  return request({
135
-    url: '/caseApplication/selectById',
136
-    method: 'get',
137
-    params: data
138
-  })
1
+import request from '@/utils/request'
2
+
3
+// 查询被申请人案件列表
4
+export function respondentList(data) {
5
+	return request({
6
+		'url': '/evidence/all',
7
+		method: 'get',
8
+		params: data
9
+	})
10
+}
11
+// 查询详情
12
+export function respondentDetail(data) {
13
+	return request({
14
+		'url': `/evidence/${data}`,
15
+		method: 'get',
16
+	})
17
+}
18
+// 查询仲裁员列表
19
+export function arbitratorList(data) {
20
+	return request({
21
+		'url': `/caseApplication/listMediator`,
22
+		method: 'get',
23
+		params: data
24
+	})
25
+}
26
+// 确认证据
27
+export function evidenceConfirm() {
28
+	return request({
29
+		'url': `/evidence/confirm`,
30
+		method: 'put',
31
+	})
32
+}
33
+// 案件质证
34
+export function evidenceCrossexami(data) {
35
+	return request({
36
+		'url': `/evidence/crossexami`,
37
+		method: 'post',
38
+		data: data
39
+	})
40
+}
41
+// 查询物流信息
42
+export function logistics(data) {
43
+	return request({
44
+		'url': `/adjudication/logistics`,
45
+		method: 'get',
46
+		data: data
47
+	})
48
+}
49
+// 查询案件列表
50
+export function caseApplicationList(data) {
51
+	return request({
52
+		'url': `/caseApplication/list`,
53
+		method: 'get',
54
+		params: data
55
+	})
56
+}
57
+// 调解系统查看相关案件
58
+export function caseApplicationTj(data) {
59
+	return request({
60
+		'url': `/caseApplication/list`,
61
+		method: 'get',
62
+		params: data
63
+	})
64
+}
65
+// 调解系统查看相关案件详情
66
+export function selectById(data) {
67
+	return request({
68
+		'url': `/caseApplication/selectById`,
69
+		method: 'get',
70
+		params: data
71
+	})
72
+}
73
+// 调解系统选择仲裁员时间
74
+export function updateBooking(data) {
75
+	return request({
76
+		'url': `/caseApplication/updateBooking`,
77
+		method: 'post',
78
+		data: data
79
+	})
80
+}
81
+// 查询按钮列表
82
+export function queryCaseFlowInfo(data) {
83
+	return request({
84
+		'url': `/case/flow/queryCaseFlowInfo`,
85
+		method: 'post',
86
+		data: data
87
+	})
88
+}
89
+
90
+// 根据机构id查询模板
91
+export function getTemplate(data) {
92
+	return request({
93
+		url: `/deptIdentify/getTemplate`,
94
+		method: 'get',
95
+		params: data
96
+	})
97
+}
98
+
99
+// 根据身份证获取生日和性别
100
+export function getInfoByIdCard(query) {
101
+	return request({
102
+		url: '/caseApplication/getInfoByIdCard',
103
+		method: 'get',
104
+		params: query
105
+	})
106
+}
107
+
108
+/** 新增案件 */
109
+export function caseApplicationInsert(data) {
110
+	return request({
111
+		url: '/caseApplication/insert',
112
+		method: 'post',
113
+		data: data
114
+	})
115
+}
116
+// 修改立案申请接口
117
+export function updateComfire(data) {
118
+	return request({
119
+		url: "/caseApplication/update",
120
+		method: "post",
121
+		data: data,
122
+	})
123
+}
124
+//提交案件
125
+export function caseAppSubmit(data) {
126
+	return request({
127
+		url: '/caseApplication/submit',
128
+		method: 'post',
129
+		data: data
130
+	})
131
+}
132
+/** 根据id查询案件信息 */
133
+export function caseApplicationSelectById(data) {
134
+	return request({
135
+		url: '/caseApplication/selectById',
136
+		method: 'get',
137
+		params: data
138
+	})
139 139
 }
140 140
 // 删除案件
141
-export function caseDelete(data) {
142
-	return request({
143
-		url: '/caseApplication/delete',
144
-		method: 'post',
145
-		data: data
146
-	})
141
+export function caseDelete(data) {
142
+	return request({
143
+		url: '/caseApplication/delete',
144
+		method: 'post',
145
+		data: data
146
+	})
147 147
 }
148 148
 //   案件id查询缴费清单
149
-export function selectPaymentDetail(data) {
150
-  return request({
151
-    url: '/pay/selectPaymentDetail',
152
-    method: 'get',
153
-    params: data
154
-  })
149
+export function selectPaymentDetail(data) {
150
+	return request({
151
+		url: '/pay/selectPaymentDetail',
152
+		method: 'get',
153
+		params: data
154
+	})
155 155
 }
156 156
 // 申请人缴费确认
157
-export function confirmPaid(data) {
158
-	return request({
159
-		url: '/pay/confirmPaid',
160
-		method: 'post',
161
-		data: data
162
-	})
157
+export function confirmPaid(data) {
158
+	return request({
159
+		url: '/pay/confirmPaid',
160
+		method: 'post',
161
+		data: data
162
+	})
163 163
 }
164 164
 //默认新增显示
165
-export function getUserInfo(data) {
166
-  return request({
167
-    url: '/caseApplication/getUserInfo',
168
-    method: 'get',
169
-    params: data
170
-  })
165
+export function getUserInfo(data) {
166
+	return request({
167
+		url: '/caseApplication/getUserInfo',
168
+		method: 'get',
169
+		params: data
170
+	})
171 171
 }
172 172
 // 被申请人缴费确认
173
-export function resConfirmPaid(data) {
174
-	return request({
175
-		url: '/pay/resConfirmPaid',
176
-		method: 'post',
177
-		data: data
178
-	})
173
+export function resConfirmPaid(data) {
174
+	return request({
175
+		url: '/pay/resConfirmPaid',
176
+		method: 'post',
177
+		data: data
178
+	})
179
+}
180
+//申请人和被申请人签收调解书
181
+export function msCaseSign(data) {
182
+	return request({
183
+		url: "/mssignSeal/msCaseSign",
184
+		method: "post",
185
+		data: data,
186
+	})
179 187
 }

+ 4
- 4
config.js Vedi File

@@ -3,11 +3,11 @@ module.exports = {
3 3
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
4 4
 	// baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
5 5
 	// baseUrl: 'http://121.40.189.20:9001',
6
-	// baseUrlZC:'https://api.xayunmei.com/zhongcaiapi',
7
-	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
6
+	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
7
+	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
8 8
 	baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
9
-	// baseUrlTJ:'https://api.xayunmei.com/tiaojieapi',
10
-	// baseUrlZC: 'http://121.40.189.20:8001',
9
+	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
10
+	// baseUrlZC: 'http://121.40.189.20:8001',	
11 11
 	// baseUrlTJ: 'http://172.16.1.43:6001',
12 12
 	// baseUrl: 'http://172.16.1.24:8001',
13 13
 	// baseUrl: 'http://localhost:8080',

+ 109
- 54
pages/handlecase/component/list.vue Vedi File

@@ -41,8 +41,10 @@
41 41
 			</view>
42 42
 		</view>
43 43
 		<view class="btn" v-if="sysType == 2">
44
-			<button class="btnItem" type="primary" size="mini" @tap="modify" v-if="checkPermi(['caseManagement:list:edit'])">修改</button>
45
-			<button class="btnItem" type="primary" size="mini" @tap="deleteCase" v-if="checkPermi(['caseManagement:list:delete'])">删除</button>
44
+			<button class="btnItem" type="primary" size="mini" @tap="modify"
45
+				v-if="checkPermi(['caseManagement:list:edit']) && defalutVal.caseFlowId <= 1">修改</button>
46
+			<button class="btnItem" type="primary" size="mini" @tap="deleteCase"
47
+				v-if="checkPermi(['caseManagement:list:delete']) && defalutVal.caseFlowId <= 1">删除</button>
46 48
 			<!-- <button class="btnItem" type="primary" size="mini" @tap="clickPay">申请人缴费</button>
47 49
 			<button class="btnItem" type="primary" size="mini" @tap="caseDetail">选择调解员</button> -->
48 50
 			<button class="btnItem" type="primary" @tap="clickType(item.id)" size="mini" v-for="(item) in buttonList"
@@ -63,12 +65,13 @@
63 65
 	import {
64 66
 		queryCaseFlowInfo,
65 67
 		caseAppSubmit,
66
-		caseDelete
68
+		caseDelete,
69
+		msCaseSign
67 70
 	} from '@/api/handlecase/index.js'
68 71
 	export default {
69 72
 		data() {
70 73
 			return {
71
-				
74
+
72 75
 			}
73 76
 		},
74 77
 		props: {
@@ -122,8 +125,10 @@
122 125
 					// 归档
123 126
 				} else if (type == 15) {
124 127
 					// 申请人签收
128
+					this.signMediation();
125 129
 				} else if (type == 16) {
126 130
 					// 被申请人签收
131
+					this.receivedMediation();
127 132
 				} else if (type == 17) {
128 133
 					//结束
129 134
 				} else if (type == 44) {
@@ -150,38 +155,38 @@
150 155
 				})
151 156
 			},
152 157
 			// 确认缴费
153
-			confirmPayments(){
158
+			confirmPayments() {
154 159
 				uni.navigateTo({
155 160
 					url: `/pages/handlecase/component/confirmPayment?id=${this.defalutVal.id}&caseFlowId=${this.defalutVal.caseFlowId}`
156 161
 				})
157 162
 			},
158 163
 			/**提交案件*/
159 164
 			onsubmitRow() {
160
-				let onsubmitVal ={
161
-					id : this.defalutVal.id,
162
-					batchNumber:"",
163
-					caseFlowId:this.defalutVal.caseFlowId
165
+				let onsubmitVal = {
166
+					id: this.defalutVal.id,
167
+					batchNumber: "",
168
+					caseFlowId: this.defalutVal.caseFlowId
164 169
 				}
165 170
 				uni.showModal({
166
-				  title: '提示',
167
-				  content: '您确定要提交案件',
168
-				  success: function (res) {
169
-				    if (res.confirm) {
170
-				      // console.log('用户点击确定');
171
-					   caseAppSubmit(onsubmitVal).then(res => {
172
-					   	uni.showToast({
173
-					   		title: '提交成功',
174
-					   		icon: 'none',
175
-					   		duration: 1000
176
-					   	})
177
-					   	uni.navigateTo({
178
-					   		url:'/pages/handlecase/index'
179
-					   	})
180
-					   })
181
-				    } else if (res.cancel) {
182
-				      // console.log('用户点击取消');
183
-				    }
184
-				  }
171
+					title: '提示',
172
+					content: '您确定要提交案件',
173
+					success: function(res) {
174
+						if (res.confirm) {
175
+							// console.log('用户点击确定');
176
+							caseAppSubmit(onsubmitVal).then(res => {
177
+								uni.showToast({
178
+									title: '提交成功',
179
+									icon: 'none',
180
+									duration: 1000
181
+								})
182
+								uni.navigateTo({
183
+									url: '/pages/handlecase/index'
184
+								})
185
+							})
186
+						} else if (res.cancel) {
187
+							// console.log('用户点击取消');
188
+						}
189
+					}
185 190
 				});
186 191
 			},
187 192
 			// 修改
@@ -192,37 +197,87 @@
192 197
 			},
193 198
 			/*删除*/
194 199
 			deleteCase() {
195
-				let objValue ={
196
-					id : this.defalutVal.id,
197
-					batchNumber:"",
198
-					caseFlowId:this.defalutVal.caseFlowId
200
+				let objValue = {
201
+					id: this.defalutVal.id,
202
+					batchNumber: "",
203
+					caseFlowId: this.defalutVal.caseFlowId
199 204
 				}
200 205
 				uni.showModal({
201
-				  title: '提示',
202
-				  content: '您确定要删除案件',
203
-				  success: function (res) {
204
-				    if (res.confirm) {
205
-				      // console.log('用户点击确定');
206
-					  caseDelete(objValue).then(res =>{
207
-					    	uni.showToast({
208
-					    		title: '删除成功',
209
-					    		icon: 'none',
210
-					    		duration: 1000
211
-					    	})
212
-					    	uni.navigateTo({
213
-					    		url:'/pages/handlecase/index'
214
-					    	})
215
-					    }) 
216
-				    } else if (res.cancel) {
217
-				      // console.log('用户点击取消');
218
-				    }
219
-				  }
206
+					title: '提示',
207
+					content: '您确定要删除案件',
208
+					success: function(res) {
209
+						if (res.confirm) {
210
+							// console.log('用户点击确定');
211
+							caseDelete(objValue).then(res => {
212
+								uni.showToast({
213
+									title: '删除成功',
214
+									icon: 'none',
215
+									duration: 1000
216
+								})
217
+								uni.navigateTo({
218
+									url: '/pages/handlecase/index'
219
+								})
220
+							})
221
+						} else if (res.cancel) {
222
+							// console.log('用户点击取消');
223
+						}
224
+					}
225
+				});
226
+
227
+			},
228
+			/**申请人签收*/
229
+			signMediation() {
230
+				let that = this;
231
+				let objValue = {
232
+					caseId: this.defalutVal.id,
233
+					isSignApply: 1
234
+				}
235
+				uni.showModal({
236
+					title: '提示',
237
+					content: '您确定要签收',
238
+					success: function(res) {
239
+						if (res.confirm) {
240
+							that.signingMediationAgreement(objValue)
241
+						} else if (res.cancel) {
242
+							// console.log('用户点击取消');
243
+						}
244
+					}
245
+				});
246
+			},
247
+			/**被申请人签收*/
248
+			receivedMediation() {
249
+				let that = this;
250
+				let objValue = {
251
+					caseId: this.defalutVal.id,
252
+					isSignRespon: 1
253
+				}
254
+				uni.showModal({
255
+					title: '提示',
256
+					content: '您确定要签收',
257
+					success: function(res) {
258
+						if (res.confirm) {
259
+							that.signingMediationAgreement(objValue)
260
+						} else if (res.cancel) {
261
+							// console.log('用户点击取消');
262
+						}
263
+					}
264
+				});
265
+			},
266
+			/**申请人和被申请人签收调解书接口*/
267
+			signingMediationAgreement(val) {
268
+				msCaseSign(val).then((res) => {
269
+					uni.showToast({
270
+						title: '签收成功',
271
+						icon: 'none',
272
+						duration: 1000
273
+					})
274
+					uni.navigateTo({
275
+						url: '/pages/handlecase/index'
276
+					})
220 277
 				});
221
-				
222 278
 			},
223 279
 		},
224
-		created() {
225
-		}
280
+		created() {}
226 281
 	}
227 282
 </script>
228 283
 

+ 2
- 1
pages/handlecase/index.vue Vedi File

@@ -188,9 +188,10 @@
188 188
 					pageSize: this.pageSize,
189 189
 					caseFlowId:this.caseFlowId
190 190
 				}
191
+				this.getButtonList();
191 192
 			}
192 193
 			this.getList(obj)
193
-			this.getButtonList()
194
+			// this.getButtonList()
194 195
 		},
195 196
 		onLoad(data) {
196 197
 			this.caseFlowId = data.caseFlowId

+ 5
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
File diff suppressed because it is too large
Vedi File


+ 5
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
File diff suppressed because it is too large
Vedi File


+ 5
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
File diff suppressed because it is too large
Vedi File


+ 5
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
File diff suppressed because it is too large
Vedi File


+ 29
- 28
unpackage/dist/dev/mp-weixin/project.config.json Vedi File

@@ -1,29 +1,30 @@
1
-{
2
-  "description": "项目配置文件。",
3
-  "packOptions": {
4
-    "ignore": [],
5
-    "include": []
6
-  },
7
-  "setting": {
8
-    "urlCheck": false,
9
-    "es6": false,
10
-    "postcss": true,
11
-    "minified": true,
12
-    "newFeature": true,
13
-    "bigPackageSizeSupport": true,
14
-    "babelSetting": {
15
-      "ignore": [],
16
-      "disablePlugins": [],
17
-      "outputPath": ""
18
-    }
19
-  },
20
-  "compileType": "miniprogram",
21
-  "libVersion": "3.3.2",
22
-  "appid": "wx91cb8459dca561b4",
23
-  "projectname": "智慧仲裁",
24
-  "condition": {},
25
-  "editorSetting": {
26
-    "tabIndent": "insertSpaces",
27
-    "tabSize": 2
28
-  }
1
+{
2
+  "description": "项目配置文件。",
3
+  "packOptions": {
4
+    "ignore": [],
5
+    "include": []
6
+  },
7
+  "setting": {
8
+    "urlCheck": false,
9
+    "es6": false,
10
+    "postcss": true,
11
+    "minified": true,
12
+    "newFeature": true,
13
+    "bigPackageSizeSupport": true,
14
+    "babelSetting": {
15
+      "ignore": [],
16
+      "disablePlugins": [],
17
+      "outputPath": ""
18
+    },
19
+    "condition": false
20
+  },
21
+  "compileType": "miniprogram",
22
+  "libVersion": "3.1.1",
23
+  "appid": "wx91cb8459dca561b4",
24
+  "projectname": "智慧仲裁",
25
+  "condition": {},
26
+  "editorSetting": {
27
+    "tabIndent": "insertSpaces",
28
+    "tabSize": 2
29
+  }
29 30
 }

+ 7
- 7
unpackage/dist/dev/mp-weixin/project.private.config.json Vedi File

@@ -1,8 +1,8 @@
1
-{
2
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
3
-  "projectname": "miniapp",
4
-  "setting": {
5
-    "compileHotReLoad": true,
6
-    "urlCheck": false
7
-  }
1
+{
2
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
3
+  "projectname": "miniapp",
4
+  "setting": {
5
+    "compileHotReLoad": true,
6
+    "urlCheck": false
7
+  }
8 8
 }