MrShi
2025-06-30 55d25cf1648310cc60bb9a412b4ed3e886d732e1
提交
已修改2个文件
31 ■■■■■ 文件已修改
admin/src/views/system/user.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/snapshot.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/system/user.vue
@@ -14,6 +14,11 @@
      <el-form-item label="组织" prop="companyName">
        <el-input v-model="searchForm.companyName" v-trim placeholder="请输入组织" @keypress.enter.native="search"/>
      </el-form-item>
      <el-form-item label="角色" prop="roleId">
        <el-select v-model="searchForm.roleId" placeholder="请选择角色" @change="search">
          <el-option :label="item.name" :value="item.id" v-for="(item, index) in rolesList" :key="index"></el-option>
        </el-select>
      </el-form-item>
<!--            <el-form-item label="所属部门" prop="rootDeptId">-->
<!--        <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="请选择所属部门" clearable/>-->
<!--      </el-form-item>-->
@@ -122,7 +127,7 @@
import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
import DepartmentSelect from '@/components/common/DepartmentSelect'
import PositionSelect from '@/components/common/PositionSelect'
import { fetchAll as fetchAllRoles, fetchAll } from '@/api/system/role'
export default {
  name: 'SystemUser',
  extends: BaseTable,
@@ -136,8 +141,10 @@
        rootDeptId: null, // 部门ID
        positionId: null, // 岗位ID
        companyName: null, // 企业名称
        roleId: null, // 角色
        mobile: '' // 手机号码
      }
      },
      rolesList: []
    }
  },
  created () {
@@ -151,6 +158,13 @@
      }]
    })
    this.search()
    fetchAllRoles()
      .then(records => {
        this.rolesList = records
      })
      .catch(e => {
        this.$tip.apiFailed(e)
      })
  }
}
</script>
h5/pages/staff/snapshot.vue
@@ -13,6 +13,19 @@
                    <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
                </view>
            </view>
            <view class="line">
                <view class="label">
                    <text>*</text>
                    <text>检查类型</text>
                </view>
                <view class="value" @click="openArea">
                    <text class="mr6"
                        :style="{ color: param.areaName ? '#000000' : '#999999' }">{{ param.areaName ? param.areaName : "请选择" }}</text>
                    <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
                </view>
            </view>
            <view class="line">
                <view class="label">
                    <text>*</text>