Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbSummaryMapper.xml

@@ -134,7 +134,7 @@
         from cb_summary csu
         left join cb_summary_actual csa on (csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate}  AND csa.del_flag = 0)
         left join cb_summary_actual csa1 on (csu.id = csa1.cb_summary_id and csa1.expense_date <= #{expenseDate}  AND csa1.del_flag = 0)
-        left join cb_direct_expense cde on (csu.project_id = cde.project_id and csu.cb_stage = cde.cb_stage and cde.del_flag = 0)
+        left join cb_direct_expense cde on (csu.project_id = cde.project_id and cde.del_flag = 0)
         where csu.id = #{id} and csu.del_flag = 0
         group by csu.id
         order by csu.sort
@@ -147,7 +147,7 @@
         from cb_summary csu
         left join cb_summary_actual csa on (csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate}  AND csa.del_flag = 0)
         left join cb_summary_actual csa1 on (csu.id = csa1.cb_summary_id and csa1.expense_date <= #{expenseDate}  AND csa1.del_flag = 0)
-        left join cb_direct_expense cde on (csu.project_id = cde.project_id and csu.cb_stage = cde.cb_stage and cde.del_flag = 0)
+        left join cb_direct_expense cde on (csu.project_id = cde.project_id  and cde.del_flag = 0)
         where csu.parent_id = #{parentId} and csu.del_flag = 0
         group by csu.id
         order by csu.sort

dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue

@@ -37,7 +37,11 @@
         <div class="project-feedsummary-list-container">
           <dsk-skeleton v-if="tableLoading"></dsk-skeleton>
           <table-list-com :tableData="tableDataList" :formColum="formColum" v-else-if="!tableLoading" :maxHeight="true" :tableDataTotal="total"
-            :paging="false"></table-list-com>
+            :paging="false">
+            <template slot="jhcb">
+              
+            </template>
+          </table-list-com>
         </div>
       </div>
     </div>
@@ -97,7 +101,7 @@ export default {
       comProjectId: this.projectId,
       menuTreeList: [],
       // 加载数据列表
-      tableLoading: false,
+      tableLoading: true,
       total: 0,
       // 列表表头
       formColum: [
@@ -110,6 +114,7 @@ export default {
         { label: '计算规则', prop: "calculationRule", width: "137", uid: v4() },
         { label: '单位', prop: "unit", width: "57", uid: v4() },
         { label: '甲供材料说明', prop: "materialDescription", width: "137", uid: v4() },
+        { label: '计划成本', prop: "jhcb", width: "137", align: "center", slot: true, uid: v4() },
       ],
       // 已记录月份集合
       monthList: [],
@@ -194,6 +199,7 @@ export default {
     },
     async getFeedSummaryList(params = {}) {
       try {
+        this.tableLoading = true;
         const list = await getFeedSummaryListApi(params);
         if (list.code == 200 && list.data instanceof Array) {
           this.tableDataList = list.data;
@@ -201,6 +207,8 @@ export default {
         }
       } catch (error) {
 
+      } finally {
+        this.tableLoading = false;
       }
     },
     async getFeedSummaryMenuTree(params) {
@@ -397,6 +405,11 @@ export default {
         height: calc(100% - 48px);
         /* overflow: auto; */
 
+        .dsk-skeleton-outer-container {
+          padding: 0px;
+          height: 100%;
+        }
+
         .table-list-com-ins {
           height: 100%;
         }