Merge branch 'master' into test-dev

src/views/data-fill/collapse-form/index.vue

@@ -31,6 +31,15 @@
                                     type="primary"
                                     disabled
                                 >
+                                    <el-tooltip
+                                        v-if="item.dateIsComplete === 2"
+                                        class="box-item"
+                                        effect="light"
+                                        content="表单日期未完善"
+                                        placement="right"
+                                    >
+                                        <HcIcon name="error-warning" ui=" text-red" />
+                                    </el-tooltip>
                                     本 表 预 览
                                 </el-link>
                                 <el-link
@@ -39,6 +48,15 @@
                                     :disabled="tableFormPreviewLoading"
                                     @click.stop="previewClick(item)"
                                 >
+                                    <el-tooltip
+                                        v-if="item.dateIsComplete === 2"
+                                        class="box-item"
+                                        effect="light"
+                                        content="表单日期未完善"
+                                        placement="right"
+                                    >
+                                        <HcIcon name="error-warning" ui=" text-red" />
+                                    </el-tooltip>
                                     本 表 预 览
                                 </el-link>
                             </HcTooltip>

src/views/data-fill/division.vue

@@ -35,7 +35,7 @@
             >
                 <el-scrollbar>
                     <HcLazyTree
-                        v-model:loading="isLoading" 
+                        v-model:loading="isLoading"
                         is-form-date
                         :is-auto-check="true"
                         :show-checkbox="isShowCheckbox"

src/views/data-fill/wbs.vue

@@ -89,6 +89,7 @@
                                 is-type
                                 :auto-expand-keys="TreeAutoExpandKeys"
                                 default-expand-all
+                       
                                 @node-tap="wbsElTreeClick"
                                 @menu-tap="ElTreeMenuClick"
                                 @load-menu="loadMenu"
@@ -100,15 +101,14 @@
                         >
                             <HcLazyTree
                                 ref="wbstree"
-                                
-                                
+                                is-load-menu
                                 :auto-expand-keys="TreeAutoExpandKeys"
                                 :is-mark="TreeMark"
                                 :menus="ElTreeMenu"
                                 
                                 
                                 
-                                is-load-menu is-counts is-type show-checkbox check-strictly is-form-date 
+                                is-counts is-type show-checkbox check-strictly is-form-date 
                                 @load="treeLoadNode"
                                 @menu-tap="ElTreeMenuClick"
                                 @node-loading="ElTreeNodeLoading"