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

pages/handlecase/component/list.vue

@@ -53,7 +53,7 @@
 			<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"
 				:key="item.id"
-				v-if="item.id == defalutVal.caseFlowId && checkPermi([item.buttonAuthFlag])">{{ item.nodeName }}</button>
+				v-if="item.id == defalutVal.caseFlowId && checkPermi([item.buttonAuthFlag])&& (defalutVal.appOperatorFlag == 1 || defalutVal.resOperatorFlag == 1 || defalutVal.otherFlag == 1)">{{ item.nodeName }}</button>
 			<!-- <button class="btnItem" type="primary" size="mini" @tap="confirmationEvidence">确认证据</button>
 			<button class="btnItem" type="primary" size="mini" @tap="isAssignrbitrators">是否指派仲裁员</button>
 			<button class="btnItem" type="primary" size="mini" @tap="isAssignrbitrators">是否指派仲裁员</button>

pages/handlecase/component/newlyAddedCase.vue

@@ -243,6 +243,7 @@ import constant from '../../../utils/constant.js'
 				formZipData: {},
 				formData: {
 					organizeFlag: 0,
+					caseSource:"YC",
 					// affiliate: {
 					// 	roleType:1,	
 					// 	respondentSex: 0,
@@ -264,7 +265,7 @@ import constant from '../../../utils/constant.js'
 									birth: "",
 									sex: "",
 									group_order: 1,
-									operatorFlag:1
+									operatorFlag:0
 								},
 								applicantAgent:{
 									roleType:2,
@@ -280,12 +281,12 @@ import constant from '../../../utils/constant.js'
 									nationality:1,
 									birth:"",
 									sex:"",
-									operatorFlag:1
+									operatorFlag:0
 								}	
 							}],
 							res:[{
 								res:{
-									roleType: 1,
+									roleType: 3,
 									name: "",
 									idCard: "",
 									code: "",
@@ -299,10 +300,10 @@ import constant from '../../../utils/constant.js'
 									birth: "",
 									sex: "",
 									group_order: 1,
-									operatorFlag:1
+									operatorFlag:0
 								},
 								resAgent:{
-									roleType: 1,
+									roleType: 4,
 									name: "",
 									idCard: "",
 									code: "",
@@ -316,7 +317,7 @@ import constant from '../../../utils/constant.js'
 									birth: "",
 									sex: "",
 									group_order: 1,
-									operatorFlag:1
+									operatorFlag:0
 								}
 							}]
 					},
@@ -814,7 +815,7 @@ import constant from '../../../utils/constant.js'
 						birth: "",
 						sex: "",
 						group_order: 1,
-						operatorFlag:1
+						operatorFlag:0
 					},
 					applicantAgent:{
 						roleType:2,
@@ -830,7 +831,7 @@ import constant from '../../../utils/constant.js'
 						nationality:1,
 						birth:"",
 						sex:"",
-						operatorFlag:1
+						operatorFlag:0
 					}
 				})
 				let idnexVal = ""
@@ -859,7 +860,7 @@ import constant from '../../../utils/constant.js'
 			addRespondent(){
 				this.formData.affiliate.res.push({
 					res:{
-						roleType: 1,
+						roleType: 3,
 						name: "",
 						idCard: "",
 						code: "",
@@ -873,10 +874,10 @@ import constant from '../../../utils/constant.js'
 						birth: "",
 						sex: "",
 						group_order: 1,
-						operatorFlag:1
+						operatorFlag:0
 					},
 					resAgent:{
-						roleType: 1,
+						roleType: 4,
 						name: "",
 						idCard: "",
 						code: "",
@@ -890,7 +891,7 @@ import constant from '../../../utils/constant.js'
 						birth: "",
 						sex: "",
 						group_order: 1,
-						operatorFlag:1
+						operatorFlag:0
 					}
 				})
 			},

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="affiliate.applicationName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.name"
 						placeholder="" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required>
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.respondentName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliateRes.name"
 						placeholder="" />
 				</uni-forms-item>
 				<!-- <uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required>
@@ -63,7 +63,8 @@
 		data() {
 			return {
 				formData: {},
-				affiliate:{},
+				affiliate:{},
+				affiliateRes:{},
 				selectFlag: false,
 				rules: {},
 				payPlatforms: [{
@@ -100,8 +101,18 @@
 			getData(parms) {
 				selectById(parms).then(res => {
 					this.formData = res.data
-					this.affiliate = res.data.affiliate
+					res.data.affiliate.applicant.forEach((item,index) =>{
-					console.log(this.formData)
+						if(item.applicant!=null){
+						this.affiliate = {name:item.applicant.name}	
+						}
+						
+					})
+					res.data.affiliate.applicant.forEach((item,index) =>{
+						if(item.res!=null){
+							this.affiliateRes = {name:item.res.name}
+						}
+						
+					})
 					if(this.dataType.type==4){
 						this.formDataVal ={
 							annexType: 4,
@@ -160,7 +171,6 @@
 							annexId: data.annexId,
 							annexName: data.fileName
 						});
-						// console.log(this.submitForm, "OOOOOOOOOOOOOOOOOOOOOOOOO");
 						uni.showToast({
 							title: '上传成功',
 							icon: 'none',

pages/handlecase/index.vue

@@ -29,7 +29,7 @@
 			return {
 				caseList: [],
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 50,
 				sysType: null,
 				total: null,
 				buttonList: []
@@ -127,6 +127,7 @@
 							this.caseList = []
 						}
 					})
+					
 				}
 
 			},