Browse Source

优化节点搜索,团队样式,新建月报时间限制

qinzhipeng_v@didiglobal.com 4 năm trước cách đây
mục cha
commit
038c3a0074

+ 1 - 1
src/views/monthlyReport/childrenPage/setReport/components/nodeTreeSet.vue

@@ -18,7 +18,7 @@
     <normal-dialog :show-dialog="showTreeNodeDialog" :title="typeVal === 'add' ? '添加根节点' : '设置'" :width="'35%'" @confirm="createOdinDeptRel" @cancel="showTreeNodeDialog = false, $set(setTeam, 'value', [])">
       <el-form :model="setTeam" label-width="65px">
         <el-form-item v-if="typeVal === 'add'" label="根节点">
-          <el-select v-model="setTeam.odinIds" multiple filterable remote style="width: 100%" reserve-keyword placeholder="请选择" :remote-method="remoteMethod">
+          <el-select v-model="setTeam.odinIds" multiple filterable remote style="width: 100%" reserve-keyword placeholder="请选择">
             <el-option v-for="item in treeOption" :key="item.odinId" :label="item.odinNs" :value="item.odinId" />
           </el-select>
         </el-form-item>

+ 1 - 1
src/views/monthlyReport/childrenPage/setReport/components/teamSet.vue

@@ -185,7 +185,7 @@ export default {
 
     .team-member {
       color: #666666;
-      height: calc(100vh - 362px);
+      max-height: calc(100vh - 362px);
       overflow: auto;
       margin: 20px 0;
     }

+ 6 - 0
src/views/monthlyReport/index.vue

@@ -74,6 +74,7 @@ is-succes
           <el-date-picker
             v-model="setReportData.deadline"
             type="date"
+            :picker-options="expireTimeOption"
             placeholder="选择截止时间"
             format="yyyy-MM-dd 23:59:59"
             value-format="yyyy-MM-dd 23:59:59"
@@ -100,6 +101,11 @@ export default {
   },
   data() {
     return {
+      expireTimeOption: {
+        disabledDate(date) {
+          return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
+        }
+      },
       reportStatus: {},
       tagData: {}, // tagData
       createReportDialog: false, // 新建月报