Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj

api/handlecase/index.js

@@ -1,179 +1,187 @@
-import request from '@/utils/request'
-
-// 查询被申请人案件列表
-export function respondentList(data) {
-	return request({
-		'url': '/evidence/all',
-		method: 'get',
-		params: data
-	})
-}
-// 查询详情
-export function respondentDetail(data) {
-	return request({
-		'url': `/evidence/${data}`,
-		method: 'get',
-	})
-}
-// 查询仲裁员列表
-export function arbitratorList(data) {
-	return request({
-		'url': `/caseApplication/listMediator`,
-		method: 'get',
-		params: data
-	})
-}
-// 确认证据
-export function evidenceConfirm() {
-	return request({
-		'url': `/evidence/confirm`,
-		method: 'put',
-	})
-}
-// 案件质证
-export function evidenceCrossexami(data) {
-	return request({
-		'url': `/evidence/crossexami`,
-		method: 'post',
-		data: data
-	})
-}
-// 查询物流信息
-export function logistics(data) {
-	return request({
-		'url': `/adjudication/logistics`,
-		method: 'get',
-		data: data
-	})
-}
-// 查询案件列表
-export function caseApplicationList(data) {
-	return request({
-		'url': `/caseApplication/list`,
-		method: 'get',
-		params: data
-	})
-}
-// 调解系统查看相关案件
-export function caseApplicationTj(data) {
-	return request({
-		'url': `/caseApplication/list`,
-		method: 'get',
-		params: data
-	})
-}
-// 调解系统查看相关案件详情
-export function selectById(data) {
-	return request({
-		'url': `/caseApplication/selectById`,
-		method: 'get',
-		params: data
-	})
-}
-// 调解系统选择仲裁员时间
-export function updateBooking(data) {
-	return request({
-		'url': `/caseApplication/updateBooking`,
-		method: 'post',
-		data: data
-	})
-}
-// 查询按钮列表
-export function queryCaseFlowInfo(data) {
-	return request({
-		'url': `/case/flow/queryCaseFlowInfo`,
-		method: 'post',
-		data: data
-	})
-}
-
-// 根据机构id查询模板
-export function getTemplate(data) {
-	return request({
-		url: `/deptIdentify/getTemplate`,
-		method: 'get',
-		params: data
-	})
-}
-
-// 根据身份证获取生日和性别
-export function getInfoByIdCard(query) {
-	return request({
-		url: '/caseApplication/getInfoByIdCard',
-		method: 'get',
-		params: query
-	})
-}
-
-/** 新增案件 */
-export function caseApplicationInsert(data) {
-	return request({
-		url: '/caseApplication/insert',
-		method: 'post',
-		data: data
-	})
-}
-// 修改立案申请接口
-export function updateComfire(data) {
-	return request({
-		url: "/caseApplication/update",
-		method: "post",
-		data: data,
-	})
-}
-//提交案件
-export function caseAppSubmit(data) {
-	return request({
-		url: '/caseApplication/submit',
-		method: 'post',
-		data: data
-	})
-}
-/** 根据id查询案件信息 */
-export function caseApplicationSelectById(data) {
-  return request({
-    url: '/caseApplication/selectById',
-    method: 'get',
-    params: data
-  })
+import request from '@/utils/request'
+
+// 查询被申请人案件列表
+export function respondentList(data) {
+	return request({
+		'url': '/evidence/all',
+		method: 'get',
+		params: data
+	})
+}
+// 查询详情
+export function respondentDetail(data) {
+	return request({
+		'url': `/evidence/${data}`,
+		method: 'get',
+	})
+}
+// 查询仲裁员列表
+export function arbitratorList(data) {
+	return request({
+		'url': `/caseApplication/listMediator`,
+		method: 'get',
+		params: data
+	})
+}
+// 确认证据
+export function evidenceConfirm() {
+	return request({
+		'url': `/evidence/confirm`,
+		method: 'put',
+	})
+}
+// 案件质证
+export function evidenceCrossexami(data) {
+	return request({
+		'url': `/evidence/crossexami`,
+		method: 'post',
+		data: data
+	})
+}
+// 查询物流信息
+export function logistics(data) {
+	return request({
+		'url': `/adjudication/logistics`,
+		method: 'get',
+		data: data
+	})
+}
+// 查询案件列表
+export function caseApplicationList(data) {
+	return request({
+		'url': `/caseApplication/list`,
+		method: 'get',
+		params: data
+	})
+}
+// 调解系统查看相关案件
+export function caseApplicationTj(data) {
+	return request({
+		'url': `/caseApplication/list`,
+		method: 'get',
+		params: data
+	})
+}
+// 调解系统查看相关案件详情
+export function selectById(data) {
+	return request({
+		'url': `/caseApplication/selectById`,
+		method: 'get',
+		params: data
+	})
+}
+// 调解系统选择仲裁员时间
+export function updateBooking(data) {
+	return request({
+		'url': `/caseApplication/updateBooking`,
+		method: 'post',
+		data: data
+	})
+}
+// 查询按钮列表
+export function queryCaseFlowInfo(data) {
+	return request({
+		'url': `/case/flow/queryCaseFlowInfo`,
+		method: 'post',
+		data: data
+	})
+}
+
+// 根据机构id查询模板
+export function getTemplate(data) {
+	return request({
+		url: `/deptIdentify/getTemplate`,
+		method: 'get',
+		params: data
+	})
+}
+
+// 根据身份证获取生日和性别
+export function getInfoByIdCard(query) {
+	return request({
+		url: '/caseApplication/getInfoByIdCard',
+		method: 'get',
+		params: query
+	})
+}
+
+/** 新增案件 */
+export function caseApplicationInsert(data) {
+	return request({
+		url: '/caseApplication/insert',
+		method: 'post',
+		data: data
+	})
+}
+// 修改立案申请接口
+export function updateComfire(data) {
+	return request({
+		url: "/caseApplication/update",
+		method: "post",
+		data: data,
+	})
+}
+//提交案件
+export function caseAppSubmit(data) {
+	return request({
+		url: '/caseApplication/submit',
+		method: 'post',
+		data: data
+	})
+}
+/** 根据id查询案件信息 */
+export function caseApplicationSelectById(data) {
+	return request({
+		url: '/caseApplication/selectById',
+		method: 'get',
+		params: data
+	})
 }
 // 删除案件
-export function caseDelete(data) {
-	return request({
-		url: '/caseApplication/delete',
-		method: 'post',
-		data: data
-	})
+export function caseDelete(data) {
+	return request({
+		url: '/caseApplication/delete',
+		method: 'post',
+		data: data
+	})
 }
 //   案件id查询缴费清单
-export function selectPaymentDetail(data) {
-  return request({
-    url: '/pay/selectPaymentDetail',
-    method: 'get',
-    params: data
-  })
+export function selectPaymentDetail(data) {
+	return request({
+		url: '/pay/selectPaymentDetail',
+		method: 'get',
+		params: data
+	})
 }
 // 申请人缴费确认
-export function confirmPaid(data) {
-	return request({
-		url: '/pay/confirmPaid',
-		method: 'post',
-		data: data
-	})
+export function confirmPaid(data) {
+	return request({
+		url: '/pay/confirmPaid',
+		method: 'post',
+		data: data
+	})
 }
 //默认新增显示
-export function getUserInfo(data) {
-  return request({
-    url: '/caseApplication/getUserInfo',
-    method: 'get',
-    params: data
-  })
+export function getUserInfo(data) {
+	return request({
+		url: '/caseApplication/getUserInfo',
+		method: 'get',
+		params: data
+	})
 }
 // 被申请人缴费确认
-export function resConfirmPaid(data) {
-	return request({
-		url: '/pay/resConfirmPaid',
-		method: 'post',
-		data: data
-	})
+export function resConfirmPaid(data) {
+	return request({
+		url: '/pay/resConfirmPaid',
+		method: 'post',
+		data: data
+	})
+}
+//申请人和被申请人签收调解书
+export function msCaseSign(data) {
+	return request({
+		url: "/mssignSeal/msCaseSign",
+		method: "post",
+		data: data,
+	})
 }

config.js

@@ -3,11 +3,11 @@ module.exports = {
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
 	// baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
 	// baseUrl: 'http://121.40.189.20:9001',
-	// baseUrlZC:'https://api.xayunmei.com/zhongcaiapi',
-	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
+	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
+	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
 	baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
-	// baseUrlTJ:'https://api.xayunmei.com/tiaojieapi',
-	// baseUrlZC: 'http://121.40.189.20:8001',
+	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
+	// baseUrlZC: 'http://121.40.189.20:8001',	
 	// baseUrlTJ: 'http://172.16.1.43:6001',
 	// baseUrl: 'http://172.16.1.24:8001',
 	// baseUrl: 'http://localhost:8080',

pages/handlecase/component/list.vue

@@ -41,8 +41,10 @@
 			</view>
 		</view>
 		<view class="btn" v-if="sysType == 2">
-			<button class="btnItem" type="primary" size="mini" @tap="modify" v-if="checkPermi(['caseManagement:list:edit'])">修改</button>
-			<button class="btnItem" type="primary" size="mini" @tap="deleteCase" v-if="checkPermi(['caseManagement:list:delete'])">删除</button>
+			<button class="btnItem" type="primary" size="mini" @tap="modify"
+				v-if="checkPermi(['caseManagement:list:edit']) && defalutVal.caseFlowId <= 1">修改</button>
+			<button class="btnItem" type="primary" size="mini" @tap="deleteCase"
+				v-if="checkPermi(['caseManagement:list:delete']) && defalutVal.caseFlowId <= 1">删除</button>
 			<!-- <button class="btnItem" type="primary" size="mini" @tap="clickPay">申请人缴费</button>
 			<button class="btnItem" type="primary" size="mini" @tap="caseDetail">选择调解员</button> -->
 			<button class="btnItem" type="primary" @tap="clickType(item.id)" size="mini" v-for="(item) in buttonList"
@@ -63,12 +65,13 @@
 	import {
 		queryCaseFlowInfo,
 		caseAppSubmit,
-		caseDelete
+		caseDelete,
+		msCaseSign
 	} from '@/api/handlecase/index.js'
 	export default {
 		data() {
 			return {
-				
+
 			}
 		},
 		props: {
@@ -122,8 +125,10 @@
 					// 归档
 				} else if (type == 15) {
 					// 申请人签收
+					this.signMediation();
 				} else if (type == 16) {
 					// 被申请人签收
+					this.receivedMediation();
 				} else if (type == 17) {
 					//结束
 				} else if (type == 44) {
@@ -150,38 +155,38 @@
 				})
 			},
 			// 确认缴费
-			confirmPayments(){
+			confirmPayments() {
 				uni.navigateTo({
 					url: `/pages/handlecase/component/confirmPayment?id=${this.defalutVal.id}&caseFlowId=${this.defalutVal.caseFlowId}`
 				})
 			},
 			/**提交案件*/
 			onsubmitRow() {
-				let onsubmitVal ={
-					id : this.defalutVal.id,
-					batchNumber:"",
-					caseFlowId:this.defalutVal.caseFlowId
+				let onsubmitVal = {
+					id: this.defalutVal.id,
+					batchNumber: "",
+					caseFlowId: this.defalutVal.caseFlowId
 				}
 				uni.showModal({
-				  title: '提示',
-				  content: '您确定要提交案件',
-				  success: function (res) {
-				    if (res.confirm) {
-				      // console.log('用户点击确定');
-					   caseAppSubmit(onsubmitVal).then(res => {
-					   	uni.showToast({
-					   		title: '提交成功',
-					   		icon: 'none',
-					   		duration: 1000
-					   	})
-					   	uni.navigateTo({
-					   		url:'/pages/handlecase/index'
-					   	})
-					   })
-				    } else if (res.cancel) {
-				      // console.log('用户点击取消');
-				    }
-				  }
+					title: '提示',
+					content: '您确定要提交案件',
+					success: function(res) {
+						if (res.confirm) {
+							// console.log('用户点击确定');
+							caseAppSubmit(onsubmitVal).then(res => {
+								uni.showToast({
+									title: '提交成功',
+									icon: 'none',
+									duration: 1000
+								})
+								uni.navigateTo({
+									url: '/pages/handlecase/index'
+								})
+							})
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
 				});
 			},
 			// 修改
@@ -192,37 +197,87 @@
 			},
 			/*删除*/
 			deleteCase() {
-				let objValue ={
-					id : this.defalutVal.id,
-					batchNumber:"",
-					caseFlowId:this.defalutVal.caseFlowId
+				let objValue = {
+					id: this.defalutVal.id,
+					batchNumber: "",
+					caseFlowId: this.defalutVal.caseFlowId
 				}
 				uni.showModal({
-				  title: '提示',
-				  content: '您确定要删除案件',
-				  success: function (res) {
-				    if (res.confirm) {
-				      // console.log('用户点击确定');
-					  caseDelete(objValue).then(res =>{
-					    	uni.showToast({
-					    		title: '删除成功',
-					    		icon: 'none',
-					    		duration: 1000
-					    	})
-					    	uni.navigateTo({
-					    		url:'/pages/handlecase/index'
-					    	})
-					    }) 
-				    } else if (res.cancel) {
-				      // console.log('用户点击取消');
-				    }
-				  }
+					title: '提示',
+					content: '您确定要删除案件',
+					success: function(res) {
+						if (res.confirm) {
+							// console.log('用户点击确定');
+							caseDelete(objValue).then(res => {
+								uni.showToast({
+									title: '删除成功',
+									icon: 'none',
+									duration: 1000
+								})
+								uni.navigateTo({
+									url: '/pages/handlecase/index'
+								})
+							})
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
+
+			},
+			/**申请人签收*/
+			signMediation() {
+				let that = this;
+				let objValue = {
+					caseId: this.defalutVal.id,
+					isSignApply: 1
+				}
+				uni.showModal({
+					title: '提示',
+					content: '您确定要签收',
+					success: function(res) {
+						if (res.confirm) {
+							that.signingMediationAgreement(objValue)
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			/**被申请人签收*/
+			receivedMediation() {
+				let that = this;
+				let objValue = {
+					caseId: this.defalutVal.id,
+					isSignRespon: 1
+				}
+				uni.showModal({
+					title: '提示',
+					content: '您确定要签收',
+					success: function(res) {
+						if (res.confirm) {
+							that.signingMediationAgreement(objValue)
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			/**申请人和被申请人签收调解书接口*/
+			signingMediationAgreement(val) {
+				msCaseSign(val).then((res) => {
+					uni.showToast({
+						title: '签收成功',
+						icon: 'none',
+						duration: 1000
+					})
+					uni.navigateTo({
+						url: '/pages/handlecase/index'
+					})
 				});
-				
 			},
 		},
-		created() {
-		}
+		created() {}
 	}
 </script>
 

pages/handlecase/index.vue

@@ -188,9 +188,10 @@
 					pageSize: this.pageSize,
 					caseFlowId:this.caseFlowId
 				}
+				this.getButtonList();
 			}
 			this.getList(obj)
-			this.getButtonList()
+			// this.getButtonList()
 		},
 		onLoad(data) {
 			this.caseFlowId = data.caseFlowId

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,29 +1,30 @@
-{
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": false,
-    "postcss": true,
-    "minified": true,
-    "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
-  },
-  "compileType": "miniprogram",
-  "libVersion": "3.3.2",
-  "appid": "wx91cb8459dca561b4",
-  "projectname": "智慧仲裁",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
+{
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": false,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true,
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "condition": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "3.1.1",
+  "appid": "wx91cb8459dca561b4",
+  "projectname": "智慧仲裁",
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }

unpackage/dist/dev/mp-weixin/project.private.config.json

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