Skip to content

V
vue-gjjs
Commit 1d749d11 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 7d89e9e9 3312433b
Showing with 163 additions and 101 deletions
src/business/gitopn/event/index.js
......@@ -164,8 +164,6 @@ export default {
let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
setglgRequest.setglg = {setgll: emitParams.list};
this.setgllAccts(setglgRequest, index);
emitParams.list = this.model.setmod.setglg.setgll || [{value: '', lable:''}];
emitParams.list[index-1].act = emitParams.list[index-1].acts[0].value;
break
default:
return
......
src/business/infgid/event/index.js
import Api from '~/service/Api';
import { getTrnNameByInr } from "~/service/business/common";
export default {
methods: {
async handleSearch() {
......@@ -21,13 +22,13 @@ export default {
cmtflg: this.model.cmtflg,
fingua: this.model.fingua,
pageIndex: this.pagination.pageIndex,
pageSize: this.pagination.pageSize
pageSize: this.pagination.pageSize,
};
let rtnmsg = await Api.post('/service/infgid/getList', params);
if (rtnmsg.respCode == SUCCESS) {
this.stmData.data = [];
this.stmData.data = rtnmsg.data.list;
this.pagination.total = rtnmsg.data.total
this.pagination.total = rtnmsg.data.total;
} else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
......@@ -63,15 +64,65 @@ export default {
// pageSize改变
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pagination.pageIndex = 1
this.pagination.pageSize = val
this.handleSearch()
this.pagination.pageIndex = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pagination.pageIndex = val
this.handleSearch()
this.pagination.pageIndex = val;
this.handleSearch();
},
toGitpop() {
this.$router.history.push('/business/gitpop');
},
toGitopn() {
// 点击开立，清空从待经办进来的时候带的行参数
this.updateToHandleRowData({
[`row_${row.frm.toLowerCase()}`]: {}
})
this.$router.history.push('/business-new/gitopn');
},
toGetopn() {
this.$router.history.push('/business/getopn');
},
// 详情
async details(row) {
const params = {
//根据xx字段 查询详情表的数据
ownref: row.ownref,
};
const res = await Api.post('/service/infgid/getDetailByOwnref', params);
if (res.respCode === SUCCESS) {
this.trnData.data = res.data;
}
},
// 关闭详情弹框
closeDetailsDialog(refId) {
this.$refs[refId].doClose();
console.log('close');
},
// 处理
handler() {
this.initdialog = true;
},
// 关闭处理弹框
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
}
},
};
src/business/infgid/views/Infsea.vue
......@@ -487,34 +487,39 @@
@click="closeDetailsDialog('popover_' + scope.row.IDX)"
></span>
</div>
<c-istream-table
:list="trnData.data"
<el-table
:data="trnData.data"
:columns="trnData.columns"
:showButtonFlg="true"
>
<el-table-column
prop="op"
label="操作"
width="0"
fixed="right"
v-for="(item, key) in trnData.columns"
:key="key"
:label="item.label"
:prop="item.prop"
>
<template slot-scope="scope">
<div>{{ scope.row[item.prop] }}</div>
</template>
</el-table-column>
<el-table-column fixed="right" prop="op" label="操作" width="250px" >
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.row['INR'])"
@click="display(scope.row['inr'])"
>详情</c-button
>
</template>
</el-table-column>
</c-istream-table>
</el-table>
<c-button
style="margin-left: 0"
size="small"
slot="reference"
@click="details"
>
详情</c-button
>
@click="details(scope.row)">
详情
</c-button>
</el-popover>
<c-button
style="margin-left: 5px"
......@@ -553,7 +558,7 @@
:key="index"
type="primary"
:disabled="item.disabled"
></el-button>
>{{ item.name }}</el-button>
</div>
</el-dialog>
</div>
......@@ -608,61 +613,48 @@ export default {
// 详情
trnData: {
columns: [
'0 1 "交易ID" 100',
'1 2 "保函编号" 200',
'2 3 "交易名称" 200',
'3 4 "条目" 200',
{
index: 4,
position: 5,
width: 100,
pattern: "code",
label: "状态",
code: this.codes.relflg,
label: '交易id',
prop: 'inr'
},
'5 6 "币种" 80',
'6 7 "相关金额" 150',
'7 8 "标识" 100',
],
data: [],
{
label: '保函编号',
prop: 'ownref'
},
// 处理
initdialog: false,
handlerDataList: []
};
{
label: '交易名称',
prop: 'ininam'
},
methods: {
...mapMutations(['updateToHandleRowData']),
toGitpop() {
this.$router.history.push("/business/gitpop");
{
label: '条目',
prop: 'inidattim'
},
toGitopn() {
this.$router.history.push("/business-new/gitopn");
// 点击开立，清空从待经办进来的时候带的行参数
this.updateToHandleRowData({
[`row_${row.frm.toLowerCase()}`]: {}
})
{
label: '状态',
prop: 'relflg'
},
toGetopn() {
this.$router.history.push("/business/getopn");
{
label: '币种',
prop: 'reloricur'
},
// 详情
async details(idx, row) {
{
label: '相关金额',
prop: 'reloriamt'
},
{
label: '标识',
prop: 'relres'
},
// 关闭详情弹框
closeDetailsDialog(refId) {
this.$refs[refId].doClose();
console.log('close')
],
data: [],
},
// 处理
handler () {
this.initdialog = true
initdialog: false,
handlerDataList: []
};
},
// 关闭处理弹框
closeHandlerDialog () {
this.initdialog = false
}
methods: {
...mapMutations(['updateToHandleRowData'])
},
mounted () {},
};
......
src/components/business/setmod/event/index.js
......@@ -9,8 +9,10 @@ export default {
this.model.setmod.ref = rtnmsg.data.ref;
this.model.setmod.doccur = rtnmsg.data.doccur;
this.model.setmod.docamt = rtnmsg.data.docamt;
this.srcSetgllIndex = this.model.setmod.setfeg.setfel.length;
// 试算账务
if (this.model.setmod.setfeg.setfel.length > 0) {
if (this.srcSetgllIndex > 0) {
loading = this.loading('正在请求试算账务');
let setglgRequestParams = fn()
let res = await Api.post(`/service/${ objtyp.toLowerCase() }/setmod/calcPayDetail`, setglgRequestParams);
......
src/components/business/setmod/views/dialog.vue
......@@ -373,19 +373,19 @@ export default {
computed: {
formData() {
let formDataTmp = this.model.setmod.setfeg.setfel[this.idx];
formDataTmp.fecp1.taxrat = formDataTmp.fecp1.taxrat || '';
return formDataTmp
formDataTmp.fecp1 = formDataTmp.fecp1 ? formDataTmp.fecp1 : {};
formDataTmp.fecp1.taxrat = formDataTmp.fecp1.taxrat ? formDataTmp.fecp1.taxrat : '';
formDataTmp.wrkfec = formDataTmp.wrkfec ? formDataTmp.wrkfec : {};
formDataTmp.wrkfec.ratcur = formDataTmp.wrkfec.ratcur ? formDataTmp.wrkfec.ratcur : 0;
return formDataTmp;
}
},
methods: {
saveDialog() {
this.model.setmod.setfeg.setfel.splice(this.idx, 1, this.formData);
this.$nextTick(()=>{
this.executeRule("setmod.glemod.glepan").then((res) => {
//TODO 处理数据逻辑
if (res.respCode == SUCCESS) this.updateModel(res.data)
})
})
this.visiable = false;
},
beforeClose(done) {
......
src/components/business/setmod/views/index.vue
......@@ -421,7 +421,7 @@
style="padding: 4px"
class="el-icon-plus"
size="mini"
@click="addRowSetfel(scope)"
@click="addRowSetfel()"
>
</c-button>
<c-button
......@@ -429,7 +429,7 @@
circle
class="el-icon-minus"
size="mini"
@click="removeRowSetfel(scope)"
@click="removeRowSetfel()"
>
</c-button>
</template>
......@@ -1417,7 +1417,14 @@ export default {
}
this.stmData3 = stm;
},
deep: true
},
'model.setmod.setfeg.setfel': {
handler(val, oldVal) {
this.$emit('changeSetmodModel', {code: 'processMethods'});
},
deep: true
}
},
methods: {
//第一个表格
......@@ -1428,7 +1435,8 @@ export default {
},
removeRowSetfol() {
this.model.setmod.setfog.setfol.shift();
this.defaultFunction();
// this.defaultFunction();
this.$emit('changeSetmodModel', {setmod: this.model.setmod});
},
saveDialog() {
this.dialogVisible = false;
......@@ -1436,39 +1444,40 @@ export default {
},
// 第二个表格
addRowSetfel() {
let newRow = { ...this.dialog2 };
// 复制最新一条数据
let oldsetfel = this.root.model.setmod.setfeg.setfel;
if (!oldsetfel || oldsetfel.length == 0) {
return;
}
let newRow = JSON.parse(JSON.stringify(oldsetfel[oldsetfel.length-1]));
this.model.setmod.setfeg.setfel.splice(0, 0, newRow);
this.defaultFunction();
},
removeRowSetfel() {
this.model.setmod.setfeg.setfel.shift();
this.defaultFunction();
let curLen = this.model.setmod.setfeg.setfel.length ;
if (curLen <= this.root.srcSetgllIndex) {
// 原始计算数据不能删除
this.$notify.error({ title: '错误', message: '原始计算数据,该记录无法删除!' });
return;
}
this.model.setmod.setfeg.setfel.pop();
},
detail1(index, row) {
this.index = index;
this.dialogVisible = true;
this.dialog = row;
/*this.executeDefault('setfel.det').then((res) => {
this.index = index;
this.dialogVisible = true;
this.dialog = row;
});*/
},
// 处理方式改变
changeProcessMethods(code) {
this.$emit('changeSetmodModel', {
code
})
// let vm = this;
// vm.root.calcPayDetail();
},
// 第二个表格
detail2(index, row) {
const that = this;
that.index = index;
that.$refs.setpanDialog.visiable = true;
that.dialog2 = row;
that.root.model.setmod.setfeg.setfel[index] = row;
setTimeout(() => { that.$refs.setpanDialog.visiable = true }, 100);
/* const rule = 'setmod.setfeg.setfel(' + (index + 1) + ').det';
that.executeRule(rule).then((res) => {
that.index = index;
......@@ -1482,14 +1491,12 @@ export default {
saveDialog3() {
this.detpDialogVisible = false;
this.model.setmod.setglg.setgll.splice(this.index, 1, this.dialog3);
this.changeDsp(this.index, 'changeDsp');
},
async handleDetail(index, row) {
const that = this;
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,
......@@ -1499,6 +1506,16 @@ export default {
that.dialog3.scbrattyp,
that.codes.ratetype
);
that.dialog3.setgrp = that.dialog3.setgrp ? that.dialog3.setgrp : {act: {}};
that.dialog3.setgrp.act = that.dialog3.setgrp.act ? that.dialog3.setgrp.act : {pts: {extkey: ''}};
that.dialog3.setgrp.act.pts = that.dialog3.setgrp.act.pts ? that.dialog3.setgrp.act.pts : {extkey: ''};
that.dialog3.actp = that.dialog3.actp ? that.dialog3.actp : {};
that.dialog3.actp.ptsget = that.dialog3.actp.ptsget ? that.dialog3.actp.ptsget : {sdamod: {seainf: ''}};
that.$refs.detpDialog.visiable = true;
that.detpDialogVisible = true;
that.dialog3.setgll = {};
// const rule = "setmod.setglg.setgll(" + (index + 1) + ").det";
// let rtnmsg = await this.executeRule(rule);
......@@ -1547,7 +1564,8 @@ export default {
}
},
async accucrChange(index) {
let rtnmsg = await this.executeRule(
this.changeDsp(index, 'changeDsp');
/*let rtnmsg = await this.executeRule(
'setmod.setglg.setgll(' + (index + 1) + ').acccur'
);
if (rtnmsg.respCode == SUCCESS) {
......@@ -1559,10 +1577,11 @@ export default {
if (res.respCode == SUCCESS) this.updateModel(res.data);
});
});
}
}*/
},
async fmtaccamtChange(index) {
let rtnmsg = await this.executeRule(
this.changeDsp(index, 'changeDsp');
/* let rtnmsg = await this.executeRule(
'setmod.setglg.setgll(' + (index + 1) + ').fmtaccamt'
);
if (rtnmsg.respCode == SUCCESS) {
......@@ -1574,7 +1593,7 @@ export default {
if (res.respCode == SUCCESS) this.updateModel(res.data);
});
});
}
}*/
},
async changeDsp(index, code) {
this.$emit('changeSetmodModel', {
......
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