cost.vue

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

@@ -122,7 +122,14 @@
                         <el-option v-for="item in hasReportUserList"  :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
 
-                    <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'350'" :subject="hasReportUserList" :clearable="true" :multiSelect="true" @selectCal="selectCal"></selectCat>
+                    <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'350'" :subject="hasReportUserList" :clearable="true" :multiSelect="true" @selectCal="selectCal" :distinction="'1'"></selectCat>
+                </el-form-item>
+                <el-form-item prop="userIds" :label="$t('screening.selectPeople')" v-if="radio == $t('other.project') || radio == $t('projectclassification')">
+                    <el-select v-if="user.userNameNeedTranslate != '1'" v-model="exportParam.userIds" :placeholder="$t('lable.allStaff')" multiple="true"  clearable style="width:350px;" filterable="true">
+                        <el-option v-for="item in users"  :key="item.id" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+
+                    <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'350'" :subject="users" :clearable="true" :multiSelect="true" @selectCal="selectCal" :distinction="'1'"></selectCat>
                 </el-form-item>
                 <el-form-item prop="projectId" :label="user.timeType.fixMonthcost==0?$t('time.dateRange'):$t('Selectmonth')">
                     <el-date-picker v-show="user.timeType.fixMonthcost==0"
@@ -145,7 +152,7 @@
                     ></el-date-picker>
                 </el-form-item>
                 
-                <el-form-item :label="$t('screening.selectPeople')" v-if="radio == $t('other.project') || radio == $t('projectclassification')">
+                <el-form-item :label="$t('screening.selectPeople')" v-if="false">
                     <el-select v-if="user.userNameNeedTranslate != '1'" v-model="exportParam.userId"  :placeholder="$t('lable.allStaff')" style="width: 350px" filterable="true" clearable="true">
                         <span v-for="(item, index) in users" :key="index">
                         <el-option :label="item.name" :value="item.id"></el-option>
@@ -336,6 +343,15 @@
                  }
                  var url = "/project/exportTimeCost";
                  var fileName = this.$t('projectmanhourcoststatistics')+ '.xls';
+                 if(this.radio == this.$t('other.project')){
+                    if (this.exportParam.userIds != null && this.exportParam.userIds.length > 0) {
+                         var ids = '';
+                        this.exportParam.userIds.forEach(u=>{
+                            ids += u+',';
+                        })
+                        param.userIds = ids.substring(0,ids.length-1);
+                     }
+                 }
                  if (this.radio == this.$t('ren-yuan') ) {
                     //  console.log(this.exportParam.userIds);
                      fileName = this.$t('labortimecoststatistics')+ '.xls';
@@ -345,7 +361,7 @@
                         this.exportParam.userIds.forEach(u=>{
                             ids += u+',';
                         })
-                        param.userIds = ids;
+                        param.userIds = ids.substring(0,ids.length-1);
                      }
                  } 
                 if(this.radio == this.$t('projectclassification')){
@@ -354,6 +370,13 @@
                     if(this.exportParam.projectCategoryId){
                         param.projectCategoryId = this.exportParam.projectCategoryId
                     }
+                    if (this.exportParam.userIds != null && this.exportParam.userIds.length > 0) {
+                         var ids = '';
+                        this.exportParam.userIds.forEach(u=>{
+                            ids += u+',';
+                        })
+                        param.userIds = ids.substring(0,ids.length-1);
+                     }
                 }
                 if(this.radio == this.$t('lable.department')){
                     fileName = this.$t('departmenthourscoststatistics')+ '.xls'
@@ -364,7 +387,7 @@
                     param.projectId = this.exportParam.projectId;
                 }
                 if (this.exportParam.userId) {
-                    if(this.radio == this.$t('other.project') || this.radio == this.$t('lable.department') || this.radio == this.$t('ren-yuan') || this.radio == this.$t('projectclassification')){
+                    if(this.radio == this.$t('lable.department') || this.radio == this.$t('ren-yuan')){
                         param.userId = this.exportParam.userId;
                     }
                 }