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

src/api/deliveryRecord/deliveryRecord.js

@@ -17,4 +17,28 @@ export function smsList(data,params) {
         data: data,
         params:params
     })
+}
+// 分页查询短信
+export function recordList(data) {
+    return request({
+        url: '/shortMessage/recordList',
+        method: 'get',
+        params: data
+    })
+}
+//更新短信内容
+export function updateSendContent(data) {
+    return request({
+        url: 'shortMessage/updateSendContent',
+        method: 'post',
+        data: data,
+    })
+}
+// 重新发送短信
+export function reSendShortMessage(data) {
+    return request({
+        url: 'shortMessage/reSendShortMessage',
+        method: 'post',
+        data: data,
+    })
 }

src/views/deliveryRecord/smsRecord.vue

@@ -22,7 +22,16 @@
             <el-table-column label="发送时间" align="center" prop="sendTime" />
             <el-table-column label="发送状态" align="center" prop="sendStatus" />
             <el-table-column label="发送内容" align="center" prop="sendContent" :show-overflow-tooltip="true" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="copyContent(scope.row.sendContent)" type="text"
+                        icon="el-icon-document-copy">复制内容</el-button>
+                    <el-button size="mini" @click="resend(scope.row)" type="text" icon="el-icon-s-promotion">编辑内容</el-button>
+                    <el-button v-if="scope.row.sendStatus == '发送失败'|| scope.row.sendStatus == '发送中'" size="mini" type="text" @click="resendMessage(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
+                </template>
+            </el-table-column>
         </el-table>
+        <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})" />
        
@@ -31,20 +40,22 @@
   
 <script>
 import {
-    smsList,
+    recordList,reSendShortMessage
 } from "@/api/deliveryRecord/deliveryRecord.js";
-
+import resend from "./components/resend.vue";
 import { getDicts } from '@/api/system/dict/data.js'
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: { },
+    components: {resend },
     data() {
         return {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
             },
+            resendVidable:false,
+            rowData:{},
             caseStatus: [],
             // 遮罩层
             loading: false,
@@ -76,16 +87,16 @@ export default {
         // 查询列表数据
         getList(data,params) {
             this.loading = true;
-            smsList(data,params).then((response) => {
+            recordList(data,params).then((response) => {
                 this.dataList = response.rows;
+                console.log(this.dataList)
                 this.dataList.forEach(item=>{
-                    if(item.sendStatus == 0){
+                    console.log(item)
-                        item.sendStatus = "发送失败"
+                    if(item.sendStatus == 1){
-                    }else if(item.sendStatus == 1){
+                        item.sendStatus = "发送成功"
-                        item.sendStatus = "已送达"
                     }else if(item.sendStatus == 2){
-                        item.sendStatus = "已读取"
+                        item.sendStatus = "发送中"
-                    }else{
+                    }else if(item.sendStatus == 3){
                         item.sendStatus = "发送失败"
                     }
                 })
@@ -93,6 +104,45 @@ export default {
                 this.loading = false;
             });
         },
+          /** 复制内容 */
+        copyContent(row) {
+            const el = document.createElement('textarea');
+            el.value = row;
+            document.body.appendChild(el);
+            el.select();
+            document.execCommand('copy');
+            document.body.removeChild(el);
+            this.$message.success('复制成功');
+        },
+          /**重新发送 */
+        resend(row){
+            console.log(row)
+            this.resendVidable = true;
+            this.rowData = row;
+        },
+                /**关闭弹窗 */
+        cancelSend(){
+            this.resendVidable = false;
+        },
+                // 重新发送
+        resendMessage(row){
+            console.log(row.sendStatus)
+            let valuesRow ={
+                id:row.id,
+                templateId:row.templateId,
+                phone:row.phone,
+                templateParams:row.templateParams
+            }
+            this.reSendShortMessageFn(valuesRow)
+            console.log(valuesRow)
+           
+        },
+        reSendShortMessageFn(valuesRow){
+            reSendShortMessage(valuesRow).then(res=>{
+                this.$message.success('发送成功');
+                this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
+            })
+        }
     },
 };
 </script>