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

src/views/deliveryRecord/components/emailEdits.vue

     },
     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) {

src/views/deliveryRecord/smsRecord.vue

         <resend :resendVidable="resendVidable" :rowData="rowData" @getList="getList" @cancelSend="cancelSend" :queryParams="queryParams"></resend>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
             :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>
 </template>
     },
     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: {
         /** 搜索按钮操作 */
         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() {
             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) {
         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 });
             })
         }
     },