Merge remote-tracking branch 'origin/master'

jiangping

2024-09-20 af1603e4e4f5505a1fd5526134bbd43dc66d5281

 admin/src/views/business/internalMember.vue

@@ -61,7 +61,12 @@
                @selection-change="handleSelectionChange"
            >
                <el-table-column type="selection" width="55"></el-table-column>
                <el-table-column prop="name" label="姓名" min-width="100px"></el-table-column>
                <el-table-column prop="name" label="姓名" min-width="110px">
                  <template slot-scope="{row}">
                    <span>{{ row.name }}</span>
                      <span class="zhuguan" v-if="row.headStatus == 1">主管</span>
                    </template>
                </el-table-column>
                <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
                <el-table-column prop="idcardDecode" label="身份证号" min-width="100px"></el-table-column>
                <el-table-column label="性别" min-width="100px">
@@ -381,6 +386,7 @@
</script>

<style lang="scss" scoped>
 @import '@/assets/style/variables.scss';
    .box {
        width: 100%;
        display: flex;
@@ -395,4 +401,11 @@
            height: 100%;
        }
    }
    .zhuguan{
      color: $primary-color;
      border: 1px solid $primary-color;
      padding: 0px 3px;
      border-radius: 4px;
      margin-left: 6px;
    }
</style>