diff --git a/src/views/deliveryRecord/components/emailEdits.vue b/src/views/deliveryRecord/components/emailEdits.vue index d4821c8..154b933 100644 --- a/src/views/deliveryRecord/components/emailEdits.vue +++ b/src/views/deliveryRecord/components/emailEdits.vue @@ -124,12 +124,22 @@ export default { }, submitSend() { console.log(this.emailRow.mailContent); - this.updateSendContentFn({ + if(this.files.annexId){ + this.updateSendContentFn({ id: this.emailRow.id, mailContent: this.sendData, caseAttachList:[{annexId:this.files.annexId}], }); + }else{ + this.updateSendContentFn({ + id: this.emailRow.id, + mailContent: this.sendData, + caseAttachList:[], + + }); + } + }, updateSendContentFn(data) { diff --git a/src/views/deliveryRecord/smsRecord.vue b/src/views/deliveryRecord/smsRecord.vue index 715cf63..458f4ba 100644 --- a/src/views/deliveryRecord/smsRecord.vue +++ b/src/views/deliveryRecord/smsRecord.vue @@ -36,7 +36,7 @@ + @pagination="getList({ caseNum: queryParams.caseNum,pageNum: queryParams.pageNum, pageSize: queryParams.pageSize})" /> @@ -74,7 +74,7 @@ export default { }, created() { getDicts("case_status").then(res => { - this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize }); + this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize}); }) }, methods: { @@ -100,7 +100,7 @@ export default { /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; - this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize }); + this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize }); }, /** 重置按钮操作 */ resetQuery() { @@ -108,9 +108,9 @@ export default { this.handleQuery(); }, // 查询列表数据 - getList(data, params) { + getList(data) { this.loading = true; - recordList(data, params).then((response) => { + recordList(data).then((response) => { this.dataList = response.rows; this.dataList.forEach(item => { if (item.sendStatus == 1) { @@ -141,7 +141,7 @@ export default { reSendShortMessageFn(valuesRow){ reSendShortMessage(valuesRow).then(res=>{ this.$message.success('发送成功'); - this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize }); + this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize }); }) } },