#131 调解修改短信bug

Слито
gaogaoyujie слито 2 коммит(ов) из gyj в dev 2 лет назад
2 измененных файлов: 17 добавлений и 7 удалений
  1. 11
    1
      src/views/deliveryRecord/components/emailEdits.vue
  2. 6
    6
      src/views/deliveryRecord/smsRecord.vue

+ 11
- 1
src/views/deliveryRecord/components/emailEdits.vue Просмотреть файл

124
     },
124
     },
125
     submitSend() {
125
     submitSend() {
126
       console.log(this.emailRow.mailContent);
126
       console.log(this.emailRow.mailContent);
127
-      this.updateSendContentFn({
127
+      if(this.files.annexId){
128
+        this.updateSendContentFn({
128
         id: this.emailRow.id,
129
         id: this.emailRow.id,
129
         mailContent: this.sendData,
130
         mailContent: this.sendData,
130
         caseAttachList:[{annexId:this.files.annexId}],
131
         caseAttachList:[{annexId:this.files.annexId}],
131
         
132
         
132
       });
133
       });
134
+      }else{
135
+        this.updateSendContentFn({
136
+        id: this.emailRow.id,
137
+        mailContent: this.sendData,
138
+        caseAttachList:[],
139
+        
140
+      });
141
+      }
142
+      
133
      
143
      
134
     },
144
     },
135
     updateSendContentFn(data) {
145
     updateSendContentFn(data) {

+ 6
- 6
src/views/deliveryRecord/smsRecord.vue Просмотреть файл

36
         <resend :resendVidable="resendVidable" :rowData="rowData" @getList="getList" @cancelSend="cancelSend" :queryParams="queryParams"></resend>
36
         <resend :resendVidable="resendVidable" :rowData="rowData" @getList="getList" @cancelSend="cancelSend" :queryParams="queryParams"></resend>
37
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
37
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
38
             :limit.sync="queryParams.pageSize"
38
             :limit.sync="queryParams.pageSize"
39
-            @pagination="getList({ caseNum: queryParams.caseNum }, { pageNum: queryParams.pageNum, pageSize: queryParams.pageSize })" />
39
+            @pagination="getList({ caseNum: queryParams.caseNum,pageNum: queryParams.pageNum, pageSize: queryParams.pageSize})" />
40
 
40
 
41
     </div>
41
     </div>
42
 </template>
42
 </template>
74
     },
74
     },
75
     created() {
75
     created() {
76
         getDicts("case_status").then(res => {
76
         getDicts("case_status").then(res => {
77
-            this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
77
+            this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize});
78
         })
78
         })
79
     },
79
     },
80
     methods: {
80
     methods: {
100
         /** 搜索按钮操作 */
100
         /** 搜索按钮操作 */
101
         handleQuery() {
101
         handleQuery() {
102
             this.queryParams.pageNum = 1;
102
             this.queryParams.pageNum = 1;
103
-            this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
103
+            this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
104
         },
104
         },
105
         /** 重置按钮操作 */
105
         /** 重置按钮操作 */
106
         resetQuery() {
106
         resetQuery() {
108
             this.handleQuery();
108
             this.handleQuery();
109
         },
109
         },
110
         // 查询列表数据
110
         // 查询列表数据
111
-        getList(data, params) {
111
+        getList(data) {
112
             this.loading = true;
112
             this.loading = true;
113
-            recordList(data, params).then((response) => {
113
+            recordList(data).then((response) => {
114
                 this.dataList = response.rows;
114
                 this.dataList = response.rows;
115
                 this.dataList.forEach(item => {
115
                 this.dataList.forEach(item => {
116
                     if (item.sendStatus == 1) {
116
                     if (item.sendStatus == 1) {
141
         reSendShortMessageFn(valuesRow){
141
         reSendShortMessageFn(valuesRow){
142
             reSendShortMessage(valuesRow).then(res=>{
142
             reSendShortMessage(valuesRow).then(res=>{
143
                 this.$message.success('发送成功');
143
                 this.$message.success('发送成功');
144
-                this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
144
+                this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
145
             })
145
             })
146
         }
146
         }
147
     },
147
     },