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

api/handlecase/index.js

@@ -89,38 +89,46 @@ export function queryCaseFlowInfo(data) {
 
 // 根据机构id查询模板
 export function getTemplate(data) {
-    return request({
-        url: `/deptIdentify/getTemplate`,
-        method: 'get',
-        params: data
-    })
+	return request({
+		url: `/deptIdentify/getTemplate`,
+		method: 'get',
+		params: data
+	})
 }
 
 // 根据身份证获取生日和性别
 export function getInfoByIdCard(query) {
-  return request({
-    url: '/caseApplication/getInfoByIdCard',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: '/caseApplication/getInfoByIdCard',
+		method: 'get',
+		params: query
+	})
 }
 
 /** 新增案件 */
 export function caseApplicationInsert(data) {
-  return request({
-    url: '/caseApplication/insert',
-    method: 'post',
-    data: data
-  })
+	return request({
+		url: '/caseApplication/insert',
+		method: 'post',
+		data: data
+	})
 }
 // 修改立案申请接口
 export function updateComfire(data) {
-  return request({
-    url: "/caseApplication/update",
-    method: "post",
-    data: 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({

pages/handlecase/component/list.vue

@@ -44,7 +44,8 @@
 			<button class="btnItem" type="primary" size="mini" @tap="modify">修改</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" size="mini" v-for="(item) in buttonList" :key="item.id"
+			<button class="btnItem" type="primary" @tap="clickType(item.id)" size="mini" v-for="(item) in buttonList"
+				:key="item.id"
 				v-if="item.id == defalutVal.caseFlowId && checkPermi([item.buttonAuthFlag])">{{ item.nodeName }}</button>
 			<!-- <button class="btnItem" type="primary" size="mini" @tap="confirmationEvidence">确认证据</button>
 			<button class="btnItem" type="primary" size="mini" @tap="isAssignrbitrators">是否指派仲裁员</button>
@@ -56,12 +57,13 @@
 
 <script>
 	import {
-		queryCaseFlowInfo
+		queryCaseFlowInfo,
+		caseAppSubmit
 	} from '@/api/handlecase/index.js'
 	export default {
 		data() {
 			return {
-				buttonList: []
+
 			}
 		},
 		props: {
@@ -72,9 +74,57 @@
 			sysType: {
 				type: Number,
 				default: () => {}
+			},
+			buttonList: {
+				type: Array,
+				default: () => {}
 			}
 		},
 		methods: {
+			/**点击列表按钮*/
+			clickType(type) {
+				if (type == 1) {
+					// 提交案件
+					this.onsubmitRow()
+				} else if (type == 2) {
+					// 缴费
+					this.clickPay()
+				} else if (type == 3 || type == 45) {
+					// 确认缴费
+				} else if (type == 4) {
+					// 受理分配
+				} else if (type == 5) {
+					// 选择调解员
+					this.caseDetail()
+				} else if (type == 6) {
+					// 核实调解员
+				} else if (type == 7) {
+					// 确认调解员
+				} else if (type == 8) {
+					// 确定调解时间
+				} else if (type == 9) {
+					// 调解
+				} else if (type == 10) {
+					// 确认调解书
+				} else if (type == 11) {
+					// 签名
+				} else if (type == 12) {
+					// 用印申请
+				} else if (type == 13) {
+					// 用印
+				} else if (type == 14) {
+					// 归档
+				} else if (type == 15) {
+					// 申请人签收
+				} else if (type == 16) {
+					// 被申请人签收
+				} else if (type == 17) {
+					//结束
+				} else if (type == 44) {
+					// 被申请人缴费
+					this.clickPay()
+				}
+			},
 			// 案件详情以及操作
 			caseDetail() {
 				uni.navigateTo({
@@ -86,6 +136,17 @@
 					url: `/pages/handlecase/component/payList?id=${this.defalutVal.id}`
 				})
 			},
+			/**提交案件*/
+			onsubmitRow() {
+				caseAppSubmit().then(res => {
+					uni.showToast({
+						title: '成功',
+						icon: 'none',
+						duration: 1000
+					})
+					this.$emit("getList");
+				})
+			},
 			// 修改
 			modify(){
 				uni.redirectTo({
@@ -107,7 +168,7 @@
 			},
 		},
 		created() {
-			this.getButtonList()
+			// this.getButtonList()
 		}
 	}
 </script>

pages/handlecase/component/payList.vue

@@ -6,11 +6,11 @@
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum" placeholder="" />
 				</uni-forms-item>
 				<uni-forms-item label="申请人：" name="applicantName" label-width="120px" required>
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.applicantName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.affiliate.applicationName"
 						placeholder="" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required>
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.respondentName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.affiliate.respondentName"
 						placeholder="" />
 				</uni-forms-item>
 				<uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required>
@@ -25,7 +25,7 @@
 		<uni-forms-item label="缴费方式">
 			<uni-data-checkbox v-model="payType" :localdata="payTypes" @change="changeType" />
 		</uni-forms-item>
-		<uni-forms-item label="缴费平台">
+		<uni-forms-item label="缴费平台" v-if="payType == 0">
 			<uni-data-checkbox v-model="payPlatform" :localdata="payPlatforms" @change="changePayType" />
 		</uni-forms-item>
 		<div class="payImg" v-if="payType == 0">
@@ -114,7 +114,7 @@
 			},
 			/**选择缴费方式*/
 			changeType(val) {
-				this.submitForm.payType = val;
+				this.submitForm.payType = val.detail.value;
 			},
 			/**文件上传*/
 			select(e) {

pages/handlecase/index.vue

@@ -3,7 +3,8 @@
 		<view class="" v-if="sysType == 2">
 			<button type="primary" @tap="newlyAddedCases">新增案件</button>
 		</view>
-		<List class="caseList" v-for="(item,index) in caseList" :defalutVal='item' :key="index" :sysType='sysType'>
+		<List class="caseList" v-for="(item,index) in caseList" :defalutVal='item' :buttonList='buttonList' :key="index"
+			:sysType='sysType'>
 		</List>
 		<view class="emptyBox" v-if="caseList.length == 0">
 			<luanqing-empty :show="true" textColor="#000"></luanqing-empty>
@@ -15,7 +16,8 @@
 	import List from './component/list.vue'
 	import {
 		respondentList,
-		caseApplicationTj
+		caseApplicationTj,
+		queryCaseFlowInfo
 	} from '../../api/handlecase/index.js'
 	import LuanqingEmpty from "@/components/luanqing-empty.vue"
 	export default {
@@ -30,9 +32,23 @@
 				pageSize: 10,
 				sysType: null,
 				total: null,
+				buttonList: []
 			}
 		},
 		methods: {
+			/**查询按钮列表 */
+			getButtonList() {
+				queryCaseFlowInfo({
+					pageNum: 1,
+					pageSize: 100000
+				}).then(res => {
+					res.rows.forEach(item => {
+						if (item.id != 11 && item.id != 17) {
+							this.buttonList.push(item)
+						}
+					});
+				})
+			},
 			getList(parms) {
 				if (this.sysType == 1) {
 					respondentList(parms).then(res => {
@@ -154,7 +170,7 @@
 				this.getList(obj)
 			}
 		},
-		onShow() {
+		onLoad() {
 			this.sysType = uni.getStorageSync('sysType');
 			let obj = {}
 			if (this.sysType == 1) {
@@ -170,6 +186,7 @@
 				}
 			}
 			this.getList(obj)
+			this.getButtonList()
 		},
 		// onLoad() {
 		// 	let obj = {