调整提交

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -321,14 +321,14 @@
         <div class="informant"><!--  报销人 -->
           <el-form :model="ParticularsList" label-width="80px">
             <el-form-item :label="$t('peopleconcerned')" style="width: 270px" :rules="{ required: true, message: $t('pleaseselecttheapplicant'), trigger: 'blur' }">
-              <!-- <el-input v-show="flg" v-model="ParticularsList.ownerName" disabled ></el-input> -->
+              <el-input v-show="flg" v-model="ParticularsList.ownerName" disabled v-if="user.userNameNeedTranslate != '1'"></el-input>
               <!-- <el-select v-model="ParticularsList.ownerId" :placeholder="$t('pleaseselecttheapplicant')" style="width: 150px" :disabled="flg || ParticularsList.ownerId == ParticularsList.operatorId">
                 <span v-for="(item, index) in users" :key="index">
                   <el-option :label="item.name" :value="item.id"></el-option>
                 </span>
               </el-select> -->
 
-              <selectCat v-if="user.userNameNeedTranslate != '1'" :size="'medium'" :widthStr="'150'" :distinction="'3'" :subject="users" :disabled="flg || ParticularsList.ownerId == ParticularsList.operatorId" :subjectId="ParticularsList.ownerId" ref="selectCat" @selectCal="selectCal"></selectCat>
+              <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'150'" :distinction="'3'" :subject="users" :disabled="flg || ParticularsList.ownerId == ParticularsList.operatorId" :subjectId="ParticularsList.ownerId" ref="selectCat" @selectCal="selectCal"></selectCat>
 
             </el-form-item>
             <el-form-item :label="$t('fillinthedate')">

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

@@ -1,5 +1,7 @@
 <template>
     <section class="sectionaa">
+        <div v-loading="!componentFlg" :style="'width: 100%;height:'+tableHeight+'px'" id="components">
+        <div v-if="componentFlg">
         <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane :label="$t('maincontent')" name="project" @click="null" disabled=true>
                 <template slot="label">
@@ -1041,6 +1043,8 @@
                 </el-upload>
             </div>
         </el-dialog>
+        </div>
+        </div>
     </section>
 </template>
 <script>
@@ -1084,6 +1088,7 @@
         
         data() {
             return {
+                componentFlg: false,
                 mileageCup: false,
                 loadingExport : false,
                 saveTemplateLoading: false,
@@ -3305,6 +3310,10 @@
                 that.stageListHeight = that.tableHeight - 45;
                 that.taskListinH = that.stageListHeight - 75;
             };
+
+            setTimeout(function(){
+                that.componentFlg = true
+            }, 1000)
         },
         mounted() {
 
@@ -3317,7 +3326,6 @@
             
             this.getInsideData();
             this.getGroupTemplate();
-            
         }
     };
 </script>