2 Commits 7710974f67 ... 6a91fca73a

Autore SHA1 Messaggio Data
  ZhouRuiTing 6a91fca73a 工时管家——H5修改 5 anni fa
  ZhouRuiTing 93c9068413 工时管家——H5 5 anni fa

+ 7 - 8
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -22,8 +22,8 @@
                         <van-picker show-toolbar :columns="project" value-key="projectName" @confirm="choseProject" @cancel="showPickerProject = false" />
                     </van-popup>
 
-                    <van-field readonly clickable class="form_input" :value="item.workingTime" name="workingTime" label="工作时长" placeholder="请输入工作时长" 
-                    :rules="[{ required: true, message: '请输入工作时长' }]" @touchstart.native.stop="showNumberKey = true"/>
+                    <van-field readonly clickable class="form_input" :value="item.workingTime" name="workingTime" label="工作时长" placeholder="请输入工作时长(单位:小时)"
+                    :rules="[{ required: true, message: '请输入工作时长(单位:小时)' }]" @touchstart.native.stop="showNumberKey = true"/>
                     <van-number-keyboard v-model="item.workingTime" :show="showNumberKey" close-button-text="完成" extra-key="." :maxlength="4" @blur="showNumberKey = false" />
 
                     <van-field class="form_input" v-model="item.content" name="content" type="textarea" label="工作事项" placeholder="请输入工作事项" 
@@ -31,11 +31,10 @@
                 </van-cell-group>
             </div>
             <div class="form_btn" style="margin: 16px;">
-                <van-button v-if="canClick" round block type="info" native-type="submit"> 提交 </van-button>
+                <van-button v-if="canClick == 2" round block type="info" native-type="submit"> 提交 </van-button>
                 <van-button v-else round block type="info" disabled native-type="submit"> 提交 </van-button>
-                <div class="form_tip" v-if="!canClick">
-                    当前日报审核中,无法修改
-                </div>
+                <div class="form_tip" v-if="canClick == 0"> 当前日报审核中,无法修改 </div>
+                <div class="form_tip" v-if="canClick == 1"> 当前日报审核通过 </div>
             </div>
         </van-form>
         </van-list>
@@ -54,7 +53,7 @@
                 showPickerProject: false,
                 clickIndex: 0,
                 showNumberKey: false,
-                canClick: true,
+                canClick: 2,
 
                 form: {
                     createDate: this.format(new Date(new Date()),"yyyy-MM-dd"),
@@ -141,7 +140,7 @@
                         this.report = res.data;
                         var list = res.data.report;
                         if(list.length != 0) {
-                            this.canClick = (list[0].state==2?true:false);
+                            this.canClick = list[0].state;
                             let array = [];
                             for(var i in list) {
                                 var projectName = "";

+ 21 - 2
fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="body">
         <van-swipe class="my-swipe" :autoplay="3000" :height="200" indicator-color="white">
             <van-swipe-item v-for="(item, index) in images" :key="index" class="swipe-img">
                 <img :src="item"/>
@@ -9,7 +9,10 @@
             <van-grid-item v-for="(item,index) in routers" v-show="index==2?user.role==2?false:true:true" :key="index" :icon="item.icon" :text="item.name" :to="item.url"/>
             </van-grid-item>
         </van-grid>
-
+        <div class="tip">
+            新注册用户请登录PC版,完善项目及组织结构信息<br>
+            http://worktime.ttkuaiban.com
+        </div>
         <Footer page="index"></Footer>
     </div>
 </template>
@@ -80,4 +83,20 @@
             height: 100%;
         }
     }
+
+    .body {
+        height: calc(100vh - 50px);
+        position: relative;
+    }
+
+    .tip {
+        position: absolute;
+        width: 100%;
+        bottom: 5px;
+        font-size: 14px;
+        color: #8f8f8f;
+        margin-top: 20px;
+        text-align: center;
+        line-height: 30px;
+    }
 </style>