Pārlūkot izejas kodu

2022.8.15 针对威派格的功能调整。移动端日期筛选显示调整

ggooalice 2 gadi atpakaļ
vecāks
revīzija
7acdf90a64

+ 8 - 3
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -449,9 +449,9 @@
                 <!-- 增加合同金额字段 -->
                 <el-form-item  label="合同金额" v-if="user.company.packageProject==1">
                     <el-input id="contractAmount" v-model="addForm.contractAmount" style="width:32%;" @input="contractAmountChange(addForm.contractAmount)" placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')"></el-input><span style="margin-left:10px;position:absolute;">元</span>
-                    <template v-if="title == '修改项目'">
+                    <template v-if="title == '修改项目' && contractAmountReasonShow">
                         <span style="margin-left:63px;margin-right:10px;">修改原因</span>
-                        <el-input v-model="addForm.changeContractReason" style="width:33%" clearable placeholder="合同金额修改原因" :disabled="!contractAmountReasonShow"></el-input>
+                        <el-input v-model="addForm.changeContractReason" style="width:33%" clearable placeholder="合同金额修改原因"></el-input>
                     </template>
                 </el-form-item>
 
@@ -500,7 +500,12 @@
                      placeholder="选择日期"></el-date-picker>
                 </el-form-item>
                 <el-form-item label="自主项目类别" >
-                    <el-input v-model="addForm.projectCategorySub" placeholder="请输入自主项目类别" clearable></el-input>
+                    <!-- <el-input v-model="addForm.projectCategorySub" placeholder="请输入自主项目类别" clearable></el-input> -->
+                    <el-select v-model="addForm.projectCategorySub" placeholder="请选择自主项目类别" clearable>
+                        <el-option value="纯软件项目" label="纯软件项目"></el-option>
+                        <el-option value="纯硬件项目" label="纯硬件项目"></el-option>
+                        <el-option value="集成项目" label="集成项目"></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="所属大区" >
                     <el-input v-model="addForm.region" placeholder="请输入 所属大区" clearable></el-input>

+ 4 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/index.vue

@@ -4,7 +4,7 @@
         
         <div class="login_form">
             <van-sticky offset-top="1.22667rem" style="margin-bottom:10px">
-                <van-cell title="选择日期" :value="selectDateValue" @click="selectShow = true">
+                <van-cell title="选择日期" :value="selectDateValue" @click="selectShow = true" class="dateSelectCell">
                     <template #extra>
                         <van-icon v-if="selectDateValue" name="close" style="line-height:0.64rem;position:relative;left:5px;" @click.stop="selectDateClear"/>
                     </template>
@@ -518,6 +518,9 @@
 </script>
 
 <style lang="less" scoped>
+.dateSelectCell{
+    display: -webkit-box;
+}
 .userCheckbox {
         padding: 10px;;
     }