fix:工单样式兼容移动端

2026-01-23 14:24:29 +08:00
parent 5b5e0f62ec
commit ead7c5bba5
6 changed files with 1094 additions and 59 deletions
@@ -24,9 +24,15 @@
              </div>
            </el-form-item>
            <el-form-item label="管理员组" v-if="queryParams.owner_type === 'group'">
-              <el-select v-model="queryParams.admin_group_id" placeholder="请选择管理员组" clearable filterable style="width: 200px">
-                <el-option v-for="item in adminGroupOptions" :key="item.id" :label="`${item.name} (ID: ${item.id})`" :value="item.id" />
-              </el-select>
+              <div class="selector-inline">
+                <el-tag v-if="queryParams.admin_group_id" type="success" closable @close="clearQueryGroup" style="margin-right: 8px;">
+                  {{ getQueryGroupName() }}
+                </el-tag>
+                <el-button type="success" plain @click="openQueryGroupSelector" size="default">
+                  <el-icon><User /></el-icon>
+                  {{ queryParams.admin_group_id ? '重新选择' : '选择管理员组' }}
+                </el-button>
+              </div>
            </el-form-item>
            <el-form-item>
              <el-button type="primary" @click="handleQuery">
@@ -115,14 +121,34 @@
      </div>
    </el-card>

-    <!-- 用户选择弹窗 -->
-    <el-dialog
+    <!-- 用户选择弹窗 - 使用UserListSelector组件 -->
+    <UserListSelector
      v-model="userSelectorVisible"
+      :current-user-id="selectorType === 'query' ? queryParams.user_id : permissionForm.user_id"
+      @confirm="handleUserSelectorConfirm"
+    />
+
+    <!-- 管理员组选择弹窗 - 使用UserGroupSelector组件 -->
+    <UserGroupSelector
+      v-model="groupSelectorVisible"
+      :current-group-id="selectorType === 'query' ? queryParams.admin_group_id : permissionForm.admin_group_id"
+      @confirm="handleGroupSelectorConfirm"
+    />
+
+    <!-- 路径权限选择弹窗 -->
+    <PermissionPathSelector
+      v-model="permissionSelectorVisible"
+      :current-permission-id="permissionForm.permission_id"
+      @confirm="handlePermissionSelectorConfirm"
+    />
+
+    <!-- 旧的用户选择弹窗 - 已废弃 -->
+    <!-- <el-dialog
+      v-model="userSelectorVisibleOld"
      title="选择用户"
      width="800px"
      class="user-selector-dialog"
    >
-      <!-- 搜索栏 -->
      <div class="selector-search">
        <el-input
          v-model="userSearchParams.key"
@@ -142,7 +168,6 @@
        <el-button @click="resetUserSearch">重置</el-button>
      </div>

-      <!-- 用户表格 -->
      <el-table
        v-loading="userSelectorLoading"
        :data="userSelectorList"
@@ -164,7 +189,7 @@
        </el-table-column>
      </el-table>

-      <!-- 分页 -->
+    
      <el-pagination
        v-model:current-page="userSearchParams.page"
        v-model:page-size="userSearchParams.count"
@@ -178,12 +203,12 @@
      />

      <template #footer>
-        <el-button @click="userSelectorVisible = false">取消</el-button>
+        <el-button @click="userSelectorVisibleOld = false">取消</el-button>
        <el-button type="primary" @click="confirmUserSelection" :disabled="!selectedUserTemp">
          确定选择
        </el-button>
      </template>
-    </el-dialog>
+    </el-dialog> -->
    <!-- 分配权限对话框 -->
    <el-dialog
      v-model="dialogVisible"
@@ -204,45 +229,80 @@
          <div class="form-tip">如果是 user 则填写 user_id，如果是 group 则填写 admin_group_id</div>
        </el-form-item>
        <el-form-item label="用户" prop="user_id" v-if="permissionForm.owner_type === 'user'" >
-          <div class="user_selector-inline">
-            <el-tag v-if="permissionForm.user_id" type="primary" closable @close="clearFormUser" style="margin-right: 8px;">
-              {{ getFormUserName() }}
-            </el-tag>
-            <el-button type="primary" plain @click="openFormUserSelector" size="default" :disabled="permissionForm.user_id">
-              <el-icon><User /></el-icon>
-              {{ permissionForm.user_id ? '重新选择' : '选择用户' }}
+          <div class="recommend-user-selector">
+            <el-input
+              :model-value="getFormUserName()"
+              placeholder="点击选择用户"
+              readonly
+              @click="openFormUserSelector"
+              :disabled="!!permissionForm.id"
+            >
+              <template #append>
+                <el-button @click="openFormUserSelector" :disabled="!!permissionForm.id">
+                  <el-icon><Search /></el-icon>
+                </el-button>
+              </template>
+            </el-input>
+            <el-button 
+              v-if="permissionForm.user_id && !permissionForm.id" 
+              type="danger" 
+              link 
+              @click="clearFormUser"
+              class="clear-btn"
+            >
+              清除
            </el-button>
          </div>
        </el-form-item>
        <el-form-item label="管理员组" prop="admin_group_id" v-if="permissionForm.owner_type === 'group'">
-          <el-select v-model="permissionForm.admin_group_id" placeholder="请选择管理员组" filterable style="width: 100%">
-            <el-option v-for="item in adminGroupOptions" :key="item.id" :label="`${item.name} (ID: ${item.id})`" :value="item.id" />
-          </el-select>
+          <div class="recommend-user-selector">
+            <el-input
+              :model-value="getFormGroupName()"
+              placeholder="点击选择管理员组"
+              readonly
+              @click="openFormGroupSelector"
+              :disabled="!!permissionForm.id"
+            >
+              <template #append>
+                <el-button @click="openFormGroupSelector" :disabled="!!permissionForm.id">
+                  <el-icon><Search /></el-icon>
+                </el-button>
+              </template>
+            </el-input>
+            <el-button 
+              v-if="permissionForm.admin_group_id && !permissionForm.id" 
+              type="danger" 
+              link 
+              @click="clearFormGroup"
+              class="clear-btn"
+            >
+              清除
+            </el-button>
+          </div>
        </el-form-item>
        <el-form-item label="路径权限" prop="permission_id">
-          <div style="display: flex; gap: 8px;">
-            <el-select 
-              v-model="permissionForm.permission_id" 
-              placeholder="请选择路径权限" 
-              filterable 
-              style="flex: 1"
-              :loading="permissionLoading"
+          <div class="recommend-user-selector">
+            <el-input
+              :model-value="getFormPermissionName()"
+              placeholder="点击选择路径权限"
+              readonly
+              @click="openPermissionSelector"
            >
-              <el-option 
-                v-for="item in permissionOptions" 
-                :key="item.id" 
-                :value="item.id"
-              >
-                <div style="display: flex; justify-content: space-between; align-items: center;">
-                  <span>
-                    <el-tag v-if="item.method" :type="getMethodTag(item.method)" size="small" style="margin-right: 8px;">{{ item.method }}</el-tag>
-                    {{ item.path }}
-                  </span>
-                  <span style="color: #999; font-size: 12px; margin-left: 12px;">{{ item.note || item.name || `ID: ${item.id}` }}</span>
-                </div>
-              </el-option>
-            </el-select>
-            <el-button @click="fetchPermissionList" :loading="permissionLoading" :icon="Refresh">刷新</el-button>
+              <template #append>
+                <el-button @click="openPermissionSelector">
+                  <el-icon><Search /></el-icon>
+                </el-button>
+              </template>
+            </el-input>
+            <el-button 
+              v-if="permissionForm.permission_id" 
+              type="danger" 
+              link 
+              @click="clearFormPermission"
+              class="clear-btn"
+            >
+              清除
+            </el-button>
          </div>
          <div class="form-tip">共 {{ permissionOptions.length }} 个路径权限可选</div>
        </el-form-item>
@@ -283,6 +343,9 @@
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Search, Refresh, User } from '@element-plus/icons-vue'
+import UserListSelector from '@/components/admin/UserListSelector.vue'
+import UserGroupSelector from '@/components/admin/UserGroupSelector.vue'
+import PermissionPathSelector from '@/components/admin/PermissionPathSelector.vue'
 import { 
  getPermissionListByAdmin, 
  addPermissionAdmin, 
@@ -297,6 +360,8 @@ import { formatDate ,timeToTimestamp} from '@/utils/tool'

 const selectorType = ref('query') 
 const userSelectorVisible = ref(false)
+const groupSelectorVisible = ref(false)
+const permissionSelectorVisible = ref(false)
 const userSelectorList = ref([])
 const userSelectorTotal = ref(0)
 const userSearchParams = reactive({
@@ -307,6 +372,8 @@ const userSearchParams = reactive({
 const selectedUserTemp = ref(null)
 const userSelectorLoading = ref(false)
 const UserOptions = ref([])
+const GroupOptions = ref([])
+const selectedPermission = ref(null)
 // 查询参数
 const queryParams = reactive({
  owner_type: '',
@@ -324,16 +391,122 @@ const getQueryUserName = () => {
  const user = UserOptions.value.find(u => u.UserId === queryParams.user_id)
  return user ? `${user.UserName} (ID: ${user.UserId})` : `用户ID: ${queryParams.user_id}`
 }
+// 清除查询管理员组
+const clearQueryGroup = () => {
+  queryParams.admin_group_id = undefined
+}
+// 获取查询管理员组名称
+const getQueryGroupName = () => {
+  const group = GroupOptions.value.find(g => g.id === queryParams.admin_group_id) || 
+                adminGroupOptions.value.find(g => g.id === queryParams.admin_group_id)
+  return group ? `${group.name} (ID: ${group.id})` : `管理员组ID: ${queryParams.admin_group_id}`
+}
+// 打开查询管理员组选择器
+const openQueryGroupSelector = () => {
+  selectorType.value = 'query'
+  groupSelectorVisible.value = true
+}
 // 表单：清除用户
 const clearFormUser = () => {
  permissionForm.user_id = undefined
 }
 // 表单：获取显示名称
 const getFormUserName = () => {
+  if (!permissionForm.user_id) return ''
  const user = UserOptions.value.find(u => u.UserId === permissionForm.user_id)
  return user ? `${user.UserName} (ID: ${user.UserId})` : `用户ID: ${permissionForm.user_id}`
 }
-// 确认用户选择
+
+// 表单：获取管理员组显示名称
+const getFormGroupName = () => {
+  if (!permissionForm.admin_group_id) return ''
+  const group = GroupOptions.value.find(g => g.id === permissionForm.admin_group_id)
+  return group ? `${group.name} (ID: ${group.id})` : `管理员组ID: ${permissionForm.admin_group_id}`
+}
+
+// 表单：获取路径权限显示名称
+const getFormPermissionName = () => {
+  if (!permissionForm.permission_id) return ''
+  if (selectedPermission.value && selectedPermission.value.id === permissionForm.permission_id) {
+    const p = selectedPermission.value
+    return `${p.method || ''} ${p.path}${p.name ? ' - ' + p.name : ''}`
+  }
+  const perm = permissionOptions.value.find(p => p.id === permissionForm.permission_id)
+  return perm ? `${perm.method || ''} ${perm.path}${perm.name ? ' - ' + perm.name : ''}` : `权限ID: ${permissionForm.permission_id}`
+}
+
+// 清除表单管理员组
+const clearFormGroup = () => {
+  permissionForm.admin_group_id = undefined
+}
+
+// 清除表单路径权限
+const clearFormPermission = () => {
+  permissionForm.permission_id = undefined
+  selectedPermission.value = null
+}
+
+// 打开管理员组选择器
+const openFormGroupSelector = () => {
+  selectorType.value = 'form'
+  groupSelectorVisible.value = true
+}
+
+// 打开路径权限选择器
+const openPermissionSelector = () => {
+  permissionSelectorVisible.value = true
+}
+
+// 管理员组选择确认
+const handleGroupSelectorConfirm = (group) => {
+  if (group) {
+    const groupId = group.id || group.Id
+    const groupName = group.name || group.Name
+    
+    if (selectorType.value === 'query') {
+      queryParams.admin_group_id = groupId
+    } else {
+      permissionForm.admin_group_id = groupId
+    }
+    
+    if (!GroupOptions.value.find(g => g.id === groupId)) {
+      GroupOptions.value.push({ id: groupId, name: groupName })
+    }
+  }
+  groupSelectorVisible.value = false
+}
+
+// 路径权限选择确认
+const handlePermissionSelectorConfirm = (permission) => {
+  if (permission) {
+    permissionForm.permission_id = permission.id
+    selectedPermission.value = permission
+  }
+  permissionSelectorVisible.value = false
+}
+// UserListSelector 组件确认回调
+const handleUserSelectorConfirm = (user) => {
+  if (user) {
+    const userId = user.user_id || user.UserId
+    const userName = user.user_name || user.UserName
+    
+    if (selectorType.value === 'query') {
+      queryParams.user_id = userId
+      // 添加到 UserOptions 用于显示名称
+      if (!UserOptions.value.find(u => u.UserId === userId)) {
+        UserOptions.value.push({ UserId: userId, UserName: userName })
+      }
+    } else if (selectorType.value === 'form') {
+      permissionForm.user_id = userId
+      if (!UserOptions.value.find(u => u.UserId === userId)) {
+        UserOptions.value.push({ UserId: userId, UserName: userName })
+      }
+    }
+  }
+  userSelectorVisible.value = false
+}
+
+// 确认用户选择（旧方法，保留兼容）
 const confirmUserSelection = () => {
  if (!selectedUserTemp.value) {
    ElMessage.warning('请选择一个用户')
@@ -684,7 +857,7 @@ const fetchUserList = async () => {
  try {
    const res = await getUserList({
      page: 1,
-      count: 10000,
+      count: 10,
      key: ''
    })
    if (res.data.code === 200) {
@@ -700,7 +873,7 @@ const fetchAdminGroupList = async () => {
  try {
    const res = await getAdminGroupList({
      page: 1,
-      count: 1000
+      count: 10
    })
    if (res.data.code === 200) {
      adminGroupOptions.value = res.data.data?.data || []
@@ -716,7 +889,7 @@ const fetchPermissionList = async () => {
  try {
    const res = await getPermissionList({
      page: 1,
-      count: 10000
+      count: 10
    })
    if (res.data.code === 200) {
      permissionOptions.value = res.data.data?.list || []
@@ -837,4 +1010,34 @@ onMounted(() => {
 :deep(.el-card__body) {
  padding: 0;
 }
+
+/* 推介人选择器样式 - 与UserList.vue保持一致 */
+.recommend-user-selector {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+}
+
+.recommend-user-selector .el-input {
+  flex: 1;
+}
+
+.recommend-user-selector .clear-btn {
+  flex-shrink: 0;
+}
+
+.selector-inline {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.user_selector-inline {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
 </style>
@@ -437,7 +437,7 @@ const fetchGroupList = async () => {

 const fetchAllGroupList = async () => {
  try {
-    const res = await getSettingGroupList({ page: 1, count: 1000 })
+    const res = await getSettingGroupList({ page: 1, count: 10 })
    if (res.data.code === 200) {
      allGroupList.value = res.data.data.data || []
    }
@@ -635,8 +635,10 @@ const handleTypeChange = (type) => {
  }
 }

-const handleAddSetting = () => {
+const handleAddSetting = async () => {
  settingDialogTitle.value = '新增配置'
+  // 刷新配置组列表以确保数据最新
+  await fetchAllGroupList()
  Object.assign(settingForm, {
    id: undefined,
    name: '',
@@ -780,6 +782,7 @@ watch(activeTab, (newVal) => {
  if (newVal === 'group') {
    fetchGroupList()
  } else if (newVal === 'setting') {
+    fetchAllGroupList() // 切换到配置管理时刷新配置组列表用于下拉筛选
    fetchSettingList()
  }
 })