Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-21 2193f1e8240e2a0ed5900dddc6347a1d9db081cf

 platform/src/views/business/company.vue

@@ -2,14 +2,14 @@
  <TableLayout :permissions="['business:company:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入名称" @keypress.enter.native="search"></el-input>
      <el-form-item label="企业名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入企业名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <!-- <el-form-item label="企业简称" prop="shortName">
        <el-input v-model="searchForm.shortName" placeholder="请输入企业简称" @keypress.enter.native="search"></el-input>
      </el-form-item> -->
      <el-form-item label="管理员账号" prop="managerUserName">
        <el-input v-model="searchForm.managerUserName" placeholder="请输入管理员账号" @keypress.enter.native="search"></el-input>
      <el-form-item label="登录账号" prop="managerUserName">
        <el-input v-model="searchForm.managerUserName" placeholder="请输入登录账号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="有效期" prop="oepnValidDate">
        <el-date-picker type="daterange" v-model="oepnValidDate" value-format="yyyy-MM-dd" start-placeholder="开始日期"
@@ -37,11 +37,15 @@
        <!-- <el-table-column type="selection" width="55" align="center"></el-table-column> -->
        <el-table-column prop="id" label="企业编号" min-width="80px" align="center"></el-table-column>
        <el-table-column prop="name" label="企业名称" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="managerUserName" label="管理员账号" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="managerUserName" label="登录账号" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="linkname" label="联系人" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="linkephone" label="联系人电话" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="oepnValidDate" label="用有效期" min-width="140px" align="center"></el-table-column>
        <el-table-column prop="userNum" label="主播数量限制" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="oepnValidDate" label="有效期" min-width="140px" align="center"></el-table-column>
        <el-table-column prop="userNum" label="主播账号限制" min-width="100px" align="center">
          <template slot-scope="{row}">
            {{ row.userNum || '不限' }}
          </template>
        </el-table-column>
        <el-table-column prop="empUserNum" label="员工数" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="salesmanRealName" label="销售人员" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="status" label="状态" min-width="100px" align="center">