提交代码

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

@@ -81,7 +81,7 @@
                                 @cancel="item.showPickerTaskGroup = false;$forceUpdate();" />
                         </van-popup>
                         <!--任务阶段 -->
-                        <van-field  readonly  name="stage" v-if="user.company.packageProject==1&&item.stages != null && item.stages.length > 0" clickable 
+                        <van-field  readonly  name="stage" v-if="user.company.packageProject==1&&item.stages != null && item.stages.length > 0 && user.timeType.enableNewWeeklyfill != 1" clickable 
                             :value="item.stage" label="投入阶段" placeholder="请选择投入阶段" 
                         @click="clickPickStage(index, item)" />
                         <van-popup v-model="item.showPickerStage" position="bottom">
@@ -1445,10 +1445,6 @@
                 this.$forceUpdate();
             },
             clickPickTaskGroup(i, item) {
-                // if (!this.canEdit) return;
-                if(this.user.timeType.enableNewWeeklyfill == 1) {
-                    return
-                }
                 this.clickIndex = i;
                 item.showPickerTaskGroup = true;
                 this.$forceUpdate();