From 2caffc8f0566d704e7a17a208a4408b2d420bd69 Mon Sep 17 00:00:00 2001
From: gyj <gaoyj@aliyun.com>
Date: Tue, 6 Feb 2024 09:14:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/handlecase/component/newlyAddedCase.vue | 128 +++++++++---------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/pages/handlecase/component/newlyAddedCase.vue b/pages/handlecase/component/newlyAddedCase.vue
index eb9ac2f..9fdb23e 100644
--- a/pages/handlecase/component/newlyAddedCase.vue
+++ b/pages/handlecase/component/newlyAddedCase.vue
@@ -3,13 +3,19 @@
 		<view class="assignrbitrators">
 			<uni-forms ref="form" :modelValue="formData" :rules="rules">
 				<uni-section title="案件信息" type="line" padding></uni-section>
-				<uni-forms-item label="申请人调解请求:" name="arbitratClaims" label-width="120px" required>
+				<uni-forms-item label="申请人调解请求:" name="arbitratClaims" label-width="120px" required
+				:rules="[{'required': true,errorMessage: '申请人调解请求不能为空'}]"
+				>
 					<uni-easyinput  v-model="formData.arbitratClaims" type="textarea" placeholder="请输入申请人调解请求" />
 				</uni-forms-item>
-				<uni-forms-item label="事实和理由:" name="facts" label-width="120px" required>
+				<uni-forms-item label="事实和理由:" name="facts" label-width="120px" required
+				:rules="[{'required': true,errorMessage: '事实和理由不能为空'}]"
+				>
 					<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="请输入案件标的" />
 				</uni-forms-item>
 				<uni-forms-item label="模板:" name="templateId" label-width="120px" required 
@@ -18,7 +24,7 @@
 					<uni-data-select :localdata="templateList" v-model="formData.templateId"></uni-data-select>
 				</uni-forms-item>
 				<uni-forms-item label="申请人案件证据资料上传:" name="headImage" label-width="120px">
-							<uni-file-picker ref="files" file-mediatype="all" :auto-upload="false" @select="select" :limit='1' />
+							<uni-file-picker ref="files" file-mediatype="all" :auto-upload="false" @select="select" :limit='9' />
 				</uni-forms-item>
 				<uni-section title="双方信息" type="line" padding></uni-section>
 				<uni-forms-item label="选择机构或自然人" label-width="120px" name="objectiJuris">
@@ -27,34 +33,14 @@
 						v-model="formData.affiliate.organizeFlag"
 						@change='clearValidate'></uni-data-checkbox>
 				</uni-forms-item>
-				<uni-forms-item label="申请人:" name="affiliate.applicationName" 
-				:rules="[{'required': true,errorMessage: '申请人不能为空'}]"
-				label-width="120px" required v-if="formData.affiliate.organizeFlag==0">
-					<uni-easyinput v-model="formData.affiliate.applicationName" type="text" placeholder="请输入申请人名称" />
+				<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-forms-item>
-				<uni-forms-item label="申请人机构名称:" name="affiliate.applicationName" label-width="120px"
-				 :rules="[{'required': true,errorMessage: '申请人机构名称为空'}]" required
-				v-if="formData.affiliate.organizeFlag==1"
-				>
-					<uni-easyinput v-model="formData.affiliate.applicationName" 
-					type="text" placeholder="请输入申请人机构名称" />
+				<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-forms-item>
-				<uni-forms-item label="申请人身份证号码:" name="affiliate.code" label-width="120px" required 
-				:rules="[
-					{'required': true,errorMessage: '申请人身份证号码为空'},
-					{pattern:'^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$',errorMessage:'申请人身份证格式错误'}
-					]"
 				
-				v-if="formData.affiliate.organizeFlag==0"
-				>
-					<uni-easyinput v-model="formData.affiliate.code" type="text" placeholder="请输入申请人身份证号码" />
-				</uni-forms-item>
-				<uni-forms-item label="统一社会信用代码:" name="affiliate.code" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '统一社会信用代码为空'}]"
-				v-if="formData.affiliate.organizeFlag==1"
-				>
-					<uni-easyinput type="text" v-model="formData.affiliate.code" placeholder="请输入统一社会信用代码:" />
-				</uni-forms-item>
 				<uni-forms-item label="申请人邮箱:" name="affiliate.applicationEmail" label-width="120px" required
 				:rules="[
 					{'required': true,errorMessage: '申请人邮箱不能为空'},
@@ -215,47 +201,58 @@
 							value: 0
 						}
 					],
-					rules: {
-						arbitratClaims: {
-							rules:[
-								{
-									required: true,
-									errorMessage: '申请人调解请求不能为空',
-								},
-							],
-						},
-						facts:{
-							rules:[
-								{
-									required: true,
-									errorMessage: '事实和理由不能空',
-								},
-							],
-						},
-						caseSubjectAmount:{
-							rules:[
-								{
-									required: true,
-									errorMessage: '案件标的不能为空',
-								},
-							],
-						},
-						respondentEmail:{
-							rules:[
-								{
-									required: true,
-									errorMessage: '邮箱不能为空',
+					rules:{},
+					rulesappName: [
+						{  
+							required: true,    
+							errorMessage: '输入信息不能为空',    
+						},{
+							
+							validateFunction: (rule, value, data, callback) => {
+								//判断手机号格式时候正确
+								if (value.length<3) {
+									if(this.formData.affiliate.organizeFlag == 0){
+										callback('请输入申请人姓名')
+									}else{
+										callback('请输入机构名称')
+									}
 								}
-							],
-						},
-						
-					}
+								return true
+							}
+													
+						}
+					],
+					rulesappNo: [
+						{  
+							required: true,    
+							errorMessage:'输入信息不能为空',    
+						},{
+							
+							validateFunction: (rule, value, data, callback) => {
+								//判断手机号格
+								if(this.formData.affiliate.organizeFlag == 0){
+									let pNoReg = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+									if(!pNoReg.test(value)){
+										callback('请输入正确的身份证号码')
+									}
+								}else{
+									if(!value){
+										callback('请输入正确的机构信息')
+									}
+								}
+								return true
+							}
+													
+						}
+					]
 				}
 			
 			
 		},
 		methods:{
 			clearValidate(val){
+				 this.formData.affiliate.applicationName = null
+				 this.formData.affiliate.code = null
 				 this.$refs["form"].clearValidate()
 			},
 			submitReasont(){
@@ -274,7 +271,7 @@
 					})
 			      });
 			},
-			// 被申请人获取性别喝出生年月
+			// 被申请人获取性别出生年月
 			handleBlur(){
 				let idCards = {
 				        idCard: this.formData.affiliate.respondentIdentityNum,
@@ -359,6 +356,9 @@
 		},
 		onLoad(data) {
 			this.getTemplateFn()
+		},
+		onReady() {
+			this.$refs.form.setRules(this.rules)
 		}
 	}
 	

From e988fe64074d501483ea1c03c9b90e95602357cd Mon Sep 17 00:00:00 2001
From: gyj <gaoyj@aliyun.com>
Date: Tue, 6 Feb 2024 14:39:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/handlecase/index.js                       |  8 ++++++
 pages/handlecase/component/list.vue           |  7 +++++
 pages/handlecase/component/newlyAddedCase.vue | 26 ++++++++++++++++---
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/api/handlecase/index.js b/api/handlecase/index.js
index 9df86e0..753b383 100644
--- a/api/handlecase/index.js
+++ b/api/handlecase/index.js
@@ -120,4 +120,12 @@ export function updateComfire(data) {
     method: "post",
     data: data,
   })
+}
+/** 根据id查询案件信息 */
+export function caseApplicationSelectById(data) {
+  return request({
+    url: '/caseApplication/selectById',
+    method: 'get',
+    params: data
+  })
 }
\ No newline at end of file
diff --git a/pages/handlecase/component/list.vue b/pages/handlecase/component/list.vue
index 1d5068c..98886f0 100644
--- a/pages/handlecase/component/list.vue
+++ b/pages/handlecase/component/list.vue
@@ -41,6 +41,7 @@
 			</view>
 		</view>
 		<view class="btn" v-if="sysType == 2">
+			<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"
@@ -85,6 +86,12 @@
 					url: `/pages/handlecase/component/payList?id=${this.defalutVal.id}`
 				})
 			},
+			// 修改
+			modify(){
+				uni.redirectTo({
+					url: `/pages/handlecase/component/newlyAddedCase?id=${this.defalutVal.id}`,
+				})
+			},
 			/**查询按钮列表 */
 			getButtonList() {
 				queryCaseFlowInfo({
diff --git a/pages/handlecase/component/newlyAddedCase.vue b/pages/handlecase/component/newlyAddedCase.vue
index 9fdb23e..29a1a22 100644
--- a/pages/handlecase/component/newlyAddedCase.vue
+++ b/pages/handlecase/component/newlyAddedCase.vue
@@ -167,7 +167,7 @@
 </template>
 
 <script>
-	import {getTemplate,getInfoByIdCard,caseApplicationInsert,updateComfire} from '../../../api/handlecase/index.js'
+	import {getTemplate,getInfoByIdCard,caseApplicationInsert,updateComfire,caseApplicationSelectById} from '../../../api/handlecase/index.js'
 	import {
 		getToken
 	} from '@/utils/auth'
@@ -183,6 +183,7 @@
 						columnValueList: [],
 						caseAttachList: [],
 					},
+					ids:null,
 					tempFilePaths: null,
 					templateList:[],
 					objectiJurisArr: [{
@@ -210,7 +211,7 @@
 							
 							validateFunction: (rule, value, data, callback) => {
 								//判断手机号格式时候正确
-								if (value.length<3) {
+								if (value.length<1) {
 									if(this.formData.affiliate.organizeFlag == 0){
 										callback('请输入申请人姓名')
 									}else{
@@ -257,7 +258,12 @@
 			},
 			submitReasont(){
 				this.$refs.form.validate().then(res=>{
-						this.insertFn(this.formData)
+						if(this.ids){
+							this.modifyData(this.formData)
+						}else{
+							this.insertFn(this.formData)
+						}
+						
 					}).catch(err =>{
 						
 				})
@@ -271,6 +277,13 @@
 					})
 			      });
 			},
+			 /** 根据案件id获取对应信息 */
+			 caseApplicationSelectByIdFn(data) {
+				  caseApplicationSelectById(data).then(res=>{
+					 res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
+					 this.formData = res.data
+				  })
+			 },
 			// 被申请人获取性别出生年月
 			handleBlur(){
 				let idCards = {
@@ -355,6 +368,13 @@
 			}
 		},
 		onLoad(data) {
+			this.ids = data.id
+			if(this.ids){
+				this.caseApplicationSelectByIdFn({id:data.id})
+				uni.setNavigationBarTitle({title:"案件修改"})
+			}else{
+				uni.setNavigationBarTitle({title:"案件新增"})
+			}
 			this.getTemplateFn()
 		},
 		onReady() {