2022.8.26

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -8,12 +8,11 @@
                 </el-form-item>
                 <el-form-item >
                     <!-- <div style="display: flex;align-items: center;height: 40px;"> -->
-                    <div style="display: flex;align-items: center;height: 40px;">
-                    <el-input v-model="keyword" class="input-with-select" :placeholder="searchField == '1' ? '请输入项目名称关键字' : (searchField == '2' ? '请输入项目编号关键字' : '请输入项目经理工号')" clearable="true" size="small">
+                    <div v-if="true" style="display: flex;align-items: center;height: 40px;">
+                    <el-input v-model="keyword" class="input-with-select" :placeholder="searchField == '1' ? '请输入项目名称关键字' : '请输入项目编号关键字'" clearable="true" size="small">
                         <el-select v-model="searchField" style="width:120px;"  slot="prepend" placeholder="请选择">
                             <el-option label="项目名称" value=1 ></el-option>
-                            <el-option label="项目编号" value=2></el-option>
-                            <el-option label="项目经理" v-if="user.companyId == 936" value=3></el-option>
+                            <el-option label="项目编号" value=2 ></el-option>
                         </el-select>
                         <el-button slot="append" @click="searchList" icon="el-icon-search"></el-button>
                     </el-input>
@@ -51,26 +50,18 @@
                         :props="{ checkStrictly: true, expandTrigger: 'hover' }" :show-all-levels="false" clearable filterable @change="searchClfList" size="small"
                     ></el-cascader>
                 </el-form-item>
-                
-                <!-- 分类条目 -->
-                <!-- <el-form-item style="float:right;"  v-if="permissions.projectClassification">
-                    <el-link type="primary" :underline="false" @click="showClfDialog = true">分类管理</el-link>
-                </el-form-item>
-                <el-form-item style="float:right;"  v-if="user.company.packageProject == 1 && permissions.projectCostOfItems">
-                    <el-link type="primary" :underline="false" @click="showBaseCostItemDialog">基线成本项</el-link>
+                <br v-if="user.companyId == 936">
+                <!-- 项目经理筛选 -->
+                <el-form-item>
+                    <span style="margin-left:5px;margin-right:5px;color:#606266;">项目经理</span>
+                    <el-select v-model="inchagerId" style="width:190px;" placeholder="请选择" clearable @change="manageSelect" size="small" filterable popper-class="managePopperClass">
+                        <el-option v-for="item in users" :key="item.id" :label="user.companyId == 936 ? item.name + '\u3000' + item.jobNumber : item.name" :value="item.id">
+                            <span style="float: left">{{ item.name }}</span>
+                            <span style="float: right; color: #8492a6;" v-if="user.companyId == 936">{{ item.jobNumber }}</span>
+                        </el-option>
+                    </el-select>
                 </el-form-item>
                 
-                <el-form-item style="float:right;" v-if="permissions.projectExport">
-                    <el-link type="primary" style="margin-left:5px;" :underline="false" @click="exportProjectData" download="项目导出.xlsx">导出项目</el-link>
-                </el-form-item>
-                <el-form-item style="float:right;" v-if="permissions.projectImport">
-                    <el-link type="primary" style="margin-left:5px;" :underline="false" href="./upload/项目导入模板.xlsx" download="项目导入模板.xlsx">模板下载</el-link>
-                </el-form-item>
-                <el-form-item style="float:right;" v-if="permissions.projectImport">
-                    <el-upload ref="upload" style="margin-left:5px;" action="#" :limit="1" :http-request="importProject" :show-file-list="false">
-                        <el-link type="primary" :underline="false" >导入项目</el-link>
-                    </el-upload>
-                </el-form-item>  -->
                 <el-form-item style="float:right;" v-if="permissions.projectImport || permissions.projectExport || permissions.projectClassification || (user.company.packageProject == 1 && permissions.projectCostOfItems)">
                     <el-dropdown>
                         <el-link type="primary" :underline="false">查看更多<i class="el-icon-arrow-down el-icon--right"></i></el-link>
@@ -1203,7 +1194,9 @@ a {
                 centerNameDegree: '',
 
                 batchInchargerDialog: false,
-                paramInchargerId: ''
+                paramInchargerId: '',
+
+                inchagerId: ''
 
             };
         },
@@ -2631,6 +2624,10 @@ a {
                 this.page = 1;
                 this.getList();
             },
+            manageSelect(){
+                this.page = 1
+                this.getList()
+            },
             
 
             getProjectBaseConfigList() {
@@ -2907,6 +2904,10 @@ a {
                 })
             },
             getUsers() {
+
+
+
+
                 // this.http.post(this.port.manage.list, {
                 //     departmentId: -1,
                 //     pageIndex: 1,
@@ -2954,7 +2955,8 @@ a {
                     searchField: this.searchField,
                     status: this.status,
                     category: this.statusClf,
-                    projectMainId: this.projectMainId
+                    projectMainId: this.projectMainId,
+                    inchagerId: this.inchagerId
                 }
                 if(this.sortOrder){
                     if(this.sortProp == 'inchargerName'){
@@ -3741,10 +3743,14 @@ a {
     white-space: nowrap;
     text-overflow: ellipsis;
 }
+
 // 111
 
 </style>
 <style>
+.managePopperClass{
+    width: 190px;
+}
 .el-dropdown-link {
     color: #409EFF;
 }