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

pages/handlecase/component/newlyAddedCase.vue

@@ -26,9 +26,22 @@
 				<uni-forms-item label="申请人案件证据资料上传:" name="headImage" label-width="120px">
 							<uni-file-picker ref="files" file-mediatype="all" return-type='object' v-model="fileList" :auto-upload="false" @select="select" :limit='1' />
 				</uni-forms-item>
+				<uni-forms-item label="证据:"  label-width="120px" v-if="ids">
+					<view class="" v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==2" :href="baseUrl+item.annexPath" color="#007BFF"
+							:text="item.annexName"></uni-link>
+					</view>
+				</uni-forms-item>
+				<uni-forms-item label="调解申请书:"  label-width="120px"  v-if="ids">
+					<view class="" v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==3" :href="baseUrl+item.annexPath" color="#007BFF"
+							:text="item.annexName"></uni-link>
+					</view>
+				</uni-forms-item>
 				<uni-section title="双方信息" type="line" padding></uni-section>
 				<uni-forms-item label="选择机构或自然人" label-width="120px" name="objectiJuris">
 					<uni-data-checkbox class='checkbox' 
+						:disabled="ids?true:false"
 						:localdata="objectiJurisArr"
 						v-model="formData.affiliate.organizeFlag"
 						@change='clearValidate'></uni-data-checkbox>
@@ -144,6 +157,7 @@
 	export default {
 		data() {
 				return {
+					baseUrl : config.baseUrlTJ,
 					formData:{
 						affiliate:{
 							organizeFlag: 0,
@@ -300,6 +314,7 @@
 				  caseApplicationSelectById(data).then(res=>{
 					 res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
 					 this.formData = res.data
+					 console.log( this.formData)
 				  })
 			 },
 			// 被申请人获取性别出生年月

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.affiliate.applicationName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="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.affiliate.respondentName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.respondentName"
 						placeholder="" />
 				</uni-forms-item>
 				<!-- <uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required>
@@ -62,7 +62,8 @@
 	export default {
 		data() {
 			return {
-				formData: {},
+				formData: {},
+				affiliate:{},
 				selectFlag: false,
 				rules: {},
 				payPlatforms: [{
@@ -99,6 +100,8 @@
 			getData(parms) {
 				selectById(parms).then(res => {
 					this.formData = res.data
+					this.affiliate = res.data.affiliate
+					console.log(this.formData)
 					if(this.dataType.type==4){
 						this.formDataVal ={
 							annexType: 4,