阿拉蕾 1 year ago
parent
commit
1fb2bcd24b

+ 3 - 1
src/views/company/company/index.vue

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

+ 1 - 1
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 => {

+ 1 - 1
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" />

+ 9 - 0
src/views/qw/qwAccounts/index.vue

@@ -64,6 +64,11 @@
       <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 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 width="300" label="关联设备id" align="center" prop="deviceId"  v-if="queryParams.isAudit == 1"/>
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -147,6 +152,7 @@ export default {
       // 企微功能账号管理表格数据
       accountList: [],
       isAuditOptions:[],
+      authCheckOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -194,6 +200,9 @@ export default {
     this.getDicts("common_audit").then((response) => {
       this.isAuditOptions = response.data;
     });
+    this.getDicts("qw_login_status").then((response) => {
+      this.authCheckOptions = response.data;
+    });
   },
   methods: {
     /** 查询企微功能账号管理列表 */