Commit 7e1a007b authored by tianhongyang's avatar tianhongyang

merge

parent a96ea66e
...@@ -27,7 +27,7 @@ ...@@ -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="unit-conversion-btn" v-if="currentParentName.indexOf('实体工程材料') != -1">单位换算</el-button>
<!-- 填写实际成本 --> <!-- 填写实际成本 -->
<el-button type="primary" size="medium" class="actual-cost-btn" v-else <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> <dsk-table-header-setting :settingList="formColum" @settingChange="settingChange"></dsk-table-header-setting>
</div> </div>
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
}, },
{ label: '推送工程量', prop: "pushQuantities", width: "95", uid: v4() }, { label: '推送工程量', prop: "pushQuantities", width: "95", uid: v4() },
{ label: '备注', prop: "remark", width: "115", uid: v4(), slot: true }, { 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: [], monthList: [],
...@@ -404,6 +404,10 @@ export default { ...@@ -404,6 +404,10 @@ export default {
// 填写或修改新的 成本月份 // 填写或修改新的 成本月份
fillActualCost() { fillActualCost() {
this.showAddActualCost = true; this.showAddActualCost = true;
},
// 保存
saveActualCost() {
}, },
// 编辑状态下 进行了其它操作 // 编辑状态下 进行了其它操作
resetEditStatus() { resetEditStatus() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment