|
@@ -43,11 +43,11 @@
|
|
|
<ws-select v-model="deptBudgetList.autoAssign" class="typeselect">
|
|
|
<ws-option label="不自动分配" value="不自动分配" style="color: #8890b1" />
|
|
|
<ws-option label="仓储费自动分配" value="仓储费自动分配" style="color: #8890b1" />
|
|
|
- <ws-option label="煤款自动分配" value="煤款自动分配" style="color: #8890b1" />
|
|
|
+ <ws-option label="燃料费自动分配" value="燃料费自动分配" style="color: #8890b1" />
|
|
|
</ws-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
|
|
|
- v-show="deptBudgetList.autoAssign == '煤款自动分配'">
|
|
|
+ <el-form-item label-width='100px' label="单价(元/吨)" span="1" prop="coalPrice"
|
|
|
+ v-show="deptBudgetList.autoAssign == '燃料费自动分配'">
|
|
|
<el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label-width='100px' v-if='deptBudgetList.purpose == "合同费用"' label="合同编号" span="1"
|
|
@@ -889,7 +889,7 @@ export default {
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (this.deptBudgetList.autoAssign != '煤款自动分配' && this.deptBudgetList.autoAssign != '仓储费自动分配') {//库点费用 仓储费自动分配和煤款自动分配不需要自动请款
|
|
|
+ if (this.deptBudgetList.autoAssign != '燃料费自动分配' && this.deptBudgetList.autoAssign != '仓储费自动分配') {//库点费用 仓储费自动分配和煤款自动分配不需要自动请款
|
|
|
if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode == '全部分配' || this.deptBudgetList.expensesPurpose == 3 && this.mode == '全部分配' && this.deptBudgetList.storageFeeFlag != 1) {
|
|
|
this.deptBudgetList.amountMoney = Number(this.deptBudgetList.amountMoney).toFixed(2)
|
|
|
if (this.amount != this.deptBudgetList.amountMoney) {
|
|
@@ -916,10 +916,10 @@ export default {
|
|
|
} else if (this.deptBudgetList.autoAssign == "仓储费自动分配") {
|
|
|
this.deptBudgetList.autoAssign = 3
|
|
|
this.deptBudgetList.expenseAllocationInfoList = []
|
|
|
- } else if (this.deptBudgetList.autoAssign == "煤款自动分配") {
|
|
|
+ } else if (this.deptBudgetList.autoAssign == "燃料费自动分配") {
|
|
|
if (!this.deptBudgetList.coalPrice) {
|
|
|
this.$message({
|
|
|
- message: '煤单价不能为空!',
|
|
|
+ message: '燃料费单价不能为空!',
|
|
|
type: 'warning',
|
|
|
})
|
|
|
return
|