duy il y a 2 ans
Parent
commit
703fea935b

+ 1 - 1
src/layout/index.vue

@@ -275,7 +275,7 @@ const setInitSocket = () => {
         if (data) {
             msgCount.value = JSON.parse(data)
         }
-        console.log(data,'消息信息')
+        // console.log(data,'消息信息')
     };
     socket.onerror = function ({data}) {
         console.log('发生错误:', data)

+ 2 - 2
src/views/data-fill/wbs.vue

@@ -108,10 +108,10 @@
                         <el-scrollbar>
                             <KeepAlive>
                                 <template v-if="isSearchTree">
-                                    <HcTreeData :datas="searchTreeData" :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :searchTreeVal="searchTreeVal" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"  @changeSearch="changeisSearch" submitCounts/>
+                                    <HcTreeData :datas="searchTreeData" :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :searchTreeVal="searchTreeVal" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"  @changeSearch="changeisSearch" />
                                 </template>
                                 <template v-else>
-                                    <WbsTree :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick" @nodeLoading="ElTreeNodeLoading" submitCounts/>
+                                    <WbsTree :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick" @nodeLoading="ElTreeNodeLoading" />
                                 </template>
                             </KeepAlive>
                         </el-scrollbar>

+ 4 - 0
src/views/ledger/components/internal.vue

@@ -55,6 +55,10 @@
                 <el-tag type="success" class="mx-1" effect="dark" v-if="row['isEvaluate']">是</el-tag>
                 <el-tag type="info" class="mx-1" effect="dark" v-else>否</el-tag>
             </template>
+            
+            <template #reportNumber="{row}">
+              {{row['reportNumber']==='-1'?'':row['reportNumber']}}
+            </template>
             <template #isExperiment="{row}">
                 <el-tag type="success" class="mx-1" effect="dark" v-if="row['isExperiment']">是</el-tag>
                 <el-tag type="info" class="mx-1" effect="dark" v-else>否</el-tag>