Commit 396a604d by WF1020

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 63683712 508041cf
......@@ -2080,7 +2080,9 @@
"integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
"deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
"dev": true,
"hasInstallScript": true
"hasInstallScript": true,
"optional": true,
"peer": true
},
"node_modules/@vue/babel-preset-jsx": {
"version": "1.2.4",
......@@ -15749,7 +15751,6 @@
"integrity": "sha512-ad35OBAQgc0m1m4iqRhMRuMN0rvGb8vFx0hU7lVjVMIuuLLXornU38d2U1uMI096dIItht70RCJlZt48DsLbUQ==",
"dev": true,
"requires": {
"@babel/core": "^7.11.0",
"@babel/helper-compilation-targets": "^7.9.6",
"@babel/helper-module-imports": "^7.8.3",
"@babel/plugin-proposal-class-properties": "^7.8.3",
......@@ -15762,16 +15763,16 @@
"@vue/babel-plugin-jsx": "^1.0.3",
"@vue/babel-preset-jsx": "^1.2.4",
"babel-plugin-dynamic-import-node": "^2.3.3",
"core-js": "^3.6.5",
"core-js-compat": "^3.6.5",
"semver": "^6.1.0"
},
"dependencies": {
"core-js": {
"version": "3.21.1",
"resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
"version": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
"integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
"dev": true
"dev": true,
"optional": true,
"peer": true
}
}
},
......
......@@ -493,15 +493,14 @@
label="直接Swift添加"
prop="gitp.indirectswiadd"
>
<c-input-xml
<c-input-textarea
type="textarea"
:maxRows="10"
:model="model.gitp.indirectswiadd"
v-model="model.gitp.indirectswiadd"
maxlength="9750"
show-word-limit
placeholder="请输入直接Swift添加"
@change="commonExecuteRule('gitp.indirectswiadd')"
></c-input-xml>
></c-input-textarea>
</el-form-item>
</c-col>
......@@ -634,9 +633,9 @@
</template>
<script>
import event from '../event';
import InputXml from "~/components/InputXml";
import InputTextarea from "~/components/InputTextarea";
export default {
components: { InputXml },
components: { InputTextarea },
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
......
......@@ -9,29 +9,29 @@
label="保函文本可变因素"
prop="gidgrp.blk.gtxgidtxt"
>
<c-input-xml
:disabled="model.gitp.gidtxtmodflgc == ''"
<c-input-textarea
type="textarea"
:disabled="model.gitp.gidtxtmodflgc == ''"
:maxRows="14"
:model="model.gidgrp.blk.gtxgidtxtc"
v-model="model.gidgrp.blk.gtxgidtxtc"
maxlength="32500"
show-word-limit
placeholder="请输入保函文本可变因素"
></c-input-xml>
></c-input-textarea>
</el-form-item>
<el-form-item
v-if="model.gitp.gidtxtmodflgc == 'X'"
label="保函文本可变因素 - 抵消保函文本"
prop="gidgrp.blk.gtxgidtxtc"
>
<c-input-xml
<c-input-textarea
type="textarea"
:modle="model.gidgrp.blk.gtxgidtxtc"
v-modle="model.gidgrp.blk.gtxgidtxtc"
:maxRows="16"
maxlength="32500"
show-word-limit
placeholder="请输入保函文本可变因素 - 抵消保函文本"
></c-input-xml>
></c-input-textarea>
</el-form-item>
</c-col>
</c-col>
......@@ -71,7 +71,6 @@
>允许</c-checkbox
>
</c-col>
<c-col :span="24">
<c-button
disabled
......@@ -126,10 +125,9 @@
</div>
</template>
<script>
import IStreamInput from "~/components/IStreamInput";
import event from '../event'
export default {
components: { IStreamInput },
components: { },
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
......@@ -137,7 +135,7 @@ export default {
return {};
},
methods: {},
created: function () {},
created () {},
};
</script>
<style>
......
......@@ -66,7 +66,7 @@
v-model="model.gidgrp.rec.delto"
style="width: 100%"
placeholder="请选择交付收款人"
:code="getValues('gidgrp.rec.delto','delto1')"
:code="getDelto"
>
</c-select>
</el-form-item>
......@@ -218,18 +218,44 @@
<script>
import _ from "lodash";
import event from '../event'
import Utils from "~/utils";
import commonProcess from "~/mixin/commonProcess"
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess, event],
computed: {
getDelto () {
let list = [{
label: '其他',
value: 'OTHR'
}]
if (this.model.gidgrp.apl.pts.extkey) {
list.push({
label: '申请人',
value: 'APPL'
})
}
if (this.model.gidgrp.ben.pts.extkey) {
list.push({
label: '收益人',
value: 'BENE'
})
}
// if (this.model.gidgrp.ctr.pts.extkey) {
// list.push({
// label: '申请人',
// value: 'OBLI'
// })
// }
return list
}
},
data() {
return {};
},
methods: {},
created: function () {},
created () {},
};
</script>
<style scoped>
......
......@@ -9,9 +9,7 @@
</div>
</template>
<script>
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import commonProcess from "~/mixin/commonProcess";
import Infgid from "../model";
import Infsea from "./Infsea";
......@@ -25,7 +23,6 @@ export default {
root: this,
};
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "",
......@@ -35,24 +32,8 @@ export default {
codes: { ...CodeTable },
};
},
methods: {
myTabClick(tab) {
this.tabClick(tab);
/**
* do it yourself
**/
},
},
created: async function () {
console.log("进入infgid交易");
let rtnmsg = await this.init({});
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
} else {
this.$notify.error({ title: "错误", message: "服务请求失败!" });
}
},
methods: {},
created () {},
};
</script>
<style>
......
export default class Trnrel {
constructor() {
this.data = {
trncorco: {
ownref: "", // Reference .trncorco.ownref
relflg: "", // Status .trncorco.relflg
inidatfro: "", // Date of entry of Transaction .trncorco.inidatfro
inidattil: new Date(), // Date of entry of Transaction until .trncorco.inidattil
trnstm: "", // List of transaction sfor display .trncorco.trnstm
dflg: "", // 国内证标志 .trncorco.dflg
selinr: {},
},
atp: {
cod: "", // Transaction Type .atp.cod
},
atpget: {
sdamod: {
seainf: "", // .atpget.sdamod.seainf
dadsnd: "", // Drag Drop Sender .atpget.sdamod.dadsnd
},
},
atptxt: "", // Transaction Text .atptxt
numtrn: "", // # of transactions .numtrn
orddsp: "", // >> .orddsp
bchcon: "", // Branch .bchcon
usrcon: "", // User .usrcon
recpan: {
cpltxt: "", // Completion text .recpan.cpltxt
spt: {
sta: "", // Status .recpan.spt.sta
},
ord: {
sta: "", // Status .recpan.ord.sta
},
recget: {
sdamod: {
seainf: "", // Ident No. .recpan.recget.sdamod.seainf
dadsnd: "", // Drag Drop Sender .recpan.recget.sdamod.dadsnd
},
},
atp: {
cod: "", // Transaction ID .recpan.atp.cod
},
atpget: {
sdamod: {
dadsnd: "", // Drag Drop Sender .recpan.atpget.sdamod.dadsnd
seainf: "", // Transaction .recpan.atpget.sdamod.seainf
},
},
smhstm: "", // Documents .recpan.smhstm
usr: {
extkey: "", // User ID .recpan.usr.extkey
},
usrget: {
sdamod: {
seainf: "", // .recpan.usrget.sdamod.seainf
},
},
trsstm: "", // Signatures .recpan.trsstm
con: "", // Reference .recpan.con
cretrs: {
usr: "", // Entered by .recpan.cretrs.usr
dattim: "", // Timestamp .recpan.cretrs.dattim
},
ackgrp: {
rec: {
sndref: "", // Send to SOP/CASmf reference .recpan.ackgrp.rec.sndref
},
},
wfestm: "", // WFEs for transaction for display .recpan.wfestm
evthisstm: "", // stream of history of transactions .recpan.evthisstm
evtstm: "", // stream of events .recpan.evtstm
ackstm: "", // ACKs for transaction .recpan.ackstm
trostm: "", // TROs for transaction for display .recpan.trostm
prtgleblk: "", // XMLPanel prtgle的内置block .recpan.prtgleblk
prtpanblk: "", // XMLPanel prtpan的内置block .recpan.prtpanblk
},
trn: {
ownref: "", // Reference .trn.ownref
inr: "", // Transaction Key .trn.inr
objnam: "", // External Readable Object Identification .trn.objnam
reloricur: "", // Relevant Amount .trn.reloricur
reloriamt: "", // Relevant Amount for Release in Original Currency .trn.reloriamt
relflg: "", // Release Status of Transaction .trn.relflg
usr: "", // Responsible .trn.usr
usg: "", // Responsible Group .trn.usg
relreq: "", // Signatures Required/Obtained .trn.relreq
relres: "", // Applied Signatures .trn.relres
cortrninr: "", // Based on Ident No. .trn.cortrninr
exedat: "", // Execution Date .trn.exedat
inftxt: "", // Infotext .trn.inftxt
infdsp: "", // Infoflag .trn.infdsp
inifrm: "",
},
wfmmod: {
wfs: {
objnam: "", // External Readable Object Identification .wfmmod.wfs.objnam
objtyp: "", // Table Used to Store Associated Object .wfmmod.wfs.objtyp
objinr: "", // Object .wfmmod.wfs.objinr
},
},
docimm: {
prtswtpblk: "", // XMLPanel prtswtp的内置block .docimm.prtswtpblk
xmldocblk: "", // XMLPanel xmldoc的内置block .docimm.xmldocblk
prtswtrpblk: "", // XMLPanel prtswtrp的内置block .docimm.prtswtrpblk
docbol: {
prtpblk: "", // XMLPanel prtp的内置block .docimm.docbol.prtpblk
},
},
pageId: "", // ctx的key
searchAllUsers: ""
}
}
}
\ No newline at end of file
<template>
<div class="eibs-tab">
<!-- <c-list-search @form-reset="handleReset" @form-search="handleSearch"> -->
<!-- <template v-slot="searchSlot"> -->
<el-form class="m-table-search-form" ref="paramsForm" label-position="right" label-width="110px"
size="small">
<el-row>
<c-col :span="24" style="">
<c-col :span="8">
<el-form-item label="业务编号" prop="trncorco.ownref" style="width: 100%">
<c-input v-model="model.trncorco.ownref" maxlength="16" placeholder="请输入业务编号"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="创建时间" style="width: 100%" prop="trncorco.inidatfro">
<c-col :span="11">
<c-date-picker type="date" v-model="model.trncorco.inidatfro" style="width: 100%" placeholder="请选择创建时间">
</c-date-picker>
</c-col>
<c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label>
</c-col>
<c-col :span="11">
<c-date-picker type="date" v-model="model.trncorco.inidattil" style="width: 100%" placeholder="请选择创建时间">
</c-date-picker>
</c-col>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="经办柜员" prop="usrcon" style="width: 100%">
<c-select v-model="model.usrcon" style="width: 100%" placeholder="请选择经办柜员">
<el-option v-for="item in codes.usrsort" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
</el-row>
<!--
<c-col :span="12">
<el-form-item label="Drag Drop Sender">
<c-input v-model="model.atpget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item>
</c-col>
-->
<el-row>
<c-col :span="24" style="">
<c-col :span="8">
<el-form-item label="业务状态" prop="trncorco.relflg" style="width: 100%">
<c-select v-model="model.trncorco.relflg" style="width: 100%" placeholder="请选择业务状态">
<el-option v-for="item in relflgCodes" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="业务机构" prop="bchcon" style="width: 100%">
<c-select v-model="model.bchcon" style="width: 100%" placeholder="请选择业务机构">
<el-option v-for="item in codes.bchtyp" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<!--
<c-col :span="12">
<el-form-item label="and">
</el-form-item>
</c-col> -->
<c-col :span="8">
<el-form-item label="交易代码" prop="atp.cod" style="width: 100%">
<c-col :span="24">
<c-col :span="20">
<c-input v-model="model.atp.cod" maxlength="6" style="width: 95%" placeholder="请输入交易代码"
@keyup.enter.native="showGridPromptDialog('findAtpCod')"></c-input>
</c-col>
<!-- <c-input v-model="model.atpget.sdamod.seainf" style="width:10%" placeholder="i"></c-input> -->
<c-col :span="4">
<c-button size="small" style="width:100%;margin-left:0" type="primary" @click="onSeainf"
icon="el-icon-search"></c-button>
</c-col>
</c-col>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24" style="">
<c-col :span="8">
<el-form-item label="业务标志" prop="trncorco.dflg" style="width: 100%">
<c-select v-model="model.trncorco.dflg" style="width: 100%" placeholder="请选择业务标志">
<el-option v-for="item in codes.dflg" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="交易名称" prop="atptxt" style="width: 100%">
<c-input v-model="model.atptxt" maxlength="37" placeholder="请输入交易名称"></c-input>
</el-form-item>
</c-col>
<c-col :span="8" style="text-align:right">
<el-button size="small" @click="handleReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleSearch">查询</el-button>
</c-col>
</c-col>
</el-row>
</el-form>
<c-col :span="24" style="">
<div style="border-bottom: 10px solid rgb(232, 232, 232)">
</div>
</c-col>
<el-row>
<c-col :span="24" style="">
<c-istream-table :list="stmData.data" :columns="stmData.columns" style="width:100%" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="140px">
<template slot="header">
<c-col :span="11" style="text-align:center"><span>操作</span></c-col>
<!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template>
<template slot-scope="scope">
<c-button style="margin-left: 0" size="small" @click="onWaitDetail(scope.$index,scope.row)">
详情
</c-button>
<c-button style="margin-left: 5px" size="small" type="primary" @click="onHandle(scope.$index,scope.row)">
处理
</c-button>
<!-- <c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onRelrow(scope.$index)"
>
复核
</c-button> -->
</template>
</el-table-column>
</c-istream-table>
</c-col>
</el-row>
</div>
</template>
<script>
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "../event";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
components: {},
data() {
return {
initdialog: false,
transactionStatus: {
busiNo: "",
modTimes: 0,
postCount: 0,
accCount: 0,
earnCount: 0,
earnAmt: 0,
},
stmData: {
columns: [
'10 1 "交易代码" 100',
'11 2 "业务编号" 150',
'17 3 "摘要信息" 300',
'12 4 "币种" 70',
'13 5 "金额" 100',
// '14 6 "创建时间" 170',
{ index: 14, position: 6, width: 140, pattern: 'time', label: '创建时间' },
'9 7 "签名要求" 100',
'2 8 "签名状态" 100',
'16 9 "经办柜员" 100',
// '0 10 "业务状态" 80',
{
index: 0, position: 10, width: 100, pattern: 'code', label: '业务状态', code: [{ label: "等待", value: "W" },
{ label: "已打回", value: "C" },
{ label: "已拾取", value: "P" },
{ label: "已拒绝", value: "N" },]
},
'15 11 "业务机构" 120',
],
data: [],
},
relrowDisabled: true,
relflgCodes: [],
Trnp0Visible: false,
// multipleSelection: [],
};
},
methods: {
// multipleSelect(val) {
// // TODO 根据Status判断按钮是否禁用
// this.relrowDisabled = !(val.length > 0);
// this.multipleSelection = val;
// },
// getSelectedData() {
// return this.multipleSelection.map((idx) => this.stmData.data[idx]);
// },
...Event,
getInidatfro(){
let datetime = new Date();
datetime = datetime.setDate(datetime.getDate() - 1);
this.model.trncorco.inidatfro = new Date(datetime);
}
},
created: function () {
this.getInidatfro();
},
async mounted() {
this.relflgCodes = [
{ label: "全部", value: "0" }, //待复核列表业务状态All
{ label: "已修改", value: "C" },
// { label: "Closed", value: "M" },
// { label: "Entered", value: "E" },
// { label: "External", value: "X" },
{ label: "已拾取", value: "P" },
{ label: "已拒绝", value: "N" },
{ label: "等待", value: "W" },
];
// await this.handleSearch()
// this.$store.commit("setTaskList", {key: "trnrel", val: this.stmData.data.length})
},
computed: {},
};
</script>
<style>
</style>
\ No newline at end of file
<template>
<div class="eContainer-search">
<el-form
:model="model"
:rules="rules"
ref="modelForm"
tokenKey="modelForm"
:validate-on-rule-change="false"
label-width="120px"
size="small"
>
<!-- <el-tabs ref="elment" type="card" @tab-click="tabClick">
<el-tab-pane label="复核夹查询"> -->
<c-content>
<m-inftrnps :model="model" :codes="codes" ref="inftrnps" />
</c-content>
<!-- </el-tab-pane>
</el-tabs> -->
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog>
</el-form>
</div>
</template>
<script>
import CodeTable from "~/config/CodeTable";
import Trnrel from "../model";
import commonProcess from "~/mixin/commonProcess";
import Utils from "~/utils/index";
import Inftrnps from "./Inftrnps";
export default {
name: "Trnrel",
components: {
"m-inftrnps": Inftrnps,
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
// computed: {},
provide() {
return {
root: this,
};
},
data() {
return {
trnName: "trnrel",
model: new Trnrel().data,
rules: null,
codes: {
dflg: CodeTable.dflg,
bchtyp: CodeTable.bchtyp,
usrsort: CodeTable.usrsort,
},
// reload:false,
};
},
created() {
const that = this;
that.init().then((res) => {
//TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data);
// that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
this.$refs.inftrnps.handleSearch();
});
},
methods: {
},
computed: {
reload: function(){
return this.$store.state.Status.loading.freshReview;
}
},
watch:{
reload: function(val, oldVal){
if(val){
const that = this;
that.init(that.model).then((res) => {
//TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data);
// that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
this.$refs.inftrnps.handleSearch();
//刷新页面后重置刷新状态为不刷新
this.$store.commit("setLoadingFreshReview", false)
});
}
},
},
};
</script>
<style>
</style>
\ No newline at end of file
<template>
<el-input
:id="id"
ref="form-item"
v-model="value"
type="textarea"
v-bind="$attrs"
v-on="$listeners"
v-bind:disabled="disabled"
:rows="maxRows"
resize="none"
@change="onChange"
/>
</template>
<script>
export default {
props: {
id: {
type: String,
default: undefined
},
value: {
type: [String, Number],
default: undefined
},
disabled: {
type: Boolean,
default: false
},
maxRows: {
type: Number,
default: 3
}
},
computed: {
model: {
get () {
return this.value
},
set (newVal) {
this.$emit('input', newVal)
}
}
},
methods: {
onChange () {
this.$emit('change', this.model)
}
}
}
</script>
......@@ -152,4 +152,7 @@ export default {
/* .el-select.highlight .el-input .el-input__inner {
border-color: red;
} */
.c-highlight-content {
overflow: hidden;
}
</style>
\ No newline at end of file
......@@ -52,6 +52,7 @@ import Fullbox from "./Fullbox"
import CompareTable from "./CompareTable"
import InputXml from "./InputXml.vue"
import InputTextarea from "./InputTextarea.vue"
import PagingTable from "./PagingTable.vue";
import MulRowInput from "./MulRowInput.vue"
......@@ -111,6 +112,7 @@ export default {
Vue.component("c-fullbox", Fullbox)
Vue.component("c-compare-table", CompareTable)
Vue.component("c-input-xml", InputXml)
Vue.component("c-input-textarea", InputTextarea)
Vue.component("c-paging-table", PagingTable)
Vue.component("c-mul-row-input", MulRowInput)
Vue.component("c-rich-text-editor", RichTextEditor)
......
......@@ -7716,6 +7716,11 @@ const CodeTable = {
{ label: "ISSU Issuance of undertaking", value: "ISSU" },
{ label: "ISCO Issuance of counter-undertaking", value: "ISCO" },
{ label: "ICCO Issuance of counter-counter-undert", value: "ICCO" },
],
sndto: [
{ label: "ISSU Issuance of undertaking", value: "ISSU" },
{ label: "ISCO Issuance of counter-undertaking", value: "ISCO" },
{ label: "ICCO Issuance of counter-counter-undert", value: "ICCO" },
]
}
export default CodeTable;
......@@ -86,7 +86,8 @@
<script>
import Sptsel from "~/business/sptsel/views";
import Sptbrk from "~/views/Business/Sptsel/Sptbrk";
import Trnrel from "~/views/Business/Trnrel";
//import Trnrel from "~/views/Business/Trnrel";
import Trnrel from "~/business/trnrel/views";
import Trnfnd from "~/views/Business/Trnrel/Trnfnd";
import Diasel from "~/views/Business/Diasel";
import Bopsel from "~/views/Business/Bopsel";
......
......@@ -71,7 +71,7 @@ module.exports = {
}
},
'/gjjs/service/': {
target: 'http://127.0.0.1:9999',
target: 'http://192.168.0.70:9999',
changeOrigin: true,
pathRewrite: {
'^/gjjs/service': '/gjjs/service'
......
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