Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

zhangxiao

2024-08-13 e611f0e211e257776bd3402ea7a90bb1fa2afdc3

 src/views/authority/users/index.vue

@@ -64,71 +64,6 @@
          </div>
        </div>
      </div>
      <!-- <a-row>
        <a-col :flex="2"></a-col>
        <a-col :flex="1">
          <a-form :model="formModel" style="margin-top: 30px">
            <a-form-item field="name">
              <a-input
                v-model="formModel.name"
                :style="{ width: '320px' }"
                :placeholder="$t('请输入')"
              />
            </a-form-item>
          </a-form>
        </a-col>
        <a-col :flex="'200px'" style="text-align: right; margin-top: 30px">
          <a-button type="primary" @click="search" style="margin-right: 20px">
            <template #icon>
              <icon-search />
            </template>
            {{ $t('searchTable.form.search') }}
          </a-button>
          <a-button @click="reset">
            <template #icon>
              <icon-refresh />
            </template>
            {{ $t('searchTable.form.reset') }}
          </a-button>
        </a-col>
      </a-row> -->
      <!-- <a-divider style="margin-top: 0" />
      <a-row style="margin-bottom: 16px">
        <a-col :span="12">
          <a-space>
            <a-button type="primary" :align="'right'" @click="operation(0)"
              >+ 新建账户</a-button
            >
          </a-space>
        </a-col>
        <a-col
          :span="12"
          style="display: flex; align-items: center; justify-content: end"
        >
          <a-tooltip :content="$t('searchTable.actions.refresh')">
            <div class="action-icon" @click="search">
              <icon-refresh size="18" />
            </div>
          </a-tooltip>
          <a-dropdown @select="handleSelectDensity">
            <a-tooltip :content="$t('searchTable.actions.density')">
              <div class="action-icon">
                <icon-line-height size="18" />
              </div>
            </a-tooltip>
            <template #content>
              <a-doption
                v-for="item in densityList"
                :key="item.value"
                :value="item.value"
                :class="{ active: item.value === size }"
              >
                <span>{{ item.name }}</span>
              </a-doption>
            </template>
          </a-dropdown>
        </a-col>
      </a-row> -->
      <a-table
        row-key="id"
        :loading="loading"
@@ -191,18 +126,16 @@
      @ok="editHandleOk"
    >
      <a-form :model="editform">
        <a-form-item field="email" label="用户名">
          <a-input v-model="editform.email" />
        </a-form-item>
        <a-form-item field="name" label="昵称">
          <a-input v-model="editform.nickName" />
        </a-form-item>
        <a-form-item field="userName" label="用户名">
          <a-input v-model="editform.userName" />
        </a-form-item>
        <a-form-item field="phoneNumber" label="手机号">
          <a-input v-model="editform.phoneNumber" />
        </a-form-item>
        <a-form-item field="email" label="邮箱">
          <a-input v-model="editform.email" />
        </a-form-item>

      </a-form>
    </a-modal>
    <a-modal
@@ -631,7 +564,7 @@
      slotName: 'index',
    },
    {
      title: t('登录名'),
      title: t('用户名'),
      dataIndex: 'email',
    },
    {