|
|
@@ -397,20 +397,20 @@
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="业务类型" prop="businessTypes">
|
|
|
- <dic-select
|
|
|
- v-model="form.businessTypes"
|
|
|
- placeholder="业务类型"
|
|
|
- key="id"
|
|
|
- label="label"
|
|
|
- keyValue="value"
|
|
|
- :activateCreated="false"
|
|
|
- :mockData="businessTypesData"
|
|
|
- :filterable="true"
|
|
|
- :multiple="true"
|
|
|
- :collapseTags="true"
|
|
|
- :disabled="editSave"
|
|
|
- dataType="string"
|
|
|
- ></dic-select>
|
|
|
+ <dic-select
|
|
|
+ v-model="form.businessTypes"
|
|
|
+ placeholder="业务类型"
|
|
|
+ key="id"
|
|
|
+ label="label"
|
|
|
+ keyValue="value"
|
|
|
+ :activateCreated="false"
|
|
|
+ :mockData="businessTypesData"
|
|
|
+ :filterable="true"
|
|
|
+ :multiple="true"
|
|
|
+ :collapseTags="true"
|
|
|
+ :disabled="editSave"
|
|
|
+ dataType="string"
|
|
|
+ ></dic-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
@@ -1116,19 +1116,10 @@ export default {
|
|
|
this.saveLoading = false;
|
|
|
});
|
|
|
} else if (type == "确认对抵") {
|
|
|
- finstlbillsSubmit(this.form)
|
|
|
+ confirmOffset(this.form)
|
|
|
.then(res => {
|
|
|
- // this.form = res.data.data;
|
|
|
- // this.finstlbillsConfirmReconciliationfun();
|
|
|
- confirmOffset(this.form)
|
|
|
- .then(res => {
|
|
|
- this.$message.success("操作成功");
|
|
|
- this.finstlbillsDetailfun(this.form.id);
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- this.pageLoading = false;
|
|
|
- this.saveLoading = false;
|
|
|
- });
|
|
|
+ this.$message.success("操作成功");
|
|
|
+ this.finstlbillsDetailfun(this.form.id);
|
|
|
})
|
|
|
.catch(() => {
|
|
|
this.pageLoading = false;
|
|
|
@@ -1264,7 +1255,7 @@ export default {
|
|
|
this.finstlbillslistAccBillV1fun();
|
|
|
},
|
|
|
// 检索
|
|
|
- retrievalfun() {
|
|
|
+ retrievalfun(type) {
|
|
|
// 判断是否有对抵单位
|
|
|
if (!this.form.corpId && (this.form.businessNo || this.form.accountNo || this.form.hblno || this.form.mblno)) {
|
|
|
console.log("新接口");
|
|
|
@@ -1274,7 +1265,7 @@ export default {
|
|
|
return this.$message.warning("请填写对抵单位");
|
|
|
}
|
|
|
console.log("原来的接口");
|
|
|
- this.finstlbillslistAccBillV1fun();
|
|
|
+ this.finstlbillslistAccBillV1fun("检索");
|
|
|
}
|
|
|
},
|
|
|
// 检索出的弹窗
|
|
|
@@ -1319,7 +1310,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 检索接口
|
|
|
- finstlbillslistAccBillV1fun() {
|
|
|
+ finstlbillslistAccBillV1fun(type) {
|
|
|
// delete this.form.id;
|
|
|
// let obj = JSON.parse(JSON.stringify(this.form))
|
|
|
let obj = {};
|
|
|
@@ -1384,7 +1375,7 @@ export default {
|
|
|
this.queryData.push(item);
|
|
|
}
|
|
|
}
|
|
|
- if (this.queryData.length == 0) {
|
|
|
+ if (this.queryData.length == 0 && type == "检索") {
|
|
|
this.$message.warning("当前检索暂无数据!");
|
|
|
}
|
|
|
});
|