Quellcode durchsuchen

1、新增延时时间管理模块
2、调整员工管理展示数据(新增延时时间展示字段)
3、新增批量绑定延时时间

yfh vor 1 Woche
Ursprung
Commit
bb24e607c2

+ 59 - 0
src/api/company/sendDelayTime.js

@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+// 查询员工发送延时时间关联列表
+export function listSendDelayTime(query) {
+  return request({
+    url: '/company/sendDelayTime/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工发送延时时间关联详细
+export function getSendDelayTime(id) {
+  return request({
+    url: '/company/sendDelayTime/' + id,
+    method: 'get'
+  })
+}
+
+// 新增员工发送延时时间关联
+export function addSendDelayTime(data) {
+  return request({
+    url: '/company/sendDelayTime',
+    method: 'post',
+    data: data
+  })
+}
+export function batchAddSendDelayTime(data) {
+  return request({
+    url: '/company/sendDelayTime/batchAdd',
+    method: 'post',
+    data: data
+  })
+}
+// 修改员工发送延时时间关联
+export function updateSendDelayTime(data) {
+  return request({
+    url: '/company/sendDelayTime',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工发送延时时间关联
+export function delSendDelayTime(id) {
+  return request({
+    url: '/company/sendDelayTime/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出员工发送延时时间关联
+export function exportSendDelayTime(query) {
+  return request({
+    url: '/company/sendDelayTime/export',
+    method: 'get',
+    params: query
+  })
+}

+ 98 - 1
src/views/company/companyUser/index.vue

@@ -73,6 +73,15 @@
               @click="handerCompanyUserAreaList"
             >批量设置销售所属区域(原有的暂用)</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              size="mini"
+              :disabled="multiple"
+              @click="handleBind"
+            >批量绑定延时时间</el-button>
+          </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -83,6 +92,7 @@
           <el-table-column label="员工后台昵称" align="center" prop="nickName" :show-overflow-tooltip="true" 员工后台  width="100"/>
           <el-table-column label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
+          <el-table-column label="发送延时时间" align="center" prop="sendDelayTime" width="100" />
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -347,6 +357,32 @@
         <el-button @click="cancelArea">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="openTime" width="500px" append-to-body>
+      <el-form ref="form" :model="formTime" :rules="rulesTime" label-width="80px">
+        <el-form-item label="延时时间" prop="sendDelayTime"
+                      :rules="rulesDelay"
+        >
+          <el-tooltip class="item" effect="dark" content="请输入延时时间,范围在1000毫秒-2000毫秒之间" placement="top-end">
+            <el-input
+              v-model.number="formTime.sendDelayTime"
+              type="number"
+              :min="1000"
+              :max="2000"
+              placeholder="请输入1000-2000之间的数值">
+              <template slot="append">毫秒</template>
+            </el-input>
+          </el-tooltip>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formTime.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormTime">绑 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -361,7 +397,7 @@ import {
   resetUserPwd,
   changeUserStatus,
   importTemplate,
-  getCitysAreaList, updateCompanyUserAreaList,
+  getCitysAreaList, updateCompanyUserAreaList, getUserList,
 } from "../../../api/company/companyUser";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/company/companyDept";
@@ -371,6 +407,7 @@ import {bindQwUser, getQwUserList, addQwUser, getQwUser, getQwUserByIds} from '@
 import { syncDept } from '@/api/qw/qwDept';
 import { getMyQwUserList,getMyQwCompanyList } from "@/api/qw/user";
 import  selectUser  from "@/views/company/components/selectQwUser.vue";
+import {batchAddSendDelayTime} from "@/api/company/sendDelayTime";
 export default {
   name: "User",
   components: { Treeselect ,selectUser},
@@ -382,12 +419,14 @@ export default {
       qwUserId:[],
       myQwCompanyList:[],
       qwUser:[],
+      formTime:{},
       user:{
         open:false,
         title:"搜索企业"
       },
       // 选中数组
       ids: [],
+      users:[],
       synform:{corpId:null},
       synOpen:false,
       // 非单个禁用
@@ -406,6 +445,7 @@ export default {
       deptOptions: undefined,
       // 是否显示弹出层
       open: false,
+      openTime: false,
       qwOpen:false,
       // 部门名称
       deptName: undefined,
@@ -468,6 +508,30 @@ export default {
       },
       qwStatusOptions:[],
       // 表单校验
+      rulesTime: {
+        companyUserId: [
+          { required: true, message: "员工信息不能为空", trigger: "change" }
+        ],
+        sendDelayTime: [
+          { required: true, message: "发送延时时间(单位:毫秒)不能为空", trigger: "blur" }
+        ],
+      },
+      rulesDelay:[
+        {
+          validator: (rule, value, callback) => {
+            if (value === '' || value == null) {
+              callback(); // 允许为空,不校验范围
+            } else if (isNaN(value)) {
+              callback(new Error('请输入有效数字'));
+            } else if (value < 1000 || value > 2000) {
+              callback(new Error('延时时间必须在1000-2000毫秒之间'));
+            } else {
+              callback();
+            }
+          },
+          trigger: 'blur'
+        }
+      ],
       rules: {
         userName: [
           { required: true, message: "员工工号不能为空", trigger: "blur" },
@@ -518,6 +582,7 @@ export default {
     },
   },
   created() {
+    this.getUserList();
     this.getList();
     this.getTreeselect();
     this.getDicts("sys_normal_disable").then((response) => {
@@ -537,6 +602,17 @@ export default {
     });
   },
   methods: {
+    getUserList() {
+      getUserList().then(response => {
+        this.users = response.data;
+      });
+    },
+    handleBind(row) {
+      this.reset();
+      const id = row.id || this.ids
+      this.openTime = true;
+      this.title = "批量绑定发送延时时间";
+    },
     onDomainBlur() {
       if (this.form.domain!=null){
         let value = this.form.domain.trim();
@@ -872,6 +948,27 @@ export default {
         loadingRock.close()
       });
     },
+
+    submitFormTime(){
+
+      let loadingRock = this.$loading({
+        lock: true,
+        text: '绑定中.....同步客户信息中.....',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+      this.formTime.id = (this.ids).join(',');
+      console.log(this.formTime)
+      batchAddSendDelayTime(this.formTime).then(response => {
+        this.msgSuccess("绑定成功");
+        this.openTime = false;
+        this.getList();
+        this.ids=[];
+      }).finally(res=>{
+        loadingRock.close()
+      });
+    },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;

+ 336 - 0
src/views/company/sendDelayTime/index.vue

@@ -0,0 +1,336 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+
+      <el-form-item label="员工昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入员工用户昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['company:sendDelayTime:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['company:sendDelayTime:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['company:sendDelayTime:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['company:sendDelayTime:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="sendDelayTimeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id主键" align="center" prop="id" />
+      <el-table-column label="发送延时时间(单位:毫秒)" align="center" prop="sendDelayTime" />
+      <el-table-column label="员工用户昵称" align="center" prop="nickName" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['company:sendDelayTime:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['company:sendDelayTime:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改员工发送延时时间关联对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="员工信息" prop="companyUserId">
+          <el-select v-model="form.companyUserId"  filterable  placeholder="请选择员工" clearable size="small">
+            <el-option
+              v-for="item in users"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="延时时间" prop="sendDelayTime"
+                      :rules="rulesDelay"
+        >
+          <el-tooltip class="item" effect="dark" content="请输入延时时间,范围在1000毫秒-2000毫秒之间" placement="top-end">
+            <el-input
+              v-model.number="form.sendDelayTime"
+              type="number"
+              :min="1000"
+              :max="2000"
+              placeholder="请输入1000-2000之间的数值">
+              <template slot="append">毫秒</template>
+            </el-input>
+          </el-tooltip>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSendDelayTime, getSendDelayTime, delSendDelayTime, addSendDelayTime, updateSendDelayTime, exportSendDelayTime } from "@/api/company/sendDelayTime";
+import {getUserList} from "@/api/company/companyUser";
+
+export default {
+  name: "SendDelayTime",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工发送延时时间关联表格数据
+      sendDelayTimeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 删除标志字典
+      delFlagOptions: [],
+      users:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        companyId: null,
+        companyUserId: null,
+        sendDelayTime: null,
+        nickName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rulesDelay:[
+        {
+          validator: (rule, value, callback) => {
+            if (value === '' || value == null) {
+              callback(); // 允许为空,不校验范围
+            } else if (isNaN(value)) {
+              callback(new Error('请输入有效数字'));
+            } else if (value < 1000 || value > 2000) {
+              callback(new Error('延时时间必须在1000-2000毫秒之间'));
+            } else {
+              callback();
+            }
+          },
+          trigger: 'blur'
+        }
+      ],
+      rules: {
+        companyUserId: [
+          { required: true, message: "员工信息不能为空", trigger: "change" }
+        ],
+        sendDelayTime: [
+          { required: true, message: "发送延时时间(单位:毫秒)不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getUserList();
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.delFlagOptions = response.data;
+    });
+  },
+  methods: {
+    getUserList() {
+      getUserList().then(response => {
+        this.users = response.data;
+      });
+    },
+    /** 查询员工发送延时时间关联列表 */
+    getList() {
+      this.loading = true;
+      listSendDelayTime(this.queryParams).then(response => {
+        this.sendDelayTimeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        companyId: null,
+        companyUserId: null,
+        sendDelayTime: null,
+        nickName: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "关联发送延时时间";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSendDelayTime(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改关联发送延时时间";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSendDelayTime(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSendDelayTime(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除员工发送延时时间关联编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSendDelayTime(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有员工发送延时时间关联数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSendDelayTime(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>