调整甘特图

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

@@ -49,17 +49,17 @@
       <!-- 人员/项目筛选 -->
       <div class="head_select">
         <span>{{(this.radio1 == $t('an-ren-yuan-cha-kan') ? $t('ren-yuan') : $t('other.project'))}}</span>
-      <el-select clearable filterable v-model="valuex" :placeholder="$t('defaultText.pleaseChoose')" size="small" style="margin-left:9px;width:10vw" @change="optupdata()">
-        <el-option
-          v-for="item in screenList"
-          :key="item.id"
-          :label="reqpar1 ? item.projectName : item.name"
-          :value="item.id"
-          >
-          <span v-if="reqpar1" style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
-          <span v-if="reqpar1" style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
-        </el-option>
-      </el-select>
+          <el-select v-if="reqpar1" clearable filterable v-model="valuex" :placeholder="$t('defaultText.pleaseChoose')" size="small" style="margin-left:9px;width:10vw" @change="optupdata()">
+            <el-option v-for="item in screenList" :key="item.id" :label="item.projectName" :value="item.id">
+              <span v-if="reqpar1" style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
+              <span v-if="reqpar1" style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
+            </el-option>
+          </el-select>
+          <el-select v-if="!reqpar1 && user.userNameNeedTranslate != '1'" clearable filterable v-model="valuex" :placeholder="$t('defaultText.pleaseChoose')" size="small" style="margin-left:9px;width:10vw" @change="optupdata()">
+            <el-option v-for="item in screenList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+          <selectCat v-if="!reqpar1 && user.userNameNeedTranslate == '1'" style="margin-left:9px;" :size="'small'" :widthStr="'153'" :subject="screenList" :subjectId="valuex" :distinction="'1'" @selectCal="selectCal"></selectCat>
       </div>
       <!-- 资源需求导入/导出 -->
       <div class="head_files" v-if="!isDataLoaded">
@@ -180,11 +180,13 @@
 import { error } from 'dingtalk-jsapi';
 import Gantt from './gantt.vue';
 import vueGantt from './vueGantt.vue'
+// 自定义select组件
+import SelectCat from "@/components/select.vue"
 
 export default {
   name: 'project_gantt',
   props: {},
-  components: {Gantt, vueGantt},
+  components: {Gantt, vueGantt, SelectCat},
   data() {
     return {
       taskType: '',
@@ -240,6 +242,12 @@ export default {
     this.isDataLoaded = true
   },
   methods: {
+    selectCal() {
+      if(obj.distinction == '1') {
+          this.valuex = obj.id
+          this.optupdata()
+      }
+    },
     setGroup() {
           this.$refs.ganttTable1.setGroup();
           // this.$refs.ganttTable2.setGroup();

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

@@ -4,21 +4,21 @@
         <el-table-column prop="text" label="姓名" width="240" fixed="left" v-if="stafforpro != '按项目查看'">
           <template slot-scope="scope">
               <!-- user.userNameNeedTranslate == 1 -->
-              <span v-if="user.userNameNeedTranslate == 1 && scope.row.type == 'department'"><ww-open-data type='departmentName' :openid='scope.row.text'></ww-open-data></span>
-              <span v-if="user.userNameNeedTranslate == 1 && scope.row.type == 'user'"><ww-open-data type='userName' :openid='scope.row.text'></ww-open-data></span>
-              <span v-if="user.userNameNeedTranslate == 1 && (scope.row.type == 'null' || scope.row.type == null)">{{scope.row.text}}</span>
+              <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'department'"><ww-open-data type='departmentName' :openid='scope.row.text'></ww-open-data></span>
+              <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'user'"><ww-open-data type='userName' :openid='scope.row.text'></ww-open-data></span>
+              <span v-if="user.userNameNeedTranslate == 1 && (scope.row.translationType == 'null' || scope.row.translationType == null)">{{scope.row.text}}</span>
               <span v-if="user.userNameNeedTranslate != 1">{{scope.row.text}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="text" label="项目" width="240" fixed="left" v-if="stafforpro == '按项目查看'">
           <template slot-scope="scope">
-            <span v-if="user.userNameNeedTranslate == 1 && scope.row.type == 'user'">
+            <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'user'">
               <span v-for="(item, index) in scope.row.userNameList" :key="index">
                 <ww-open-data type='userName' :openid='scope.row.text'></ww-open-data>
               </span>
             </span>
-            <span v-if="user.userNameNeedTranslate == 1 && scope.row.type == 'user'">{{scope.row.proNameText}}</span>
-            <span v-if="user.userNameNeedTranslate == 1 && (scope.row.type == 'null' || scope.row.type == null)"> {{scope.row.text}}</span>
+            <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'user'">{{scope.row.proNameText}}</span>
+            <span v-if="user.userNameNeedTranslate == 1 && (scope.row.translationType == 'null' || scope.row.translationType == null)"> {{scope.row.text}}</span>
             <span v-if="user.userNameNeedTranslate != 1">{{scope.row.text}}</span>
           </template>
         </el-table-column>