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-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue

@@ -27,7 +27,7 @@
             <el-button type="primary" size="medium" class="unit-conversion-btn" v-if="currentParentName.indexOf('实体工程材料') != -1">单位换算</el-button>
             <!-- 填写实际成本 -->
             <el-button type="primary" size="medium" class="actual-cost-btn" v-else
-              @click="fillActualCost">{{addActualCostEditStatus ? '保存成本' : '填写实际成本'}}</el-button>
+              @click="addActualCostEditStatus ? saveActualCost() : fillActualCost()">{{addActualCostEditStatus ? '保存成本' : '填写实际成本'}}</el-button>
             <!-- 表头设置组件 -->
             <dsk-table-header-setting :settingList="formColum" @settingChange="settingChange"></dsk-table-header-setting>
           </div>
@@ -159,7 +159,7 @@ export default {
         },
         { label: '推送工程量', prop: "pushQuantities", width: "95", uid: v4() },
         { label: '备注', prop: "remark", width: "115", uid: v4(), slot: true },
-        { label: '操作', prop: "action-field-bar", width: "99", uid: v4() },
+        { label: '操作', prop: "action-field-bar", width: "99", uid: v4(), fixed: "right" },
       ],
       // 已记录月份集合
       monthList: [],
@@ -404,6 +404,10 @@ export default {
     // 填写或修改新的 成本月份
     fillActualCost() {
       this.showAddActualCost = true;
+    },
+    // 保存
+    saveActualCost() {
+
     },
     // 编辑状态下 进行了其它操作
     resetEditStatus() {