SH-Arbitrate/Mediation-Frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

Browse Source
This commit was merged in pull request #101.
This commit is contained in:
hanchaobo
2024-04-18 09:48:27 +08:00
committed by Gitea
parent 1f1a8dcd46 c7c4ed8f6e
commit e00f712efb
7 changed files with 278 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/deliveryRecord/deliveryRecord.js
+16
View File
@@ -42,3 +42,19 @@ export function reSendShortMessage(data) {
data: data,
})
}
// 重新发送邮件
export function reSendMailRecord(data) {
return request({
url: 'sendMailRecord/reSendMailRecord',
method: 'post',
data: data,
})
}
// 更新邮件发送记录
export function update(data) {
return request({
url: 'sendMailRecord/update',
method: 'post',
data: data,
})
}
src/api/login.js
+8
View File
@@ -65,6 +65,14 @@ export function sendCode(data) {
params:data
})
}
// 获取邮箱验证码
export function sendEmailCode(data) {
return request({
url: '/weChatUser/sendEmailCode',
method: 'get',
params:data
})
}
// 注册方法
export function wxregister(data) {
return request({
src/views/caseManagement/components/addCase.vue
+160 -51
View File
@@ -126,7 +126,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="选择机构或自然人">
<el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag" @change="clearValidate">
<el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag" @change="clearValidate">
<el-radio :label="0">自然人</el-radio>
<el-radio :label="1">机构</el-radio>
</el-radio-group>
@@ -222,7 +222,28 @@
trigger: 'blur',
},
]">
<el-input v-model="item.applicant.idCard" placeholder="请输入申请人的证件号码" />
<el-input v-model="item.applicant.idCard" @blur="handleBlurApplicant(index)"
placeholder="请输入申请人的证件号码" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label-width="140px" label="申请人出生年月："
:prop="'affiliate.applicant.' + index + '.applicant.birth'">
<el-date-picker disabled v-model="item.applicant.birth" type="date" placeholder="被申请人出生年月日">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="被申请人性别：" :prop="'affiliate.applicant.' + index + '.applicant.sex'" :rules="[
{
required: true,
message: '请选择性别',
},
]">
<el-radio-group v-model="item.applicant.sex" disabled>
<el-radio :label="'0'">男</el-radio>
<el-radio :label="'1'">女</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
@@ -393,7 +414,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="选择机构或自然人">
<el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag" @change="clearValidateRes">
<el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag" @change="clearValidateRes">
<el-radio :label="0">自然人</el-radio>
<el-radio :label="1">机构</el-radio>
</el-radio-group>
@@ -430,6 +451,37 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :prop="'affiliate.res.' + index + '.res.nationality'" label="国籍" :rules="[
{
required: true,
message: '国籍不能为空',
trigger: 'blur',
},
]">
<el-select v-model="item.res.nationality" placeholder="请选择国籍" auto-complete="off" style="width: 100%;">
<el-option v-for="item in nationalityList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item :prop="'affiliate.res.' + index + '.res.idType'" label="证件类型" :rules="[
{
required: true,
message: '证件类型不能为空',
trigger: 'blur',
},
]">
<el-select v-model="item.res.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;">
<el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel"
:value="Number(item.dictValue)">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label-width="140px" label="被申请人联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
{
@@ -457,6 +509,17 @@
<el-input v-model="item.res.home" placeholder="请输入被申请人住所" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="被申请联系地址" :prop="'affiliate.res.' + index + '.res.address'" :rules="[
{
required: true,
message: '申请人联系地址不能为空',
trigger: 'blur',
},
]">
<el-input v-model="item.res.address" placeholder="请输入被申请人联系地址" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="被申请人邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
{
@@ -503,7 +566,7 @@
<el-input v-model="item.res.code" placeholder="请输入统一社会信用代码" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="formData.organizeFlag == 1">
<el-col :span="12" v-if="item.res.organizeFlag == 1">
<el-form-item label="法定代表人" :prop="'affiliate.res.' + index + '.res.compLegalPerson'" :rules="[
{
required: true,
@@ -717,7 +780,7 @@ export default {
birth: "",
sex: "1",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
applicantAgent: {
roleType: 2,
@@ -734,7 +797,7 @@ export default {
birth: "",
sex: "1",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
},
],
@@ -755,7 +818,7 @@ export default {
birth: "",
sex: "0",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
resAgent: {
roleType: 4,
@@ -772,7 +835,7 @@ export default {
birth: "",
sex: "",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
}
}
]
@@ -875,7 +938,7 @@ export default {
birth: "",
sex: "1",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
applicantAgent: {
roleType: 2,
@@ -892,7 +955,7 @@ export default {
birth: "",
sex: "1",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
}
},
],
@@ -913,7 +976,7 @@ export default {
birth: "",
sex: "0",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
resAgent: {
roleType: 4,
@@ -930,7 +993,7 @@ export default {
birth: "",
sex: "",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
}
}
]
@@ -977,12 +1040,15 @@ export default {
getUserInfoFn() {
getUserInfo().then(res => {
this.getUserInfoList = res.data;
console.log(this.getUserInfoList.sex)
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.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex);
this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth);
})
},
/** 根据案件id获取对应信息 */
@@ -1096,15 +1162,40 @@ export default {
},
successZip(res) {
this.formZipData = res.data;
// this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate.applicant[0].applicant.home);
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
// this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 0) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate.applicant[0].applicant.home);
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
this.$set(this.formData.affiliate.applicant[0].applicant, 'sex', this.formZipData.affiliate.applicant[0].applicant.sex);
this.$set(this.formData.affiliate.applicant[0].applicant, 'birth', this.formZipData.affiliate.applicant[0].applicant.birth);
} else if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 1) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData
.affiliate.applicant[0]
.applicant.name);
this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData
.affiliate.applicant[0].applicant.code);
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData
.affiliate.applicant[0]
.applicant.home);
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this
.formZipData.affiliate.applicant[0]
.applicant.address);
this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this
.formZipData.affiliate.applicant[0]
.applicant.compLegalPerson);
this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData
.affiliate.applicant[0]
.applicant.email);
this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData
.affiliate.applicant[0]
.applicant.phone);
}
this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
@@ -1140,22 +1231,19 @@ export default {
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);
if (this.formZipData.affiliate) {
this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name);
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
// this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
// this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
// this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
// this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
// this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
// this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
// this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
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);
} else {
this.formData.affiliate.applicant[0].applicantAgent.name = null;
this.formData.affiliate.applicant[0].applicantAgent.email = null;
@@ -1169,17 +1257,26 @@ export default {
this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1);
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name);
this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData.affiliate.applicant[0].applicant.code);
this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData.affiliate.applicant[0].applicant.email);
this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData.affiliate.applicant[0].applicant.phone);
// this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
// this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
// this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
// this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex);
// this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
// this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
// this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData
.affiliate.applicant[0]
.applicant.name);
this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData
.affiliate.applicant[0].applicant.code);
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData
.affiliate.applicant[0]
.applicant.home);
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this
.formZipData.affiliate.applicant[0]
.applicant.address);
this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this
.formZipData.affiliate.applicant[0]
.applicant.compLegalPerson);
this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData
.affiliate.applicant[0]
.applicant.email);
this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData
.affiliate.applicant[0]
.applicant.phone);
} else {
this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null);
this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null);
@@ -1189,8 +1286,8 @@ export default {
}
this.$refs["ruleForm"].clearValidate()
},
clearValidateRes(val){
if(val==0){
clearValidateRes(val) {
if (val == 0) {
if (this.formZipData.affiliate) {
this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
@@ -1201,7 +1298,7 @@ export default {
this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
}
}else if(val == 1){
} else if (val == 1) {
if (this.formZipData.affiliate) {
this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
@@ -1233,6 +1330,18 @@ export default {
this.formData.affiliate.res[index].res.birth = res.respondentBirth;
});
},
// 申请人身份证
handleBlurApplicant(index) {
console.log(index)
let idCards = {
idCard: this.formData.affiliate.applicant[index].applicant.idCard,
};
getInfoByIdCard(idCards).then((res) => {
this.formData.affiliate.applicant[index].applicant.sex = res.respondentSex;
// console.log(res.respondentBirth);
this.formData.affiliate.applicant[index].applicant.birth = res.respondentBirth;
});
},
/**删除新增信息某一项 */
deleteDetali(item) {
var index = this.formData.affiliate.indexOf(item)
@@ -1258,7 +1367,7 @@ export default {
birth: "",
sex: "1",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
applicantAgent: {
roleType: 2,
@@ -1275,7 +1384,7 @@ export default {
birth: "",
sex: "1",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
},);
},
@@ -1297,7 +1406,7 @@ export default {
birth: "",
sex: "1",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
resAgent: {
roleType: 4,
@@ -1314,7 +1423,7 @@ export default {
birth: "",
sex: "1",
operatorFlag: 1,
organizeFlag:0,
organizeFlag: 0,
},
},);
},
src/views/deliveryRecord/components/emailEdits.vue
+7 -7
View File
@@ -16,7 +16,7 @@
<script>
import {
updateSendContent,
updateSendContent,update
} from "@/api/deliveryRecord/deliveryRecord.js";
export default {
props: ["emailVidable", "emailRow","queryParams"],
@@ -38,15 +38,15 @@ export default {
},
submitSend() {
console.log(this.emailRow.mailContent)
// this.updateSendContentFn({
// id:this.rowData.id,
// sendContent:this.sendData
// })
this.updateSendContentFn({
id:this.emailRow.id,
mailContent:this.sendData
})
},
updateSendContentFn(data){
updateSendContent(data).then(res=>{
update(data).then(res=>{
this.$message.success('更新成功');
this.$emit("cancelSend");
this.$emit("cancelEmail");
this.$emit('getList',this.queryParams);
})
}
src/views/deliveryRecord/emailRecord.vue
+14 -9
View File
@@ -30,7 +30,7 @@
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="emailEditing(scope.row)" icon="el-icon-s-promotion">邮箱编辑</el-button>
<el-button v-if="sendStatusMessage" size="mini" type="text" @click="resendCounts(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
<el-button v-if="scope.row.sendStatus == '未发送'" size="mini" type="text" @click="resendCounts(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
</template>
</el-table-column>
</el-table>
@@ -43,7 +43,7 @@
<script>
import {
emailList,
emailList,reSendMailRecord
} from "@/api/deliveryRecord/deliveryRecord.js";
import emailEdits from "./components/emailEdits.vue";
import { getDicts } from '@/api/system/dict/data.js'
@@ -96,15 +96,10 @@ export default {
this.dataList = response.rows;
this.dataList.forEach(item => {
if (item.sendStatus == 0) {
this.sendStatusMessage = true
item.sendStatus = "未发送"
} else if (item.sendStatus == 1) {
this.sendStatusMessage = false
item.sendStatus = "已发送"
} else {
item.sendStatus = "未发送"
this.sendStatusMessage = true
}
})
this.total = response.total;
@@ -122,8 +117,18 @@ export default {
this.emailVidable = false
},
// 重新发送
resendCounts(){
resendCounts(row){
if(row.sendStatus=='未发送'){
row.sendStatus = 0
}else if(row.sendStatus=='已发送'){
row.sendStatus = 1
}
reSendMailRecord(row).then(res=>{
console.log(res)
this.$message.success('发送成功');
this.getList(this.queryParams);
})
}
},
};
src/views/deliveryRecord/smsRecord.vue
+12 -17
View File
@@ -23,12 +23,13 @@
<el-table-column label="发送时间" align="center" prop="sendTime" />
<el-table-column label="发送状态" align="center" prop="sendStatus" />
<el-table-column label="发送内容" align="center" prop="sendContent" :show-overflow-tooltip="true"/>
<el-table-column label="备注" align="center" prop="reason" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" @click="copyContent(scope.row.sendContent)" type="text"
icon="el-icon-document-copy">复制内容</el-button>
<el-button size="mini" @click="resend(scope.row)" type="text" icon="el-icon-s-promotion">编辑内容</el-button>
<el-button v-if="sendStatusMessage" size="mini" type="text" @click="resendMessage(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
<el-button v-if="scope.row.sendStatus == '发送失败'|| scope.row.sendStatus == '发送中'" size="mini" type="text" @click="resendMessage(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
</template>
</el-table-column>
</el-table>
@@ -112,18 +113,12 @@ export default {
recordList(data, params).then((response) => {
this.dataList = response.rows;
this.dataList.forEach(item => {
if (item.sendStatus == 0) {
item.sendStatus = "发送失败"
this.sendStatusMessage = true
} else if (item.sendStatus == 1) {
item.sendStatus = "已送达"
this.sendStatusMessage = false
if (item.sendStatus == 1) {
item.sendStatus = "发送成功"
} else if (item.sendStatus == 2) {
item.sendStatus = "已读取"
this.sendStatusMessage = false
} else {
item.sendStatus = "发送中"
} else if(item.sendStatus == 3){
item.sendStatus = "发送失败"
this.sendStatusMessage = true
}
})
this.total = response.total;
@@ -132,21 +127,21 @@ export default {
},
// 重新发送
resendMessage(row){
console.log(row)
console.log(row.sendStatus)
let valuesRow ={
id:row.id,
templateId:row.templateId,
phone:row.phone,
templateParams:row.templateParams
}
this.reSendShortMessageFn(valuesRow)
console.log(valuesRow)
},
reSendShortMessageFn(valuesRow){
reSendShortMessage(valuesRow).then(res=>{
this.$message.success('发送成功');
this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
if(res.code==200){
this.sendStatusMessage = false
}
})
}
},
src/views/register.vue
+61 -5
View File
@@ -1,5 +1,9 @@
<template>
<div class="register">
<div class="leftIcon">
<div class="Icon"></div>
<div>智慧调解系统</div>
</div>
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">智慧调解系统注册</h3>
<el-form-item prop="userName">
@@ -46,9 +50,18 @@
</el-input>
</el-form-item>
<el-form-item prop="email">
<el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱">
<el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱" style="width:63%;">
<svg-icon slot="prefix" icon-class="email" class="el-input__icon input-icon" />
</el-input>
<div class="register-code">
<el-button type="primary" :disabled="emailDisabled" @click="getEmailNumber(registerForm.email)">{{ emailText
}}</el-button>
</div>
</el-form-item>
<el-form-item prop="emailVerifyCode">
<el-input v-model="registerForm.emailVerifyCode" type="text" auto-complete="off" placeholder="邮箱验证码">
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="name">
<el-input v-model="registerForm.name" type="text" auto-complete="off" placeholder="用户名">
@@ -105,7 +118,7 @@
</template>
<script>
import { getCodeImg, register, sendCode, wxregister,verifyUserName,getIdType } from "@/api/login";
import { getCodeImg, register, sendCode, wxregister,verifyUserName,getIdType,sendEmailCode } from "@/api/login";
import { listRoleNotoken } from "@/api/system/role.js"
export default {
name: "Register",
@@ -119,7 +132,9 @@ export default {
};
return {
codeText: "发送验证码",
emailText:"发送验证码",
codeDisabled: false,
emailDisabled:false,
codeUrl: "",
registerForm: {
userName: "",
@@ -192,7 +207,10 @@ export default {
},
],
verifyCode: [
{ required: true, trigger: "blur", message: "请输入验证码" },
{ required: true, trigger: "blur", message: "请输入短信验证码" },
],
emailVerifyCode:[
{ required: true, trigger: "blur", message: "请输入邮箱验证码" },
],
idType: [
{ required: true, trigger: "blur", message: "请选择证件类型" },
@@ -295,6 +313,28 @@ export default {
})
},
// 获取邮箱验证码
getEmailNumber(emailValue){
sendEmailCode({email:emailValue}).then(res=>{
if(res.code != 200){
this.$modal.msgError(res.msg);
return
}else{
this.$modal.msgSuccess('发送成功');
let time = 60;
let timer = setInterval(() => {
time--;
this.emailDisabled = true;
this.emailText = time + 's重试'
if (time == 0) {
clearInterval(timer)
this.emailText = '发送验证码'
this.emailDisabled = false;
}
}, 1000)
}
})
}
}
};
</script>
@@ -304,9 +344,25 @@ export default {
display: flex;
justify-content: center;
align-items: center;
//height: 100%;
background-image: url("../assets/images/login-background.jpg");
// height: 100%;
// background-image: url("../assets/images/login-background.jpg");
background-image: url("../assets/images/login.svg");
background-size: cover;
.leftIcon {
position: relative;
width: 200px;
height: 155px;
top:-300px;
left: -300px;
.Icon {
width: 100px;
height: 105px;
background-image: url("../assets/images/logos.png");
background-size: cover;
}
}
}
.title {