Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -4,8 +4,8 @@
         <el-col :span="6" >
             <div ><span style="color:#999;">{{ $t('chartY') }} </span>
             <el-radio-group v-model="yAxisValue" @change="onYAxisChange" size="small">
-            <el-radio-button label="0" v-if="permissions.countCost">{{ $t('accordingtothecost') }}</el-radio-button>
-            <el-radio-button label="1" v-if="permissions.countHours">{{ $t('accordingtoworkinghours') }}</el-radio-button>
+                <el-radio-button label="1" v-if="permissions.countHours">{{ $t('accordingtoworkinghours') }}</el-radio-button>
+                <el-radio-button label="0" v-if="permissions.countCost">{{ $t('accordingtothecost') }}</el-radio-button>
             </el-radio-group></div>
         </el-col>
         <el-col :span="14" style="display: flex;flex-wrap: wrap;justify-content: flex-end;">
@@ -220,7 +220,7 @@
                 personnelValue: '',
                 personnelAll: [],
                 personnelAllPlly: [],
-                yAxisValue: localStorage.yAxisValue?localStorage.yAxisValue:0,
+                yAxisValue: localStorage.yAxisValue?localStorage.yAxisValue:'1',
                 parentDeptStack:[],
                 parentDeptId:null,
                 hasReportUserList:[],

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -78,8 +78,8 @@
                     </van-field>
 
                     <!-- <div>请选择投入项目</div> -->
-                    <van-field readonly name="projectId" clickable :value="item.projectName"
-                        :label="user.companyId == 781 ? '工作任务' : '投入项目'" :disabled="!item.canEdit"
+                    <van-field readonly name="projectId" clickable :value="item.projectName" type="textarea" autosize
+                        :label="user.companyId == 781 ? '工作任务' : '投入项目'" :disabled="!item.canEdit" rows="1"
                         :placeholder="user.companyId == 781 ? '请选择工作任务' : '请选择项目'" @click="clickPicker(index, item)"
                         :rules="[{ required: true, message: user.companyId == 781 ? '请选择任务' : '请选择项目' }]" />
                     <!--昱众不显示子项目-->
@@ -526,7 +526,7 @@
 
                     <div v-for="(item, index) in integrationProjectList" :key="index" class="popupItem paddingDiv"
                         @click="fZr(item, index)">
-                        <p class="popupItemOne" v-if="item.projectName">{{ item.projectName }}</p>
+                        <div class="popupItemOne" v-if="item.projectName">{{ item.projectName }}</div>
                         <p class="popupItemTwo" v-if="item.projectCode">{{ item.projectCode }}</p>
                     </div>
 
@@ -534,7 +534,7 @@
 
                     <div v-for="(item, index) in projectss" :key="item.id" class="popupItem paddingDiv"
                         @click="fZr(item, index)">
-                        <p class="popupItemOne" v-if="item.projectName">{{ item.projectName }}</p>
+                        <div class="popupItemOne" v-if="item.projectName">{{ item.projectName }}</div>
                         <p class="popupItemTwo" v-if="item.projectCode">{{ item.projectCode }}</p>
                     </div>
 

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit-01.vue

@@ -369,14 +369,14 @@
                     <div class="popupTitle">近期选择项目</div>
 
                     <div v-for="(item, index) in integrationProjectList" :key="index" class="popupItem paddingDiv" @click="fZr(item, index)">
-                        <p class="popupItemOne" v-if="item.projectName">{{item.projectName}}</p>
+                        <div class="popupItemOne" v-if="item.projectName">{{item.projectName}}</div>
                         <p class="popupItemTwo" v-if="item.projectCode">{{item.projectCode}}</p> 
                     </div>
 
                     <div class="popupTitle marginTop">全部项目</div>
 
                     <div v-for="(item, index) in projectss" :key="item.id" class="popupItem paddingDiv" @click="fZr(item, index)">
-                        <p class="popupItemOne" v-if="item.projectName">{{item.projectName}}</p>
+                        <div class="popupItemOne" v-if="item.projectName">{{item.projectName}}</div>
                         <p class="popupItemTwo" v-if="item.projectCode">{{item.projectCode}}</p> 
                     </div>
                 </div>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -68,7 +68,7 @@
                         <!-- <div>请选择投入项目</div> -->
                         <!--按周填报的项目改成非必填-->
                         <van-field  readonly  name="projectId" clickable :value="item.projectName" :label="user.companyId==781?'工作任务':'投入项目'" :placeholder="user.companyId==781?'请选择工作任务':'请选择项目'" 
-                            @click="clickPicker(index, item)" :disabled="item.state<=1" />
+                            @click="clickPicker(index, item)" :disabled="item.state<=1" type="textarea" autosize rows="1" />
                         <van-field  readonly  name="subProjectId" v-if="item.subProjectList != null && item.subProjectList.length > 0 && user.timeType.mainProjectState != 1" clickable 
                             :value="item.subProjectName" label="子项目" placeholder="请选择子项目"  :disabled="item.state<=1"
                         @click="clickPickSubProject(index, item)" />
@@ -465,14 +465,14 @@
                     <div class="popupTitle">近期选择项目</div>
 
                     <div v-for="(item, index) in integrationProjectList" :key="index" class="popupItem paddingDiv" @click="fZr(item, index)">
-                        <p class="popupItemOne" v-if="item.projectName">{{item.projectName}}</p>
+                        <div class="popupItemOne" v-if="item.projectName">{{item.projectName}}</div>
                         <p class="popupItemTwo" v-if="item.projectCode">{{item.projectCode}}</p> 
                     </div>
 
                     <div class="popupTitle marginTop">全部项目</div>
 
                     <div v-for="(item, index) in projectss" :key="item.id" class="popupItem paddingDiv" @click="fZr(item, index)">
-                        <p class="popupItemOne" v-if="item.projectName">{{item.projectName}}</p>
+                        <div class="popupItemOne" v-if="item.projectName">{{item.projectName}}</div>
                         <p class="popupItemTwo" v-if="item.projectCode">{{item.projectCode}}</p> 
                     </div>
                 </div>