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

src/api/company/companyVoicePackageOrder.js

@@ -17,6 +17,14 @@ export function getVoicePackagelist(query) {
   })
 }
 
+export function exportCompanyVoicePackageOrder(query) {
+  return request({
+    url: '/company/companyVoicePackageOrder/export',
+    method: 'get',
+    params: query
+  })
+}
+
 export function buy(data) {
   return request({
     url: '/company/companyVoicePackageOrder/buy',

src/views/company/companyVoiceLogs/index.vue

@@ -62,11 +62,11 @@
         </el-select>
       </el-form-item>
 
-        <el-form-item label="创建时间" prop="createTime">
+        <el-form-item label="创建时间" prop="createTimeRange">
             <el-date-picker
               style="width:205.4px"
               clearable size="small"
-              v-model="dateRange"
+              v-model="createTimeRange"
               type="daterange"
               value-format="yyyy-MM-dd"
               start-placeholder="开始日期"
@@ -74,8 +74,16 @@
             </el-date-picker>
           </el-form-item>
         
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-form-item label="开始时间" prop="startTimeRange">
+          <el-date-picker
+              style="width:205.4px"
+              clearable size="small"
+              v-model="dateRange"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
         </el-form-item>
 
       <el-form-item>
@@ -179,6 +187,7 @@ export default {
       timesOptions:[],
       statusOptions:[],
       companys:[],
+      createTimeRange:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -263,6 +272,19 @@ export default {
     /** 查询通话记录列表 */
     getList() {
       this.loading = true;
+      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;
+      }
+      if(this.dateRange!=null&&this.dateRange.length==2){
+        this.queryParams.dateRange=this.dateRange[0]+"--"+this.dateRange[1]
+      }
+      else{
+        this.queryParams.dateRange=null;
+      }
       listCompanyVoiceLogs(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.companyVoiceLogsList = response.rows;
         this.total = response.total;
@@ -371,6 +393,18 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
+        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
+      }
+      else{
+        this.queryParams.createTimeRange=null;
+      }
+      if(this.dateRange!=null&&this.dateRange.length==2){
+        this.queryParams.dateRange=this.dateRange[0]+"--"+this.dateRange[1]
+      }
+      else{
+        this.queryParams.dateRange=null;
+      }
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有通话记录数据项?', "警告", {
           confirmButtonText: "确定",

src/views/qw/qwAccounts/index.vue

@@ -36,6 +36,11 @@
               <el-tag prop="isAudit" v-for="(item, index) in isAuditOptions"  :type="scope.row.isAudit==-1?'danger':'success'"  v-if="scope.row.isAudit==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
+      <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="关联设备id" align="center" prop="deviceId" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="设备是否可用" align="center" prop="availableDevice" >
@@ -47,7 +52,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.availableDevice >= -1"
+            v-if="scope.row.availableDevice == -1"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -57,6 +62,7 @@
             size="mini"
             type="text"
             icon="el-icon-offline"
+            v-if="scope.row.authCheck == 1"
             @click="handleOffLine(scope.row)"
           >强制下线</el-button>
         </template>
@@ -116,6 +122,7 @@ export default {
       accountList: [],
       isAuditOptions:[],
       availableOptions:[],
+      authCheckOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -166,6 +173,9 @@ export default {
     this.getDicts("qw_device_status").then((response) => {
       this.availableOptions = response.data;
     });
+    this.getDicts("qw_login_status").then((response) => {
+      this.authCheckOptions = response.data;
+    });
   },
   methods: {
     /** 查询企微功能账号管理列表 */