Browse Source

查询用户

duy 2 năm trước cách đây
mục cha
commit
d399768c43

+ 4 - 1
src/views/program/project/form.vue

@@ -132,6 +132,7 @@ import projectApi from '~api/program/project.js';
 import contractApi from '~api/project/project-contract.js';
 import {getArrValue,getObjValue} from "js-fast-way"
 
+
 //初始变量
 const router = useRouter()
 const useRoutes = useRoute()
@@ -141,7 +142,7 @@ const dataType = ref(useRoutes?.query?.type ?? '')
 onActivated(() => {
     dataId.value = useRoutes?.query?.id ?? ''
     dataType.value = useRoutes?.query?.type ?? ''
-   
+    getUserDict()
     if(dataType.value!=='add'){
         getPlanByProjectId()
     
@@ -175,6 +176,8 @@ const getPlanByProjectId=async()=>{
         // milestoneData.value=[]
     }
 }
+
+
 //类型tab数据和相关处理
 const tabKey = ref('')
 const tabTab = ref([

+ 11 - 4
src/views/project/list/index.vue

@@ -16,10 +16,17 @@
                     <el-option v-for="item in projectUser" :label="item.name" :value="item.key"/>
                 </el-select>
             </div>
-            <div class="w-36 ml-2">
-                <el-select v-model="searchForm.queryDate" block clearable placeholder="选择时间" size="large">
-                    <el-option v-for="item in annuals" :label="item.name" :value="item.key"/>
-                </el-select>
+            <div class="w-36 ml-2 ">
+                <el-date-picker
+                    v-model="searchForm.queryDate"
+                    format="YYYY-MM"
+                    value-format="YYYY-MM"
+                    type="month"
+                    placeholder="选择时间"
+                    size="large"
+                    block clearable
+                    style="width: 100%;"
+                />
             </div>
             <div class="w-48 ml-2">
                 <el-input v-model="searchForm.queryValue" clearable placeholder="请输入项目名称进行查询" @keyup="keyUpEvent" size="large"/>

+ 20 - 3
src/views/project/list/list-info.vue

@@ -51,17 +51,17 @@
                             <HcCardItem title="联系人信息">
                                 <el-form-item label="项目负责人:">
                                     <el-select v-model="formModel.projectPrincipal" block clearable placeholder="项目负责人" size="large">
-                                        <el-option v-for="item in contractType" :label="item.name" :value="item.key"/>
+                                        <el-option v-for="item in userList" :label="item.name" :value="item.id"/>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="实施负责人:">
                                     <el-select v-model="formModel.implementPrincipal" block clearable placeholder="实施负责人" size="large">
-                                        <el-option v-for="item in contractType" :label="item.name" :value="item.key"/>
+                                        <el-option v-for="item in userList" :label="item.name" :value="item.id"/>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="维护负责人:">
                                     <el-select v-model="formModel.maintainPrincipal" block clearable placeholder="维护负责人" size="large">
-                                        <el-option v-for="item in contractType" :label="item.name" :value="item.key"/>
+                                        <el-option v-for="item in userList" :label="item.name" :value="item.id"/>
                                     </el-select>
                                 </el-form-item>
                             </HcCardItem>
@@ -117,6 +117,9 @@ import {ref, onActivated,onMounted} from "vue";
 import {useRoute, useRouter} from 'vue-router'
 import projectApi from '~api/project/project-list.js';
 import {getArrValue,getObjValue,formValidate} from "js-fast-way"
+import { getuserList} from "~api/other";
+import {useAppStore} from "~src/store";
+const useAppState = useAppStore();
 
 const router = useRouter()
 const useRoutes = useRoute()
@@ -130,6 +133,7 @@ onActivated(() => {
     dataType.value = useRoutes?.query?.type ?? 'view'
     dataId.value = useRoutes?.query?.id ?? ''
     getBaseProcess()
+    getUserDict()
     if(dataType.value!=='add'){
         getProjectInfoById()
     }else{
@@ -160,6 +164,19 @@ const getProjectServerTypeDict=async()=>{
         serverType.value=[]
     }
 }
+//获取所有员工
+const userList=ref([])
+//获取部门人员列表
+const getUserDict=async()=>{
+    const {error, code, data} = await getuserList({tenantId:useAppState.tenantId})
+    if (!error && code === 200) {
+        userList.value = getArrValue(data)
+
+    } else {
+        userList.value = []
+
+    }
+}
 //获取项目详情
 const getProjectInfoById=async()=>{
     const {error, code, data} = await projectApi.getProjectInfoById({id: dataId.value})