MrShi
2024-11-12 5ec088f7b2c1281a1874ef6ba4e783a64acb8079
优化
已添加1个文件
已修改18个文件
365 ■■■■ 文件已修改
company/.env.development 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/.env.developmentCom 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/api/business/applyChange.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/api/business/companyPermission.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/api/business/customerService.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/api/system/common.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/assets/icons/ic_company@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaInsuranceApplyWindow.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaSolutionsDescWindow.vue 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/authorizedEnterprise.vue 81 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/common/CommonHeader.vue 93 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/system/role/Permissions.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/layouts/AppLayout.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/applyChange.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/contract.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/insuranceApply.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/switchCourt.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/userManagement.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/system/role.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/.env.development
@@ -11,4 +11,4 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# 任康
VUE_APP_API = 'http://192.168.0.134:10030/'
VUE_APP_API = 'http://192.168.0.137:10030/'
company/.env.developmentCom
@@ -9,6 +9,6 @@
#VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
VUE_APP_API = 'http://192.168.0.134:10031/'
VUE_APP_API = 'http://192.168.0.137:10031/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
company/src/api/business/applyChange.js
@@ -57,3 +57,11 @@
export function update (data) {
    return request.post('/business/applyChange/update', data)
}
// 导出保单下所有加减保详情单
export function exportApplyJiajianBaoExcel (data) {
    return request.post('/business/applyChange/exportApplyJiajianBaoExcel', data, {
        trim: true,
        download: true
    })
}
company/src/api/business/companyPermission.js
@@ -4,3 +4,13 @@
export function create (data) {
    return request.post('/business/companyPermission/create', data)
}
// 分页查询
export function page (data) {
    return request.post('/business/companyPermission/page', data)
}
// 删除
export function deleteById (id) {
    return request.get(`/business/companyPermission/delete/${id}`)
}
company/src/api/business/customerService.js
@@ -22,6 +22,11 @@
  return request.get(`/business/customerService/delete/${id}`)
}
// 根据ID查询
export function findByCompanyId (companyId) {
  return request.get(`/business/customerService/findByCompanyId?companyId=${companyId}`)
}
// 授权企业
export function auth (data) {
  return request.post('/business/customerService/auth', data)
company/src/api/system/common.js
@@ -32,6 +32,11 @@
  })
}
// 切换企业
export function switchCompany (params) {
  return request.get('/system/switchCompany', { params })
}
// 品牌列表查询
export function brand (data) {
  return request.post('/business/brand/list', data)
company/src/assets/icons/ic_company@2x.png
company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -195,8 +195,8 @@
                            <el-button type="primary" style="width: 80px;" @click="search">查询</el-button>
                            <el-button @click="resetting" style="width: 80px;">重置</el-button>
                            <el-button type="primary" style="width: 80px;" @click="exportExcel" v-if="activeName === '0'">导出名单</el-button>
                          <el-button type="primary" style="width: 100px;" @click="$refs.OperaApplyChangeMonthWindow.open('加减保费用月度统计',model)" v-if="activeName === '1'">费用统计查询</el-button>
                            <el-button type="primary" style="width: 100px;" @click="$refs.OperaApplyChangeMonthWindow.open('加减保费用月度统计',model)" v-if="activeName === '1'">费用统计查询</el-button>
                            <el-button type="primary" style="width: 120px;" @click="exportRecords" v-if="activeName === '1' && (model.status === 5 || model.status === 27)">导出加减保记录</el-button>
                        </el-form-item>
                    </el-form>
                </div>
@@ -504,7 +504,7 @@
import applyReturn from '@/components/enterprise/applyReturn'
import { getDetail, getSignLink, applyDetailPage,  exportExcel, applyChagneDetailExcel, applyOpt } from '@/api/business/insuranceApply'
import { findListByDTO } from '@/api/business/dispatchUnit'
import { fetchList } from '@/api/business/applyChange'
import { fetchList, exportApplyJiajianBaoExcel } from '@/api/business/applyChange'
import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
@@ -604,6 +604,14 @@
      this.getDW()
      this.getGZ()
    },
    exportRecords() {
      // let formDate = new FormData()
      // formDate.append('id', this.dataId)
      exportApplyJiajianBaoExcel({ id: this.dataId })
        .then(response => {
          this.download(response)
        })
    },
    result(flag,param){
      console.log(flag,param)
      if(param && param.godetail && param.id){
company/src/components/business/OperaSolutionsDescWindow.vue
@@ -57,6 +57,7 @@
                    <div class="info_list_item_val" ><a v-if="form.fanganFile && form.fanganFile.fileurlFull" style="cursor: pointer;color: #2E68EC" title="点击查看" @click="openFile(form.fanganFile.fileurlFull)">{{ form.fanganFile.name || '点击查看' }}</a></div>
                </div>
            </div>
            <div style="font-size: 18px; font-weight: bold; margin-bottom: 10px;">方案使用情况</div>
            <el-table
                :data="form.worktypeList"
                border
@@ -70,11 +71,37 @@
                    </template>
                </el-table-column>
                <el-table-column
                    prop="worktypeName"
                    prop="companyName"
                    align="center"
                    label="工种名称">
                    label="企业名称">
                </el-table-column>
                <el-table-column
                    align="center"
                    label="签章情况">
                    <template slot-scope="{row}">
                        <span v-if="row.signStatus === 0">待签章</span>
                        <span v-if="row.signStatus === 1">已签章</span>
                    </template>
                </el-table-column>
            </el-table>
<!--            <el-table-->
<!--                :data="form.worktypeList"-->
<!--                border-->
<!--                style="width: 100%; margin-bottom: 20px;">-->
<!--                <el-table-column-->
<!--                    label="序号"-->
<!--                    align="center"-->
<!--                    width="80">-->
<!--                    <template slot-scope="scope">-->
<!--                        <span>{{scope.$index + 1}}</span>-->
<!--                    </template>-->
<!--                </el-table-column>-->
<!--                <el-table-column-->
<!--                    prop="worktypeName"-->
<!--                    align="center"-->
<!--                    label="工种名称">-->
<!--                </el-table-column>-->
<!--            </el-table>-->
        </div>
        <!-- 修改 -->
        <OperaSolutionsWindow ref="operaSolutionsWindow" @success="callback"/>
@@ -89,7 +116,7 @@
import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import OperaSolutionsBaseDescWindow from '@/components/business/OperaSolutionsBaseDescWindow'
import { solutionsId } from '@/api/business/solutions'
import { solutionsId, listForCompany } from '@/api/business/solutions'
import { mapState } from 'vuex'
export default {
  name: 'OperaSolutionsDescWindow',
@@ -186,8 +213,15 @@
          this.form[key] = target[key]
        }
        this.getDetails()
        this.getList()
      })
    },
    getList() {
      listForCompany({ solutionId: this.form.id })
        .then(res => {
          console.log(res)
        })
    },
    openFile (url) {
      setTimeout(() => {
        this.$refs.OperaPdfViewerWindow.open('方案确认书',url)
company/src/components/business/authorizedEnterprise.vue
@@ -12,41 +12,55 @@
            border
            style="width: 100%">
            <el-table-column
                prop="date"
                prop="username"
                label="账号">
            </el-table-column>
            <el-table-column
                prop="name"
                prop="realname"
                label="姓名">
            </el-table-column>
            <el-table-column
                prop="address"
                prop="mobile"
                label="联系方式">
            </el-table-column>
            <el-table-column
                prop="address"
                width="200"
                prop="companyName"
                label="授权企业名称">
            </el-table-column>
            <el-table-column
                prop="address"
                prop="auditName"
                label="授权人">
            </el-table-column>
            <el-table-column
                prop="address"
                width="170"
                prop="createDate"
                label="授权时间">
            </el-table-column>
            <el-table-column
                prop="address"
                label="操作">
                <template slot-scope="{row}">
                    <el-button type="text" @click="cancel(row.id)">取消授权</el-button>
                </template>
            </el-table-column>
        </el-table>
        <div style="width: 100%; height: 15px;"></div>
        <el-pagination
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
            :current-page="form.page"
            :page-sizes="[10, 30, 50, 100]"
            :page-size="form.size"
            layout="total, sizes, prev, pager, next, jumper"
            :total="total">
        </el-pagination>
    </GlobalWindow>
</template>
<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  import { page } from '@/api/business/companyUserApply'
  import { page, deleteById } from '@/api/business/companyPermission'
  export default {
    name: 'authorizedEnterprise',
    extends: BaseOpera,
@@ -54,22 +68,55 @@
    data () {
      return {
        model: {},
        tableData: []
        tableData: [],
        form: {
          page: 1,
          capacity: 10,
          model: {
            userId: null
          }
        },
        total: 0
      }
    },
    methods: {
      open (title, target) {
      cancel(id) {
        this.$confirm('确定取消授权该企业吗?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          deleteById(id)
            .then(res => {
              this.getList()
            })
        }).catch(() => {
        });
      },
      handleSizeChange(e) {
        this.form.capacity = e
        this.getList()
      },
      handleCurrentChange(e) {
        this.form.page = e
        this.getList()
      },
      open (title, id) {
        this.title = title
        this.visible = true
        this.form.page = 1
        this.form.capacity = 10
        this.form.model.userId = id
        this.getList()
      },
      getList() {
        page({
          capacity: 10,
          page: 1,
          model: {
            userId: ''
          }
        })
        page(this.form)
          .then(res => {
            console.log(res)
            this.total = res.total
            this.tableData = res.records
          })
      }
    }
  }
company/src/components/common/CommonHeader.vue
@@ -6,16 +6,40 @@
        <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
      </div>
      <div class="user">
        <el-dropdown v-if="isLogined" trigger="click">
        <!--    企业    -->
        <div style="display: flex; align-items: center;" v-if="userInfo.type === 1">
          <div class="user_kf" v-if="info">
            服务人员:{{info.name}} {{info.mobile}}
          </div>
          <el-dropdown v-if="isLogined" trigger="click">
          <span class="el-dropdown-link">
            <!-- <img v-if="userInfo != null" :src="userInfo.avatar == null ? `${require('@/assets/avatar/man.png')}` : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i> -->
            <img v-if="userInfo != null" style="width: 30px !important;" src="@/assets/avatar/man.png" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i>
            <img v-if="userInfo != null" class="img1" style="width: 20px !important;" src="@/assets/icons/ic_company@2x.png" alt="">{{userInfo.showCompany.name}}<i class="el-icon-arrow-down el-icon--right"></i>
          </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item @click.native="changePwd">修改密码</el-dropdown-item>
            <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item @click.native="changeCompany(item)" v-for="(item, index) in userInfo.companyPermissionList" :key="index">{{item.companyName}}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
          <el-dropdown v-if="isLogined" trigger="click" style="top: -7px;">
          <span class="el-dropdown-link">
            <img v-if="userInfo != null" class="img2" style="width: 30px !important;" src="@/assets/avatar/man.png" alt="">{{userInfo.realname}}<i class="el-icon-arrow-down el-icon--right"></i>
          </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item @click.native="changePwd">修改密码</el-dropdown-item>
              <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </div>
        <div v-else>
          <el-dropdown v-if="isLogined" trigger="click" style="top: -7px;">
          <span class="el-dropdown-link">
            <img v-if="userInfo != null" class="img2" style="width: 30px !important;" src="@/assets/avatar/man.png" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i>
          </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item @click.native="changePwd">修改密码</el-dropdown-item>
              <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </div>
      </div>
    </div>
    <!-- 修改密码 -->
@@ -43,7 +67,8 @@
<script>
import { mapState, mapMutations } from 'vuex'
import GlobalAlertWindow from './GlobalAlertWindow'
import { logout, updatePwd } from '@/api/system/common'
import { logout, updatePwd, switchCompany } from '@/api/system/common'
import { findByCompanyId } from '@/api/business/customerService'
export default {
  name: 'CommonHeader',
  components: { GlobalAlertWindow },
@@ -65,6 +90,7 @@
        changePwd: false
      },
      username: 'bob', // 用户名
      info: null,
      // 修改密码弹框
      changePwdData: {
        form: {
@@ -88,6 +114,7 @@
  },
  created () {
    document.title=this.systemTitle
    this.setFindByCompanyId(this.userInfo.companyId)
  },
  computed: {
    ...mapState(['menuData', 'userInfo']),
@@ -114,6 +141,24 @@
  },
  methods: {
    ...mapMutations(['setUserInfo', 'switchCollapseMenu']),
    // 切换企业
    changeCompany(row) {
      if (row.companyId === this.userInfo.companyId) {
        this.$message.warning('不能切换当前企业')
        return
      }
      switchCompany({ companyId: row.companyId })
        .then(res => {
          location.reload();
        })
    },
    setFindByCompanyId(companyId) {
      findByCompanyId(companyId)
        .then(res => {
          console.log(res)
          this.info = res
        })
    },
    // 修改密码
    changePwd () {
      this.visible.changePwd = true
@@ -205,13 +250,31 @@
    padding-right: 25px;
    background: url('../../assets/images/top_ic_bolang@2x.png') no-repeat;
    flex-shrink: 0;
    text-align: right;
    .el-dropdown {
      top: 10px;
      color: #fff;
    /*text-align: right;*/
    display: flex;
    align-items: center;
    justify-content: end;
    .user_kf {
      color: #ffffff;
      font-size: 14px;
      margin-right: 30px;
    }
    img {
      width: 32px;
    .el-dropdown {
      top: -2px;
      color: #fff;
      margin-right: 30px;
      &:last-child {
        margin: 0 !important;
      }
    }
    .img1 {
      width: 20px;
      position: relative;
      top: 5px;
      margin-right: 10px;
    }
    .img2 {
      width: 20px;
      position: relative;
      top: 10px;
      margin-right: 10px;
company/src/components/system/role/Permissions.vue
@@ -75,6 +75,8 @@
          let obj = JSON.parse(JSON.stringify(this.form))
          if (obj.customData.length > 0) {
            obj.customData = obj.customData.flat().join(',')
          } else {
            obj.customData = ''
          }
          createRoleDataPermission(obj)
            .then(() => {
company/src/layouts/AppLayout.vue
@@ -47,7 +47,8 @@
      // 企业端用户设置水印
      if (this.userInfo.type === 1 || this.userInfo.type === 2) {
        if(this.userInfo.company && this.userInfo.company.name){
          Watermark.set(this.userInfo.company.name, this.$refs.containerS);
          Watermark.set(this.userInfo.showCompany.name, this.$refs.containerS);
          // Watermark.set(this.userInfo.company.name, this.$refs.containerS);
        }
      }
    },
company/src/views/business/applyChange.vue
@@ -14,6 +14,12 @@
          <el-option label="已关闭" value="6"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="投保类型" prop="solutionType">
        <el-select v-model="searchForm.solutionType" placeholder="请选择" @change="search">
          <el-option label="直保投保" :value="0"></el-option>
          <el-option label="委托投保" :value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="投保企业" prop="companyId">
        <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
          <el-option
@@ -85,7 +91,7 @@
            fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaApplyChangeDetailWindow.open('加减保详情', row)">查看详情</el-button>
            <el-button type="text" @click="openEdit(row)">查看详情</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -98,6 +104,7 @@
    </template>
    <!-- 详情 -->
    <OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handlePageChange"/>
    <OperaUnionChangeDetailWindow ref="OperaUnionChangeDetailWindow" @success="handlePageChange"/>
  </TableLayout>
</template>
@@ -105,13 +112,14 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaUnionChangeDetailWindow from '@/components/business/OperaUnionChangeDetailWindow'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import {all as solutionAll, all} from '@/api/business/solutions'
import {pageAll as companyAll} from "@/api/business/company";
export default {
  name: 'add_subtract',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaApplyChangeDetailWindow },
  components: { TableLayout, Pagination, OperaApplyChangeDetailWindow, OperaUnionChangeDetailWindow },
  data () {
    return {
      // 搜索
@@ -122,7 +130,7 @@
        createDateE: '',
        createDateS: '',
        companyId: '',
        solutionType: 0,
        solutionType: '',
        baseSolutionsId: '',
        time: []
      },
@@ -141,6 +149,13 @@
    this.loadSelectList()
  },
  methods: {
    openEdit(row) {
      if (row.solutionType === 0) {
        this.$refs.operaApplyChangeDetailWindow.open('加减保详情', row)
      } else if (row.solutionType === 1) {
        this.$refs.OperaUnionChangeDetailWindow.open('加减保详情', row)
      }
    },
    loadSelectList() {
      solutionAll({dataType:2,type:0}).then(res => {
        this.solutionList = res
company/src/views/business/contract.vue
@@ -12,12 +12,12 @@
                    <el-option label="商户-企业" :value="2"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="状态" prop="status">
                <el-select v-model="searchForm.status" placeholder="请选择" @change="search">
                    <el-option label="待签章" :value="0"></el-option>
                    <el-option label="我方已签章" :value="1"></el-option>
                    <el-option label="企业商户已签章" :value="2"></el-option>
                    <el-option label="完成" :value="3"></el-option>
            <el-form-item label="状态" prop="queryStatus">
                <el-select v-model="searchForm.queryStatus" placeholder="请选择" @change="search">
                    <el-option label="待平台签署" :value="0"></el-option>
                    <el-option label="待商户签署" :value="1"></el-option>
                    <el-option label="待企业签署" :value="2"></el-option>
                    <el-option label="已完成" :value="3"></el-option>
                    <el-option label="已取消" :value="4"></el-option>
                    <el-option label="已关闭" :value="5"></el-option>
                </el-select>
@@ -62,12 +62,12 @@
                </el-table-column>
                <el-table-column label="状态" min-width="100px">
                    <template slot-scope="{row}">
                        <template v-if="row.status === 0">待签章</template>
                        <template v-else-if="row.status === 1">我方已签章</template>
                        <template v-else-if="row.status === 2">企业商户已签章</template>
                        <template v-else-if="row.status === 3">完成</template>
                        <template v-else-if="row.status === 4">已取消</template>
                        <template v-else-if="row.status === 5">已关闭</template>
                        <template v-if="row.queryStatus === 0">待平台签署</template>
                        <template v-else-if="row.queryStatus === 1">待商户签署</template>
                        <template v-else-if="row.queryStatus === 2">待企业签署</template>
                        <template v-else-if="row.queryStatus === 3">已完成</template>
                        <template v-else-if="row.queryStatus === 4">已取消</template>
                        <template v-else-if="row.queryStatus === 5">已关闭</template>
                    </template>
                </el-table-column>
                <el-table-column
@@ -133,7 +133,7 @@
        searchForm: {
          name: '',
          signType: '',
          status: ''
          queryStatus: ''
        }
      }
    },
company/src/views/business/insuranceApply.vue
@@ -3,7 +3,7 @@
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="保单状态" prop="statusCollect">
                <el-select v-model="searchForm.statusCollect" placeholder="请选择" @keypress.enter.native="search">
                <el-select v-model="searchForm.statusCollect" placeholder="请选择" @change="search">
                    <el-option label="待审核" value="0"></el-option>
                    <el-option label="待出单" value="1"></el-option>
                  <el-option label="待签署" value="7"></el-option>
@@ -12,6 +12,12 @@
                  <el-option label="已退回" value="4"></el-option>
                  <el-option label="退回申请中" value="5"></el-option>
                  <el-option label="已关闭" value="6"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="投保类型" prop="solutionType">
                <el-select v-model="searchForm.solutionType" placeholder="请选择" @change="search">
                    <el-option label="直保投保" :value="0"></el-option>
                    <el-option label="委托投保" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="投保企业" prop="companyId">
@@ -52,6 +58,9 @@
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar">
                <li><el-button type="primary">新增</el-button></li>
            </ul>
              <el-table
                  v-loading="isWorking.search"
                  :data="tableData.list"
@@ -149,7 +158,7 @@
                createTimeE: '',
                time: [],
                baseSolutionId: '',
                 solutionType: 0,
                 solutionType: '',
                companyId: '',
                statusCollect: ''
            },
company/src/views/business/switchCourt.vue
@@ -14,6 +14,12 @@
          <el-option label="已关闭" value="6"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="投保类型" prop="solutionType">
        <el-select v-model="searchForm.solutionType" placeholder="请选择" @change="search">
          <el-option label="直保投保" :value="0"></el-option>
          <el-option label="委托投保" :value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="投保企业" prop="companyId">
        <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
          <el-option
@@ -122,7 +128,7 @@
        type: '1',
        solutionsId: '',
        createDateE: '',
        solutionType: 0,
        solutionType: '',
        createDateS: '',
        baseSolutionsId: '',
        companyId: '',
company/src/views/business/userManagement.vue
@@ -36,20 +36,19 @@
                <el-table-column prop="username" label="账号" min-width="120px"></el-table-column>
                <el-table-column prop="realname" label="姓名" min-width="100px"></el-table-column>
                <el-table-column prop="mobile" label="联系方式" min-width="100px"></el-table-column>
                <el-table-column prop="companyDepartmentPathName" label="归属公司" min-width="100px"></el-table-column>
                <el-table-column prop="companyName" label="归属公司" min-width="100px"></el-table-column>
                <el-table-column label="授权企业" min-width="100px">
                    <template slot-scope="{row}">
                        <span>{{row.authNum}}家</span>
                    </template>
                </el-table-column>
                <el-table-column prop="roles" label="角色" min-width="160px" class-name="table-column-strings">
                <el-table-column label="是否超管" min-width="100px">
                    <template slot-scope="{row}">
                        <ul>
                            <li v-for="role in row.roles" :key="role.id">{{role.name}}</li>
                        </ul>
                        <span v-if="row.isAdmin === '1'">是</span>
                        <span v-if="row.isAdmin === '0'">否</span>
                    </template>
                </el-table-column>
                <el-table-column label="启用状态" min-width="100px">
                <el-table-column label="状态" min-width="100px">
                    <template slot-scope="{row}">
                        <el-switch
                            v-if="!row.fixed"
@@ -99,7 +98,8 @@
          username: '',
          realname: '',
          mobile: '',
          companyName: ''
          companyName: '',
          type: 1
        }
      }
    },
company/src/views/system/role.vue
@@ -47,7 +47,7 @@
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaRoleWindow.open('编辑角色', row)" icon="el-icon-edit" v-permissions="['system:role:update']">编辑</el-button>
            <el-button type="text" @click="openRole(row.systemDataPermission)">数据权限</el-button>
            <el-button type="text" @click="openRole(row.systemDataPermission, row.id)">数据权限</el-button>
            <el-button type="text" @click="$refs.permissionConfigWindow.open(row)" v-permissions="['system:role:createRolePermission']">配置权限</el-button>
            <el-button type="text" @click="$refs.menuConfigWindow.open(row)" icon="el-icon-menu" v-permissions="['system:role:createRoleMenu']">授权菜单</el-button>
            <el-button v-if="!row.fixed" type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['system:role:delete']">删除</el-button>
@@ -105,12 +105,16 @@
    this.search()
  },
  methods: {
    openRole(row) {
      let customData = []
      row.customData.split(',').forEach(item => {
        customData.push([item])
      })
      this.$refs.permissions.open('数据权限', { ...row, customData })
    openRole(row, id) {
      if (row) {
        let customData = []
        row.customData.split(',').forEach(item => {
          customData.push([item])
        })
        this.$refs.permissions.open('数据权限', { ...row, customData })
      } else {
        this.$refs.permissions.open('数据权限', { roleId: id, customData: [] })
      }
    }
  }
}