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

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

Browse Source
This commit was merged in pull request #131.
This commit is contained in:
gaogaoyujie
2024-05-30 16:20:47 +08:00
committed by Gitea
parent d901c1efdd 971461aaa8
commit 5f7e0ad19e
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/deliveryRecord/components/emailEdits.vue
+10
View File
@@ -124,12 +124,22 @@ export default {
}, },
submitSend() { submitSend() {
console.log(this.emailRow.mailContent); console.log(this.emailRow.mailContent);
if(this.files.annexId){
this.updateSendContentFn({ this.updateSendContentFn({
id: this.emailRow.id, id: this.emailRow.id,
mailContent: this.sendData, mailContent: this.sendData,
caseAttachList:[{annexId:this.files.annexId}], caseAttachList:[{annexId:this.files.annexId}],
}); });
}else{
this.updateSendContentFn({
id: this.emailRow.id,
mailContent: this.sendData,
caseAttachList:[],
});
}
}, },
updateSendContentFn(data) { updateSendContentFn(data) {
src/views/deliveryRecord/smsRecord.vue
+6 -6
View File
@@ -36,7 +36,7 @@
<resend :resendVidable="resendVidable" :rowData="rowData" @getList="getList" @cancelSend="cancelSend" :queryParams="queryParams"></resend> <resend :resendVidable="resendVidable" :rowData="rowData" @getList="getList" @cancelSend="cancelSend" :queryParams="queryParams"></resend>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList({ caseNum: queryParams.caseNum }, { pageNum: queryParams.pageNum, pageSize: queryParams.pageSize })" /> @pagination="getList({ caseNum: queryParams.caseNum,pageNum: queryParams.pageNum, pageSize: queryParams.pageSize})" />
</div> </div>
</template> </template>
@@ -74,7 +74,7 @@ export default {
}, },
created() { created() {
getDicts("case_status").then(res => { 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: { methods: {
@@ -100,7 +100,7 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; 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() { resetQuery() {
@@ -108,9 +108,9 @@ export default {
this.handleQuery(); this.handleQuery();
}, },
// 查询列表数据 // 查询列表数据
getList(data, params) { getList(data) {
this.loading = true; this.loading = true;
recordList(data, params).then((response) => { recordList(data).then((response) => {
this.dataList = response.rows; this.dataList = response.rows;
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.sendStatus == 1) { if (item.sendStatus == 1) {
@@ -141,7 +141,7 @@ export default {
reSendShortMessageFn(valuesRow){ reSendShortMessageFn(valuesRow){
reSendShortMessage(valuesRow).then(res=>{ reSendShortMessage(valuesRow).then(res=>{
this.$message.success('发送成功'); 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 });
}) })
} }
}, },