Skip to content

V
vue-gjjs
Commit 23830a32 by Wuyuqiu
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 d5f62228 c514fecf
Showing with 196 additions and 134 deletions
src/config/CodeTable/index.js
...@@ -4134,6 +4134,10 @@ const CodeTable = { ...@@ -4134,6 +4134,10 @@ const CodeTable = {
{ label: "Credit Party", value: "UMH" }, { label: "Credit Party", value: "UMH" },
{ label: "Debit Party", value: "UMS" }, { label: "Debit Party", value: "UMS" },
], ],
payrol1: [
{ label: "Applicant", value: "APL" },
{ label: "Further Party", value: "OTH" },
],
ptyp2:[ ptyp2:[
{ label: "TPO Third Party", value: "TPO" }, { label: "TPO Third Party", value: "TPO" },
{ label: "TP1 Third Party .", value: "TP1" }, { label: "TP1 Third Party .", value: "TP1" },
...@@ -6644,6 +6648,14 @@ const CodeTable = { ...@@ -6644,6 +6648,14 @@ const CodeTable = {
{ label: "ISS issuing Bank", value: "ISS" }, { label: "ISS issuing Bank", value: "ISS" },
{ label: "APL Applicat", value: "APL" } { label: "APL Applicat", value: "APL" }
], ],
setfelRol1: [
{ label: "A2B 2nd Advising Bank", value: "A2B" },
{ label: "ADV Advising Bank", value: "ADV" },
{ label: "APL Applicant", value: "APL" },
{ label: "AVB Available with Bank", value: "AVB" },
{ label: "BEN Beneficiary", value: "BEN" },
{ label: "CON Confirming Bank", value: "CON" },
],
ptydbt: [ ptydbt: [
{ label: "OWN Ourselves", value: "OWN" }, { label: "OWN Ourselves", value: "OWN" },
{ label: "ISS issuing Bank", value: "ISS" }, { label: "ISS issuing Bank", value: "ISS" },
...@@ -7095,6 +7107,22 @@ const CodeTable = { ...@@ -7095,6 +7107,22 @@ const CodeTable = {
{ label: "OWN Ourselves", value: "OWN" }, { label: "OWN Ourselves", value: "OWN" },
{ label: "Advising Bank", value: "ADV" }, { label: "Advising Bank", value: "ADV" },
], ],
ptydbt_setpan1: [
{ label: "OWN Ourselves", value: "OWN" },
{ label: "ADV Advising Bank", value: "ADV" },
{ label: "APL Applicant", value: "APL" },
{ label: "AVB Available with Bank", value: "AVB" },
{ label: "BEN Beneficiary", value: "BEN" },
{ label: "CON Confirming Bank", value: "CON" },
],
ptydbt_setpan2: [
{ label: "OWN Ourselves", value: "OWN" },
{ label: "A2B 2nd Advising Bank", value: "A2B" },
{ label: "ADV Advising Bank", value: "ADV" },
{ label: "AVB Available with Bank", value: "AVB" },
{ label: "BEN Beneficiary", value: "BEN" },
{ label: "CON Confirming Bank", value: "CON" },
],
apprul2: [ apprul2: [
{ label: "The guarantee is subject to the ICC Rules for Demand Guarantees", value: "URDG" }, { label: "The guarantee is subject to the ICC Rules for Demand Guarantees", value: "URDG" },
{ label: "The guarantee is subject to the ICC Rules for Contract Guarantees", value: "URCG" }, { label: "The guarantee is subject to the ICC Rules for Contract Guarantees", value: "URCG" },
......
src/model/Brtdck/Pattern.js
...@@ -183,6 +183,7 @@ export default { ...@@ -183,6 +183,7 @@ export default {
"days":[ "days":[
{required: true, message: "必输项"}, {required: true, message: "必输项"},
// {max: 2,message:"长度不能超过2"} // {max: 2,message:"长度不能超过2"}
// {pattern: /^-?[1-9][0-9]{0,2}$/, message: "应在-999至999之间" }
], ],
"brtp.oth.namelc":[ "brtp.oth.namelc":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
......
src/views/Business/Brtdck/Brtdckp.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<c-row> <c-row>
<!-- =================================左边================================= --> <!-- =================================左边================================= -->
<c-col :span="12"> <c-col :span="12" class="col-left">
<!-- S0000198 : 信用证编号 --> <!-- S0000198 : 信用证编号 -->
<c-col :span="24"> <c-col :span="24">
<c-form-item label="信用证编号" prop="lidgrp.rec.ownref"> <c-form-item label="信用证编号" prop="lidgrp.rec.ownref">
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
v-model="model.brdgrp.cbs.max.amt" v-model="model.brdgrp.cbs.max.amt"
placeholder="" placeholder=""
class="m-input-currency" class="m-input-currency"
disabled :disabled="model.mhtyp=='R'"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -231,7 +231,6 @@ ...@@ -231,7 +231,6 @@
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
:code="codes.curtxt1" :code="codes.curtxt1"
disabled
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -242,6 +241,7 @@ ...@@ -242,6 +241,7 @@
v-model="model.brdgrp.cbs.max.amt" v-model="model.brdgrp.cbs.max.amt"
placeholder="" placeholder=""
class="m-input-currency" class="m-input-currency"
:disabled="model.mhtyp=='R'"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -275,7 +275,6 @@ ...@@ -275,7 +275,6 @@
style="width: 100%" style="width: 100%"
placeholder="请输入Drawn Add Amount" placeholder="请输入Drawn Add Amount"
:code="codes.curtxt1" :code="codes.curtxt1"
disabled
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -287,6 +286,7 @@ ...@@ -287,6 +286,7 @@
v-model="model.brdgrp.cbs.max2.amt" v-model="model.brdgrp.cbs.max2.amt"
class="m-input-currency" class="m-input-currency"
placeholder="" placeholder=""
:disabled="model.mhtyp=='R'"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -431,7 +431,7 @@ ...@@ -431,7 +431,7 @@
</c-col> </c-col>
<!-- =================================右边=============================== --> <!-- =================================右边=============================== -->
<c-col :span="11" :offset="1"> <c-col :span="12" class="col-right">
<!-- S0000192 : 信用证余额 --> <!-- S0000192 : 信用证余额 -->
<c-col :span="12"> <c-col :span="12">
...@@ -526,7 +526,7 @@ ...@@ -526,7 +526,7 @@
v-model="model.brdgrp.rec.payrol" v-model="model.brdgrp.rec.payrol"
style="width: 100%" style="width: 100%"
placeholder="请输入付款人" placeholder="请输入付款人"
:code="codes.payrol" :code="codes.payrol1"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
......
src/views/Business/Brtdck/Docpre.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="eibs-tab"> <div class="eibs-tab">
<!--================================左边================================== --> <!--================================左边================================== -->
<c-col :span="11"> <c-col :span="12" class="col-left">
<c-col :span="21" > <c-col :span="21" >
<el-form-item label="不符点信息" prop="brdgrp.blk.docdis" > <el-form-item label="不符点信息" prop="brdgrp.blk.docdis" >
<c-input type="textarea" v-model="model.brdgrp.blk.docdis" <c-input type="textarea" v-model="model.brdgrp.blk.docdis"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</c-col> </c-col>
<!--===========================右边============================== --> <!--===========================右边============================== -->
<c-col :span="11" :offset="1"> <c-col :span="12" class="col-right">
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.brdgrp.rec.igndisflg">忽略不符点</c-checkbox> <c-checkbox v-model="model.brdgrp.rec.igndisflg">忽略不符点</c-checkbox>
</c-col> </c-col>
......
src/views/Business/Brtdck/Shpdet.vue
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<!--=== ==========左边=============== --> <!--=== ==========左边=============== -->
<c-col :span="11"> <c-col :span="12" class="col-left">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="提货担保申请人" prop="brdgrp.rec.relgodflg"> <el-form-item label="提货担保申请人" prop="brdgrp.rec.relgodflg">
<c-select v-model="model.brdgrp.rec.relgodflg" style="width:100%" placeholder="请选择提货担保申请人" :code="codes.relgod"> <c-select v-model="model.brdgrp.rec.relgodflg" style="width:100%" placeholder="请选择提货担保申请人" :code="codes.relgod">
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<!--=== ==========右边=============== --> <!--=== ==========右边=============== -->
<c-col :span="11" :offset="1"> <c-col :span="12" class="col-right">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="合同编号" prop="brtp.connum"> <el-form-item label="合同编号" prop="brtp.connum">
<c-input v-model="model.brtp.connum" maxlength="35" placeholder="请输入合同编号"></c-input> <c-input v-model="model.brtp.connum" maxlength="35" placeholder="请输入合同编号"></c-input>
......
src/views/Business/Brtdck/index.vue
<template> <template>
<div class="eContainer"> <c-page>
<!-- <c-bus-button :$pntvm="this"></c-bus-button> j加操作按钮--> <div class="eContainer">
<c-function-btn <!-- <c-bus-button :$pntvm="this"></c-bus-button> j加操作按钮-->
:handleSubmit="handleSubmit" <el-form
:handleCheck="handleCheck" :model="model"
:handleStash="handleStash" :rules="rules"
> ref="modelForm"
<el-button size="small">查询</el-button> label-width="150px"
<el-button size="small">用户确认</el-button> label-position="right"
<el-button size="small">检核</el-button> size="small"
<el-button size="small">日志</el-button> :validate-on-rule-change="false"
<!-- <el-button size="small">保存模板</el-button> --> >
<!-- <el-button size="small">使用模板</el-button> --> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<el-button size="small">imgyge</el-button> <!--brtdck PD000046 Documents Received 标签页-->
<!-- <el-button size="small">拆分报文</el-button> --> <el-tab-pane label="收单信息" name="brtdckp">
<el-button size="small">img</el-button> <!--在页面上添加滚动条，使用 c-content 组件，有个height属性，默认是250,height：指的是页面document的高度与自身dom元素高度的差值。-->
<el-button size="small">His.img</el-button> <c-content>
</c-function-btn> <m-brtdckp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--brtp PD000062 Discr./Instr. -->
<el-tab-pane
label="不符点指示"
name="docpre"
v-if="model.brdgrp.rec.dscinsflg"
>
<c-content>
<m-docpre :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--brtp PD000079 Shipping Details -->
<el-tab-pane
label="装运详情"
name="shpdet"
v-if="model.brdgrp.rec.dscinsflg"
>
<c-content>
<m-shpdet :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-form <el-tab-pane label="费用/账务" name="engp,setpan">
:model="model" <c-content>
:rules="rules" <el-collapse v-model="fyzw">
ref="modelForm" <el-collapse-item title="表外记账" name="engp">
label-width="150px" <!--liaall PD000027 Liability -->
label-position="right" <m-engp :model="model" :codes="codes" />
size="small" </el-collapse-item>
:validate-on-rule-change="false" <el-collapse-item title="结算" name="setpan">
> <!--setmod PD000000 Settlement -->
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <!-- 结算 -->
<!--brtdck PD000046 Documents Received 标签页--> <m-setpan :model="model" :codes="codes" />
<el-tab-pane label="收单信息" name="brtdckp"> </el-collapse-item>
<!--在页面上添加滚动条，使用 c-content 组件，有个height属性，默认是250,height：指的是页面document的高度与自身dom元素高度的差值。--> </el-collapse>
<c-content> </c-content>
<m-brtdckp :model="model" :codes="codes" /> </el-tab-pane>
</c-content>
</el-tab-pane> <!--coninf PD000000 Completion -->
<!--brtp PD000062 Discr./Instr. --> <el-tab-pane label="提示信息" name="coninfp">
<el-tab-pane <c-content>
label="不符点指示" <m-coninfp :model="model" :codes="codes" />
name="docpre" </c-content>
v-if="model.brdgrp.rec.dscinsflg" </el-tab-pane>
> <!--trndoc PD000529 &Messages -->
<c-content> <el-tab-pane label="报文/面函" name="docpan">
<m-docpre :model="model" :codes="codes" /> <m-docpan :model="model" :codes="codes" />
</c-content> </el-tab-pane>
</el-tab-pane> <!--trndoc PD000546 Attachments -->
<!--brtp PD000079 Shipping Details --> <el-tab-pane label="附件信息" name="doctre">
<el-tab-pane <c-content>
label="装运详情" <m-doctre :model="model" :codes="codes" />
name="shpdet" </c-content>
v-if="model.brdgrp.rec.dscinsflg" </el-tab-pane>
> <!--limmod PD000001 统一授信 -->
<c-content> <el-tab-pane label="统一授信" name="limitbody">
<m-shpdet :model="model" :codes="codes" /> <c-content>
</c-content> <m-limitbody :model="model" :codes="codes" />
</el-tab-pane> </c-content>
<!--liaall PD000027 Liability --> </el-tab-pane>
<el-tab-pane label="表外记账" name="engp"> </c-tabs>
<c-content> </el-form>
<m-engp :model="model" :codes="codes" /> <c-function-btn
</c-content> :handleSubmit="handleSubmit"
</el-tab-pane> :handleCheck="handleCheck"
<!--setmod PD000000 Settlement --> :handleStash="handleStash"
<el-tab-pane label="结算" name="setpan"> >
<m-setpan :model="model" :codes="codes" /> <!-- <el-button size="small">查询</el-button> -->
</el-tab-pane> <!-- <el-button size="small">用户确认</el-button> -->
<!--coninf PD000000 Completion --> <!-- <el-button size="small">检核</el-button> -->
<el-tab-pane label="提示信息" name="coninfp"> <!-- <el-button size="small">日志</el-button> -->
<c-content> <!-- <el-button size="small">保存模板</el-button> -->
<m-coninfp :model="model" :codes="codes" /> <!-- <el-button size="small">使用模板</el-button> -->
</c-content> <!-- <el-button size="small">imgyge</el-button> -->
</el-tab-pane> <!-- <el-button size="small">拆分报文</el-button> -->
<!--trndoc PD000529 &Messages --> <!-- <el-button size="small">img</el-button> -->
<el-tab-pane label="报文和面函" name="docpan"> <!-- <el-button size="small">His.img</el-button> -->
<m-docpan :model="model" :codes="codes" /> </c-function-btn>
</el-tab-pane> <c-grid-ety-prompt-dialog
<!--trndoc PD000546 Attachments --> ref="etyDialog"
<el-tab-pane label="附件" name="doctre"> :promptData="promptData"
<c-content> v-on:select-ety="selectEty"
<m-doctre :model="model" :codes="codes" /> >
</c-content> </c-grid-ety-prompt-dialog>
</el-tab-pane> <c-grid-ety-prompt-dialog
<!--limmod PD000001 统一授信 --> ref="doxpDialog"
<el-tab-pane label="统一授信" name="limitbody"> :isPty="false"
<c-content> :promptData="promptData"
<m-limitbody :model="model" :codes="codes" /> @select-ety="selectMsg"
</c-content> >
</el-tab-pane> </c-grid-ety-prompt-dialog>
</c-tabs> </div>
</el-form> </c-page>
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
</div>
</template> </template>
<script> <script>
import Api from '~/service/Api' import Api from '~/service/Api'
...@@ -121,14 +129,14 @@ import Shpdet from './Shpdet' ...@@ -121,14 +129,14 @@ import Shpdet from './Shpdet'
// import Coninfp from "./Coninfp" // import Coninfp from "./Coninfp"
// import Docpan from "./Docpan" // import Docpan from "./Docpan"
// import Doctre from "./Doctre" // import Doctre from "./Doctre"
// import Limitbody from "./Limitbody" import Limitbody from "./Limitbody"
import Engp from '~/views/Public/Engp' import Engp from '~/views/Public/Engp'
import Setpan from '~/views/Public/Setpan' import Setpan from '~/views/Public/Setpan'
import Coninfp from '~/views/Public/Coninfp' import Coninfp from '~/views/Public/Coninfp'
import Docpan from '~/views/Public/Docpan' import Docpan from '~/views/Public/Docpan'
import Doctre from '~/views/Public/Doctre' import Doctre from '~/views/Public/Doctre'
import Limitbody from '~/views/Public/Limitbody' // import Limitbody from '~/views/Public/Limitbody'
export default { export default {
name: 'Brtdck', name: 'Brtdck',
......
src/views/Business/Litdck/Litdckp.vue
...@@ -271,7 +271,8 @@ ...@@ -271,7 +271,8 @@
<c-col :span="12"> <c-col :span="12">
<c-checkbox <c-checkbox
:disabled="this.model.brdgrp.blk.docdisflg == 'X'" :disabled="this.model.brdgrp.blk.docdisflg == 'X'"
v-model="model.brdgrp.rec.dscinsflg">记录单据和不符点</c-checkbox> v-model="model.brdgrp.rec.dscinsflg"
@change="dscinsflgChange">记录单据和不符点</c-checkbox>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="最迟送达日期" prop="zcsdrq"> <el-form-item label="最迟送达日期" prop="zcsdrq">
...@@ -551,6 +552,14 @@ export default { ...@@ -551,6 +552,14 @@ export default {
methods:{...Event}, methods:{...Event},
created:function(){ created:function(){
},
dscinsflgChang(){
if(this.model.brdgrp.rec.dscinsflg==='X'){
this.model.brdgrp.rec.docsta='H'
}
else{
this.model.brdgrp.rec.docsta='G'
}
} }
} }
</script> </script>
......
src/views/Business/Litdck/index.vue
...@@ -29,42 +29,58 @@ ...@@ -29,42 +29,58 @@
label="不符点/说明" label="不符点/说明"
name="docpre" name="docpre"
> >
<m-docpre :model="model" :codes="codes" /> <c-content>
<m-docpre :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="表外记账" name="engp"> <el-tab-pane label="表外记账" name="engp">
<m-engp :model="model" :codes="codes" /> <c-content>
<m-engp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="结算" name="setpan"> <el-tab-pane label="结算" name="setpan">
<m-setpan :model="model" :codes="codes" /> <c-content>
<m-setpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="提示信息" name="coninfp"> <el-tab-pane label="提示信息" name="coninfp">
<m-coninfp :model="model" :codes="codes" /> <c-content>
<m-coninfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="面函/报文" name="docpan"> <el-tab-pane label="面函/报文" name="docpan">
<m-docpan :model="model" :codes="codes" /> <c-content>
<m-docpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000546 --> <!--PD000546 -->
<el-tab-pane label="附件" name="doctre"> <el-tab-pane label="附件" name="doctre">
<m-doctre :model="model" :codes="codes" /> <c-content>
<m-doctre :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="货权单据" name="srmp"> <el-tab-pane label="货权单据" name="srmp">
<m-srmp :model="model" :codes="codes" /> <c-content>
<m-srmp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody"> <el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" /> <c-content>
<m-limitbody :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
...@@ -107,15 +123,15 @@ import Docpre from "./Docpre"; ...@@ -107,15 +123,15 @@ import Docpre from "./Docpre";
// import Coninfp from "./Coninfp" // import Coninfp from "./Coninfp"
// import Docpan from "./Docpan" // import Docpan from "./Docpan"
// import Doctre from "./Doctre" // import Doctre from "./Doctre"
// import Limitbody from "./Limitbody" import Limitbody from "./Limitbody"
import Srmp from "./Srmp"; import Srmp from "./Srmp"
import Engp from "~/views/Public/Engp"; import Engp from "~/views/Public/Engp"
import Setpan from "~/views/Public/Setpan"; import Setpan from "~/views/Public/Setpan"
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp"
import Docpan from "~/views/Public/Docpan"; import Docpan from "~/views/Public/Docpan"
import Doctre from "~/views/Public/Doctre"; import Doctre from "~/views/Public/Doctre"
import Limitbody from "~/views/Public/Limitbody"; // import Limitbody from "~/views/Public/Limitbody"
export default { export default {
name: "Litdck", name: "Litdck",
......
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