diff --git a/pages/handlecase/component/newlyAddedCase.vue b/pages/handlecase/component/newlyAddedCase.vue
index 9bdc841..117532e 100644
--- a/pages/handlecase/component/newlyAddedCase.vue
+++ b/pages/handlecase/component/newlyAddedCase.vue
@@ -15,16 +15,6 @@
:rules="[{required: true,errorMessage: '事实和理由不能为空'}]">
-
@@ -41,111 +31,161 @@
:text="item.annexName">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ v-model="formData.organizeFlag" @change='clearValidate'>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -170,26 +210,115 @@
getToken
} from '@/utils/auth'
import config from '@/config'
+import constant from '../../../utils/constant.js'
export default {
data() {
return {
baseUrl: config.baseUrlTJ,
certificate: [],
+ dynamicLists: [],
nationality: [
- { value: 0, text: "国内" },
- { value: 1, text: "国外" },
+ { value: 0, text: "境内" },
+ { value: 1, text: "境外" },
],
+ isOperate:[
+ { value: 1, text: "是" },
+ { value: 0, text: "否" },
+ ],
+ isProxyApplicant:[
+ { value: 1, text: "是" },
+ { value: 0, text: "否" },
+ ],
+ isRespondent:[
+ { value: 1, text: "是" },
+ { value: 0, text: "否" },
+ ],
+ isResApplicant:[
+ { value: 1, text: "是" },
+ { value: 0, text: "否" },
+ ],
+ delShow:false,
formZipData: {},
formData: {
- affiliate: {
- organizeFlag: 0,
- respondentSex: 0,
- idType:0,
- nationality:0
- },
+ organizeFlag: 0,
+ // affiliate: {
+ // roleType:1,
+ // respondentSex: 0,
+ // },
+ affiliate:[{
+ applicant: {
+ roleType: 1,
+ name: "",
+ idCard: "",
+ code: "",
+ phone: "",
+ compLegalPerson: "",
+ email: "",
+ home: "",
+ address: "",
+ idType: 0,
+ nationality: 1,
+ birth: "",
+ sex: "",
+ group_order: 1,
+ operatorFlag:1
+ },
+ applicantAgent: {
+ roleType: 2,
+ name: "",
+ idCard: "",
+ code: "",
+ phone: "",
+ compLegalPerson: "",
+ email: "",
+ home: "",
+ address: "",
+ idType: 0,
+ nationality: 1,
+ birth: "",
+ sex: "",
+ group_order: 1,
+ operatorFlag:1
+ },
+ res:{
+ roleTyp: 3,
+ name: "",
+ idCard: "",
+ code: "",
+ phone: "",
+ compLegalPerson: "",
+ email: "",
+ home: "",
+ address: "",
+ idType: 0,
+ nationality: 1,
+ birth: "",
+ sex: "0",
+ group_order: 1,
+ operatorFlag:1
+ },
+ resAgent: {
+ roleType: 4,
+ name: "",
+ idCard: "",
+ code: "",
+ phone: "",
+ compLegalPerson: "",
+ email: "",
+ home: "",
+ address: "",
+ idType: 0,
+ nationality: 1,
+ birth: "",
+ sex: "",
+ group_order: 1,
+ operatorFlag:1
+ }
+ }],
columnValueList: [],
caseAttachList: [],
},
+ testVerify:true,
getUserInfoList: {},
ids: null,
tempFilePaths: null,
@@ -214,24 +343,11 @@
fileList: {},
fileListZip: {},
rules: {},
- rulesappName: [{
- required: true,
- errorMessage: '输入信息不能为空',
- }, {
-
- validateFunction: (rule, value, data, callback) => {
- //判断手机号格式时候正确
- if (value.length < 1) {
- if (this.formData.affiliate.organizeFlag == 0) {
- callback('请输入申请人姓名')
- } else {
- callback('请输入机构名称')
- }
- }
- return true
- }
-
- }],
+ rulesRespondentPhone:[
+ {required:true ,errorMessage: '被申请人联系电话不能为空'},
+ {pattern:'^[1][3,4,5,6,7,8,9][0-9]{9}$',errorMessage:'被申请人联系电话格式不正确'}
+ ],
+ rulesPersonName:[{'required': true,errorMessage: '不能为空'}],
rulesappNo: [{
required: true,
errorMessage: '输入信息不能为空',
@@ -239,7 +355,7 @@
validateFunction: (rule, value, data, callback) => {
//判断手机号格
- if (this.formData.affiliate.organizeFlag == 0) {
+ if (this.formData.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)) {
@@ -261,7 +377,7 @@
methods: {
submitReasont() {
this.$refs.form.validate().then(res => {
- console.log(this.ids)
+ console.log("pppppppppppp")
if (this.ids) {
this.modifyData(this.formData)
} else {
@@ -269,42 +385,44 @@
}
}).catch(err => {
-
+ console.log(err)
})
},
// 获取新增默认值
getUserInfoNumber() {
+ let indexs = ""
+ this.formData.affiliate.forEach((item,index)=>{
+ indexs = index
+ })
getUserInfo().then(res => {
this.getUserInfoList = res.data
- console.log(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, 'idType', res.data.idType)
- this.$set(this.formData.affiliate, 'nationality', res.data.nationality)
- // 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.$set(this.formData.affiliate, 'nationality', res.data.nationality)
- this.disabledVal = true
- this.disabledApplicat = false
+ if (this.formData.organizeFlag == 0) {
+ this.$set(this.formData.affiliate[indexs].applicant, 'name', res.data.nickName)
+ this.$set(this.formData.affiliate[indexs].applicant, 'idCard', res.data.idCard)
+ this.$set(this.formData.affiliate[indexs].applicant, 'email', res.data.email)
+ this.$set(this.formData.affiliate[indexs].applicant, 'phone', res.data.phonenumber)
+ this.$set(this.formData.affiliate[indexs].applicant, 'idType', res.data.idType)
+ this.$set(this.formData.affiliate[indexs].applicant, 'nationality', res.data.nationality)
+ } else if (this.formData.organizeFlag == 1) {
+ console.log(this.formData.organizeFlag)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'name', res.data.nickName)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'email', res.data.email)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'phone', res.data.phonenumber)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'nationality', res.data.nationality)
}
})
},
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)
+ let indexs = ""
+ this.formData.affiliate.forEach((item,index)=>{
+ indexs = index
+ })
+ if (this.formData.organizeFlag == 0) {
+ this.$set(this.formData.affiliate[indexs].applicant, 'name', this.getUserInfoList.nickName)
+ this.$set(this.formData.affiliate[indexs].applicant, 'idCard', this.getUserInfoList.idCard)
+ this.$set(this.formData.affiliate[indexs].applicant, 'email', this.getUserInfoList.email)
+ this.$set(this.formData.affiliate[indexs].applicant, 'phone', this.getUserInfoList.phonenumber)
if (this.formZipData.affiliate) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
@@ -335,16 +453,16 @@
this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate
.compLegalPerson);
} else {
- this.$set(this.formData.affiliate, 'nameAgent', null)
- this.$set(this.formData.affiliate, 'agentEmail', null)
- this.$set(this.formData.affiliate, 'contactTelphoneAgent', null)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'name', null)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'email', null)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'phone', 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)
+ } else if (this.formData.organizeFlag == 1) {
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'name', this.getUserInfoList.nickName)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'email', this.getUserInfoList.email)
+ this.$set(this.formData.affiliate[indexs].applicantAgent, 'phone', this.getUserInfoList.phonenumber)
if (this.formZipData.affiliate) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
@@ -376,10 +494,10 @@
this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate
.respondentEmail);
} else {
- 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.$set(this.formData.affiliate[indexs].applicant, 'name', null)
+ this.$set(this.formData.affiliate[indexs].applicant, 'idCard', null)
+ this.$set(this.formData.affiliate[indexs].applicant, 'email', null)
+ this.$set(this.formData.affiliate[indexs].applicant, 'phone', null)
}
this.disabledVal = true
this.disabledApplicat = false
@@ -409,13 +527,15 @@
})
},
// 被申请人获取性别出生年月
- handleBlur() {
+ handleBlur(index) {
+ console.log(this.formData.affiliate[index].res.idCard)
let idCards = {
- idCard: this.formData.affiliate.respondentIdentityNum,
+ idCard: this.formData.affiliate[index].res.idCard,
};
- getInfoByIdCard(idCards).then(res => {
- this.formData.affiliate.respondentSex = Number(res.respondentSex);
- this.formData.affiliate.respondentBirth = res.respondentBirth;
+
+ getInfoByIdCard(idCards).then(res => {
+ this.formData.affiliate[index].res.sex = Number(res.respondentSex);
+ this.formData.affiliate[index].res.birth= res.respondentBirth;
})
},
// 新增案件
@@ -475,7 +595,7 @@
duration: 1000
})
this.formZipData = result.data;
- if (this.formData.affiliate.organizeFlag == 0) {
+ if (this.formData.organizeFlag == 0) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate
@@ -504,7 +624,7 @@
.respondentEmail);
this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate
.compLegalPerson);
- } else if (this.formData.affiliate.organizeFlag == 1) {
+ } else if (this.formData.organizeFlag == 1) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate, 'applicationName', this.formZipData.affiliate
@@ -598,6 +718,16 @@
changeDocment(e){
console.log(e)
},
+ //改变地区类型
+ changeArea(e){
+ if(e==0){
+ this.testVerify = true
+ this.rulesRespondentPhone[0].required = true;
+ }else if(e==1){
+ this.testVerify = false
+ this.rulesRespondentPhone[0].required = false;
+ }
+ },
// 获取证件类型
getIdType(){
idType().then(res =>{
@@ -606,7 +736,108 @@
this.certificate.push({value:item.dictSort,text:item.dictLabel})
})
})
+ },
+ // 新增多个申请代理人
+ addMultiple(){
+ this.delShow =true
+ this.formData.affiliate.push({
+ applicant:{
+ roleType: 1,
+ name: "",
+ idCard: "",
+ code: "",
+ phone: "",
+ compLegalPerson: "",
+ email: "",
+ home: "",
+ address: "",
+ idType: 0,
+ nationality: 1,
+ birth: "",
+ sex: "",
+ group_order: 1,
+ operatorFlag:1
+ },
+ applicantAgent: {
+ roleType: 2,
+ name: "",
+ idCard: "",
+ code: "",
+ phone: "",
+ compLegalPerson: "",
+ email: "",
+ home: "",
+ address: "",
+ idType: 0,
+ nationality: 1,
+ birth: "",
+ sex: "",
+ group_order: 1,
+ operatorFlag:1
+ },
+ res:{
+ roleTyp: 3,
+ name: "",
+ idCard: "",
+ code: "",
+ phone: "",
+ compLegalPerson: "",
+ email: "",
+ home: "",
+ address: "",
+ idType: 0,
+ nationality: 1,
+ birth: "",
+ sex: "0",
+ group_order: 1,
+ operatorFlag:1
+ },
+ resAgent: {
+ roleType: 4,
+ name: "",
+ idCard: "",
+ code: "",
+ phone: "",
+ compLegalPerson: "",
+ email: "",
+ home: "",
+ address: "",
+ idType: 0,
+ nationality: 1,
+ birth: "",
+ sex: "",
+ group_order: 1,
+ operatorFlag:1
+ }
+ })
+ let idnexVal = ""
+ this.formData.affiliate.forEach((item,index)=>{
+ idnexVal = index
+ })
+ getUserInfo().then(res => {
+ this.getUserInfoList = res.data
+ if (this.formData.organizeFlag == 0) {
+ this.$set(this.formData.affiliate[idnexVal].applicant, 'name', res.data.nickName)
+ this.$set(this.formData.affiliate[idnexVal].applicant, 'idCard', res.data.idCard)
+ this.$set(this.formData.affiliate[idnexVal].applicant, 'email', res.data.email)
+ this.$set(this.formData.affiliate[idnexVal].applicant, 'phone', res.data.phonenumber)
+ this.$set(this.formData.affiliate[idnexVal].applicant, 'idType', res.data.idType)
+ this.$set(this.formData.affiliate[idnexVal].applicant, 'nationality', res.data.nationality)
+ } else if (this.formData.organizeFlag == 1) {
+ this.$set(this.formData.affiliate[idnexVal].applicantAgent, 'name', res.data.nickName)
+ this.$set(this.formData.affiliate[idnexVal].applicantAgent, 'email', res.data.email)
+ this.$set(this.formData.affiliate[idnexVal].applicantAgent, 'phone', res.data.phonenumber)
+ this.$set(this.formData.affiliate[idnexVal].applicantAgent, 'nationality', res.data.nationality)
+ }
+
+ })
+ },
+ //删除新增的多个申请代理人
+ delValue(id){
+ let index = this.formData.affiliate.findIndex(v => v.id === id)
+ this.formData.affiliate.splice(index, 1)
}
+
},
onLoad(data) {
this.ids = data.id
@@ -622,6 +853,13 @@
title: "案件新增"
})
}
+ if(this.formData.affiliate.nationality == 0){
+ this.testVerify = true
+ this.rulesRespondentPhone[0].required = true;
+ }else if(this.formData.affiliate.idType==1){
+ this.testVerify = false
+ this.rulesRespondentPhone[0].required = false;
+ }
this.getTemplateFn()
this.getUserInfoNumber()
this.getIdType() //获取证件类型
diff --git a/pages/register.vue b/pages/register.vue
index 9eee9b5..9e2bf30 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -112,8 +112,8 @@ import constant from '../utils/constant'
sysType:null,
certificate: [],
nationality: [
- { value: 0, text: "国内" },
- { value: 1, text: "国外" },
+ { value: 0, text: "境内" },
+ { value: 1, text: "境外" },
],
passportVal:{}
}
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index 8513e0e..9b32348 100644
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -348,7 +348,7 @@
.uni-select {
font-size: 14px;
- // border: 1px solid $uni-border-3;
+ border: 1px solid $uni-border-3;
box-sizing: border-box;
border-radius: 4px;
padding: 0 5px;
@@ -360,7 +360,7 @@
/* #endif */
flex-direction: row;
align-items: center;
- // border-bottom: solid 1px $uni-border-3;
+ border-bottom: solid 1px $uni-border-3;
width: 100%;
flex: 1;
height: 35px;