From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/sms/smsRecord.vue |  154 +++++++++++---------------------------------------
 1 files changed, 35 insertions(+), 119 deletions(-)

diff --git a/src/views/resource/sms.vue b/src/views/sms/smsRecord.vue
similarity index 69%
copy from src/views/resource/sms.vue
copy to src/views/sms/smsRecord.vue
index 54037f1..1087159 100644
--- a/src/views/resource/sms.vue
+++ b/src/views/sms/smsRecord.vue
@@ -4,31 +4,9 @@
       :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
       @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.sms_delete"
-          @click="handleDelete">删 除
-        </el-button>
-      </template>
 
-      <template slot-scope="{ row, size, index }" slot="menu">
-        <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
-          @click="handleDebug(row)">调试
-        </el-button>
-        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.sms_enable"
-          @click.stop="handleEnable(row)">启用
-        </el-button>
-      </template>
-
-      <template slot-scope="{row, size}" slot="status">
-        <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
-      </template>
-      <template slot-scope="{row, size}" slot="category">
-        <el-tag :size="size">{{ row.categoryName }}</el-tag>
-      </template>
     </avue-crud>
-    <el-dialog title="手机短信发送调试" append-to-body :visible.sync="box" width="550px">
-      <avue-form :option="debugOption" v-model="debugForm" @submit="handleSend" />
-    </el-dialog>
+
   </basic-container>
 </template>
 
@@ -38,10 +16,8 @@
     getDetail,
     add,
     update,
-    remove,
-    enable,
-    send
-  } from "@/api/resource/sms"
+    remove
+  } from "@/api/resource/smsRecord"
   import {
     mapGetters
   } from "vuex"
@@ -66,115 +42,46 @@
           searchShow: true,
           searchMenuSpan: 3,
           menuWidth: 350,
-
+          menu: false,
           height: 'auto',
           calcHeight: 30,
           tip: false,
           border: true,
+          addBtn: false,
           index: true,
           viewBtn: true,
           selection: true,
           dialogWidth: 880,
           dialogClickModal: false,
-          column: [
-            // {
-            //     label: "分类",
-            //     type: "radio",
-            //     value: 1,
-            //     span: 24,
-            //     width: 100,
-            //     searchLabelWidth: 46,
-            //     row: true,
-            //     dicUrl: "/api/blade-system/dict/dictionary?code=sms",
-            //     props: {
-            //         label: "dictValue",
-            //         value: "dictKey"
-            //     },
-            //     dataType: "number",
-            //     slot: true,
-            //     prop: "category",
-            //     searchSpan: 4,
-            //     search: true,
-            //     rules: [{
-            //         required: true,
-            //         message: "请选择分类",
-            //         trigger: "blur"
-            //     }]
-            // },
-            {
-              label: "资源编号",
-              prop: "smsCode",
+          column: [{
+              // width: 100,
+              label: "电话号码",
+              prop: "phone",
+              search: true,
               span: 24,
-              width: 200,
+              align: "center",
+              slot: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+            }, {
+              label: "短信内容",
+              prop: "content",
+              span: 24,
+              width: 800,
               searchSpan: 4,
+              align: "center",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入资源编号",
+                message: "请输入模版内容",
                 trigger: "blur"
               }]
             },
             {
+              // width: 100,
               label: "模版ID",
               prop: "templateId",
-              span: 24,
-              width: 200,
-              searchSpan: 4,
-              searchLabelWidth: 80,
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入模版ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "accessKey",
-              prop: "accessKey",
-              span: 24,
-              overHidden: true,
-              rules: [{
-                required: true,
-                message: "请输入accessKey",
-                trigger: "blur"
-              }],
-            },
-            {
-              label: "secretKey",
-              prop: "secretKey",
-              span: 24,
-              overHidden: true,
-              display: true,
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入secretKey",
-                trigger: "blur"
-              }],
-            },
-            {
-              label: "regionId",
-              prop: "regionId",
-              span: 24,
-              value: "cn-hangzhou",
-              hide: true,
-              display: false
-            },
-            {
-              label: "短信签名",
-              prop: "signName",
-              span: 24,
-              width: 200,
-              rules: [{
-                required: true,
-                message: "请输入短信签名",
-                trigger: "blur"
-              }],
-            },
-            {
-              width: 100,
-              label: "是否启用",
-              prop: "status",
               span: 24,
               align: "center",
               slot: true,
@@ -183,11 +90,19 @@
               viewDisplay: false,
             },
             {
-              label: "备注",
-              prop: "remark",
+              label: "发送时间",
+              prop: "createTime",
               span: 24,
-              hide: true
+              // width: 200,
+              align: "center",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入短信签名",
+                trigger: "blur"
+              }],
             },
+
           ]
         },
         data: [],
@@ -412,6 +327,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true
+        this.query.isDeleted = 0
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data
           this.page.total = data.total

--
Gitblit v1.9.3