diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index 1109cf1..ee36f82 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -56,6 +56,14 @@ export function confirmPaid(data) { data: data, }); } +// 缴费确认(被申请人) +export function resConfirmPaid(data) { + return request({ + url: "/pay/resConfirmPaid", + method: "post", + data: data, + }); +} // 案件id查询缴费清单 export function selectPaymentDetail(data) { return request({ diff --git a/src/api/deliveryRecord/deliveryRecord.js b/src/api/deliveryRecord/deliveryRecord.js new file mode 100644 index 0000000..8c9a19e --- /dev/null +++ b/src/api/deliveryRecord/deliveryRecord.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +// 查询邮件列表 +export function emailList(data) { + return request({ + url: '/sendMailRecord/list', + method: 'get', + params: data + }) +} + +// 查询短信列表 +export function smsList(data,params) { + return request({ + url: '/caseApplication/smsRecord', + method: 'post', + data: data, + params:params + }) +} \ No newline at end of file diff --git a/src/api/login.js b/src/api/login.js index 649f59c..f810acb 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -56,4 +56,23 @@ export function getCodeImg() { method: 'get', timeout: 20000 }) +} +// 获取手机验证码 +export function sendCode(data) { + return request({ + url: '/weChatUser/sendCode', + method: 'get', + params:data + }) +} +// 注册方法 +export function wxregister(data) { + return request({ + url: '/weChatUser/registerUser', + headers: { + isToken: false + }, + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 2e68d9c..68e5b62 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -79,7 +79,7 @@ 上传证据 - 归档详情 + 归档详情 @@ -113,7 +113,7 @@ :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow" :formPayDetailAffiliate="formPayDetailAffiliate"> + :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma" :isapplicant="isapplicant" @getList="getList"> + + +
+
+ {{ item.annexName }} +
+
+
+
@@ -490,13 +499,15 @@ export default { applicantEvidence: [], //申请人证据 respondentEvidence: [], //被申请人证据 buttonFlag: true, - getUserInfoList: {} + getUserInfoList: {}, + applicationFlag: null }; }, watch: { addModifyData(val) { if (val == 1) { this.title = "新增案件"; + this.getUserInfoFn(); this.modelFlag = false; this.buttonFlag = true; this.formData = { @@ -524,48 +535,12 @@ export default { if (this.addModifyData != 1) { this.caseApplicationSelectByIdFn(this.caseData.id); } - if (this.formData.affiliate.organizeFlag == 0) { - this.formData.affiliate.applicationName = this.getUserInfoList.nickName; - this.formData.affiliate.code = this.getUserInfoList.idCard; - this.formData.affiliate.applicationEmail = this.getUserInfoList.email; - this.formData.affiliate.applicationPhone = this.getUserInfoList.phonenumber; - } else if (this.formData.affiliate.organizeFlag == 1) { - this.formData.affiliate.nameAgent = this.getUserInfoList.nickName; - this.formData.affiliate.agentEmail = this.getUserInfoList.email; - this.formData.affiliate.contactTelphoneAgent = this.getUserInfoList.phonenumber; - } } }, - formData: { - handler(newVal) { - if (newVal) { - console.log('newVal========newVal==========newVal', newVal); - if (newVal.affiliate.organizeFlag == 0) { - this.formData.affiliate.applicationName = this.getUserInfoList.nickName; - this.formData.affiliate.code = this.getUserInfoList.idCard; - this.formData.affiliate.applicationEmail = this.getUserInfoList.email; - this.formData.affiliate.applicationPhone = this.getUserInfoList.phonenumber; - // this.formData.affiliate.nameAgent = ''; - // this.formData.affiliate.agentEmail = ''; - // this.formData.affiliate.contactTelphoneAgent = ''; - } else if (newVal.affiliate.organizeFlag == 1) { - // this.formData.affiliate.applicationName = ""; - // this.formData.affiliate.code = ""; - // this.formData.affiliate.applicationEmail = ""; - // this.formData.affiliate.applicationPhone = ""; - this.formData.affiliate.nameAgent = this.getUserInfoList.nickName; - this.formData.affiliate.agentEmail = this.getUserInfoList.email; - this.formData.affiliate.contactTelphoneAgent = this.getUserInfoList.phonenumber; - } - } - }, - deep: true, // 深度监听 - immediate: true, // 初始化监听 - } }, created() { console.log(this.formData, "000000000000000000") - this.getUserInfoFn(); + // this.getUserInfoFn(); }, methods: { /** 切换申请类型 */ @@ -576,8 +551,11 @@ export default { /**获取申请人信息 */ getUserInfoFn() { getUserInfo().then(res => { - console.log(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); }) }, /** 根据案件id获取对应信息 */ @@ -671,6 +649,23 @@ 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.formData.affiliate.nameAgent = null; + this.formData.affiliate.agentEmail = null; + this.formData.affiliate.contactTelphoneAgent = 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.formData.affiliate.applicationName = null; + this.formData.affiliate.code = null; + this.formData.affiliate.applicationEmail = null; + this.formData.affiliate.applicationPhone = null; + } this.$refs["ruleForm"].clearValidate() }, cancel() { diff --git a/src/views/caseManagement/components/caseAcceptance.vue b/src/views/caseManagement/components/caseAcceptance.vue index 6d9fb38..afd9dab 100644 --- a/src/views/caseManagement/components/caseAcceptance.vue +++ b/src/views/caseManagement/components/caseAcceptance.vue @@ -11,7 +11,7 @@ - 开庭调解 + 线上调解 线下调解 diff --git a/src/views/caseManagement/components/mediation.vue b/src/views/caseManagement/components/mediation.vue index a8f978d..8f20491 100644 --- a/src/views/caseManagement/components/mediation.vue +++ b/src/views/caseManagement/components/mediation.vue @@ -130,7 +130,7 @@ export default { data() { return { loanStartDate: "", - title: "开庭调解", + title: "线上调解", applicateArr: [], quiltArr: [], recordArr: [], @@ -159,7 +159,7 @@ export default { mediationVisable(val) { this.recordArr = []; if (this.mediationData.mediationMethod == "1") { - this.title = "开庭调解"; + this.title = "线上调解"; this.mediationType = true; } else if (this.mediationData.mediationMethod == "2") { this.title = "线下调解"; diff --git a/src/views/caseManagement/components/payDialog.vue b/src/views/caseManagement/components/payDialog.vue index c127571..96ccf48 100644 --- a/src/views/caseManagement/components/payDialog.vue +++ b/src/views/caseManagement/components/payDialog.vue @@ -12,7 +12,7 @@ {{ formPayDetail.caseSubjectAmount }} - {{ + {{ formPayDetail.feePayable }} {{ @@ -23,6 +23,11 @@ {{ formPayDetail.caseStatusName }} + + + {{ formPayDetail.reason }} + +
diff --git a/src/views/caseManagement/components/paymentdetailsDialog.vue b/src/views/caseManagement/components/paymentdetailsDialog.vue index a9d6cdb..80f7084 100644 --- a/src/views/caseManagement/components/paymentdetailsDialog.vue +++ b/src/views/caseManagement/components/paymentdetailsDialog.vue @@ -1,12 +1,12 @@ + + \ No newline at end of file diff --git a/src/views/deliveryRecord/smsRecord.vue b/src/views/deliveryRecord/smsRecord.vue new file mode 100644 index 0000000..baaa95b --- /dev/null +++ b/src/views/deliveryRecord/smsRecord.vue @@ -0,0 +1,100 @@ + + + + + \ No newline at end of file diff --git a/src/views/register.vue b/src/views/register.vue index 396d582..5333e38 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -29,6 +29,39 @@ + + + + + + + + + + + + + + + + + + + +
+ {{codeText}} +
+
+ + + + + @@ -164,13 +224,14 @@ export default { border-radius: 6px; background: #ffffff; width: 400px; + height: 90%; padding: 25px 25px 5px 25px; - .el-input { - height: 38px; - input { - height: 38px; - } - } + // .el-input { + // height: 38px; + // input { + // height: 38px; + // } + // } .input-icon { height: 39px; width: 14px; diff --git a/vue.config.js b/vue.config.js index 67d42b9..29dce0a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,7 +12,7 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 // const API = 'http://121.40.189.20:9001' //生产 -const API = 'http://121.40.189.20:6001' //测试 +// const API = 'http://121.40.189.20:6001' //测试 // const API = 'http://192.168.3.18:6001' //B // const API = 'http://172.16.0.237:6001' //Q // const API = 'http://172.16.1.43:6001' //w @@ -61,6 +61,7 @@ module.exports = { }, configureWebpack: { name: name, + devtool: '#eval-source-map', resolve: { alias: { '@': resolve('src')