diff --git a/src/main.js b/src/main.js index fae9808..5d51bfd 100644 --- a/src/main.js +++ b/src/main.js @@ -13,11 +13,15 @@ import router from './router' import directive from './directive' // directive import plugins from './plugins' // plugins import { download } from '@/utils/request' - +import { Message } from 'element-ui' +import NProgress from 'nprogress' +import 'nprogress/nprogress.css' +import { getToken } from '@/utils/auth' +import { isRelogin } from '@/utils/request' import './assets/icons' // icon // 引入Iconfont 矢量图标库 import './assets/icon/iconfont.css' -import './permission' // permission control +// import './permission' // permission control import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; @@ -78,7 +82,61 @@ DictData.install() * Currently MockJs will be used in the production environment, * please remove it before going online! ! ! */ +NProgress.configure({ showSpinner: false }) +const whiteList = ['/login', '/register'] + +router.beforeEach((to, from, next) => { + let path = to.fullPath + if(path.indexOf('token') != -1){ + path = path.split('token='); + path = path[1]; + Cookies.set("Admin-Token", path) + } + NProgress.start() + if (getToken()) { + to.meta.title && store.dispatch('settings/setTitle', to.meta.title) + /* has token*/ + if (to.path === '/login') { + next({ path: '/' }) + NProgress.done() + } else { + if (store.getters.roles.length === 0) { + isRelogin.show = true + // 判断当前用户是否已拉取完user_info信息 + store.dispatch('GetInfo').then(() => { + isRelogin.show = false + store.dispatch('GenerateRoutes').then(accessRoutes => { + // 根据roles权限生成可访问的路由表 + router.addRoutes(accessRoutes) // 动态添加可访问路由表 + next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 + }) + }).catch(err => { + store.dispatch('LogOut').then(() => { + Message.error(err) + next({ path: '/' }) + }) + }) + } else { + next() + } + } + } else { + // 没有token + if (whiteList.indexOf(to.path) !== -1) { + // 在免登录白名单，直接进入 + next() + } else { + // next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页 + next(`/login`) + NProgress.done() + } + } +}) + +router.afterEach(() => { + NProgress.done() +}) Vue.use(Element, { size: Cookies.get('size') || 'medium' // set element-ui default size }) diff --git a/src/permission.js b/src/permission.js index a22753d..8e63135 100644 --- a/src/permission.js +++ b/src/permission.js @@ -11,6 +11,7 @@ NProgress.configure({ showSpinner: false }) const whiteList = ['/login', '/register'] router.beforeEach((to, from, next) => { + console.log("**************************************"); NProgress.start() if (getToken()) { to.meta.title && store.dispatch('settings/setTitle', to.meta.title) diff --git a/src/router/index.js b/src/router/index.js index ece8f48..d719aa0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -66,6 +66,11 @@ export const constantRoutes = [ component: () => import('@/views/onlyoffice/onlyoffice'), hidden: true }, + { + path: '/test', + component: () => import('@/views/test'), + hidden: true + }, { path: '', component: Layout, diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 5cd5f67..d048a65 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -18,7 +18,7 @@ @keyup.enter.native="handleQuery" /> --> - @@ -211,6 +211,7 @@ export default { pageNum: 1, pageSize: 10, }, + queryDisable:false, // 遮罩层 loading: false, // 总条数 @@ -277,6 +278,12 @@ export default { }; }, created() { + this.queryParams.caseNum = this.$route.query.caseNum; + if(this.$route.query.token){ + this.queryDisable = true; + }else{ + this.queryDisable = false; + } // this.getList(this.queryParams); this.listDeptFn(); // this.getButtonList() diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue index c46b8aa..82bc35e 100644 --- a/src/views/caseManagement/components/addCase.vue +++ b/src/views/caseManagement/components/addCase.vue @@ -48,42 +48,6 @@ :autosize="{ minRows: 4, maxRows: 8 }" /> - - - - - +
@@ -125,126 +89,135 @@ - - 达成调解 - 未达成调解 - 未达成调解但不在争议 - 未达成调解但同意引入仲裁 - 达成和解 - + + 达成调解 + 未达成调解 + 未达成调解但不在争议 + 未达成调解但同意引入仲裁 + 达成和解 +
-
双方信息：
+
双方信息：
 - - + + 自然人 机构 -
-
-
申请人
-
- - - - 新增申请人信息 + +
+ +
+
+
申请人
+
+ + + + - - - - - + + + + - - - - - + + + + + + + + + + + + + - - - - - + + + + - - + + - - - - - - + - - + + - - - - - - + - - - - - - + + + + - - - - - + + + + - - - - - - + + + + + - - - - - + + + + - - - - - + + + + - - - - -
-
-
代理人
-
- - - - + + + +
+
+
申请人代理人
+
+ + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - + + + + + 删除 + +
-
-
-
被申请人
-
- - - - 新增被申请人信息 + +
+ +
+
+
被申请人
+
+ + + + - - - - - + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + - - 男 - 女 - - - - - - - - + + 男 + 女 + + + + +
+
+
被申请人代理人
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 删除 + +
+ + +
@@ -558,9 +631,83 @@ export default { title: "新增案件", // organizeFlag:0,//选择机构和自然人 formData: { - affiliate: { - organizeFlag: 0, - respondentSex: 0, + arbitratClaims: "", + facts: "", + organizeFlag: 0, + affiliate: + { + applicant: [ + { + applicant: { + roleType: 1, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag:0 + }, + applicantAgent: { + roleType: 2, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag:0 + }, + }, + ], + res: [ + { + res: { + roleType: 3, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "0", + operatorFlag:0 + }, + resAgent: { + roleType: 4, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "", + operatorFlag:0 + } + } + ] }, columnValueList: [], caseAttachList: [], @@ -583,15 +730,25 @@ export default { applicationFlag: null, showmediate: false, showEvidence: false,//是否显示证据 - mediationApplication:false, + mediationApplication: false, formZipData: {}, nationalityList: [ { - value: '国内', + value: '境内', id: 0 }, { - value: '国外', + value: '境外', + id: 1 + } + ], + roleTypeList: [ + { + value: '否', + id: 0 + }, + { + value: '是', id: 1 } ], @@ -628,19 +785,91 @@ export default { if (val) { if (this.addModifyData == 1) { this.formData = { - affiliate: { - organizeFlag: 0, - respondentSex: 0, + organizeFlag: 0, + affiliate: + { + applicant: [ + { + applicant: { + roleType: 1, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag:0 + }, + applicantAgent: { + roleType: 2, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag:0 + } }, + ], + res: [ + { + res: { + roleType: 3, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "0", + operatorFlag:0 + }, + resAgent: { + roleType: 4, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "", + operatorFlag:0 + } + } + ] + }, columnValueList: [], caseAttachList: [], }; - 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, "idType", this.getUserInfoList.idType); - this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality); + this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName); + this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard); + this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email); + this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); + this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType); + this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); } this.activeName = "first"; this.showmediate = false; @@ -667,19 +896,19 @@ export default { }, /** 切换申请类型 */ changeApplyType(val) { - console.log(val, "变化"); + // console.log(val, "变化"); // this.$refs["ruleForm"].resetFields(); }, /**获取申请人信息 */ getUserInfoFn() { getUserInfo().then(res => { this.getUserInfoList = res.data; - 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, "idType", this.getUserInfoList.idType); - this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality); + this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName); + this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard); + this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email); + this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); + this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType); + this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); }) }, /** 根据案件id获取对应信息 */ @@ -687,9 +916,25 @@ export default { this.applicantEvidence = []; this.respondentEvidence = []; await caseApplicationSelectById({ id: data }).then((res) => { - res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex) - this.formData = res.data; - this.formData.caseAttachList.forEach((item) => { + let data = res.data; + data.affiliate.applicant.forEach(item => { + if (!item.applicant) { + item.applicant = {} + } + if (!item.applicantAgent) { + item.applicantAgent = {} + } + }) + data.affiliate.res.forEach(item => { + if (!item.res) { + item.res = {} + } + if (!item.resAgent) { + item.resAgent = {} + } + }) + this.formData = data; + data.caseAttachList.forEach((item) => { if (item.annexType == 2) { this.applicantEvidence.push(item); this.showEvidence = true @@ -697,10 +942,11 @@ export default { // this.respondentEvidence.push(item); } else if (item.annexType == 7) { this.showmediate = true - } else if(item.annexType == 3){ + } else if (item.annexType == 3) { this.mediationApplication = true } }); + }); }, // 新增案件 @@ -775,27 +1021,22 @@ export default { }, successZip(res) { this.formZipData = res.data; - // this.formData = res.data; - this.$set(this.formData.affiliate, 'organizeFlag', 0); + this.$set(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,'applicationName',this.formZipData.affiliate.applicationName); - // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code); - // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail); - // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone); - this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome); - this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress); - this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent); - this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent); - this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail); - this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName); - this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone); - this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum); - this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex)); - this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth); - this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome); - this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail); - this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate.compLegalPerson); + this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate[0].applicant.home); + this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate[0].applicant.address); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate[0].applicantAgent.phone); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate[0].applicantAgent.name); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate[0].applicantAgent.email); + this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate[0].res.name); + this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate[0].res.phone); + this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate[0].res.idCard); + this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate[0].res.sex); + this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate[0].res.birth); + this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate[0].res.home); + this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate[0].res.email); + this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this.formZipData.affiliate[0].applicant.compLegalPerson); // this.$set(this.formData.affiliate,'respondentSex',Number(res.data.affiliate.respondentSex)); }, handlePreview(file) { @@ -818,64 +1059,55 @@ export default { }, clearValidate(val) { if (val == 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.applicant[0].applicant, "name", this.getUserInfoList.nickName); + this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard); + this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email); + this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); if (this.formZipData.affiliate) { - this.$set(this.formData.affiliate, 'organizeFlag', 0); + this.$set(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,'applicationName',this.formZipData.affiliate.applicationName); - // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code); - // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail); - // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone); - this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome); - this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress); - this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent); - this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent); - this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail); - this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName); - this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone); - this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum); - this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex)); - this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth); - this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome); - this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail); + this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate[0].applicant.name); + this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate[0].applicant.address); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate[0].applicantAgent.phone); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate[0].applicantAgent.name); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate[0].applicantAgent.email); + this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate[0].res.name); + this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate[0].res.phone); + this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate[0].res.idCard); + this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate[0].res.sex)); + this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate[0].res.birth); + this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate[0].res.home); + this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate[0].res.email); } else { - this.formData.affiliate.nameAgent = null; - this.formData.affiliate.agentEmail = null; - this.formData.affiliate.contactTelphoneAgent = null; + this.formData.affiliate.applicant[0].applicantAgent.name = null; + this.formData.affiliate.applicant[0].applicantAgent.email = null; + this.formData.affiliate.applicant[0].applicantAgent.phone = null; } } else if (val == 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.applicant[0].applicantAgent, "name", this.getUserInfoList.nickName); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, "email", this.getUserInfoList.email); + this.$set(this.formData.affiliate.applicant[0].applicantAgent, "phone", this.getUserInfoList.phonenumber); if (this.formZipData.affiliate) { - this.$set(this.formData.affiliate, 'organizeFlag', 1); + this.$set(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.applicationName); - this.$set(this.formData.affiliate, 'code', this.formZipData.affiliate.code); - this.$set(this.formData.affiliate, 'applicationEmail', this.formZipData.affiliate.applicationEmail); - this.$set(this.formData.affiliate, 'applicationPhone', this.formZipData.affiliate.applicationPhone); - // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome); - // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress); - // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent); - // this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent); - // this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail); - this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName); - this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone); - this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum); - this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex)); - this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth); - this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome); - this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail); + this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate[0].applicant.name); + this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData.affiliate[0].applicant.code); + this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData.affiliate[0].applicant.email); + this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData.affiliate[0].applicant.phone); + this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate[0].res.name); + this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate[0].res.phone); + this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate[0].res.idCard); + this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate[0].res.sex); + this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate[0].res.birth); + this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate[0].res.home); + this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate[0].res.email); } else { - this.formData.affiliate.applicationName = null; - this.formData.affiliate.code = null; - this.formData.affiliate.applicationEmail = null; - this.formData.affiliate.applicationPhone = null; + this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null); + this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null); + this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null); + this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null); } } this.$refs["ruleForm"].clearValidate() @@ -884,19 +1116,114 @@ export default { this.$emit("cancelCaseAdd"); }, institutionalNatural() { - console.log(this.formData.affiliate.organizeFlag); + // console.log(this.formData.organizeFlag); }, - handleBlur() { - console.log(this.formData.affiliate.respondentIdentityNum); + handleBlur(index) { + // console.log(this.formData.affiliate.respondentIdentityNum); 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); - console.log(res.respondentBirth); - this.formData.affiliate.respondentBirth = res.respondentBirth; + this.formData.affiliate[index].res.sex = res.respondentSex; + // console.log(res.respondentBirth); + this.formData.affiliate[index].res.birth = res.respondentBirth; }); }, + /**删除新增信息某一项 */ + deleteDetali(item) { + var index = this.formData.affiliate.indexOf(item) + if (index !== -1) { + this.formData.affiliate.splice(index, 1) + } + }, + /**新增申请人信息 */ + addApplicant() { + this.formData.affiliate.applicant.push({ + applicant: { + roleType: 1, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag:0 + }, + applicantAgent: { + roleType: 2, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag:0 + }, + },); + }, + /** 新增被申请人信息*/ + addRes(){ + this.formData.affiliate.res.push({ + res: { + roleType: 1, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag:0 + }, + resAgent: { + roleType: 2, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag:0 + }, + },); + }, + /**申请人删除信息 */ + deleteApplicant(item){ + var index = this.formData.affiliate.applicant.indexOf(item) + if (index !== -1) { + this.formData.affiliate.applicant.splice(index, 1) + } + }, + /**被申请人删除信息 */ + deleteRes(item){ + var index = this.formData.affiliate.res.indexOf(item) + if (index !== -1) { + this.formData.affiliate.res.splice(index, 1) + } + }, }, }; diff --git a/src/views/register.vue b/src/views/register.vue index 2fde9f5..23dc9c7 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -206,11 +206,11 @@ export default { roleList: [], nationalityList:[ { - value:'国内', + value:'境内', id:0 }, { - value:'国外', + value:'境外', id:1 } ], diff --git a/src/views/test.vue b/src/views/test.vue new file mode 100644 index 0000000..35d2636 --- /dev/null +++ b/src/views/test.vue @@ -0,0 +1,79 @@ + + \ No newline at end of file