短信发送记录和电话拨打记录模块部分功能修改

src/views/system/phoneDialRecord/index.vue

@@ -20,13 +20,22 @@
         />
       </el-form-item>
       <el-form-item label="呼叫时间" prop="dialTime">
-        <el-date-picker
+        <!-- <el-date-picker
           clearable
           v-model="queryParams.dialTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择呼叫时间"
         >
+        </el-date-picker> -->
+        <el-date-picker
+          v-model="sendTime"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item
@@ -141,16 +150,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:phoneDialRecord:edit']"
-            >修改</el-button
+            >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:phoneDialRecord:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
@@ -262,6 +271,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      sendTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -281,6 +291,8 @@ export default {
         phoneDuration: null,
         phoneCost: null,
         billId: null,
+        dialTimeStart: null,
+        dialTimeEnd: null,
       },
       // 表单参数
       form: {},
@@ -334,11 +346,14 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.dialTimeStart = this.sendTime[0];
+      this.queryParams.dialTimeEnd = this.sendTime[1];
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.sendTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -354,14 +369,14 @@ export default {
       this.open = true;
       this.title = "添加电话拨打记录";
     },
-    /** 修改按钮操作 */
+    /** 查看按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
       getPhoneDialRecord(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改电话拨打记录";
+        this.title = "查看电话拨打记录";
       });
     },
     /** 提交按钮 */
@@ -400,12 +415,14 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.queryParams.dialTimeStart = this.sendTime[0];
+      this.queryParams.dialTimeEnd = this.sendTime[1];
       this.download(
         "system/phoneDialRecord/export",
         {
           ...this.queryParams,
         },
-        `phoneDialRecord_${new Date().getTime()}.xlsx`
+        `电话拨打记录_${new Date().getTime()}.xlsx`
       );
     },
   },

src/views/system/shortMessageSendRecord/index.vue

@@ -25,13 +25,22 @@
         />
       </el-form-item>
       <el-form-item label="消息发送时间" prop="sendTime" label-width="98px">
-        <el-date-picker
+        <!-- <el-date-picker
           clearable
           v-model="queryParams.sendTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择消息发送时间"
         >
+        </el-date-picker> -->
+        <el-date-picker
+          v-model="sendTime"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="关联账单" prop="billId">
@@ -106,7 +115,7 @@
         align="center"
         prop="messageUnitPrice"
       />
-      <el-table-column label="短信价格" align="center" prop="messagePrice" />
+      <el-table-column label="短信价格" align="center" prop="messageExpense" />
       <el-table-column label="关联账单" align="center" prop="billId" />
       <el-table-column
         label="操作"
@@ -120,16 +129,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:shortMessageSendRecord:edit']"
-            >修改</el-button
+            >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:shortMessageSendRecord:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
@@ -201,7 +210,10 @@
           />
         </el-form-item>
         <el-form-item label="短信价格" prop="messagePrice">
-          <el-input v-model="form.messagePrice" placeholder="请输入短信价格" />
+          <el-input
+            v-model="form.messageExpense"
+            placeholder="请输入短信价格"
+          />
         </el-form-item>
         <el-form-item label="关联账单id" prop="billId">
           <el-input v-model="form.billId" placeholder="请输入关联账单id" />
@@ -247,12 +259,15 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
+      sendTime: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         patientId: null,
         patientPhone: null,
-        sendTime: null,
+        // sendTime: null,
+        sendTimeStart: null,
+        sendTimeEnd: null,
         messageNodeContent: null,
         errorStatus: null,
         messageType: null,
@@ -288,7 +303,8 @@ export default {
         id: null,
         patientId: null,
         patientPhone: null,
-        sendTime: null,
+        sendTimeStart: null,
+        sendTimeEnd: null,
         messageNodeContent: null,
         errorStatus: "0",
         createBy: null,
@@ -303,10 +319,13 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.sendTimeStart = this.sendTime[0];
+      this.queryParams.sendTimeEnd = this.sendTime[1];
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.sendTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -329,7 +348,7 @@ export default {
       getShortMessageSendRecord(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改短信发送结果记录";
+        this.title = "查看短信发送结果记录";
       });
     },
     /** 提交按钮 */
@@ -368,12 +387,14 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.queryParams.sendTimeStart = this.sendTime[0];
+      this.queryParams.sendTimeEnd = this.sendTime[1];
       this.download(
         "system/shortMessageSendRecord/export",
         {
           ...this.queryParams,
         },
-        `shortMessageSendRecord_${new Date().getTime()}.xlsx`
+        `短信发送记录_${new Date().getTime()}.xlsx`
       );
     },
   },