Skip to content

V
vue-gjjs
Commit 87c79dff by lianyang
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 855139d3 80c09eb0
Showing with 149 additions and 65 deletions
src/model/Botacc/index.js
......@@ -101,33 +101,34 @@ export default class Botacc{
ptsaddg:[], // .botp.ptsaddp.ptsaddg
},
},
setmod:{
doccur:"", // document currency .setmod.doccur
docamt:"", // document amount .setmod.docamt
docamttyplab:"", // settled amount description as label .setmod.docamttyplab
retmsg:"", // Label showing Retry overflow condition .setmod.retmsg
ref:"", // our reference .setmod.ref
dspflg:"", // Type of settlement .setmod.dspflg
xreflg:"", // Recalculate Rates .setmod.xreflg
setglg:{
labdspflg:"", // Label for Type of Settlement .setmod.setglg.labdspflg
},
zmqacclab:"", // 主�'�号LABEL .setmod.zmqacclab
zmqacc:"", // 自�'�区主�'�号 .setmod.zmqacc
},
// setmod:{
// doccur:"", // document currency .setmod.doccur
// docamt:"", // document amount .setmod.docamt
// docamttyplab:"", // settled amount description as label .setmod.docamttyplab
// retmsg:"", // Label showing Retry overflow condition .setmod.retmsg
// ref:"", // our reference .setmod.ref
// dspflg:"", // Type of settlement .setmod.dspflg
// xreflg:"", // Recalculate Rates .setmod.xreflg
// setglg:{
// labdspflg:"", // Label for Type of Settlement .setmod.setglg.labdspflg
// },
// zmqacclab:"", // 主�'�号LABEL .setmod.zmqacclab
// zmqacc:"", // 自�'�区主�'�号 .setmod.zmqacc
// },
bptbck:{
bptbckg:[], // .bptbck.bptbckg
dscbckcur:"", // currency discount paid back .bptbck.dscbckcur
},
liaall:{
tenstm:"", // Tenor Stream .liaall.tenstm
misamt:"", // Amount not yet assigned .liaall.misamt
concur:"", // External Booking Amount .liaall.concur
outpct:"", // Sight Amount Percentage .liaall.outpct
outamt:"", // Sight Amount .liaall.outamt
exttotoldamt:"", // Old Amount booked externally .liaall.exttotoldamt
exttotamt:"", // Total booking amount external assinged .liaall.exttotamt
},
// liaall:{
// tenstm:"", // Tenor Stream .liaall.tenstm
// misamt:"", // Amount not yet assigned .liaall.misamt
// concur:"", // External Booking Amount .liaall.concur
// outpct:"", // Sight Amount Percentage .liaall.outpct
// outamt:"", // Sight Amount .liaall.outamt
// exttotoldamt:"", // Old Amount booked externally .liaall.exttotoldamt
// exttotamt:"", // Total booking amount external assinged .liaall.exttotamt
// },
liaall: new Pub().data.Liaall,
mtabut:{
coninf:{
oitinf:{
......
src/views/Business/Botacc/Inst.vue
......@@ -28,7 +28,7 @@
<c-col :span="24">
<c-col :span="12">
<el-form-item label="" prop="bodgrp.blk.colinsflg">
<c-checkbox v-model="model.bodgrp.blk.colinsflg">Collection instructions modified</c-checkbox>
<c-checkbox v-model="model.bodgrp.blk.colinsflg">Delivery Of Documents Instructions modified</c-checkbox>
</el-form-item>
</c-col>
<c-col :span="12">
......
src/views/Business/Botacc/Setp.vue
......@@ -183,7 +183,7 @@
</c-col>
</c-col>
</c-col>
<c-col :span="24" style="margin-top:15px;border-top:2px solid #ddd;padding-top:15px" >
<c-col :span="24" style="margin-top:15px;border-top:2px solid #ddd;padding-top:15px">
<c-col :span="11">
<c-col :span="12">
<el-form-item label="Amount Accepted" prop="setmod.doccur">
......@@ -214,9 +214,18 @@
</c-input>
</el-form-item>
</c-col> -->
<c-col :span="11">
<c-edit-table :model="model" v-bind="docgrd">
</c-edit-table>
<c-col :span="24">
<c-col :span="11">
<c-edit-table :model="model" v-bind="docgrd">
</c-edit-table>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="11">
<c-istream-table ref="table" :list="model.liaall.tenstm.rows || []" :columns="stmData.columns"
:showSelection="true" v-on:multipleSelect="multipleSelect">
</c-istream-table>
</c-col>
</c-col>
<!-- <c-col :span="24">
<div class="e-table-wrapper">
......@@ -258,6 +267,17 @@ export default {
mixins: [commonProcess],
data() {
return {
stmData: {
columns: [
'1 1 "Type" 80',
'2 2 "Dbt" 80',
'3 3 "Cdt" 80',
'4 4 "Cur" 80',
'5 5 "Amt" 113 2 8 1 4',
// '6 6 "Mat.Dat." 80 4 7 1',
{ index: 6, position: 6, width: 113, render: (item, scope) => { return scope.row[item.prop] === 'null' ? '' : scope.row[item.prop] }, label: 'Mat.Dat.' },
],
},
docgrd: {
columns: [{
title: "Reference",
......@@ -286,12 +306,16 @@ export default {
],
urls: "bptbck.bptbckg.docgrd",
},
}
},
methods: { ...Event },
methods: {
...Event,
multipleSelect(){
console.log(111);
}
},
created: function () {
console.log(this.model.liaall.tenstm);
}
}
</script>
......
src/views/Business/Botacc/index.vue
......@@ -63,7 +63,7 @@ import Api from "~/service/Api"
import Utils from "~/utils/index"
import CodeTable from "~/config/CodeTable"
import Botacc from "~/model/Botacc"
import commonFuncs from "~/mixin/commonFuncs";
import commonFuncs from "~/mixin/commonFuncs"
import commonProcess from "~/mixin/commonProcess"
import Check from "~/model/Botacc/Check"
import Default from "~/model/Botacc/Default"
......
src/views/Business/Botpay/Setp.vue
......@@ -194,7 +194,7 @@
</c-col>
<c-col :span="11" :offset="1">
<el-form-item label-width="0" prop="setmod.docamt">
<c-input v-model="model.setmod.docamt" placeholder="请输入document amount" disabled></c-input>
<c-input v-model="model.setmod.docamt" placeholder="请输入document amount"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -229,9 +229,18 @@
</c-input>
</el-form-item>
</c-col> -->
<c-col :span="11">
<c-edit-table :model="model" v-bind="docgrd">
</c-edit-table>
<c-col :span="24">
<c-col :span="11">
<c-edit-table :model="model" v-bind="docgrd">
</c-edit-table>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="11">
<c-istream-table ref="table" :list="model.liaall.tenstm.rows || []" :columns="stmData.columns"
:showSelection="true" v-on:multipleSelect="multipleSelect">
</c-istream-table>
</c-col>
</c-col>
<!-- <c-col :span="24">
......@@ -274,6 +283,17 @@ export default {
mixins: [commonProcess],
data() {
return {
stmData: {
columns: [
'1 1 "Type" 80',
'2 2 "Dbt" 80',
'3 3 "Cdt" 80',
'4 4 "Cur" 80',
'5 5 "Amt" 113 2 8 1 4',
// '6 6 "Mat.Dat." 80 4 7 1',
{ index: 6, position: 6, width: 113, render: (item, scope) => { return scope.row[item.prop] === 'null' ? '' : scope.row[item.prop] }, label: 'Mat.Dat.' },
],
},
docgrd: {
columns: [{
title: "Reference",
......@@ -305,7 +325,12 @@ export default {
}
},
methods: { ...Event },
methods: {
...Event,
multipleSelect() {
console.log(111);
}
},
created: function () {
}
......
src/views/Business/Botpay/index.vue
<template>
<c-page title="出口托收结算">
<div class="eContainer">
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right"
size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
......@@ -59,6 +61,7 @@ import Api from "~/service/Api"
import Utils from "~/utils/index"
import CodeTable from "~/config/CodeTable"
import Botpay from "~/model/Botpay"
import commonFuncs from "~/mixin/commonFuncs"
import commonProcess from "~/mixin/commonProcess"
import Check from "~/model/Botpay/Check"
import Default from "~/model/Botpay/Default"
......@@ -99,7 +102,7 @@ export default {
root: this
}
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "setp",
......
src/views/Business/Infbcd/Infsea.vue
......@@ -13,18 +13,19 @@
</el-form-item>
</c-col>
<c-col :span="8">
<c-col :span="12">
<el-form-item label="Opening between" prop="infcon.opndatfrom" style="width: 100%">
<el-form-item label="Opening between" prop="infcon.opndatfrom" style="width: 100%">
<c-col :span="11">
<c-date-picker type="date" v-model="model.infcon.opndatfrom" value-format="yyyy-MM-dd"
style="width:100%" placeholder="请选择Opening between"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Open Date to" prop="infcon.opndatto" style="width: 100%">
</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.infcon.opndatto" value-format="yyyy-MM-dd"
style="width:100%" placeholder="请选择Open Date to"></c-date-picker>
</el-form-item>
</c-col>
</c-col>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="Party Reference" prop="infcon.searef" style="width: 100%">
......
src/views/Business/Infbcd/index.vue
......@@ -2,7 +2,12 @@
<div class="eContainer">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small"
:validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<c-content>
<m-infsea v-show="!showPanel" :model="model"
:codes="codes" ref="infsea" />
</c-content>
<c-tabs v-model="tabVal" v-show="showPanel" ref="elment" type="card" @tab-click="tabClick">
<!--PD000006 -->
<el-tab-pane label="infsea" name="infsea">
......@@ -164,6 +169,7 @@ export default {
defaultRules: Default,
pattern: Pattern,
rules: null,
showPanel:false,
codes: {
...CodeTable
},
......
src/views/Business/Infbod/Infsea.vue
......@@ -8,27 +8,25 @@
<c-row>
<c-col :span="24">
<c-col :span="8">
<el-form-item label="业务编号" prop="infcon.seaownref" style="width: 100%">
<c-input v-model="model.infcon.seaownref" maxlength="16" placeholder="请输入Own Reference">
</c-input>
<el-form-item label="Own Reference" prop="infcon.seaownref" style="width: 100%">
<c-input v-model="model.infcon.seaownref" maxlength="16" placeholder="请输入Own Reference"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<c-col :span="12">
<el-form-item label="Opening between" prop="infcon.opndatfrom" style="width: 100%">
<c-date-picker type="date" v-model="model.infcon.opndatfrom" style="width: 100%"
placeholder="请选择Opening between"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Open Date to" prop="infcon.opndatto" style="width: 100%">
<c-date-picker type="date" v-model="model.infcon.opndatto" style="width: 100%"
placeholder="请选择Open Date to"></c-date-picker>
</el-form-item>
</c-col>
<el-form-item label="Opening between" prop="infcon.opndatfrom" style="width: 100%">
<c-col :span="11">
<c-date-picker type="date" v-model="model.infcon.opndatfrom" value-format="yyyy-MM-dd"
style="width:100%" placeholder="请选择Opening between"></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.infcon.opndatto" value-format="yyyy-MM-dd"
style="width:100%" placeholder="请选择Open Date to"></c-date-picker>
</c-col>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="Party Reference" prop="infcon.searef" style="width: 100%">
<c-input v-model="model.infcon.searef" maxlength="16" placeholder="请输入Party Reference"></c-input>
......
src/views/Business/Infbod/index.vue
......@@ -2,7 +2,11 @@
<div class="eContainer">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small"
:validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<c-content>
<m-infsea v-show="!showPanel" :model="model"
:codes="codes" ref="infsea" />
</c-content>
<c-tabs v-model="tabVal" v-show="showPanel" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000006 -->
<el-tab-pane label="infsea" name="infsea">
......@@ -156,6 +160,7 @@ export default {
defaultRules: Default,
pattern: Pattern,
rules: null,
showPanel:false,
codes: {
...CodeTable
},
......
src/views/Review/Business/ReviewLitame.vue 0 → 100644
<template>
<ReviewWrapper>
<Litame></Litame>
</ReviewWrapper>
</template>
<script>
import Litame from "~/views/Business/Litame";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewLitame",
components: { ReviewWrapper, Litame },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/ReviewRouter.js
......@@ -17,6 +17,7 @@ import ReviewLetnot from "./Business/ReviewLetnot.vue";
import ReviewLetopn from "./Business/ReviewLetopn.vue";
import ReviewLetamc from "./Business/ReviewLetamc.vue";
import ReviewLetame from "./Business/ReviewLetame.vue";
import ReviewLitame from "./Business/ReviewLitame.vue";
import ReviewBdtdcr from "./Business/ReviewBdtdcr.vue";
import ReviewBdteus from "./Business/ReviewBdteus.vue";
import ReviewBftsnd from "./Business/ReviewBftsnd.vue";
......@@ -67,6 +68,7 @@ const ReviewRouter = [
{ path: "letamc", component: ReviewLetamc, name: "ReviewLetamc", meta: { title: "复核-Letamc" } },
{ path: "letame", component: ReviewLetame, name: "ReviewLetame", meta: { title: "复核-Letame" } },
{ path: "litopn", component: ReviewLitopn, name: "ReviewLitopn", meta: { title: "复核-Litopn" } },
{ path: "litame", component: ReviewLitame, name: "ReviewLitame", meta: { title: "复核-Litame" } },
];
......
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