Merge branch 'master' of https://gitee.com/vansfa/rt_adminUI

src/api/qw/forbiddenMessage.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询企微违禁消息列表
+export function listForbiddenMessage(query) {
+  return request({
+    url: '/qw/forbiddenMessage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企微违禁消息详细
+export function getForbiddenMessage(id) {
+  return request({
+    url: '/qw/forbiddenMessage/' + id,
+    method: 'get'
+  })
+}
+
+// 新增企微违禁消息
+export function addForbiddenMessage(data) {
+  return request({
+    url: '/qw/forbiddenMessage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改企微违禁消息
+export function updateForbiddenMessage(data) {
+  return request({
+    url: '/qw/forbiddenMessage',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除企微违禁消息
+export function delForbiddenMessage(id) {
+  return request({
+    url: '/qw/forbiddenMessage/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出企微违禁消息
+export function exportForbiddenMessage(query) {
+  return request({
+    url: '/qw/forbiddenMessage/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/qw/words.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询企微违禁词管理列表
+export function listWords(query) {
+  return request({
+    url: '/qw/words/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企微违禁词管理详细
+export function getWords(id) {
+  return request({
+    url: '/qw/words/' + id,
+    method: 'get'
+  })
+}
+
+// 新增企微违禁词管理
+export function addWords(data) {
+  return request({
+    url: '/qw/words',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改企微违禁词管理
+export function updateWords(data) {
+  return request({
+    url: '/qw/words',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除企微违禁词管理
+export function delWords(id) {
+  return request({
+    url: '/qw/words/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出企微违禁词管理
+export function exportWords(query) {
+  return request({
+    url: '/qw/words/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/company/company/index.vue

@@ -364,7 +364,9 @@ export default {
       },
       // 表单参数
       form: {},
-      erpForm:{},
+      erpForm:{
+        omsCode:null
+      },
       // 表单校验
       rules: {
         companyName: [

src/views/company/companyVoiceLogs/index.vue

@@ -306,7 +306,7 @@ export default {
         this.queryParams.dateRange=this.dateRange[0]+"--"+this.dateRange[1]
       }
       else{
-        this.queryParams.dateRangee=null;
+        this.queryParams.dateRange=null;
       }
 
       listCompanyVoiceLogs(this.queryParams).then(response => {

src/views/company/schedule/statistics.vue

@@ -93,7 +93,7 @@
     </el-row>
 
      <!-- :span-method="objectSpanMethod"  -->
-    <el-table height="500" v-loading="loading" border :data="tcmScheduleReportList" @selection-change="handleSelectionChange">
+    <el-table  v-loading="loading" border :data="tcmScheduleReportList" @selection-change="handleSelectionChange">
       <!-- <el-table-column label="id"  width="50" align="center" prop="id" /> -->
       <el-table-column fixed label="档期" align="center" prop="scheduleName" />
       <el-table-column fixed label="公司名称" width="100px" align="center" prop="companyName" />

src/views/qw/forbiddenMessage/index.vue

@@ -0,0 +1,321 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公司名" prop="companyId">
+          <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
+              <el-option
+                v-for="item in companys"
+                :key="item.companyId"
+                :label="item.companyName"
+                :value="item.companyId"
+              />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="员工" prop="companyUserName">
+        <el-input
+          v-model="queryParams.companyUserName"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="账号" prop="account">
+        <el-input
+          v-model="queryParams.account"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发送时间" prop="createTimeRange">
+        <el-date-picker
+          style="width:205.4px"
+          clearable size="small"
+          v-model="createTimeRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['qw:forbiddenMessage:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['qw:forbiddenMessage:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" border :data="forbiddenMessageList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="40" align="center" />
+      <el-table-column label="公司" width="200" align="center" prop="companyName" />
+      <el-table-column label="员工" width="100" align="center" prop="companyUserName" />
+      <el-table-column label="发送时间" width="200" align="center" prop="sendTime">
+        <template slot-scope="scope">
+          {{ convertTimestampToTime(scope.row.sendTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="提示" align="center" prop="forbiddenMessage">
+        <template slot-scope="scope">
+          <div style="font-size: 16px; color: red;">
+            {{ scope.row.forbiddenMessage }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="100" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['qw:forbiddenMessage:edit']"
+          >查看</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="消息id" prop="messageId">
+          <el-input v-model="form.messageId" placeholder="请输入消息id" />
+        </el-form-item>
+        <el-form-item label="会话id" prop="conversationId">
+          <el-input v-model="form.conversationId" placeholder="请输入会话id" />
+        </el-form-item>
+        <el-form-item label="消息体">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="员工id" prop="companyUserId">
+          <el-input v-model="form.companyUserId" placeholder="请输入员工id" />
+        </el-form-item>
+        <el-form-item label="公司id" prop="companyId">
+          <el-input v-model="form.companyId" placeholder="请输入公司id" />
+        </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 { listForbiddenMessage, getForbiddenMessage, delForbiddenMessage, addForbiddenMessage, updateForbiddenMessage, exportForbiddenMessage } from "@/api/qw/forbiddenMessage";
+import Editor from '@/components/Editor';
+import { getCompanyList } from "@/api/company/company";
+
+export default {
+  name: "ForbiddenMessage",
+  components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      companys:[],
+      createTimeRange:[],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 企微违禁消息表格数据
+      forbiddenMessageList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        messageId: null,
+        conversationId: null,
+        content: null,
+        companyUserId: null,
+        companyId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+    getCompanyList().then(response => {
+      this.companys = response.data;
+    });
+  },
+  methods: {
+    convertTimestampToTime(timestamp) {
+    const milliseconds = timestamp * 1000; // 将时间戳乘以1000以转换为毫秒
+    // 创建一个新的Date对象，并将时间戳作为参数传入构造函数
+    const date = new Date(milliseconds);
+    // 使用Date对象的方法获取日期和时间
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    const hours = date.getHours();
+    const minutes = date.getMinutes();
+    const seconds = date.getSeconds();
+    // 返回转换后的日期和时间字符串
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  },
+    /** 查询企微违禁消息列表 */
+    getList() {
+      this.loading = true;
+      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
+        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
+      }
+      else{
+        this.queryParams.createTimeRange=null;
+      }
+      listForbiddenMessage(this.queryParams).then(response => {
+        this.forbiddenMessageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        messageId: null,
+        conversationId: null,
+        content: null,
+        companyUserId: null,
+        companyId: null,
+        createTime: 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
+      getForbiddenMessage(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) {
+            updateForbiddenMessage(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addForbiddenMessage(this.form).then(response => {
+              if (response.code === 200) {
+                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 delForbiddenMessage(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有企微违禁消息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportForbiddenMessage(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>

src/views/qw/qwAccounts/index.vue

@@ -2,15 +2,19 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公司名" prop="companyId">
-          <el-select filterable style="width: 220px" v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
-                <el-option
-                  v-for="item in companys"
-                  :key="item.companyId"
-                  :label="item.companyName"
-                  :value="item.companyId"
-                />
-          </el-select>
-        </el-form-item>          
+          <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名"  @change="companyChange" clearable size="small">
+              <el-option
+                v-for="item in companys"
+                :key="item.companyId"
+                :label="item.companyName"
+                :value="item.companyId"
+              />
+        </el-select>
+      </el-form-item>
+
+     <el-form-item >
+          <treeselect style="width: 220px" :clearable="false"  v-model="queryParams.deptId"  :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+     </el-form-item> 
       <el-form-item label="企微账号" prop="account">
         <el-input
           v-model="queryParams.account"
@@ -20,6 +24,35 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="员工姓名" prop="companyUserName">
+        <el-input
+          v-model="queryParams.companyUserName"
+          placeholder="请输入员工姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="在线状态" prop="authCheck">
+          <el-select filterable  v-model="queryParams.authCheck" placeholder="请选择" clearable size="small">
+              <el-option
+                v-for="item in authCheckOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="下线类型" prop="offlineType" >
+          <el-select filterable  v-model="queryParams.offlineType" placeholder="请选择" clearable size="small">
+              <el-option
+                v-for="item in offlineTypeOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+        </el-select>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -37,6 +70,15 @@
           v-hasPermi="['qw:account:remove']"
         >删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+          icon="el-icon-download"
+          size="mini"
+            @click="handleExport"
+          v-hasPermi="['qw:account:export']"
+        >导出</el-button>
+      </el-col>
     </el-row>
     <el-tabs type="card" v-model="queryParams.isAudit" @tab-click="handleClick">
       <el-tab-pane label="已通过" name="1"></el-tab-pane>
@@ -64,7 +106,18 @@
       <el-table-column label="企业名称" align="center" prop="corpName" />
       <el-table-column label="归属公司" align="center" prop="companyName" />
       <el-table-column label="归属员工" align="center" prop="companyUserName" />
-      <el-table-column width="300" label="关联设备id" align="center" prop="deviceId"  v-if="queryParams.isAudit == 1"/>
+      <el-table-column label="在线状态" align="center" prop="authCheck" >
+          <template slot-scope="scope">
+              <el-tag prop="authCheck" v-for="(item, index) in authCheckOptions"  :type="scope.row.authCheck==0?'danger':'success'"  v-if="scope.row.authCheck==item.dictValue">{{item.dictLabel}}</el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column label="最近一次上线时间" align="center" prop="onlineTime" />
+      <el-table-column label="最近一次下线时间" align="center" prop="offlineTime" />
+      <el-table-column label="最后一次下线类型" align="center" prop="offlineType" >
+          <template slot-scope="scope" >
+              <el-tag prop="authCheck" v-for="(item, index) in offlineTypeOptions"  :type="scope.row.offlineType==0?'danger':'success'"  v-if="scope.row.offlineType==item.dictValue">{{item.dictLabel}}</el-tag>
+          </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -125,9 +178,17 @@
 <script>
 import { listAccount, getAccount, delAccount, addAccount, auditAccount, exportAccount } from "@/api/qw/account";
 import { getCompanyList } from "@/api/company/company";
+import { treeselect } from "@/api/company/companyDept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Account",
+  watch: {
+    // 监听deptId
+    'deptId': 'currDeptChange'
+  },
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -135,6 +196,9 @@ export default {
       // 选中数组
       ids: [],
       companys:[],
+      deptOptions:[],
+      companyId:undefined,
+      deptId:undefined,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -143,10 +207,11 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      activeName:"1",
       // 企微功能账号管理表格数据
       accountList: [],
       isAuditOptions:[],
+      authCheckOptions:[],
+      offlineTypeOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -162,11 +227,10 @@ export default {
         status: null,
         realName: null,
         nickName: null,
-        companyId: null,
         deviceId: null,
         deptId: null,
-        companyUserId: null,
-        isAudit: 1,
+        companyUserName: null,
+        isAudit: "1",
       },
       // 表单参数
       form: {},
@@ -187,13 +251,23 @@ export default {
     };
   },
   created() {
-    this.getList();
     getCompanyList().then(response => {
       this.companys = response.data;
+         if(this.companys!=null&&this.companys.length>0){
+          this.companyId=this.companys[0].companyId;
+          this.getTreeselect();
+        }
     });
     this.getDicts("common_audit").then((response) => {
       this.isAuditOptions = response.data;
     });
+    this.getDicts("qw_login_status").then((response) => {
+      this.authCheckOptions = response.data;
+    });
+    this.getDicts("qw_offline_type").then((response) => {
+      this.offlineTypeOptions = response.data;
+    });
+    this.getList();
   },
   methods: {
     /** 查询企微功能账号管理列表 */
@@ -223,7 +297,6 @@ export default {
         remark: null,
         realName: null,
         nickName: null,
-        companyId: null,
         deviceId: null,
         deptId: null,
         companyUserId: null,
@@ -311,7 +384,28 @@ export default {
         }).then(response => {
           this.download(response.msg);
         }).catch(function() {});
-    }
+    },
+    getTreeselect() {
+        var that=this;
+        var param={companyId:this.companyId}
+        treeselect(param).then((response) => {
+          this.deptOptions = response.data;
+          console.log(this.deptOptions)
+          if(response.data!=null&&response.data.length>0){
+            //this.queryParams.deptId=response.data[0].id;
+          }
+        });
+    },
+    companyChange(val){
+      console.log(val);
+      this.companyId=val;
+      this.getTreeselect();
+    },
+     currDeptChange(val){
+          console.log(val)
+          this.queryParams.deptId=val;
+          this.getList();
+    },
   }
 };
 </script>

src/views/qw/words/index.vue

@@ -0,0 +1,275 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="违禁词" prop="word">
+        <el-input
+          v-model="queryParams.word"
+          placeholder="请输入违禁词"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    
+      <el-form-item label="操作人" prop="operator">
+        <el-input
+          v-model="queryParams.operator"
+          placeholder="请输入操作人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['qw:words:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['qw:words:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['qw:words:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['qw:words:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="wordsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号"  width="55" type="index" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="违禁词" align="center" prop="word" />
+      <el-table-column label="操作人" align="center" prop="operator" />
+      <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="['qw:words:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['qw:words: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="word">
+          <el-input v-model="form.word" 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 { listWords, getWords, delWords, addWords, updateWords, exportWords } from "@/api/qw/words";
+
+export default {
+  name: "Words",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 企微违禁词管理表格数据
+      wordsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        word: null,
+        severity: null,
+        operator: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询企微违禁词管理列表 */
+    getList() {
+      this.loading = true;
+      listWords(this.queryParams).then(response => {
+        this.wordsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        word: null,
+        severity: null,
+        createTime: null,
+        updateTime: null,
+        operator: 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
+      getWords(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) {
+            updateWords(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addWords(this.form).then(response => {
+              if (response.code === 200) {
+                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 delWords(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有企微违禁词管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportWords(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>

src/views/store/storeOrder/healthStoreList.vue

@@ -881,6 +881,12 @@ export default {
       else{
         this.queryParams.deliveryImportTimeRange=null;
       }
+      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
+        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+      }
+      else{
+        this.queryParams.deliverySendTimeRange=null;
+      }
       const queryParams = this.addDateRange(this.queryParams, this.dateRange);
       this.$confirm('是否确认导出所有订单数据项?', "警告", {
           confirmButtonText: "确定",
@@ -914,6 +920,12 @@ export default {
       else{
         this.queryParams.deliveryImportTimeRange=null;
       }
+      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
+        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+      }
+      else{
+        this.queryParams.deliverySendTimeRange=null;
+      }
       const queryParams = this.addDateRange(this.queryParams, this.dateRange);
       this.$confirm('是否确认导出所有订单明细数据项?', "警告", {
           confirmButtonText: "确定",