|
|
@@ -65,8 +65,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="应收款(元)" align="center" width='120'>
|
|
|
<template slot-scope="{row}">
|
|
|
- <span>{{ row.shouldAmount ? row.shouldAmount : (row.orderShouldAmount ? row.orderShouldAmount : '--')
|
|
|
- }}</span>
|
|
|
+ <span>{{ row.shouldAmount!=null ? row.shouldAmount : '--'}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="开票金额(元)" align="center" width='120'>
|
|
|
@@ -130,7 +129,7 @@
|
|
|
<el-col :xs="24" :sm="12" :lg="24" :span="12">
|
|
|
<el-form-item label="应收款金额(元)：" prop="shouldAmount" label-width="160px" class="postInfo-container-item"
|
|
|
:rules="{ required: true, message: '应收款金额不能为空', trigger: 'blur' }">
|
|
|
- <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="fund.shouldAmount"
|
|
|
+ <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="fund.shouldAmount" :default="0"
|
|
|
type="number" style="width:300px" class="filter-item" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -142,7 +141,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="24" :span="12">
|
|
|
+ <el-form-item label="提醒：" label-width="160px" class="postInfo-container-item">
|
|
|
+ <span style="color: red; font-weight: bold;">若不收款请填0，大于0将进入财务收款预警。</span>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</el-form>
|
|
|
+
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="shouldAmountDialog = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="saveShouldAmount()">确 定</el-button>
|
|
|
@@ -815,18 +822,19 @@ export default {
|
|
|
if (res.code === 200 && res.data) {
|
|
|
this.$notify({
|
|
|
title: '成功',
|
|
|
- message: '订单应收款已完善',
|
|
|
+ message: '应收款已保存',
|
|
|
type: 'success',
|
|
|
duration: 1000
|
|
|
});
|
|
|
this.getList();
|
|
|
this.shouldAmountDialog = false;
|
|
|
- this.shouldAmountDialog = false;
|
|
|
- this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
|
|
|
+ if (this.productionListDialog){
|
|
|
+ this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
|
|
|
+ }
|
|
|
} else {
|
|
|
this.$notify({
|
|
|
title: '失败',
|
|
|
- message: '订单应收款保存错误',
|
|
|
+ message: '应收款保存错误',
|
|
|
type: 'error',
|
|
|
duration: 1000
|
|
|
});
|
|
|
@@ -837,17 +845,18 @@ export default {
|
|
|
if (res.code === 200 && res.data) {
|
|
|
this.$notify({
|
|
|
title: '成功',
|
|
|
- message: '订单应收款已完善',
|
|
|
+ message: '应收款已保存',
|
|
|
type: 'success',
|
|
|
duration: 1000
|
|
|
});
|
|
|
this.getList();
|
|
|
this.shouldAmountDialog = false;
|
|
|
- this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
|
|
|
- } else {
|
|
|
+ if (this.productionListDialog){
|
|
|
+ this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
|
|
|
+ } } else {
|
|
|
this.$notify({
|
|
|
title: '失败',
|
|
|
- message: '订单应收款保存错误',
|
|
|
+ message: '应收款保存错误',
|
|
|
type: 'error',
|
|
|
duration: 1000
|
|
|
});
|
