|
|
@@ -153,9 +153,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="收款银行">
|
|
|
+ <el-form-item label="对账单号">
|
|
|
<el-input
|
|
|
- v-model="form.bank"
|
|
|
+ v-model="form.fStatementNo"
|
|
|
size="small"
|
|
|
placeholder="请输入"
|
|
|
:disabled="form.fBillstatus >= 4 || readOnly == 0"
|
|
|
@@ -163,9 +163,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="收款账号">
|
|
|
+ <el-form-item label="付款银行">
|
|
|
<el-input
|
|
|
- v-model="form.fBankNumber"
|
|
|
+ v-model="form.bank"
|
|
|
size="small"
|
|
|
placeholder="请输入"
|
|
|
:disabled="form.fBillstatus >= 4 || readOnly == 0"
|
|
|
@@ -173,9 +173,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="水单号">
|
|
|
+ <el-form-item label="付款账号">
|
|
|
<el-input
|
|
|
- v-model="form.waterBillNo"
|
|
|
+ v-model="form.fBankNumber"
|
|
|
size="small"
|
|
|
placeholder="请输入"
|
|
|
:disabled="form.fBillstatus >= 4 || readOnly == 0"
|
|
|
@@ -183,9 +183,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="备注">
|
|
|
+ <el-form-item label="水单号">
|
|
|
<el-input
|
|
|
- v-model="form.fRemarks"
|
|
|
+ v-model="form.waterBillNo"
|
|
|
size="small"
|
|
|
placeholder="请输入"
|
|
|
:disabled="form.fBillstatus >= 4 || readOnly == 0"
|
|
|
@@ -240,6 +240,18 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="备注">
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ v-model="form.fRemarks"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</el-form>
|
|
|
<div class="head-but">
|
|
|
<div>
|
|
|
@@ -278,14 +290,7 @@
|
|
|
@click="addOrUpdateHandle('f_billstatus')"
|
|
|
>查看审批流</el-button
|
|
|
>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- size="mini"
|
|
|
- @click="save"
|
|
|
- :disabled="form.fBillstatus >= 4 || readOnly == 0"
|
|
|
- >
|
|
|
- 保存
|
|
|
- </el-button>
|
|
|
+ <el-button type="success" size="mini" @click="save"> 保存 </el-button>
|
|
|
<el-button
|
|
|
type="warning"
|
|
|
size="mini"
|
|
|
@@ -709,6 +714,9 @@ export default {
|
|
|
fVoyid: this.form.fVoyid,
|
|
|
fDestportid: this.form.fDestportid,
|
|
|
fLoadportid: this.form.fLoadportid,
|
|
|
+ fStatementNo: this.form.fStatementNo,
|
|
|
+ fFromDate: this.form.date ? this.form.date[0] : null,
|
|
|
+ fToDate: this.form.date ? this.form.date[1] : null,
|
|
|
};
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -763,7 +771,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- save() {
|
|
|
+ save(type) {
|
|
|
if (this.form.fCorpid == null) {
|
|
|
return this.$message.error("客户名称不能为空");
|
|
|
}
|
|
|
@@ -786,13 +794,15 @@ export default {
|
|
|
formDate.append("billsType", JSON.stringify("KHDZ"));
|
|
|
save(formDate).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
- if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
|
|
|
- const date = [];
|
|
|
- date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
|
|
|
- res.data.tFee.date = date;
|
|
|
+ if (!type) {
|
|
|
+ if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
|
|
|
+ const date = [];
|
|
|
+ date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
|
|
|
+ res.data.tFee.date = date;
|
|
|
+ }
|
|
|
+ this.form = res.data.tFee;
|
|
|
+ this.tableData = res.data.tFeeDo;
|
|
|
}
|
|
|
- this.form = res.data.tFee;
|
|
|
- this.tableData = res.data.tFeeDo;
|
|
|
this.$emit("refFresh");
|
|
|
this.$message.success("保存成功");
|
|
|
}
|
|
|
@@ -806,7 +816,7 @@ export default {
|
|
|
type: "warning",
|
|
|
})
|
|
|
.then(() => {
|
|
|
- this.save();
|
|
|
+ this.save("back");
|
|
|
Object.assign(this.$data, this.$options.data());
|
|
|
this.$emit("goBack", false);
|
|
|
})
|
lichao