Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-14 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad

 company/src/views/system/permission.vue

@@ -8,6 +8,14 @@
      <el-form-item label="权限名称" prop="name">
        <el-input v-model="searchForm.name" v-trim placeholder="请输入权限名称" @keypress.enter.native="search"/>
      </el-form-item>
      <el-form-item label="平台类型" prop="type">
        <el-select v-model="searchForm.type" 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-select>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
@@ -30,6 +38,14 @@
        <el-table-column type="selection" fixed="left" width="55"></el-table-column>
        <el-table-column prop="code" label="权限编码" fixed="left" min-width="200px"></el-table-column>
        <el-table-column prop="name" label="权限名称" fixed="left" min-width="120px"></el-table-column>
        <el-table-column prop="name" label="平台类型" fixed="left" min-width="120px">
          <template slot-scope="{row}">
            <span  v-if="row.type == null || row.type ===0">通用</span>
            <span  v-if="row.type === 1">平台端</span>
            <span   v-if="row.type === 2">企业端</span>
            <span   v-if="row.type === 3">商户端</span>
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="权限备注" min-width="120px"></el-table-column>
        <el-table-column prop="createUser" label="创建人" min-width="100px">
          <template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
@@ -77,6 +93,7 @@
      searchForm: {
        code: '',
        name: '',
        type: '',
        remark: ''
      }
    }