Skip to content

V
vue-gjjs
Commit 69a10603 by 李少勇
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents 97cc5ca5 37b17278
Showing with 98 additions and 50 deletions
src/business/gitopn/views/index.vue
......@@ -105,6 +105,7 @@
</template>
<script>
import event from '../event'
import commonProcess from "~/mixin/commonProcess";
import formRules from '../model/check'
import CodeTable from "~/config/CodeTable";
import Gitopn from "../model";
......@@ -184,7 +185,8 @@ export default {
activeNames: ["ovwp"],
};
},
mixins: [event],
// 里面包含了Default、Check等的公共处理
mixins: [commonProcess, event],
data() {
return {
tabVal: "ovwp",
......
src/components/business/setmod/event/index.js
import Api from '~/service/Api';
import buildFn from '~/business/gitopn/event/buildCommons.js'
export default {
export default {
async processSetpan(setfegRequest, fn) {
let loading = this.loading('正在请求试算费用');
let objtyp = setfegRequest.rec.objtyp;
......@@ -21,5 +24,30 @@ export default {
}
}
loading.close()
},
async calcPayDetail() {
let loading = this.loading('正在请求试算账务');
let rulePath = '/service/gid/setmod/calcPayDetail';
let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
let rtnmsg = await Api.post(rulePath, setglgRequest);
if (rtnmsg.respCode == SUCCESS) {
this.model.setmod.setglg = rtnmsg.data.setglg;
}
loading.close()
},
async setgllAccts(index, setgll) {
this.model.setmod.setglg.setgll = setgll;
let rulePath = '/service/gid/setmod/setgll/' + index + '/accts';
let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
setglgRequest.setglg = {setgll: setgll};
let rtnmsg = await Api.post(rulePath, setglgRequest);
if (rtnmsg.respCode == SUCCESS) {
this.model.setmod.setglg = rtnmsg.data.setglg;
}
}
}
src/components/business/setmod/views/dialog.vue
......@@ -372,7 +372,9 @@ export default {
},
computed: {
formData() {
return this.model.setmod.setfeg.setfel[this.idx]
let formDataTmp = this.model.setmod.setfeg.setfel[this.idx];
formDataTmp.fecp1.taxrat = formDataTmp.fecp1.taxrat || '';
return formDataTmp
}
},
methods: {
......
src/components/business/setmod/views/index.vue
......@@ -56,16 +56,7 @@
>
</el-option>
</c-select>
<template slot="footer">
<c-button
style=""
size="small"
type="primary"
icon="el-icon-info"
@click="onSetmodDet"
>
</c-button>
</template>
<template slot="footer"></template>
</c-fullbox>
</el-form-item>
</c-col>
......@@ -558,7 +549,7 @@
>
<c-select v-model="scope.row.act">
<el-option
v-for="item in scope.act"
v-for="item in scope.row.acts"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -569,11 +560,12 @@
</template>
</el-table-column>
<el-table-column label="借/贷" prop="debcdtflg" width="70px">
</el-table-column>
<el-table-column label="原始币种" prop="cur" width="70px">
</el-table-column>
<el-table-column label="原始金额" prop="fmtamt" width="110px">
<!-- <template slot-scope="scope">
<!-- <template slot-scope="scope">
<c-input-currency
v-model="scope.row.fmtamt"
placeholder="0.00"
......@@ -1432,7 +1424,7 @@ export default {
addRowSetfol() {
let newRow = { ...this.newdialog };
this.model.setmod.setfog.setfol.splice(0, 0, newRow);
this.defaultFunction();
// this.defaultFunction();
},
removeRowSetfol() {
this.model.setmod.setfog.setfol.shift();
......@@ -1453,27 +1445,33 @@ export default {
this.defaultFunction();
},
detail1(index, row) {
this.executeDefault('setfel.det').then((res) => {
this.index = index;
this.dialogVisible = true;
this.dialog = row;
/*this.executeDefault('setfel.det').then((res) => {
this.index = index;
this.dialogVisible = true;
this.dialog = row;
});
});*/
},
dispDefault(index) {
this.executeDefault(`setmod.setfeg.setfel(${index}).mac`).then((res) => {
Utils.copyValueFromVO(this.model, res.data);
});
dispDefault(index) {
let vm = this;
vm.root.calcPayDetail();
},
// 第二个表格
detail2(index, row) {
const that = this;
const rule = 'setmod.setfeg.setfel(' + (index + 1) + ').det';
that.index = index;
that.$refs.setpanDialog.visiable = true;
that.dialog2 = row;
/* const rule = 'setmod.setfeg.setfel(' + (index + 1) + ').det';
that.executeRule(rule).then((res) => {
that.index = index;
that.$refs.setpanDialog.visiable = true;
// that.$refs.setpanDialog.formData = that.model.setmod.setfeg.setfel[index];
that.dialog2 = row;
});
});*/
},
// 第三个表格
......@@ -1483,23 +1481,38 @@ export default {
},
async handleDetail(index, row) {
const that = this;
const rule = 'setmod.setglg.setgll(' + (index + 1) + ').det';
let rtnmsg = await this.executeRule(rule);
if (rtnmsg.respCode == SUCCESS) {
that.index = index;
that.$refs.detpDialog.visiable = true;
this.detpDialogVisible = true;
that.dialog3 = that.model.setmod.setglg.setgll[index];
that.rattyp = that.strCalCode(that.dialog3.rattyp, that.codes.ratetype);
that.dcbrattyp = that.strCalCode(
that.index = index;
that.$refs.detpDialog.visiable = true;
this.detpDialogVisible = true;
that.dialog3 = that.model.setmod.setglg.setgll[index];
debugger
that.rattyp = that.strCalCode(that.dialog3.rattyp, that.codes.ratetype);
that.dcbrattyp = that.strCalCode(
that.dialog3.dcbrattyp,
that.codes.ratetype
);
that.scbrattyp = that.strCalCode(
);
that.scbrattyp = that.strCalCode(
that.dialog3.scbrattyp,
that.codes.ratetype
);
}
);
// const rule = "setmod.setglg.setgll(" + (index + 1) + ").det";
// let rtnmsg = await this.executeRule(rule);
// if (rtnmsg.respCode == SUCCESS) {
// that.index = index;
// that.$refs.detpDialog.visiable = true;
// this.detpDialogVisible = true;
// that.dialog3 = that.model.setmod.setglg.setgll[index];
// that.rattyp = that.strCalCode(that.dialog3.rattyp, that.codes.ratetype);
// that.dcbrattyp = that.strCalCode(
// that.dialog3.dcbrattyp,
// that.codes.ratetype
// );
// that.scbrattyp = that.strCalCode(
// that.dialog3.scbrattyp,
// that.codes.ratetype
// );
// }
},
strCalCode(str, code) {
var result = '';
......@@ -1560,19 +1573,22 @@ export default {
}
},
async dspChange(index) {
let rtnmsg = await this.executeDefault(
'setmod.setglg.setgll(' + (index + 1) + ').dsp'
);
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.$nextTick(() => {
this.executeRule('setmod.glemod.glepan').then((res) => {
//TODO 处理数据逻辑
if (res.respCode == SUCCESS) this.updateModel(res.data);
});
});
}
const vm = this;
vm.root.setgllAccts((index + 1), vm.stmData3);
// let rtnmsg = await this.executeDefault(
// "setmod.setglg.setgll(" + (index + 1) + ").dsp"
// );
// if (rtnmsg.respCode == SUCCESS) {
// //TODO 处理数据逻辑
// this.updateModel(rtnmsg.data);
// this.$nextTick(() => {
// this.executeRule("setmod.glemod.glepan").then((res) => {
// //TODO 处理数据逻辑
// if (res.respCode == SUCCESS) this.updateModel(res.data);
// });
// });
// }
},
},
created: function () {},
......
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