Skip to content

V
vue-gjjs
Commit 0d530bbd 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 6cc38069 75751766
Showing with 46 additions and 15 deletions
src/mixin/commonProcess.js
...@@ -233,6 +233,17 @@ export default { ...@@ -233,6 +233,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} val 选种行的值（一般是首列）
* @param {String} rulePath 路径 * @param {String} rulePath 路径
......
src/model/Detopn/Pattern.js
...@@ -146,7 +146,8 @@ export default { ...@@ -146,7 +146,8 @@ export default {
], ],
"dedgrp.rec.tenmaxday":[ "dedgrp.rec.tenmaxday":[
{required: true, message: "必输项"} {required: true, message: "必输项"},
{type:"number", max:9999, message: "大小不超过9999" }
], ],
"dedgrp.blk.defdet":[ "dedgrp.blk.defdet":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
src/views/Business/Botdav/Ovwp.vue
...@@ -188,7 +188,9 @@ ...@@ -188,7 +188,9 @@
</c-table> </c-table>
</c-col> --> </c-col> -->
<c-docpre :model="model" :argadr="{ <c-docpre
:model="model"
:argadr="{
path: 'bodgrp.blk.docpre', path: 'bodgrp.blk.docpre',
grp: 'botp', grp: 'botp',
code: 'docpre' code: 'docpre'
......
src/views/Business/Detdrv/Dscins.vue
...@@ -109,11 +109,13 @@ ...@@ -109,11 +109,13 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="付款人" prop="bfdgrp.rec.payrol"> <el-form-item label="付款人开户行" prop="bfdgrp.rec.payrol">
<c-select <c-select
v-model="model.bfdgrp.rec.payrol" v-model="model.bfdgrp.rec.payrol"
style="width: 100%" style="width: 100%"
placeholder="请选择付款人" placeholder="请选择付款人开户行"
:code="codes.rolall"
disabled
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -126,7 +128,10 @@ ...@@ -126,7 +128,10 @@
grp: 'bfdgrp', grp: 'bfdgrp',
rol: 'oth', rol: 'oth',
}" }"
:noRef="true"
:disabled="true" :disabled="true"
:isAdrblk="false"
:disabledExtkey="true"
> >
</c-ptap> </c-ptap>
</c-col> </c-col>
...@@ -170,9 +175,7 @@ export default { ...@@ -170,9 +175,7 @@ export default {
inject: ["root"], inject: ["root"],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
components: { components: { "c-ptap": Ptap },
"c-ptap": Ptap,
},
data() { data() {
return {}; return {};
}, },
......
src/views/Business/Detopn/Detp1.vue
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
v-model="model.dedgrp.rec.isyifu" v-model="model.dedgrp.rec.isyifu"
style="width: 100%" style="width: 100%"
placeholder="请选择是否可议付" placeholder="请选择是否可议付"
@change="selectOrCheckboxChangeExecuteRule('dedgrp.rec.isyifu')"
> >
<el-option <el-option
v-for="item in codes.isyifu" v-for="item in codes.isyifu"
...@@ -60,9 +61,9 @@ ...@@ -60,9 +61,9 @@
--> -->
<c-ptapdome <c-ptapdome
:disabledBankno="model.dedgrp.rec.isyifu != 'Y'" :disabledBankno="model.dedgrp.rec.avbwth != 'S'"
:disabledJigomc="true" :disabledJigomc="true"
:disabledDizhii="model.dedgrp.rec.isyifu != 'Y'" :disabledDizhii="model.dedgrp.rec.avbwth != 'S'"
:model="model" :model="model"
:argadr="{ :argadr="{
title: '议付行', title: '议付行',
......
src/views/Business/Detopn/Ovwp.vue
...@@ -473,8 +473,7 @@ ...@@ -473,8 +473,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="天数" prop="dedgrp.rec.tenmaxday"> <el-form-item label="天数" prop="dedgrp.rec.tenmaxday">
<c-input <c-input
v-model="model.dedgrp.rec.tenmaxday" v-model.number="model.dedgrp.rec.tenmaxday"
maxlength="35"
placeholder="请输入天数" placeholder="请输入天数"
:disabled="model.dedgrp.rec.avbby == 'P'" :disabled="model.dedgrp.rec.avbby == 'P'"
></c-input> ></c-input>
...@@ -482,10 +481,10 @@ ...@@ -482,10 +481,10 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="远期付款指示" prop="dedgrp.blk.defdet"> <el-form-item label="远期付款指示" prop="dedgrp.blk.dftat">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.dedgrp.blk.defdet" v-model="model.dedgrp.blk.dftat"
maxlength="35" maxlength="35"
show-word-limit show-word-limit
placeholder="请输入远期付款指示" placeholder="请输入远期付款指示"
......
src/views/Business/Infbfd/Infsea.vue
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
v-model="model.infcon.searol" v-model="model.infcon.searol"
style="width: 100%" style="width: 100%"
placeholder="请选择Role" placeholder="请选择Role"
:code="codes.payrol"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -217,7 +218,7 @@ ...@@ -217,7 +218,7 @@
v-model="model.infcon.seacur" v-model="model.infcon.seacur"
style="width: 100%" style="width: 100%"
placeholder="请选择Currency" placeholder="请选择Currency"
:code="codes.seacur" :code="codes.curtxt1"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -274,6 +275,7 @@ ...@@ -274,6 +275,7 @@
v-model="model.seadoctypcod" v-model="model.seadoctypcod"
style="width: 100%" style="width: 100%"
placeholder="请选择Document Type" placeholder="请选择Document Type"
:code="codes.brdtyp"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
......
src/views/Business/Infled/Infsea.vue
...@@ -354,6 +354,15 @@ ...@@ -354,6 +354,15 @@
> >
出口信用证开立 出口信用证开立
</c-button> </c-button>
<c-button
class="medium_bcs"
size="medium"
type="primary"
title="LETDRW"
@click="toLetdrw"
>
非我行通知及收单行登记
</c-button>
<!-- <c-button size="small" type="primary" @click="onInfbutDsp"> <!-- <c-button size="small" type="primary" @click="onInfbutDsp">
Display Display
</c-button> --> </c-button> -->
...@@ -621,6 +630,9 @@ export default { ...@@ -621,6 +630,9 @@ export default {
toLetopn(){ toLetopn(){
this.$router.history.push("/business/letopn") this.$router.history.push("/business/letopn")
}, },
toLetdrw(){
this.$router.history.push("/business/letdrw")
},
handleReset: function () { handleReset: function () {
this.model = { this.model = {
......
src/views/Public/Docpre.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</c-col> --> </c-col> -->
<c-col :span="24" style="margin-bottom: 30px;"> <c-col :span="24" style="margin-bottom: 30px;">
<el-form-item :prop="'${argadr.grp}.docgrdm.docgrd'" label="" style="margin-left:-150px;"> <el-form-item :prop="'${argadr.grp}.docgrdm.docgrd'" label="" style="margin-left:-150px;">
<c-table height="300px" style="text-align: center;" stripe <c-table max-height="300px" style="text-align: center;" stripe
:list="this.model[argadr.grp].docgrdm.docgrd || []" :paginationShow="false" :border="true"> :list="this.model[argadr.grp].docgrdm.docgrd || []" :paginationShow="false" :border="true">
<el-table-column :label="model[argadr.grp].docgrdm.docdsclab || 'Documents Presented'" class="messageLabel"> <el-table-column :label="model[argadr.grp].docgrdm.docdsclab || 'Documents Presented'" class="messageLabel">
<el-table-column label="1st" width="auto" prop="cmail1" background-color="red"> <el-table-column label="1st" width="auto" prop="cmail1" background-color="red">
......
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