diff --git a/src/api/deliveryRecord/deliveryRecord.js b/src/api/deliveryRecord/deliveryRecord.js index 9e3b5cb..db4228a 100644 --- a/src/api/deliveryRecord/deliveryRecord.js +++ b/src/api/deliveryRecord/deliveryRecord.js @@ -25,4 +25,20 @@ export function updateSendContent(data) { method: 'post', data: data, }) -} \ No newline at end of file +} +// 分页查询短信 +export function recordList(data) { + return request({ + url: '/shortMessage/recordList', + method: 'get', + params: data + }) +} +// 重新发送短信 +export function reSendShortMessage(data) { + return request({ + url: 'shortMessage/reSendShortMessage', + method: 'post', + data: data, + }) +} diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue index 081d6ea..53e8022 100644 --- a/src/views/caseManagement/components/addCase.vue +++ b/src/views/caseManagement/components/addCase.vue @@ -104,14 +104,14 @@ - + 新增申请人信息 @@ -124,7 +124,15 @@ - + + + + 自然人 + 机构 + + + + - + - + + + + - + - + - + + - + - + - + @@ -337,7 +345,7 @@ - + - + + + + + 自然人 + 机构 + + + + - + - + @@ -414,7 +430,7 @@ - + - + - + - + - + - + + - + - + + - + - + +
+ +
+ + +
+
+ 取 消 + 确 认 +
+ +
+ + + + + \ No newline at end of file diff --git a/src/views/deliveryRecord/components/resend.vue b/src/views/deliveryRecord/components/resend.vue index 9262c62..6c3f6c4 100644 --- a/src/views/deliveryRecord/components/resend.vue +++ b/src/views/deliveryRecord/components/resend.vue @@ -2,10 +2,12 @@
-
- - -
+
发送内容:{{ sendData }}
+ + + + +
取 消 确 认 @@ -22,7 +24,10 @@ export default { props: ["resendVidable", "rowData","queryParams"], data() { return { - sendData:'' + sendData:'', + param:"", + paramValue:"" + }; }, watch: { @@ -37,9 +42,10 @@ export default { this.$emit("cancelSend"); }, submitSend() { + console.log(this.rowData) this.updateSendContentFn({ id:this.rowData.id, - sendContent:this.sendData + templateParams:this.rowData.templateParams }) }, updateSendContentFn(data){ @@ -48,6 +54,13 @@ export default { this.$emit("cancelSend"); this.$emit('getList',this.queryParams); }) + }, + changeContent(){ + let templateContent = this.rowData.templateContent + this.rowData.templateParams.forEach(item => { + templateContent = templateContent.replace(item.param,item.paramValue) + }); + this.sendData = templateContent } }, }; diff --git a/src/views/deliveryRecord/emailRecord.vue b/src/views/deliveryRecord/emailRecord.vue index 90f858b..6fdbcaf 100644 --- a/src/views/deliveryRecord/emailRecord.vue +++ b/src/views/deliveryRecord/emailRecord.vue @@ -27,7 +27,14 @@ + + + + @@ -38,12 +45,12 @@ import { emailList, } from "@/api/deliveryRecord/deliveryRecord.js"; - +import emailEdits from "./components/emailEdits.vue"; import { getDicts } from '@/api/system/dict/data.js' export default { name: "paymentList", dicts: ["case_status"], - components: {}, + components: {emailEdits}, data() { return { queryParams: { @@ -60,6 +67,9 @@ export default { // 校验表单 rules: {}, dataList: [], + emailVidable:false, + emailRow:{}, + sendStatusMessage:false, }; }, created() { @@ -86,17 +96,35 @@ 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; this.loading = false; }); }, + // 邮箱编辑内容 + emailEditing(data){ + this.emailVidable = true + this.emailRow = data; + console.log(data) + }, + // 关闭弹窗 + cancelEmail(){ + this.emailVidable = false + }, + // 重新发送 + resendCounts(){ + + } }, }; diff --git a/src/views/deliveryRecord/smsRecord.vue b/src/views/deliveryRecord/smsRecord.vue index ec3fbae..75f07e2 100644 --- a/src/views/deliveryRecord/smsRecord.vue +++ b/src/views/deliveryRecord/smsRecord.vue @@ -28,6 +28,7 @@ 复制内容 编辑内容 + 重新发送 @@ -41,7 +42,7 @@