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

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -307,6 +307,13 @@
             <span v-if="timeType.needDeptAudit == 1" style="margin-left:10px;color:#999;">审核人为各部门直属领导</span>
         </div>
 
+        <!-- 是否开启主项目管理 -->
+        <!-- <div class="yanjiu">
+            <p style="margin-left:10px;color:#666;">是否开启主项目管理</p>
+            <el-switch style="margin-left: 55px" v-model="timeType.mainProjectState" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
+            <span v-if="timeType.mainProjectState == 1" style="margin-left:10px;color:#999;">待定</span>
+        </div> -->
+
         <div style="width:80px;margin:0 auto;padding:20px;">
             <el-button  type="primary" @click="submitInsert" :loading="addLoading">保存</el-button>
         </div>