Skip to content

V
vue-gjjs
Commit e1db712a by wangren
Options

Merge branch 'development-202206' of http://192.168.0.110:11080/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://192.168.0.110:11080/fukai/vue-gjjs into development-202206
parents 5c2f2e14 295f01d5
Showing with 182 additions and 70 deletions
src/mixin/commonProcess.js
......@@ -236,6 +236,17 @@ export default {
})
},
/**
* 下拉框/多选框 改变时执行rule
* @param {String} rulePath 路径
*/
selectOrCheckboxChangeExecuteRule(rulePath){
this.executeRule(rulePath).then((res) => {
if (res.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, res.data);
}
})
},
/**
* 机构回填
* @param {String} val 选种行的值（一般是首列）
* @param {String} rulePath 路径
......
src/model/Detopn/Pattern.js
......@@ -146,7 +146,8 @@ export default {
],
"dedgrp.rec.tenmaxday":[
{required: true, message: "必输项"}
{required: true, message: "必输项"},
{type:"number", max:9999, message: "大小不超过9999" }
],
"dedgrp.blk.defdet":[
{type: "string", required: false, message: "必输项"},
......
src/model/Letdrw/Event.js
......@@ -7,7 +7,11 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.model.ledgrp.rec.ownref = rtnmsg.data.ledgrp_rec_ownref
this.$message({
type: 'success',
message: '获取成功！'
});
}
else
{
......
src/model/Letdrw/Pattern.js
......@@ -48,11 +48,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"ledgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"ledgrp.ben.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
......@@ -495,15 +491,14 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"ledgrp.cbs.nom1.cur":[
{type: "string", required: false, message: "必输项"},
{type: "string", required: true, message: "必输项"},
// {max: 3,message:"长度不能超过3"}
],
"ledgrp.cbs.nom1.amt":[
{type: "string", required: true, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
"ledgrp.cbs.nom1.amt": [
{ required: true, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"ledgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......
src/model/Public/Dids/Blk.js
export default class Blk {
constructor() {
this.data = {
stamet:"", // 声明 .didgrp.blk.stsament
revcls: "", // Revolving Clause .didgrp.blk.revcls
revnotes: "", // Notes to Applicant .didgrp.blk.revnotes
lcrgod: "", // Description of Goods .didgrp.blk.lcrgod
......
src/views/Business/Bftdrv/index.vue
......@@ -131,6 +131,9 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
if(this.isInDisplay){
this.restoreDisplay();
}
//TODO 处理数据逻辑
}
......
src/views/Business/Bftset/Setp.vue
......@@ -448,17 +448,18 @@
v-model="model.setmod.redamt"
placeholder="请输入扣减金额"
:disabled="frepayflg"
@change="selectOrCheckboxChangeExecuteRule('setmod.redamt')"
></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label="SG000254" prop="bpdgrp.rec.ffttyp">
<el-form-item label="福费廷转卖类型" prop="bpdgrp.rec.ffttyp">
<c-input
v-model="model.bpdgrp.rec.ffttyp"
maxlength="40"
placeholder="请输入SG000254"
placeholder="请输入福费廷转卖类型"
disabled
></c-input>
</el-form-item>
......@@ -880,10 +881,11 @@ export default {
},
frepayflg: {
get() {
return this.model.bfdgrp.rec.frepayflg === "O";
return this.model.bfdgrp.rec.frepayflg === "X";
},
set(val) {
this.model.bfdgrp.rec.frepayflg = val ? "C" : "O";
this.model.bfdgrp.rec.frepayflg = val ? "X" : "";
this.model.setmod.redamt = "";
},
},
flag() {
......@@ -910,6 +912,10 @@ export default {
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
}else{
// this.model.setmod.docamt = "";
// this.model.setmod.setamt = "";
// this.model.aamset.utlamt = "";
}
},
},
......
src/views/Business/Detdrv/Dscins.vue
......@@ -109,11 +109,13 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="付款人" prop="bfdgrp.rec.payrol">
<el-form-item label="付款人开户行" prop="bfdgrp.rec.payrol">
<c-select
v-model="model.bfdgrp.rec.payrol"
style="width: 100%"
placeholder="请选择付款人"
placeholder="请选择付款人开户行"
:code="codes.rolall"
disabled
>
</c-select>
</el-form-item>
......@@ -126,7 +128,10 @@
grp: 'bfdgrp',
rol: 'oth',
}"
:noRef="true"
:disabled="true"
:isAdrblk="false"
:disabledExtkey="true"
>
</c-ptap>
</c-col>
......@@ -170,9 +175,7 @@ export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
components: {
"c-ptap": Ptap,
},
components: { "c-ptap": Ptap },
data() {
return {};
},
......
src/views/Business/Detopn/Detp1.vue
......@@ -8,6 +8,7 @@
v-model="model.dedgrp.rec.isyifu"
style="width: 100%"
placeholder="请选择是否可议付"
@change="selectOrCheckboxChangeExecuteRule('dedgrp.rec.isyifu')"
>
<el-option
v-for="item in codes.isyifu"
......@@ -60,9 +61,9 @@
-->
<c-ptapdome
:disabledBankno="model.dedgrp.rec.isyifu != 'Y'"
:disabledBankno="model.dedgrp.rec.avbwth != 'S'"
:disabledJigomc="true"
:disabledDizhii="model.dedgrp.rec.isyifu != 'Y'"
:disabledDizhii="model.dedgrp.rec.avbwth != 'S'"
:model="model"
:argadr="{
title: '议付行',
......
src/views/Business/Detopn/Ovwp.vue
......@@ -473,8 +473,7 @@
<c-col :span="24">
<el-form-item label="天数" prop="dedgrp.rec.tenmaxday">
<c-input
v-model="model.dedgrp.rec.tenmaxday"
maxlength="35"
v-model.number="model.dedgrp.rec.tenmaxday"
placeholder="请输入天数"
:disabled="model.dedgrp.rec.avbby == 'P'"
></c-input>
......@@ -482,10 +481,10 @@
</c-col>
<c-col :span="24">
<el-form-item label="远期付款指示" prop="dedgrp.blk.defdet">
<el-form-item label="远期付款指示" prop="dedgrp.blk.dftat">
<c-input
type="textarea"
v-model="model.dedgrp.blk.defdet"
v-model="model.dedgrp.blk.dftat"
maxlength="35"
show-word-limit
placeholder="请输入远期付款指示"
......
src/views/Business/Ditopn/Ovwp.vue
......@@ -49,7 +49,7 @@
</c-col>
<c-col :span="11">
<c-form-item previewLabel="信用证金额" style="text-align: left;" label-width="5px" prop="didgrp.cbs.nom1.amt">
<c-input-currency v-model="model.didgrp.cbs.nom1.amt" placeholder="请输入信用证金额"
<c-input-currency v-model="model.didgrp.cbs.nom1.amt" placeholder="请输入信用证金额" @change="ditpAmt"
@keyup.enter.native="defaultFunction('didgrp.cbs.nom1.amt', model.didgrp.cbs.nom1.amt)">
</c-input-currency>
</c-form-item>
......@@ -191,7 +191,7 @@
<c-col :span="24">
<el-form-item label="假远期信用证" prop="didgrp.rec.jyqflg">
<c-select v-model="model.didgrp.rec.jyqflg" style="width: 100%" placeholder="请选择假远期信用证">
<el-option v-for="item in codes.jyqflg" :key="item.value" :label="item.label" :value="item.value">
<el-option v-for="item in jyqflg" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
......@@ -502,12 +502,23 @@ export default {
mixins: [commonProcess],
data() {
return {
jyqflg: [
{ label: "否", value: "" },
{ label: "是", value: "X" },
],
jigomcFlag: false,
trade: "",
};
},
methods: {
...Event,
ditpAmt(){
this.executeDefault("ditp.amt").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
mytypeChange() {
if (this.model.didgrp.rec.mytype == "F") {
this.model.didgrp.rec.tratyp = "";
......@@ -519,11 +530,11 @@ export default {
}
},
nom1CurEvent() {
this.executeDefault("didgrp.cbs.nom1.cur").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
// this.executeDefault("didgrp.cbs.nom1.cur").then((res) => {
// if ((res.respCode == SUCCESS)) {
// Utils.copyValueFromVO(this.model, res.data);
// }
// });
},
},
created: function () {
......
src/views/Business/Ditopn/Stamet.vue 0 → 100644
<template>
<div class="eibs-tab">
<!-- <c-col :span="22">
<el-form-item label="声明" prop="didgrp.blk.stamet">
<c-input
type="textarea"
v-model="model.didgrp.blk.stamet"
maxlength="65"
:row="15"
show-word-limit
placeholder="请输入声明"
></c-input>
</el-form-item>
</c-col> -->
<c-col :span="22">
<el-form-item label="声明" prop="didgrp.blk.stamet">
<c-input
type="textarea"
v-model="model.didgrp.blk.stamet"
maxlength="65"
show-word-limit
placeholder="请输入声明"
:rows="15"
></c-input>
</el-form-item>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Ditopn/Event";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {};
},
methods: { ...Event },
created: function () {
// this.executeDefault("DIDGRP.BLK.STAMET").then((res) => {
// if ((res.respCode == SUCCESS)) {
// Utils.copyValueFromVO(this.model, res.data);
// }
// });
},
};
</script>
<style>
</style>
src/views/Business/Ditopn/index.vue
......@@ -2,11 +2,7 @@
<c-page title="买方信用证开立">
<div class="eContainer">
<!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
<el-button size="small">备忘录</el-button>
<el-button size="small" @click="setDraggableContent('cms', '影像信息')">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
......@@ -15,21 +11,14 @@
<!-- <el-button size="small">拆分报文</el-button> -->
<el-button size="small">智能提示</el-button>
</c-function-btn>
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="150px"
label-position="right"
size="small"
:validate-on-rule-change="false"
>
<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">
<el-tab-pane label="基本信息" name="ovwp">
<!--PD000001 -->
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--
......@@ -47,7 +36,7 @@
<el-tab-pane label="其他当事人" name="detp1">
<!--PD000452 -->
<c-content>
<m-detp1 :model="model" :codes="codes" />
<m-detp1 :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="详细信息" name="detp">
......@@ -57,7 +46,7 @@
<el-tab-pane label="单据要求" name="tk">
<!--PD000342 -->
<c-content>
<m-tk :model="model" :codes="codes" />
<m-tk :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
......@@ -81,8 +70,8 @@
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="分录" name="glepan">
<m-glepan :model="model" :codes="codes" ref="glepan" />
<el-tab-pane label="声明" name="stamet">
<m-stamet :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="表外" name="engp">
......@@ -108,7 +97,7 @@
<m-docpan :model="model" :codes="codes" ref="docpan" />
</el-tab-pane>
<el-tab-pane label="MT799" name="mt799">
<el-tab-pane label="MT799" name="mt799" >
<!--PD000361 -->
<m-mt799 :model="model" :codes="codes" />
</el-tab-pane>
......@@ -119,7 +108,7 @@
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog>
</c-grid-ety-prompt-dialog>
</div>
</c-page>
</template>
......@@ -147,7 +136,7 @@ import Litrmbl1 from "./Litrmbl1";
import Addbcb from "./Addbcb";
import Setpan from "~/views/Public/Setpan";
import Glepan from "~/views/Public/Glepan";
import Stamet from "./Stamet";
import Engp from "~/views/Public/Engp";
import Ccvpan from "~/views/Public/Ccvpan";
import Coninfp from "~/views/Public/Coninfp";
......@@ -168,7 +157,7 @@ export default {
"m-litapll1": Litapll1,
"m-litrmbl1": Litrmbl1,
"m-setpan": Setpan,
"m-glepan": Glepan,
"m-stamet": Stamet,
"m-engp": Engp,
"m-addbcb": Addbcb,
"m-docpan": Docpan,
......@@ -181,7 +170,7 @@ export default {
root: this,
};
},
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
computed: {},
data() {
return {
......@@ -193,17 +182,18 @@ export default {
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
codes: {
...CodeTable,
avbby0: [
{ label: "即期付款", value: "P" },
{ label: "远期付款", value: "D" },
],
],
},
};
},
methods: {},
created: async function() {
methods: {
},
created: async function () {
console.log("进入ditopn交易");
let rtnmsg = await this.init(this.$route.query);
if (rtnmsg.respCode == SUCCESS) {
......@@ -239,4 +229,5 @@ export default {
},
};
</script>
<style></style>
<style>
</style>
src/views/Business/Infbfd/Infsea.vue
......@@ -120,6 +120,7 @@
v-model="model.infcon.searol"
style="width: 100%"
placeholder="请选择Role"
:code="codes.payrol"
>
</c-select>
</el-form-item>
......@@ -217,7 +218,7 @@
v-model="model.infcon.seacur"
style="width: 100%"
placeholder="请选择Currency"
:code="codes.seacur"
:code="codes.curtxt1"
>
</c-select>
</el-form-item>
......@@ -274,6 +275,7 @@
v-model="model.seadoctypcod"
style="width: 100%"
placeholder="请选择Document Type"
:code="codes.brdtyp"
>
</c-select>
</el-form-item>
......
src/views/Business/Infbfd/index.vue
......@@ -106,6 +106,7 @@ import Ordpan from "./Ordpan"
export default {
name: 'Infbfd',
components:{
"m-infsea" : Infsea,
"m-ovwp" : Ovwp,
......
src/views/Business/Infdet/Infsea.vue
......@@ -646,7 +646,7 @@
-->
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns">
<m-busbtn ref="childs" :ownref="ownref" @onChoose="onChoose"
<m-busbtn ref="childs" :ownref="ownref" trnCode="detsel" ownrefPath="dedgrp" :model="detselModel" @onChoose="onChoose"
>11</m-busbtn
>
</div>
......@@ -659,8 +659,9 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infdet/Event";
import DetselModel from "~/model/Detsel"
//交易跳转逻辑
import BusNavbar from "~/views/Business/Infdet/BusNavbar";
import BusNavbar from "~/views/Public/BusNavbar";
export default {
inject: ["root"],
......@@ -669,6 +670,7 @@ export default {
components: { "m-busbtn": BusNavbar },
data() {
return {
detselModel:new DetselModel().data,
ownref: "",
initdialog: false,
dialogTableVisible: false,
......
src/views/Business/Letdrw/Ovwp.vue
......@@ -106,7 +106,6 @@
</c-col>
<c-col :span="4">
<c-checkbox
:disabled="true"
v-model="model.ledgrp.rec.collflg"
style="margin-left: 10px"
>抵押信用证</c-checkbox
......@@ -130,6 +129,12 @@
</c-col>
<c-col :span="7">
<el-form-item label="" label-width="5px" prop="ledgrp.cbs.nom1.amt">
<!-- <el-form-item label="Balance" prop="ledgrp.cbs.nom1.amt">
<c-input
v-model="model.ledgrp.cbs.nom1.amt"
placeholder="请输入Balance"
></c-input>
</el-form-item> -->
<c-input-currency
v-model="model.ledgrp.cbs.nom1.amt"
style="text-align: left; width: 100%"
......@@ -1101,6 +1106,8 @@ export default {
},
methods: {
...Event,
onSeainf(){},
onExtkey(){},
nom1CurEvent() {
this.executeDefault('ledgrp.cbs.nom1.cur').then((res) => {
if (res.respCode == SUCCESS) {
......
src/views/Review/Business/ReviewBftdrv.vue 0 → 100644
<template>
<ReviewWrapper>
<Bftdrv></Bftdrv>
</ReviewWrapper>
</template>
<script>
import Bftdrv from "~/views/Business/Bftdrv";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewBftsnd",
components: { ReviewWrapper, Bftdrv },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/ReviewRouter.js
......@@ -24,6 +24,7 @@ import ReviewBftsnd from "./Business/ReviewBftsnd.vue";
import ReviewBftdcr from "./Business/ReviewBftdcr.vue";
import ReviewLitopn from "./Business/ReviewLitopn.vue";
import ReviewBftset from "./Business/ReviewBftset.vue";
import ReviewBftdrv from "./Business/ReviewBftdrv.vue";
const ReviewRouter = [
......@@ -71,6 +72,7 @@ const ReviewRouter = [
{ path: "litopn", component: ReviewLitopn, name: "ReviewLitopn", meta: { title: "复核-Litopn" } },
{ path: "bftset", component: ReviewBftset, name: "ReviewBftset", meta: { title: "复核-Bftset" } },
{ path: "litame", component: ReviewLitame, name: "ReviewLitame", meta: { title: "复核-Litame" } },
{ path: "bftdrv", component: ReviewBftdrv, name: "ReviewBftdrv", meta: { title: "复核-Bftdrv" } },
];
......
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