Skip to content

V
vue-gjjs
Commit b27aeed4 by taojinrui
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents c1300acf 0fde40f8
Showing with 28 additions and 28 deletions
src/views/Business/Botacc/Setp.vue
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
<c-col :span="24" style="margin-top: 30px"> <c-col :span="24" style="margin-top: 30px">
<span style="font-size:14px;">Bills to Pay back:</span> <span style="font-size:14px;">Bills to Pay back:</span>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24" style="margin-top: -10px">
<c-col :span="12"> <c-col :span="12">
<c-edit-table :model="model" v-bind="docgrd" style="margin-left:-30px"> <c-edit-table :model="model" v-bind="docgrd" style="margin-left:-30px">
</c-edit-table> </c-edit-table>
...@@ -351,22 +351,17 @@ export default { ...@@ -351,22 +351,17 @@ export default {
type: "error", type: "error",
}); });
} else { } else {
let selIds; let chkIds;
if (selection.length === 0) { if (selection.length === 0) {
selIds = []; chkIds = [];
this.model.setmod.docamt = "0.000"; this.model.setmod.docamt = "0.000";
this.model.liaall.tensetstm.rows = []; this.model.liaall.tensetstm.rows = [];
// this.model.bodgrp.rec.focflg = '';
// this.model.liaall.tenstm.rows = []
} else { } else {
selIds = [selection[0] + 1]; chkIds = [selection[0] + 1];
this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
// this.model.bodgrp.rec.focflg = 'X';
} }
// //
console.log(this.model.liaall.tensetstm); console.log(this.model.liaall.tensetstm);
let params = { selDst: "liaall.tenstm", selIds }; let params = { chkDst: "liaall.tenstm", chkIds };
const rtnmsg = await this.executeRule("liaall.tenstm", params); const rtnmsg = await this.executeRule("liaall.tenstm", params);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
......
src/views/Business/Botpay/Setp.vue
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label="" prop="bodgrp.cbs.max.amt" label-width="0"> <el-form-item label="" prop="bodgrp.cbs.max.amt" label-width="0">
<c-input v-model.number="model.bodgrp.cbs.max.amt" placeholder="请输入Document Amount" disabled></c-input> <c-input v-model.number="model.bodgrp.cbs.max.amt" placeholder="请输入Document Amount" disabled>
</c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -67,8 +68,8 @@ ...@@ -67,8 +68,8 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label="" label-width="0" prop="bodgrp.cbs.opn1.amt"> <el-form-item label="" label-width="0" prop="bodgrp.cbs.opn1.amt">
<c-input v-model.number="model.bodgrp.cbs.opn1.amt" style="width:100%" placeholder="请输入Open Amount" <c-input v-model.number="model.bodgrp.cbs.opn1.amt" style="width:100%"
disabled></c-input> placeholder="请输入Open Amount" disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -203,7 +204,8 @@ ...@@ -203,7 +204,8 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label-width="0" prop="setmod.docamt"> <el-form-item label-width="0" prop="setmod.docamt">
<c-input v-model.number="model.setmod.docamt" placeholder="请输入document amount" disabled></c-input> <c-input v-model.number="model.setmod.docamt" placeholder="请输入document amount" disabled>
</c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -224,7 +226,8 @@ ...@@ -224,7 +226,8 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label-width="0" prop="setmod.redamt"> <el-form-item label-width="0" prop="setmod.redamt">
<c-input v-model.number="model.setmod.redamt" placeholder="请输入document amount" :disabled="model.bodgrp.rec.focflg? true:false"> <c-input v-model.number="model.setmod.redamt" placeholder="请输入document amount"
:disabled="model.bodgrp.rec.focflg == 'X'">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -243,7 +246,7 @@ ...@@ -243,7 +246,7 @@
<c-col :span="24" style="margin-top: 30px"> <c-col :span="24" style="margin-top: 30px">
<span style="font-size:14px">Bills to Pay back:</span> <span style="font-size:14px">Bills to Pay back:</span>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24" style="margin-top: -10px">
<c-col :span="12"> <c-col :span="12">
<c-edit-table :model="model" v-bind="docgrd" style="margin-left:-30px"> <c-edit-table :model="model" v-bind="docgrd" style="margin-left:-30px">
</c-edit-table> </c-edit-table>
...@@ -353,6 +356,7 @@ export default { ...@@ -353,6 +356,7 @@ export default {
this.model.setmod.redamt = this.model.setmod.docamt; this.model.setmod.redamt = this.model.setmod.docamt;
let rtnmsg = await this.executeDefault("liaall.tenstm"); let rtnmsg = await this.executeDefault("liaall.tenstm");
this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta; this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta;
} else { } else {
this.model.setmod.redamt = "0.00"; this.model.setmod.redamt = "0.00";
let rtnmsg = await this.executeDefault("liaall.tenstm"); let rtnmsg = await this.executeDefault("liaall.tenstm");
...@@ -367,22 +371,22 @@ export default { ...@@ -367,22 +371,22 @@ export default {
type: "error", type: "error",
}); });
} else { } else {
let selIds; let chkIds;
if (selection.length === 0) { if (selection.length === 0) {
selIds = []; chkIds = [];
this.model.setmod.docamt = "0.000"; this.$nextTick(async () => {
this.model.setmod.docamt = "0.000";
})
this.model.liaall.tensetstm.rows = []; this.model.liaall.tensetstm.rows = [];
// this.model.bodgrp.rec.focflg = '';
// this.model.liaall.tenstm.rows = []
} else { } else {
selIds = [selection[0] + 1]; chkIds = [selection[0] + 1];
this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
// this.model.bodgrp.rec.focflg = 'X';
} }
// //
console.log(this.model.liaall.tensetstm); console.log(this.model.liaall.tensetstm);
let params = { selDst: "liaall.tenstm", selIds }; let params = { chkDst: "liaall.tenstm", chkIds };
console.log(params);
const rtnmsg = await this.executeRule("liaall.tenstm", params); const rtnmsg = await this.executeRule("liaall.tenstm", params);
console.log(rtnmsg);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
} else { } else {
......
src/views/Business/Botpay/index.vue
...@@ -143,9 +143,8 @@ export default { ...@@ -143,9 +143,8 @@ export default {
if (this.isInDisplay) { if (this.isInDisplay) {
this.restoreDisplay(); this.restoreDisplay();
} }
this.$nextTick(() => { this.$nextTick(async () => {
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection(); this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
}) })
} }
else { else {
......
src/views/Business/Getset/index.vue
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--getset PD000027 Claim Payment --> <!--getset PD000027 Claim Payment -->
<el-tab-pane label="Claim Payment" name="gitsetp1"> <el-tab-pane label="Claim Payment" name="gitsetp1">
<m-gitsetp1 :model="model" :codes="codes"/> <c-content>
<m-gitsetp1 :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--lendoc PD000001 收账通知 --> <!--lendoc PD000001 收账通知 -->
<el-tab-pane :label="$t('lendoc.PD000001')" name="docpan"> <el-tab-pane :label="$t('lendoc.PD000001')" name="docpan">
......
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