fix

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

@@ -196,7 +196,7 @@ export default {
       // 列表表头
       formColum: [
         { label: '序号', prop: "staticSerialNumber", type: "index", lock: true, width: "53", fixed: false, uid: v4() },
-        { label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4(), slot: true },
+        { label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4() },
         { label: '公司编码', prop: "companyNo", width: "137", uid: v4() },
         { label: '集团编码', prop: "orgNo", width: "137", uid: v4() },
         { label: '名称', prop: "cbName", width: "232", uid: v4() },
@@ -230,8 +230,38 @@ export default {
       ],
       // 实体工程材料表头
       entityMaterialsFormColum: [
-        { label: '多选', prop: "staticSerialNumber", type: "selection", lock: true, width: "53", fixed: false, uid: v4() },
-        { label: '操作', prop: "action-field-bar", width: "99", uid: v4(), fixed: "right" },
+        { label: '多选', prop: "staticSerialNumber", type: "selection", lock: true, width: "53", fixed: "left", uid: v4() },
+        { label: '序号', prop: "staticIndexNumber", type: "index", lock: true, width: "53", fixed: "left", uid: v4() },
+        { label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4() },
+        { label: '公司编码', prop: "companyNo", width: "137", uid: v4() },
+        { label: '集团编码', prop: "orgNo", width: "137", uid: v4() },
+        { label: '名称', prop: "cbName", width: "232", uid: v4() },
+        { label: '工作内容', prop: "jobContent", width: "341", uid: v4() },
+        { label: '计算规则', prop: "calculationRule", width: "137", uid: v4() },
+        { label: '单位', prop: "unit", width: "57", uid: v4() },
+        { label: '甲供材料说明', prop: "materialDescription", width: "137", uid: v4() },
+        {
+          label: '计划成本', prop: "jhcb", align: "center", uid: v4(), children: [
+            { label: '指导价格', prop: "guidePrice", minWidth: "81", uid: v4() },
+            { label: '投标选用单价（不含税）', prop: "bidUnitPrice", minWidth: "179", uid: v4() },
+            { label: '单价差额', prop: "unitPriceDifference", minWidth: "81", uid: v4() },
+            { label: '数量', prop: "quantity", minWidth: "150", uid: v4() },
+            { label: '合价（不含税）', prop: "combinedPrice", minWidth: "150", uid: v4() },
+            { label: '合价（含税）', prop: "combinedPriceTax", minWidth: "150", uid: v4() },
+            { label: '品牌名称', prop: "brandName", minWidth: "81", uid: v4() },
+            { label: '投标选用来源', prop: "bidSource", minWidth: "109", uid: v4() },
+          ]
+        },
+        {
+          label: '实际成本', prop: "sjcb", align: "center", uid: v4(), children: [
+            { label: '物料验收系统本月总量', prop: "quantities", minWidth: "180", uid: v4(), slot: true },
+            { label: '换算后本月总量', prop: "conversionQuantities", minWidth: "160", uid: v4(), slot: true },
+            { label: '截至本月总用量', prop: "totalQuantities", minWidth: "160", uid: v4(), slot: true },
+            { label: '剩余物料', prop: "sss", minWidth: "160", uid: v4(), slot: true },
+            { label: '填写时间', prop: "createTime", minWidth: "160", uid: v4(), slot: true },
+          ]
+        },
+        { label: '操作', prop: "action-field-bar", width: "120", uid: v4(), fixed: "right" },
       ],
       // 已记录月份集合
       monthList: [],
@@ -488,23 +518,10 @@ export default {
       if (parentName) this.currentParentName = parentName;
       this.resetTableData();
       //  实体工程材料
+      const params = this.createRequestConditions(this.recordDate);
+      await this.getFeedSummaryList(params);
       if (this.isEntityMaterials) {
-        const { projectId, cbStage } = this.comProjectDetailInfo;
-        const params = {
-          projectId,
-          cbStage
-        };
-        params["cbSubjectName"] = this.currentNodeName;
-        // 判断当月是否存在于server返回month集合中
-        const _now = this.getNowMonth();
-        if (this.includeNowMonth(_now)) {
-          params["recordDate"] = _now;
-        }
         this.getFeedSummaryConversionNotice(params);
-      } else {
-        // 非实体工程材料 获取数据
-        const params = this.createRequestConditions(this.recordDate);
-        this.getFeedSummaryList(params);
       }
     },
     async getFeedSummaryConversionNotice(params) {