Skip to content

V
vue-gjjs
Commit 2b28cfed by liushikai
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 227226d0 b94484a9
Showing with 230 additions and 161 deletions
src/config/CodeTable/index.js
......@@ -263,8 +263,11 @@ const CodeTable = {
{ label: "BY ACCEPTANCE", value: "A" },
],
avbby0: [
{ label: "即期付款", value: "P" },
{ label: "远期承兑", value: "A" },
{ label: "远期付款", value: "D" },
{ label: "混合付款", value: "M" },
{ label: "议付", value: "N" },
{ label: "即期付款", value: "P" },
],
avbwth: [
{ label: "Issuing Bank", value: "I" },
......@@ -5817,5 +5820,11 @@ const CodeTable = {
{ label: "粤/深港票据交换", value: "G" },
{ label: "Other", value: "Y" },
],
brdtyp: [
{ label: "远期付款单据(承兑)", value: "A" },
{ label: "远期付款单据", value: "D" },
{ label: "混合付款单据", value: "M" },
{ label: "即期单据", value: "P" },
],
}
export default CodeTable;
\ No newline at end of file
src/views/Business/Bctacc/Detp.vue
......@@ -77,7 +77,9 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.bcdgrp.rec.focflg" style="width:50%">Free of Payment</c-checkbox>
<el-form-item label="" style="text-align: left" prop="model.bcdgrp.rec.focflg">
<c-checkbox v-model="model.bcdgrp.rec.focflg">Free of Payment</c-checkbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Waive Collecting Bank Charges" prop="bcdgrp.rec.waicolcod">
......
src/views/Business/Bctrad/Detp.vue
......@@ -77,7 +77,9 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.bcdgrp.rec.focflg" style="width:50%">Free of Payment</c-checkbox>
<el-form-item label="" style="text-align: left" prop="model.bcdgrp.rec.focflg">
<c-checkbox v-model="model.bcdgrp.rec.focflg">Free of Payment</c-checkbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Waive Collecting Bank Charges" prop="bcdgrp.rec.waicolcod">
......
src/views/Business/Bopsel/Errp.vue
......@@ -30,25 +30,25 @@
<c-col :span="8">
<el-form-item label="起止日期" style="width: 100%">
<c-col :span="11">
<el-date-picker
<c-date-picker
type="date"
v-model="model.bopquep.frmdat"
value-format="yyyy-MM-dd"
style="width: 100%"
placeholder="请选择From"
></el-date-picker>
></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">
<el-date-picker
<c-date-picker
type="date"
v-model="model.bopquep.tildat"
value-format="yyyy-MM-dd"
style="width: 100%"
placeholder="请选择Until"
></el-date-picker>
></c-date-picker>
</c-col>
</el-form-item>
</c-col>
......
src/views/Business/Bopsel/Selp.vue
......@@ -25,25 +25,25 @@
<c-col :span="8">
<el-form-item label="起止日期" style="width: 100%">
<c-col :span="11">
<el-date-picker
<c-date-picker
type="date"
v-model="model.bopquep.frmdat"
value-format="yyyy-MM-dd"
style="width: 100%"
placeholder="请选择From"
></el-date-picker>
></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">
<el-date-picker
<c-date-picker
type="date"
v-model="model.bopquep.tildat"
value-format="yyyy-MM-dd"
style="width: 100%"
placeholder="请选择Until"
></el-date-picker>
></c-date-picker>
</c-col>
</el-form-item>
</c-col>
......
src/views/Business/Diasel/Diaselp.vue
......@@ -27,23 +27,23 @@
<c-col :span="8">
<el-form-item label="提示日期" style="width: 100%">
<c-col :span="11">
<el-date-picker
<c-date-picker
type="date"
v-model="model.diafro"
style="width: 100%"
placeholder="请选择Diary From date"
></el-date-picker>
></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">
<el-date-picker
<c-date-picker
type="date"
v-model="model.diatil"
style="width: 100%"
placeholder="请选择Diary Till date"
></el-date-picker>
></c-date-picker>
</c-col>
</el-form-item>
</c-col>
......
src/views/Business/Ditdck/Docpre.vue
......@@ -5,17 +5,25 @@
<c-col :span="20">
<el-form-item label="不符点">
<c-input type="textarea" v-model="model.bddgrp.blk.docdis" maxlength="50" show-word-limit
<c-input type="textarea" v-model="model.bddgrp.blk.docdis" disabled maxlength="50" show-word-limit
placeholder="请输入不符点"></c-input>
</el-form-item>
</c-col>
<c-col :span="4">
<c-button style="text-align: left" label-width="-10px" size="small" type="primary" icon="el-icon-search"
@click="onDocdisButtxmsel">
...
</c-button>
<c-col :span="4" style="text-align: right">
<el-form-item label-width="0">
<c-button
size="small"
type="primary"
icon="el-icon-search"
style="margin-left: 0"
@click="onDocdisButtxmsel"
disabled
></c-button>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="注释和结论">
......@@ -37,11 +45,15 @@
<!-- =================右边====================== -->
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="" prop="bddgrp.rec.igndisflg">
<c-checkbox v-model="model.bddgrp.rec.igndisflg">忽略不符点</c-checkbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" prop="bddgrp.blk.docdisflg">
<c-checkbox v-model="model.bddgrp.blk.docdisflg">录入不符点</c-checkbox>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -66,10 +78,12 @@
</c-col>
<c-col :span="24">
<el-form-item label="" prop="bddgrp.rec.approvcod">
<c-checkbox v-model="model.bddgrp.rec.approvcod">议付行担保协议</c-checkbox>
</el-form-item>
</c-col>
<c-col :span="8">
<!-- <c-col :span="8">
<c-checkbox v-model="model.bdtp.cre752flg">Create MT 752</c-checkbox>
</c-col>
......@@ -78,10 +92,12 @@
<c-select v-model="model.bdtp.furide" style="width:100%" placeholder="请选择Further Identification">
</c-select>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24">
<el-form-item label="" prop="bdtp.cre732flg">
<c-checkbox v-model="model.bdtp.cre732flg">Create MT 732</c-checkbox>
</el-form-item>
</c-col>
......@@ -89,10 +105,31 @@
<!-- =================已交单据====================== -->
<c-col :span="24">
<c-table :border="true" :list="model.bdtp.docgrdm.docgrd" style="width:80%,text-align:center">
<c-table :border="true" :paginationShow="false" :list="model.bdtp.docgrdm.docgrd" style="width:80%,text-align:center">
<el-table-column prop="cmail1" label="1st" width="auto"> </el-table-column>
<el-table-column prop="cmail2" label="2st" width="auto"> </el-table-column>
<el-table-column prop="docnam" label="Document" width="auto"> </el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right">
<template slot-scope="scope" slot="header">
<el-button
circle
style="padding:4px"
class="el-icon-plus"
size="mini"
@click="addRow(scope)"
>
</el-button>
<el-button
style="padding:4px"
circle
class="el-icon-minus"
size="mini"
@click="removeRow(scope)"
>
</el-button>
</template>
</el-table-column>
</c-table>
</c-col>
......@@ -103,26 +140,23 @@
</div>
</template>
<script>
import Api from "~/service/Api"
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Ditdck/Event"
export default {
inject: ['root'],
props: ["model", "codes"],
mixins: [CommonProcess],
data() {
return {};
},
methods: {
...Event
},
created: function () {
}
}
import Api from "~/service/Api";
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Ditdck/Event";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [CommonProcess],
data() {
return {};
},
methods: {
...Event,
},
created: function () {},
};
</script>
<style>
</style>
\ No newline at end of file
src/views/Business/Ditdck/index.vue
<template>
<c-page title="到单">
<div class="eContainer">
<c-bus-button :$pntvm="this"></c-bus-button>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left" size="small" :validate-on-rule-change="false">
<c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000047 -->
<el-tab-pane label="单据概况" name="litdckp">
<c-content>
<m-litdckp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000137 -->
<!-- <el-tab-pane label="ovwp" name="ovwp">
<c-page title="到单">
<div class="eContainer">
<c-bus-button :$pntvm="this"></c-bus-button>
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="150px"
label-position="right"
size="small"
:validate-on-rule-change="false"
>
<c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000047 -->
<el-tab-pane label="单据概况" name="litdckp">
<c-content>
<m-litdckp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000137 -->
<!-- <el-tab-pane label="ovwp" name="ovwp">
<m-ovwp :model="model" :codes="codes"/>
</el-tab-pane> -->
<!--PD000062 -->
<el-tab-pane label="单据详情" name="docpre">
<m-docpre :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000079 -->
<!-- <el-tab-pane label="Shipping Detail" name="shpdet">
<!--PD000062 -->
<el-tab-pane label="单据详情" name="docpre">
<m-docpre :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000079 -->
<!-- <el-tab-pane label="Shipping Detail" name="shpdet">
<m-shpdet :model="model" :codes="codes"/>
</el-tab-pane> -->
<el-tab-pane label="或有" name="engp">
<!-- <el-tab-pane label="或有" name="engp">
<m-engp :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="帐务" name="setpan">
<el-tab-pane label="帐务" name="setpan">
<m-setpan :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="分录" name="glepan">
<!-- <el-tab-pane label="分录" name="glepan">
<m-glepan :model="model" :codes="codes" ref="glepan" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="保证金" name="ccvpan">
<!-- <el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="面函" name="docpan">
<m-docpan :model="model" :codes="codes" ref="docpan" />
</el-tab-pane>
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
</c-tabs>
</el-form>
</div>
</c-page>
</el-form>
</div>
</c-page>
</template>
<script>
import Api from "~/service/Api"
import Utils from "~/utils/index"
import CodeTable from "~/config/CodeTable"
import Ditdck from "~/model/Ditdck"
import CommonProcess from "~/mixin/CommonProcess"
import Pattern from "~/model/Ditdck/Pattern"
import Api from "~/service/Api";
import Utils from "~/utils/index";
import CodeTable from "~/config/CodeTable";
import Ditdck from "~/model/Ditdck";
import CommonProcess from "~/mixin/CommonProcess";
import Pattern from "~/model/Ditdck/Pattern";
import Default from "~/model/Ditdck/Default";
import Check from "~/model/Ditdck/Check";
import Litdckp from "./Litdckp"
import Ovwp from "./Ovwp"
import Docpre from "./Docpre"
import Shpdet from "./Shpdet"
import Litdckp from "./Litdckp";
import Ovwp from "./Ovwp";
import Docpre from "./Docpre";
import Shpdet from "./Shpdet";
import Limitbody from "./Limitbody";
import Glepan from "~/views/Public/Glepan";
......@@ -83,62 +89,72 @@ import Engp from "~/views/Public/Engp";
import Ccvpan from "~/views/Public/Ccvpan";
import Coninfp from "~/views/Public/Coninfp";
export default {
components:{
"m-litdckp" : Litdckp,
"m-ovwp" : Ovwp,
"m-docpre" : Docpre,
"m-shpdet" : Shpdet,
"m-engp": Engp,
"m-setpan": Setpan,
"m-glepan": Glepan,
"m-docpan": Docpan,
"m-limitbody": Limitbody,
"m-coninfp": Coninfp,
"m-ccvpan": Ccvpan,
},
provide() {
return {
root: this
}
},
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "litdckp",
trnName:"ditdck",
model:new Ditdck().data,
//checkRules: Check,
defaultRules: Default,
//pattern: Pattern,
rules:null,
codes:{...CodeTable},
}
},
methods:{
},
created:async function(){
console.log("进入ditdck交易");
let rtnmsg = await this.init(this.$route.query)
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
console.log(rtnmsg)
Utils.copyValueFromVO(this.model,rtnmsg.data)
console.log(this.model);
if(this.isInDisplay){
this.restoreDisplay()
}
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
name: "Infdid",
components: {
"m-litdckp": Litdckp,
"m-ovwp": Ovwp,
"m-docpre": Docpre,
"m-shpdet": Shpdet,
"m-engp": Engp,
"m-setpan": Setpan,
"m-glepan": Glepan,
"m-docpan": Docpan,
"m-limitbody": Limitbody,
"m-coninfp": Coninfp,
"m-ccvpan": Ccvpan,
},
provide() {
return {
root: this,
};
},
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "litdckp",
trnName: "ditdck",
model: new Ditdck().data,
// checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: { ...CodeTable,
invtypCodes:[
{ label: "type1", value: "1" }
], },
};
},
methods: {
tabClick() {},
},
created: async function () {
// console.log("进入ditdck交易");
// let rtnmsg = await this.init(this.$route.query)
// if(rtnmsg.respCode == SUCCESS)
// {
// //TODO 处理数据逻辑
// console.log(rtnmsg)
// Utils.copyValueFromVO(this.model,rtnmsg.data)
// console.log(this.model);
// if(this.isInDisplay){
// this.restoreDisplay()
// }
// }
// else
// {
// this.$notify.error({title: '错误',message: '服务请求失败！'});
// }
console.log("进入ditdck交易");
let rtnmsg = await this.init({});
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
}
},
};
</script>
<style>
</style>
src/views/Business/Sptsel/Menu.vue
......@@ -74,23 +74,23 @@
<c-col :span="8">
<el-form-item label="创建时间" style="width: 100%">
<c-col :span="11">
<el-date-picker
<c-date-picker
type="date"
v-model="model.inidatfro"
style="width: 100%"
placeholder="请选择Date of entry of Transaction"
></el-date-picker>
></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">
<el-date-picker
<c-date-picker
type="date"
v-model="model.inidattil"
style="width: 100%"
placeholder="请选择Date of entry of Transaction until"
></el-date-picker>
></c-date-picker>
</c-col>
</el-form-item>
</c-col>
......
src/views/Business/Sptsel/Sptbrk/Menu.vue
......@@ -74,23 +74,23 @@
<c-col :span="8">
<el-form-item label="创建时间" style="width: 100%">
<c-col :span="11">
<el-date-picker
<c-date-picker
type="date"
v-model="model.inidatfro"
style="width: 100%"
placeholder="请选择Date of entry of Transaction"
></el-date-picker>
></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">
<el-date-picker
<c-date-picker
type="date"
v-model="model.inidattil"
style="width: 100%"
placeholder="请选择Date of entry of Transaction until"
></el-date-picker>
></c-date-picker>
</c-col>
</el-form-item>
</c-col>
......
src/views/Business/Trnrel/Inftrnps.vue
......@@ -30,23 +30,23 @@
<c-col :span="8">
<el-form-item label="创建时间" style="width: 100%">
<c-col :span="11">
<el-date-picker
<c-date-picker
type="date"
v-model="model.trncorco.inidatfro"
style="width: 100%"
placeholder="请选择Date of entry of Transaction"
></el-date-picker>
></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">
<el-date-picker
<c-date-picker
type="date"
v-model="model.trncorco.inidattil"
style="width: 100%"
placeholder="请选择Date of entry of Transaction until"
></el-date-picker>
></c-date-picker>
</c-col>
</el-form-item>
</c-col>
......
src/views/Business/Trnrel/Trnfnd/Inftrnps.vue
......@@ -29,23 +29,23 @@
<c-col :span="8">
<el-form-item label="创建时间" style="width: 100%">
<c-col :span="11">
<el-date-picker
<c-date-picker
type="date"
v-model="model.trncorco.inidatfro"
style="width: 100%"
placeholder="请选择Date of entry of Transaction"
></el-date-picker>
></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">
<el-date-picker
<c-date-picker
type="date"
v-model="model.trncorco.inidattil"
style="width: 100%"
placeholder="请选择Date of entry of Transaction until"
></el-date-picker>
></c-date-picker>
</c-col>
</el-form-item>
</c-col>
......
src/views/TaskList/index.vue
......@@ -3,19 +3,25 @@
<c-tabs :value="tabVal" type="card" @tab-click="tabClick">
<el-tab-pane label="待经办列表" name="sptsel">
<!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> -->
<c-content>
<span slot="label">
待经办列表
<el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/>
</span>
<t-sptsel />
</c-content>
</el-tab-pane>
<el-tab-pane label="待复核列表" name="trnrel">
<c-content>
<span slot="label">
待复核列表
<el-badge v-if="$store.state.Status.taskList.trnrel>0" :value="$store.state.Status.taskList.trnrel" :max="99"/>
</span>
<t-trnrel />
</c-content>
</el-tab-pane>
<el-tab-pane label="已完成列表" name="trnfnd">
<t-trnfnd />
</el-tab-pane>
......
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