提交调整

fhKeeper/formulahousekeeper/timesheet/src/views/quanx/quanx.vue

@@ -246,6 +246,9 @@ export default {
         res => {
             if (res.code == "ok") {
               console.log(res.data, '数据来源(990)')
+              for(var i in res.data) {
+                res.data[i].useState = true
+              }
               this.moduleList = res.data
               this.dialogVisible = true
             } else {

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

@@ -67,7 +67,7 @@
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
         <el-col :span="6" >
         <!-- 上下午固定时长-->
-        <div class="panel" >
+        <div class="panel panelFixation" >
         <el-radio v-model="timeType.type" :label="0" style="width:100%">{{ $t('reportintheafternoon') }}
         <el-form  ref="form1" :model="timeType" :rules="rules" label-width="5rem" style="color:#333;">
         <el-form-item>
@@ -97,7 +97,7 @@
         </el-col>
         <!-- 选择小时数样式 -->
         <el-col :span="6">   
-        <div class="panel">
+        <div class="panel panelFixation">
         <el-radio v-model="timeType.type" :label="1">{{ $t('chooseyourownhours') }}
         <el-form  class="sample" style="color:#333;">
         <p style="color:#999;display:block;line-height:2rem">
@@ -117,7 +117,7 @@
         </el-col>
         <!--选择时间段样式 -->
         <el-col :span="6">  
-        <div  class="panel" >
+        <div  class="panel panelFixation" >
             <el-radio v-model="timeType.type" :label="2">{{ $t('owntimeframe') }}
             <el-form class="sample" style="color:#333;">
             <p style="color:#999;display:block;line-height:2rem">
@@ -155,7 +155,7 @@
 
         <!--选择按比例分配样式 -->
         <el-col :span="6">  
-        <div  class="panel" >
+        <div  class="panel panelFixation" >
             <el-radio v-model="timeType.type" :label="3">{{ $t('timeproportionally') }}
             <el-form class="sample" style="color:#333;">
             <p style="color:#999;display:block;line-height:2rem">
@@ -1535,4 +1535,7 @@
     display: flex;
     align-items: center;
 }
+.panelFixation {
+    height: 300px;
+}
 </style>