Skip to content

V
vue-gjjs
Commit 6e181155 by wangna
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 0a36e0ea a00631bd
Showing with 750 additions and 4 deletions
src/config/CodeTable/index.js
......@@ -7733,6 +7733,23 @@ const CodeTable = {
{ label: 'Request to amend an undertaking (BOL,SWT)', value: 'REQAMEND' },
{ label: 'Amendment of a free-form undertaking e.g. dependent guar. (BOL,SWT)', value: 'ISSAMEND' },
],
diatxt:[
{label: 'Accept decrease', value: 'ACD' },
{label: 'Claim payment', value: 'CLM' },
{label: 'Classified', value: 'CSF' },
{label: 'Expired', value: 'EXP' },
{label: 'Expiry warning', value: 'EXW' },
{label: 'Follow-up', value: 'FOL' },
{label: 'Maturity reached', value: 'MAT' },
{label: 'Post Booking', value: 'PLB' },
{label: 'Post Due', value: 'PSD' },
{label: '贸易单证审核', value: 'RAM' },
{label: 'Shipping Guarantee returned?', value: 'SGR' },
],
dia_donflg:[
{ label: "否", value: " " },
{ label: "是", value: "X" },
],
swtcod: [
{ label: '/AGENT/', value: 'AGEN' },
{ label: '/COMM/', value: 'COM' },
......
src/model/Infdia/index.js 0 → 100644
export default class Infdia{
constructor () {
this.data = {}
}
}
\ No newline at end of file
src/service/test/dia.js 0 → 100644
import Api from "~/service/Api"
export function queryByPage(data) {
return Api.post("/manager/dia/queryByPage", data)
}
export function queryById(data) {
return Api.post(`/manager/dia/queryById`, data)
}
export function queryDetailById(data) {
return Api.post(`/manager/dia/queryDetailById`, data)
}
export function add(data) {
return Api.post("/manager/dia/add", data)
}
export function edit(data) {
return Api.post("/manager/dia/edit", data)
}
export function deleteById(data) {
return Api.post(`/manager/dia/deleteById`, data)
}
\ No newline at end of file
src/views/Business/BusRouter.js
......@@ -354,6 +354,8 @@ import Dbefee from "~/views/Statics/Dbefee";
import Dbdfee from "~/views/Statics/Dbdfee";
import Inftxm2 from "~/views/Statics/Inftxm";
import Infdia from "~/views/Statics/Infdia";
/**
* 带有name的才会被添加进顶部的标签页里
*/
......@@ -723,5 +725,11 @@ const BusRouter = [
{ path: 'dbifee/:inr', component: Dbifee, name: 'StaticsDbifee', meta: { title: (tag) => { return '费用代码详情: ' + tag.params.inr } } },
{ path: 'dbefee/:inr', component: Dbefee, name: 'StaticsDbefee', meta: { title: (tag) => { return '费用代码修改: ' + tag.params.inr } } },
{ path: 'dbdfee/:inr', component: Dbdfee, name: 'StaticsDbdfee', meta: { title: (tag) => { return '费用代码删除: ' + tag.params.inr } } },
{ path: 'infdia', component: Infdia, name: 'StaticsInfact', meta: { title: '交易备忘录查询' } },
{ path: 'dbadia', component: Dbaact, name: 'StaticsDbaact', meta: { title: '交易备忘录新增' } },
{ path: 'dbidia/:inr', component: Dbiact, name: 'StaticsDbiact', meta: { title: (tag) => { return '交易备忘录详情: ' + tag.params.inr } } },
{ path: 'dbedia/:inr', component: Dbeact, name: 'StaticsDbeact', meta: { title: (tag) => { return '交易备忘录修改: ' + tag.params.inr } } },
{ path: 'dbddia/:inr', component: Dbdact, name: 'StaticsDbdact', meta: { title: (tag) => { return '交易备忘录删除: ' + tag.params.inr } } },
]
export default BusRouter
\ No newline at end of file
src/views/Business/Clttra/Sel.vue
......@@ -154,13 +154,13 @@ export default {
show: "text",
},
{
title: "balance",
title: "余额",
width: "100px",
dataIndex: "amt",
show: "text",
},
{
title: "PAY TO",
title: "收款人",
width: "100px",
dataIndex: "paytoamt",
show: "input",
......
src/views/Layout/SideMenu.vue
......@@ -201,6 +201,7 @@ export default {
{ inifrm: "infpty", ininam: "客户信息查询", pntmiu: "10" },
{ inifrm: "inftrl", ininam: "交易权限查询", pntmiu: "10" },
{ inifrm: "infusr", ininam: "柜员信息查询", pntmiu: "10" },
{ inifrm: "infdia", ininam: "交易备忘录查询", pntmiu: "10" },
{ inifrm: "inftxm2", ininam: "固定格式文本查询", pntmiu: "10"},
// { inifrm: "gitset", ininam: "进口保函赔付", pntmiu: "13" },
// { inifrm: "gitcrq", ininam: "进口保函索赔登记", pntmiu: "13" },
......
src/views/Statics/Dbadia/index.vue 0 → 100644
<template>
<m-dia title="dbadia" type="add"></m-dia>
</template>
<script>
import Dbidia from "~/views/Statics/Dbidia";
export default {
name: "StaticsDbadia",
components: {
"m-dia": Dbidia
},
data() {
return {};
},
mounted() {
}
};
</script>
<style>
</style>
\ No newline at end of file
src/views/Statics/Dbddia/index.vue 0 → 100644
<template>
<m-dia title="dbddia" type="delete"></m-dia>
</template>
<script>
import Dbidia from "~/views/Statics/Dbidia";
export default {
name: "StaticsDbddia",
components: {
"m-dia": Dbidia
},
data() {
return {};
},
};
</script>
<style>
</style>
\ No newline at end of file
src/views/Statics/Dbedia/index.vue 0 → 100644
<template>
<m-dia title="dbedia" type="edit"></m-dia>
</template>
<script>
import Dbidia from "~/views/Statics/Dbidia";
export default {
name: "StaticsDbedia",
components: {
"m-dia": Dbidia
},
data() {
return {};
},
};
</script>
<style>
</style>
\ No newline at end of file
src/views/Statics/Dbibch/BchInfo.vue
......@@ -249,7 +249,7 @@
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<!-- <c-col :span="24">
<el-form-item label="收单行系统机构代号" prop="tid">
<c-input
v-model="model.tid"
......@@ -257,7 +257,7 @@
>
</c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24">
<el-form-item label="国内地区码" prop="tid">
<c-input
......
src/views/Statics/Dbidia/Dia.js 0 → 100644
export default class Dia {
constructor() {
this.data = {
inr: "",
bchkey: "",
trn: "",
relcur: "",
relamt: "",
ver: "",
relflg: "",
}
}
}
export const Pattern = {
"cod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
],
"objref": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 16, "message": "最大长度16个字符", "trigger": "blur" }
],
"ownusr": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
],
"ownusg": [
{ "required": true, "message": "必输项", "trigger": "blur" },
{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
],
"frm": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
],
"usr": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
],
}
src/views/Statics/Dbidia/DiaInfo.vue 0 → 100644
<template>
<div class="eibs-tab">
<!-- =============================================左边=========================================== -->
<c-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="Business Sector" prop="subObjTyp">
<c-select style="width: 100%" v-model="model.subObjTyp" placeholder="请选择Business Sector" :code="getCodesByKey('bustxt')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Reference No." prop="objref">
<c-input v-model="model.objref" style="width: 100%" placeholder="请输入Reference No"> </c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Description" prop="ownrefDesc">
<c-input v-model="model.ownrefDesc" style="width: 100%" placeholder="请输入Description"> </c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="24">
<el-form-item label="Start Transaction" prop="frm">
<c-input v-model="model.frm" placeholder="请输入账号" > </c-input>
</el-form-item>
</c-col> -->
<c-col :span="24">
<el-form-item label="Description" prop="frm">
<c-select style="width: 100%" v-model="model.frm" placeholder="请选择Description" :code="getCodesByKey('atptxt')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Description" prop="nam">
<c-input v-model="model.nam" style="width: 100%" placeholder="请输入Description">
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Detailed Information" prop="inftxt">
<c-input v-model="model.inftxt" placeholder="请输入Detailed Information" > </c-input>
</el-form-item>
</c-col>
</c-col>
<!-- =============================================右边=========================================== -->
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="User" prop="ownusr">
<c-input v-model="model.ownusr" placeholder="请输入User" > </c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Group" prop="ownusg">
<c-select style="width: 100%" v-model="model.ownusg" placeholder="请选择Group" :code="getCodesByKey('usgtxt')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Entered/Modified by" prop="usr">
<c-input v-model="model.usr" placeholder="请输入Entered/Modified by" >
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="entry Done" prop="donflg">
<c-select style="width: 100%" v-model="model.donflg" placeholder="请选择entry Done" :code="getCodesByKey('dia_donflg')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Diary Reason" prop="cod">
<c-select style="width: 100%" v-model="model.cod" placeholder="请选择Diary Reason" :code="getCodesByKey('diatxt')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Date of Diary" prop="dat">
<c-date-picker type="date"  v-model="model.dat" style="width:100%"  placeholder="请选择Date of Diary"></c-date-picker>
</el-form-item>
</c-col>
</c-col>
</div>
</template>
<script>
import codes from "~/config/CodeTable";
export default {
name: '',
props: ['model'],
data() {
return {
}
},
mounted() {},
methods: {
getCodesByKey(key) {
return codes[key] ?? [];
},
},
}
</script>
<style></style>
src/views/Statics/Dbidia/index.vue 0 → 100644
<template>
<div class="eContainer">
<c-page :title="title">
<el-form
ref="modelForm"
label-width="120px"
size="small"
label-position="right"
:model="model"
:rules="rules"
:validate-on-rule-change="false"
:disabled="isDisabled"
>
<c-tabs v-model="tabVal" ref="elment" type="card">
<el-tab-pane label="交易备忘录查询" name="dia">
<c-content>
<m-dia-info :model="model" />
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
<div style="text-align: center">
<c-button
type="primary"
style="margin-right: 10px"
@click="commitAdd"
v-if="type === 'add'"
>提 交</c-button
>
<c-button
type="primary"
style="margin-right: 10px"
@click="commitEdit"
v-if="type === 'edit'"
>提 交</c-button
>
<c-button
type="primary"
style="margin-right: 10px"
@click="commitDelete"
v-if="type === 'delete'"
>提 交</c-button
>
<c-button type="primary" @click="goBack">返 回</c-button>
</div>
</c-page>
</div>
</template>
<script>
import Utils from "~/utils";
import Dia, { Pattern } from "./Dia.js";
import DiaInfo from "./DiaInfo.vue";
import { queryById, add, edit, deleteById, queryDetailById } from "~/service/test/dia.js";
export default {
name: "StaticsDbidia",
components: {
"m-dia-info": DiaInfo,
},
provide() {
return {
root: this,
};
},
props: {
type: {
type: String,
default: "info"
},
title: {
type: String,
default: "dbidia"
}
},
data() {
return {
model: new Dia().data,
tabVal: "dia",
rules: Pattern,
};
},
computed: {
isDisabled() {
return this.type === "info" || this.type === "delete";
},
},
created() {
if (this.type !== "add") {
const data = {"inr":this.$route.params.inr};
queryDetailById(data).then((res) => {
if (res.inr) {
this.model = res;
} else {
this.$message.error("数据不存在")
}
});
}
},
methods: {
commitAdd() {
this.$refs.modelForm.validate((validated) => {
if (validated) {
add(this.model)
.then((res) => {
this.$message.success("保存成功！");
this.goBack(true)
})
.catch((err) => {
this.$message.error("保存失败！");
});
} else {
Utils.formValidateTips(this.$refs.modelForm.fields)
}
});
},
commitEdit() {
this.$refs.modelForm.validate((validated) => {
if (validated) {
edit(this.model)
.then((res) => {
this.$message.success("保存成功！");
this.goBack(true)
})
.catch((err) => {
this.$message.error("保存失败！");
});
} else {
Utils.formValidateTips(this.$refs.modelForm.fields)
}
});
},
commitDelete() {
this.$confirm("是否确认删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let data = {"inr":this.model.inr}
deleteById(data)
.then((res) => {
this.$message.success("删除成功！");
this.goBack(true)
})
.catch((err) => {
this.$message.error("删除失败！");
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
/**
* update 是否更新infdia的查询列表
*/
goBack(update) {
this.$store.dispatch("TagsView/delView", this.$route);
this.$router.push({ name: "StaticsInfdia", params: { update } });
},
},
};
</script>
<style>
</style>
\ No newline at end of file
src/views/Statics/Infdia/Infsea.vue 0 → 100644
<template>
<div class="eibs-tab">
<c-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="Reason" prop="cod">
<c-select style="width: 100%" v-model="model.cod" placeholder="请选择Reason" :code="getCodesByKey('diatxt')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Reference" prop="objref">
<c-input v-model="model.objref" placeholder="请输入Reference" style="width: 100%">
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="User" prop="ownusr">
<c-input v-model="model.ownusr" placeholder="请输入User" style="width: 100%">
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Status" prop="donflg">
<c-select style="width: 100%" v-model="model.donflg" placeholder="请选择Status" :code="getCodesByKey('dia_donflg')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Group" prop="ownusg">
<c-input v-model="model.ownusg" placeholder="请输入Group" style="width: 100%">
</c-input>
</el-form-item>
</c-col>
</c-col>
<!------------- 右 ---------->
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="From" prop="datFrom">
<c-date-picker type="date"  v-model="model.datFrom" style="width:100%"  placeholder="请选择开始日期"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="To" prop="datTo">
<c-date-picker type="date"  v-model="model.datTo" style="width:100%"  placeholder="请选择结束日期"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Start Transaction" prop="frm">
<c-select style="width: 100%" v-model="model.frm" placeholder="请选择Start Transaction" :code="getCodesByKey('atptxt')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Entered By" prop="usr">
<c-input v-model="model.usr" placeholder="请输入Entered By" style="width: 100%">
</c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="12" style="text-align: left">
<el-button type="primary" size="small" @click="diaAdd">新增</el-button>
</c-col>
<c-col :span="12" style="text-align: right">
<el-button size="small" @click="handleReset">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="small"
@click="onSearch()"
>查询
</el-button>
</c-col>
</c-col>
<c-col :span="24">
<c-paging-table
:data="diaData"
:columns="diaColumns"
:pageNumber="model.pageNum"
:pageSize="model.pageSize"
:total="model.total"
v-on:queryFunc="queryFunc"
:border="true"
>
<c-table-column fixed="right" prop="op" label="操作" width="240px">
<template slot-scope="{ scope }">
<c-button
style="margin-left: 0"
size="small"
@click="diaInfo(scope.$index, scope.row)"
>详情</c-button
>
<c-button
style="margin-left: 5px"
size="small"
type="primary"
@click="diaEdit(scope.$index, scope.row)"
>修改</c-button
>
<c-button
size="small"
style="margin-left: 5px"
@click="diaDelete(scope.$index, scope.row)"
>删除</c-button
>
<el-popover placement="top-start" width="50" trigger="click">
<ul class="table-button-item-list">
<li>
<c-button size="small" style="margin-left: 0">指派</c-button>
</li>
<li>
<c-button size="small" style="margin-left: 0">删除</c-button>
</li>
</ul>
<a
slot="reference"
href="javascript:void(0)"
style="margin-left: 5px"
>
<i class="el-icon-more"></i>
</a>
</el-popover>
</template>
</c-table-column>
</c-paging-table>
</c-col>
</div>
</template>
<script>
import codes from "~/config/CodeTable";
import { queryByPage } from "~/service/test/dia.js";
export default {
name: "",
props: ["model"],
inject: ["root"],
data() {
return {
diaData: [],
diaColumns: [
{ label: 'Date', prop: 'dat', width: 'auto' },
{ label: 'Reason', prop: 'codCn', width: 'auto' },
{ label: 'Reference', prop: 'objref', width: 'auto' },
{ label: 'Description', prop: 'nam', width: 'auto' },
{ label: 'Transaction', prop: 'frm', width: 'auto' },
{ label: 'User', prop: 'ownusr', width: 'auto' },
{ label: 'Group', prop: 'ownusg', width: 'auto' },
{ label: 'Status', prop: 'donflgCn', width: 'auto' },
],
};
},
computed: {
},
activated() {
const { update } = this.$route.params
if (update) {
this.onInfdiaSearch()
}
},
methods: {
getCodesByKey(key) {
return codes[key] ?? [];
},
handleReset() {
this.root.$refs.modelForm.resetFields();
},
onSearch() {
this.model.pageSize = 5;
this.model.pageNum = 1;
this.onInfdiaSearch();
},
onInfdiaSearch() {
queryByPage(this.model).then(res => {
/**
* pageNumber: 0
* pageSize: 0
* total: 69
* totalPage: 0
*/
const list = res.list
Object.keys(list).forEach((item) => {
let obj = list[item]
let codArr = codes['diatxt'].filter((i) => {
return i.value == obj.cod
})
obj.codCn = codArr[0].label
let donflgArr = codes['dia_donflg'].filter((i) => {
return i.value == obj.donflg
})
obj.donflgCn = donflgArr[0].label
})
this.diaData = list
this.model.pageNum = res.pageNumber
this.model.pageSize = res.pageSize
this.model.total = res.total
})
},
queryFunc(pageNumber, pageSize) {
this.model.pageNum = pageNumber
this.model.pageSize = pageSize
this.onInfdiaSearch()
},
diatypeChange(val) {
this.model.fectyp = val;
},
diaCodesByKey(key) {
return codes[key] ?? [];
},
diaAdd() {
this.$router.push(`/statics/dbadia`)
},
diaInfo(index, row) {
this.$router.push(`/statics/dbidia/${row.inr}`)
},
diaEdit(index, row) {
this.$router.push(`/statics/dbedia/${row.inr}`)
},
diaDelete(index, row) {
this.$router.push(`/statics/dbddia/${row.inr}`)
},
},
};
</script>
<style scoped>
.table-button-item-list {
padding: 0;
margin: 0;
}
.table-button-item-list li {
list-style: none;
padding: 5px 0;
text-align: center;
color: #606266;
cursor: pointer;
}</style>
\ No newline at end of file
src/views/Statics/Infdia/index.vue 0 → 100644
<template>
<div class="eContainer">
<c-page title="交易备忘录查询">
<el-form :model="model" ref="modelForm" label-width="120px" label-position="right" size="small">
<c-tabs v-model="tabVal" ref="elment" type="card">
<!--PD000039 -->
<el-tab-pane label="查询面板" name="infsea">
<c-content>
<m-infsea :model="model" ref="infsea" />
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
</c-page>
</div>
</template>
<script>
import Infsea from "./Infsea";
export default {
name: "StaticsInfdia",
components: {
"m-infsea": Infsea,
},
provide() {
return {
root: this,
};
},
data() {
return {
tabVal: "infsea",
model: {
cod: "",
pageSize:5,
pageNum:1,
total:0
},
};
},
};
</script>
<style>
</style>
\ No newline at end of file
src/views/Statics/StaticsRouter.js
......@@ -63,6 +63,12 @@ import Dbaatx from "./Dbaatx";
import Dbeatx from "./Dbeatx";
import Dbdatx from "./Dbdatx";
import Infdia from "./Infdia";
import Dbidia from "./Dbidia";
import Dbadia from "./Dbadia";
import Dbedia from "./Dbedia";
import Dbddia from "./Dbddia";
import Inftxm from "~/views/Statics/Inftxm";
import Dbitxm from "~/views/Statics/Dbitxm";
import Dbatxm from "~/views/Statics/Dbatxm";
......@@ -148,6 +154,12 @@ const StaticsRouter = [
{ path: 'dbeatx/:inr', component: Dbeatx, name: 'StaticsDbeatx', meta: { title: (tag) => { return '保函文本修改: ' + tag.params.inr } } },
{ path: 'dbdatx/:inr', component: Dbdatx, name: 'StaticsDbdatx', meta: { title: (tag) => { return '保函文本删除: ' + tag.params.inr } } },
{ path: 'infdia', component: Infdia, name: 'StaticsInfdia', meta: { title: '交易备忘录查询' } },
{ path: 'dbadia', component: Dbadia, name: 'StaticsDbadia', meta: { title: '交易备忘录新增' } },
{ path: 'dbidia/:inr', component: Dbidia, name: 'StaticsDbidia', meta: { title: (tag) => { return '交易备忘录详情: ' + tag.params.inr } } },
{ path: 'dbedia/:inr', component: Dbedia, name: 'StaticsDbedia', meta: { title: (tag) => { return '交易备忘录修改: ' + tag.params.inr } } },
{ path: 'dbddia/:inr', component: Dbddia, name: 'StaticsDbddia', meta: { title: (tag) => { return '交易备忘录删除: ' + tag.params.inr } } },
{ path: 'dbitxm/:inr', component: Dbitxm, name: 'StaticsDbitxm', meta: { title: (tag) => { return '固定格式文详情: ' + tag.params.inr } } },
{ path: 'dbatxm', component: Dbatxm, name: 'StaticsDbatxm', meta: { title: '固定格式文本新增' } },
{ path: 'dbetxm/:inr', component: Dbetxm, name: 'StaticsDbetxm', meta: { title: (tag) => { return '固定格式文修改: ' + tag.params.inr } } },
......
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