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

api/handlecase/index.js

@@ -161,3 +161,11 @@ export function confirmPaid(data) {
 		data: data
 	})
 }
+//默认新增显示
+export function getUserInfo(data) {
+  return request({
+    url: '/caseApplication/getUserInfo',
+    method: 'get',
+    params: data
+  })
+}

pages/handlecase/component/confirmPayment.vue

@@ -11,13 +11,13 @@
 				<uni-forms-item label="缴费金额:" name="feePayable" label-width="80px">
 					<uni-easyinput v-model="formData.feePayable" type="text" :disabled='true' placeholder="请输入缴费金额" />
 				</uni-forms-item>
-				<uni-forms-item label="申请人缴费:" name="feePayable" label-width="90px">
+				<uni-forms-item label="申请人缴费:" name="feePayable" label-width="90px" v-if="annexTypeS">
 					<view v-for="item in formData.caseAttachList">
 						<uni-link v-if="item.annexType==4" :href="item.annexPath" color="#007BFF"
 							:text="item.annexName"></uni-link>
 					</view>
 				</uni-forms-item>	
-				<uni-forms-item label="被申请人缴费:" name="feePayable" label-width="100px">
+				<uni-forms-item label="被申请人缴费:" name="feePayable" label-width="100px" v-if="annexTypeB">
 					<view v-for="item in formData.caseAttachList">
 						<uni-link v-if="item.annexType==9" :href="item.annexPath" color="#007BFF"
 							:text="item.annexName"></uni-link>
@@ -43,7 +43,9 @@
 			return {
 				formData:{},
 				rules:{},
-				paymentConfirm:{}
+				paymentConfirm:{},
+				annexTypeS:false,
+				annexTypeB:false
 			}
 		},
 		methods:{
@@ -69,6 +71,13 @@
 			paymentDetails(val) {
 			    selectPaymentDetail(val).then(res => {
 			        this.formData = res.data;
+					this.formData.caseAttachList.forEach(res =>{
+						if(res.annexType==4){
+							this.annexTypeS = true
+						}else if(res.annexType==9){
+							this.annexTypeB = true
+						}
+					})
 			    })
 			},        
 		},

pages/handlecase/component/list.vue

@@ -90,7 +90,7 @@
 					this.onsubmitRow()
 				} else if (type == 2) {
 					// 缴费
-					this.clickPay()
+					this.clickPay(4)
 				} else if (type == 3 || type == 45) {
 					this.confirmPayments()
 					// 确认缴费
@@ -125,7 +125,7 @@
 					//结束
 				} else if (type == 44) {
 					// 被申请人缴费
-					this.clickPay()
+					this.clickPay(9)
 				}
 			},
 			// 案件详情以及操作
@@ -135,9 +135,9 @@
 				})
 			},
 			// 缴费
-			clickPay() {
+			clickPay(type) {
 				uni.navigateTo({
-					url: `/pages/handlecase/component/payList?id=${this.defalutVal.id}`
+					url: `/pages/handlecase/component/payList?id=${this.defalutVal.id}&type=${type}`
 				})
 			},
 			// 确认缴费
@@ -148,7 +148,12 @@
 			},
 			/**提交案件*/
 			onsubmitRow() {
-				caseAppSubmit().then(res => {
+				let onsubmitVal ={
+					id : this.defalutVal.id,
+					batchNumber:"",
+					caseFlowId:this.defalutVal.caseFlowId
+				}
+				caseAppSubmit(onsubmitVal).then(res => {
 					uni.showToast({
 						title: '提交成功',
 						icon: 'none',

pages/handlecase/component/newlyAddedCase.vue

@@ -13,7 +13,7 @@
 				>
 					<uni-easyinput v-model="formData.facts" type="textarea" placeholder="请输入事实和理由" />
 				</uni-forms-item>
-				<uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="120px" required
+				<!-- <uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="120px" required
 				:rules="[{'required': true,errorMessage: '案件标的不能为空'}]"
 				>
 					<uni-easyinput v-model="formData.caseSubjectAmount" type="text" placeholder="请输入案件标的" />
@@ -22,7 +22,7 @@
 				:rules="[{'required': true,errorMessage: '模板不能为空'}]"
 				>
 					<uni-data-select :localdata="templateList" v-model="formData.templateId"></uni-data-select>
-				</uni-forms-item>
+				</uni-forms-item> -->
 				<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='9' />
 				</uni-forms-item>
@@ -34,29 +34,30 @@
 						@change='clearValidate'></uni-data-checkbox>
 				</uni-forms-item>
 				<uni-forms-item :label="formData.affiliate.organizeFlag==0 ? '申请人':'申请机构'" :rules="rulesappName" name="affiliate.applicationName" label-width="120px" required >
-					<uni-easyinput v-model="formData.affiliate.applicationName" type="text" :placeholder="formData.affiliate.organizeFlag==0 ? '请输入申请人姓名':'请输入申请机构名称'"/>
+					<uni-easyinput v-model="formData.affiliate.applicationName" :disabled="disabledApplicat" type="text" :placeholder="formData.affiliate.organizeFlag==0 ? '请输入申请人姓名':'请输入申请机构名称'"/>
 				</uni-forms-item>
 				<uni-forms-item :label="formData.affiliate.organizeFlag==0 ? '身份证号码':'机构代码'" name="affiliate.code" label-width="120px" required 
 				:rules="rulesappNo">
-					<uni-easyinput v-model="formData.affiliate.code" type="text" :placeholder="formData.affiliate.organizeFlag==0 ? '请输入身份证号码':'请输入统一社会代码'" />
+					<uni-easyinput v-model="formData.affiliate.code" :disabled="disabledApplicat" type="text" :placeholder="formData.affiliate.organizeFlag==0 ? '请输入身份证号码':'请输入统一社会代码'" />
 				</uni-forms-item>
 				
-				<uni-forms-item label="申请人邮箱:" name="affiliate.applicationEmail" label-width="120px" required
+				<uni-forms-item label="申请人邮箱:" v-if="formData.affiliate.organizeFlag==0" name="affiliate.applicationEmail" label-width="120px" required
 				:rules="[
 					{'required': true,errorMessage: '申请人邮箱不能为空'},
 					{pattern:'^\\S+?@\\S+?\\.\\S+?$',errorMessage:'邮箱格式不正确'}
 					]"
 				>
 					<uni-easyinput v-model="formData.affiliate.applicationEmail"
+					:disabled="disabledApplicat"
 					 type="text" placeholder="请输入申请人邮箱" />
 				</uni-forms-item>
-				<uni-forms-item label="申请人电话:" name="affiliate.applicationPhone" label-width="120px" required
+				<uni-forms-item label="申请人电话:" v-if="formData.affiliate.organizeFlag==0" name="affiliate.applicationPhone" label-width="120px" required 
 				:rules="[
 					{'required': true,errorMessage: '申请人电话不能为空'},
 					{pattern:'^[1][3,4,5,6,7,8,9][0-9]{9}$',errorMessage:'申请人电话格式不正确'}
 					]"
 				>
-					<uni-easyinput v-model="formData.affiliate.applicationPhone" type="text" placeholder="请输入申请人电话" />
+					<uni-easyinput v-model="formData.affiliate.applicationPhone" :disabled="disabledApplicat" type="text" placeholder="请输入申请人电话" />
 				</uni-forms-item>
 				<uni-forms-item label="法定代表人:" name="affiliate.compLegalPerson" label-width="120px" required
 				:rules="[{'required': true,errorMessage: '法定代表人不能为空'}]"
@@ -73,40 +74,14 @@
 				>
 					<uni-easyinput v-model="formData.affiliate.applicantAddress" type="text" placeholder="请输入申请人联系地址" />
 				</uni-forms-item>
-				<uni-forms-item label="代理人联系电话:" name="affiliate.contactTelphoneAgent" label-width="120px"
-				 
-				v-if="formData.affiliate.organizeFlag==0">
-					<uni-easyinput v-model="formData.affiliate.contactTelphoneAgent" type="text" placeholder="请输入代理人联系电话" />
-				</uni-forms-item>
-				<uni-forms-item label="代理人联系电话:" name="affiliate.contactTelphoneAgent" label-width="120px" required
-				 :rules="[
-					 {'required': true,errorMessage: '代理人联系电话不能为空'},
-					 {pattern:'^[1][3,4,5,6,7,8,9][0-9]{9}$',errorMessage:'代理人联系电话格式不正确'}
-					 ]"
-				v-if="formData.affiliate.organizeFlag==1"
-				>
-					<uni-easyinput v-model="formData.affiliate.contactTelphoneAgent" type="text" placeholder="请输入代理人联系电话" />
-				</uni-forms-item>
-				<uni-forms-item label="委托代理人姓名:" 	name="affiliate.nameAgent" label-width="120px" v-if="formData.affiliate.organizeFlag==0">
-					<uni-easyinput v-model="formData.affiliate.nameAgent" type="text" placeholder="请输入委托代理人姓名" />
-				</uni-forms-item>
-				<uni-forms-item label="委托代理人姓名:" name="affiliate.nameAgent"  label-width="120px" required
-				:rules="[{'required': true,errorMessage: '委托代理人姓名不能为空'}]"
-				v-if="formData.affiliate.organizeFlag==1"
-				>
-					<uni-easyinput v-model="formData.affiliate.nameAgent" type="text" placeholder="请输入委托代理人姓名" />
+				<uni-forms-item label="代理人联系电话:"  label-width="120px">
+					<uni-easyinput v-model="formData.affiliate.contactTelphoneAgent" :disabled="disabledVal" type="text" placeholder="请输入代理人联系电话" />
 				</uni-forms-item>
-				<uni-forms-item label="代理人邮箱:" name="affiliate.agentEmail" label-width="120px" v-if="formData.affiliate.organizeFlag==0">
-					<uni-easyinput v-model="formData.affiliate.agentEmail" type="text" placeholder="请输入代理人邮箱" />
+				<uni-forms-item label="代理人姓名:" 	 label-width="120px">
+					<uni-easyinput v-model="formData.affiliate.nameAgent" :disabled="disabledVal" type="text" placeholder="请输入委托代理人姓名" />
 				</uni-forms-item>
-				<uni-forms-item label="代理人邮箱:" name="affiliate.agentEmail" label-width="120px" required
-				:rules="[
-					{'required': true,errorMessage: '代理人邮箱不能为空'},
-					{pattern:'^\\S+?@\\S+?\\.\\S+?$',errorMessage:'邮箱格式不正确'}
-					]"
-				v-if="formData.affiliate.organizeFlag==1"
-				>
-					<uni-easyinput v-model="formData.affiliate.agentEmail" type="text" placeholder="请输入代理人邮箱" />
+				<uni-forms-item label="代理人邮箱:"  label-width="120px">
+					<uni-easyinput v-model="formData.affiliate.agentEmail" :disabled="disabledVal" type="text" placeholder="请输入代理人邮箱" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人姓名:" name="affiliate.respondentName" label-width="120px" required
 				:rules="[{'required': true,errorMessage: '被申请人姓名不能为空'}]"
@@ -167,7 +142,7 @@
 </template>
 
 <script>
-	import {getTemplate,getInfoByIdCard,caseApplicationInsert,updateComfire,caseApplicationSelectById} from '../../../api/handlecase/index.js'
+	import {getTemplate,getInfoByIdCard,caseApplicationInsert,updateComfire,caseApplicationSelectById,getUserInfo} from '../../../api/handlecase/index.js'
 	import {
 		getToken
 	} from '@/utils/auth'
@@ -183,6 +158,7 @@
 						columnValueList: [],
 						caseAttachList: [],
 					},
+					getUserInfoList:{},
 					ids:null,
 					tempFilePaths: null,
 					templateList:[],
@@ -202,6 +178,8 @@
 							value: 0
 						}
 					],
+					disabledVal:false,
+					disabledApplicat:false,
 					fileList: {},
 					rules:{},
 					rulesappName: [
@@ -252,11 +230,6 @@
 			
 		},
 		methods:{
-			clearValidate(val){
-				 this.formData.affiliate.applicationName = null
-				 this.formData.affiliate.code = null
-				 this.$refs["form"].clearValidate()
-			},
 			submitReasont(){
 				this.$refs.form.validate().then(res=>{
 						if(this.ids){
@@ -269,6 +242,55 @@
 						
 				})
 			},
+			// 获取新增默认值
+			getUserInfoNumber(){
+				getUserInfo().then(res =>{
+					this.getUserInfoList = res.data
+					if(this.formData.affiliate.organizeFlag == 0){
+						this.$set(this.formData.affiliate, 'applicationName', res.data.nickName)
+						this.$set(this.formData.affiliate, 'code', res.data.idCard)
+						this.$set(this.formData.affiliate, 'applicationEmail', res.data.email)
+						this.$set(this.formData.affiliate, 'applicationPhone', res.data.phonenumber)
+						// this.$set(this.formData.affiliate, 'nameAgent', res.data.nickName)
+						this.disabledVal = false
+						this.disabledApplicat = true
+					}else if(this.formData.affiliate.organizeFlag == 1){
+						console.log(this.formData.affiliate.organizeFlag)
+						this.$set(this.formData.affiliate, 'nameAgent', res.data.nickName)
+						this.$set(this.formData.affiliate, 'agentEmail', res.data.email)
+						this.$set(this.formData.affiliate, 'contactTelphoneAgent', res.data.phonenumber)
+						this.disabledVal = true
+						this.disabledApplicat = false
+					}
+					
+				})
+			},
+			clearValidate(val){
+				if(this.formData.affiliate.organizeFlag == 0){
+					this.$set(this.formData.affiliate, 'applicationName', this.getUserInfoList.nickName)
+					this.$set(this.formData.affiliate, 'code', this.getUserInfoList.idCard)
+					this.$set(this.formData.affiliate, 'applicationEmail', this.getUserInfoList.email)
+					this.$set(this.formData.affiliate, 'applicationPhone', this.getUserInfoList.phonenumber)
+					this.$set(this.formData.affiliate, 'nameAgent', null)
+					this.$set(this.formData.affiliate, 'agentEmail', null)
+					this.$set(this.formData.affiliate, 'contactTelphoneAgent', null)
+					this.disabledVal = false
+					this.disabledApplicat = true
+				}else if(this.formData.affiliate.organizeFlag == 1){
+					this.$set(this.formData.affiliate, 'nameAgent', this.getUserInfoList.nickName)
+					this.$set(this.formData.affiliate, 'agentEmail', this.getUserInfoList.email)
+					this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.getUserInfoList.phonenumber)
+					this.$set(this.formData.affiliate, 'applicationName', null)
+					this.$set(this.formData.affiliate, 'code', null)
+					this.$set(this.formData.affiliate, 'applicationEmail', null)
+					this.$set(this.formData.affiliate, 'applicationPhone', null)
+					this.disabledVal = true
+					this.disabledApplicat = false
+				}
+					// this.formData.affiliate.applicationName =null
+					// this.formData.affiliate.code =null
+				 this.$refs["form"].clearValidate()
+			},
 			/** 获取裁决书模板 */
 			getTemplateFn(data) {
 			      getTemplate(data).then((res) => {
@@ -299,7 +321,7 @@
 			    insertFn(data) {
 			      caseApplicationInsert(data).then((res) => {
 					  uni.showToast({
-					  	title: '成功',
+					  	title: '新增成功',
 					  	icon: 'none',
 					  	duration: 1000
 					  })
@@ -312,7 +334,7 @@
 				modifyData(data) {
 				      updateComfire(data).then((res) => {
 				        uni.showToast({
-				        	title: '成功',
+				        	title: '修改成功',
 				        	icon: 'none',
 				        	duration: 1000
 				        })
@@ -378,6 +400,7 @@
 				uni.setNavigationBarTitle({title:"案件新增"})
 			}
 			this.getTemplateFn()
+			this.getUserInfoNumber()	
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules)

pages/handlecase/component/payList.vue

@@ -86,14 +86,27 @@
 					payType: 1,
 					payOrderList: [],
 					caseId: null
-				}
+				},
+				dataType:{},
+				formDataVal:{}
 			}
 		},
 		methods: {
 			/**获取案件缴费信息*/
 			getData(parms) {
 				selectById(parms).then(res => {
-					this.formData = res.data
+					this.formData = res.data
+					if(this.dataType.type==4){
+						this.formDataVal ={
+							annexType: 4,
+							id: this.formData.id
+						}
+					}else if(this.dataType.type==9){
+						this.formDataVal ={
+							annexType: 9,
+							id: this.formData.id
+						}
+					}
 				})
 			},
 			/**生成二维码*/
@@ -130,10 +143,7 @@
 					header: {
 						Authorization: getToken() || '',
 					},
-					formData: {
-						annexType: 4,
-						id: this.formData.id
-					},
+					formData:this.formDataVal,
 					name: 'file',
 					success: (res) => {
 						let {
@@ -216,7 +226,8 @@
 				this.confirmPaymentFn(this.submitForm);
 			}
 		},
-		onLoad(data) {
+		onLoad(data) {
+			this.dataType = data
 			this.getData({
 				id: data.id
 			});