Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into...

jiangping

2023-10-16 d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9

 platform_web/src/views/business/clientManger.vue

@@ -1,6 +1,6 @@
<template>
  <!-- :permissions="['business:appliancechange:query']" -->
  <TableLayout>
  <TableLayout :permissions="['ext:companyext:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" label-suffix="：" inline>
      <el-form-item label="客户名称" prop="name">
@@ -26,11 +26,11 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar">
        <!-- v-permissions="['ext:workorderrecordext:exportExcel']" -->
        <li><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '新增客户')">新增</el-button></li>
        <!-- -->
        <li v-permissions="['ext:companyext:create']"><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '新增客户')">新增</el-button></li>
        <!-- <li><el-button type="primary" @click="exportExcel">调整有效期</el-button></li> -->
        <li><el-button type="primary" @click="resetUserPwd">重置主账号密码</el-button></li>
        <li><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">删除</el-button></li>
        <li v-permissions="['ext:companyext:delete']"><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">删除</el-button></li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe border
        @selection-change="handleSelectionChange">
@@ -51,11 +51,11 @@
            <span>{{ row.oepnType == 1 ? '正式' : '试用' }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="openUserNum" label="人数限制" align="center" min-width="140px"></el-table-column>
        <el-table-column prop="phone" label="主账号" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="linkName" label="联系人" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="linkPhone" label="联系电话" align="center" min-width="120px"></el-table-column>
        <el-table-column prop="oepnValidDate" label="有效期" align="center" min-width="140px"></el-table-column>
        <el-table-column prop="openUserNum" label="开通用户数" align="center" min-width="140px"></el-table-column>
        <el-table-column prop="salespersonName" label="销售人员" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="createTime" label="创建时间" align="center" min-width="140px"></el-table-column>
        <el-table-column prop="status" label="状态" align="center" min-width="100px">
@@ -65,13 +65,16 @@
              :inactive-value="0" @change="statusChange(row)"></el-switch>
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" min-width="220px" fixed="right">
        <el-table-column
          v-if="containPermissions(['ext:companyext:update', 'ext:companyext:delete'])"
          
          label="操作" align="center" min-width="220px" fixed="right">
          <template slot-scope="{ row }">
            <!-- <el-button type="text" @click="$refs.operaClientMangerWindow.open('编辑客户', row)">编辑</el-button> -->
            <el-button type="text" @click="showDetail(row, true)">编辑</el-button>
            <el-button type="text" @click="$refs.operaClientValidDateWindow.open('调整', row)">调整</el-button>
            <el-button type="text" @click="$refs.operaDDSettingWindow.open('钉钉配置', row)">钉钉配置</el-button>
            <el-button type="text" style="color:red" :loading="isWorking.delete"
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="showDetail(row, true)">编辑</el-button>
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaClientValidDateWindow.open('调整', row)">调整</el-button>
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaDDSettingWindow.open('钉钉配置', row)">钉钉配置</el-button>
            <el-button type="text" v-permissions="['ext:companyext:delete']" style="color:red" :loading="isWorking.delete"
              @click="deleteById(row, false)">删除</el-button>
          </template>
        </el-table-column>
@@ -142,8 +145,13 @@
      // this.$refs.operaApplianceChangeDetailWindow.open('更换单详情', row)
      findCompanyInfo({ CompanyId: row.id })
        .then(res => {
          const element = isEdit ? this.$refs.operaClientMangerWindow : this.$refs.operaClientDetailWindow
          element.open(res)
          if (isEdit) {
            this.$refs.operaClientMangerWindow.open({...res, openUserNum: row.openUserNum})
          } else {
            this.$refs.operaClientDetailWindow.open(res)
          }
          // const element = isEdit ? this.$refs.operaClientMangerWindow : this.$refs.operaClientDetailWindow
          // element.open({...res, ...row})
        })
        .catch(err => {
          this.$tip.error(err)