Commit 0d4acfe9 by wangna

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 68b15357 0249ff56
<template> <template>
<c-row> <div>
<!-- top --> <!-- top -->
<c-col :span="24"> <c-col :span="24">
<c-col :span="12" style="padding-right: 20px;"> <c-col :span="12" style="padding-right: 20px;">
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
</c-col> </c-col>
</c-col> </c-col>
</c-col> </c-col>
</c-row> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
......
<template> <template>
<c-row> <div>
<!-- left --> <!-- left -->
<c-col :span="12" style="padding-right: 20px;"> <c-col :span="12" style="padding-right: 20px;">
<c-col :span="24"> <!-- <c-col :span="24">
<c-col :span="22"> <c-col :span="22">
<c-form-item label="不符点描述" prop="btdgrp.blk.docdis"> <c-form-item label="不符点描述" prop="btdgrp.blk.docdis">
<c-input <c-input
...@@ -35,9 +35,43 @@ ...@@ -35,9 +35,43 @@
... ...
</c-button> </c-button>
</c-col> </c-col>
</c-col> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<c-form-item label="不符点描述" prop="btdgrp.blk.docdis">
<c-fullbox>
<c-input
type="textarea"
v-model="model.btdgrp.blk.docdis"
maxlength="65"
show-word-limit
placeholder="请输入不符点描述"
rows="4"
></c-input>
<template slot="footer">
<c-button
size="small"
type="primary"
style="margin-left: 10px"
class="point"
icon="el-icon-search"
@click="
showGridPromptDialog(
'bttp.docdis.buttxmsel',
null,
null,
{ TXT: 'btdgrp.blk.docdis' },
{ TXT: false },
'doxpDialog'
)
"
>
</c-button>
</template>
</c-fullbox>
</c-form-item>
</c-col>
<!-- <c-col :span="24">
<c-col :span="22"> <c-col :span="22">
<el-form-item label="国内不符点描述" prop="btdgrp.blk.intdis"> <el-form-item label="国内不符点描述" prop="btdgrp.blk.intdis">
<c-input <c-input
...@@ -70,9 +104,43 @@ ...@@ -70,9 +104,43 @@
... ...
</c-button> </c-button>
</c-col> </c-col>
</c-col> -->
<c-col :span="24">
<el-form-item label="国内不符点描述" prop="btdgrp.blk.intdis">
<c-fullbox>
<c-input
type="textarea"
v-model="model.btdgrp.blk.intdis"
maxlength="65"
show-word-limit
placeholder="请输入国内不符点描述"
rows="4"
></c-input>
<template slot="footer">
<c-button
size="small"
class="point"
type="primary"
style="margin-left:10px"
icon="el-icon-search"
@click="
showGridPromptDialog(
'bttp.intdis.buttxmsel',
null,
null,
{ TXT: 'btdgrp.blk.intdis' },
{ TXT: false },
'doxpDialog'
)
"
>
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <!-- <c-col :span="24">
<c-col :span="22"> <c-col :span="22">
<el-form-item label="评论和结论" prop="btdgrp.blk.comcon"> <el-form-item label="评论和结论" prop="btdgrp.blk.comcon">
<c-input <c-input
...@@ -105,8 +173,43 @@ ...@@ -105,8 +173,43 @@
... ...
</c-button> </c-button>
</c-col> </c-col>
</c-col> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<el-form-item label="评论和结论" prop="btdgrp.blk.comcon">
<c-fullbox>
<c-input
type="textarea"
v-model="model.btdgrp.blk.comcon"
maxlength="65"
show-word-limit
placeholder="请输入评论和结论"
rows="2"
></c-input>
<template slot="footer">
<c-button
size="small"
class="point"
type="primary"
style="margin-left: 10px"
icon="el-icon-search"
@click="
showGridPromptDialog(
'bttp.comcon.buttxmsel',
null,
null,
{ TXT: 'btdgrp.blk.comcon' },
{ TXT: false },
'doxpDialog'
)
"
>
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<!-- <c-col :span="24">
<c-col :span="22"> <c-col :span="22">
<el-form-item <el-form-item
label="本单据结算说明" label="本单据结算说明"
...@@ -143,6 +246,43 @@ ...@@ -143,6 +246,43 @@
... ...
</c-button> </c-button>
</c-col> </c-col>
</c-col> -->
<c-col :span="24">
<el-form-item
label="本单据结算说明"
prop="btdgrp.blk.setinsbt"
>
<c-fullbox>
<c-input
type="textarea"
v-model="model.btdgrp.blk.setinsbt"
maxlength="65"
show-word-limit
placeholder="请输入本单据结算说明"
rows="4"
></c-input>
<template slot="footer">
<c-button
size="small"
class="point"
type="primary"
style="margin-left: 10px"
icon="el-icon-search"
@click="
showGridPromptDialog(
'bttp.setins.buttxmsel',
null,
null,
{ TXT: 'btdgrp.blk.setinsbt' },
{ TXT: false },
'doxpDialog'
)
"
>
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -157,7 +297,7 @@ ...@@ -157,7 +297,7 @@
></c-docpre> ></c-docpre>
</c-col> </c-col>
<c-col :span="24"> <!-- <c-col :span="24">
<c-docpre <c-docpre
:model="model" :model="model"
rol="docgrdmbe1" rol="docgrdmbe1"
...@@ -167,15 +307,17 @@ ...@@ -167,15 +307,17 @@
code: 'docpre', code: 'docpre',
}" }"
></c-docpre> ></c-docpre>
</c-col> </c-col> -->
</c-col> </c-col>
<!-- right --> <!-- right -->
<c-col :span="12" style="padding-left: 20px;"> <c-col :span="12" style="padding-left: 20px;">
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.btdgrp.blk.docdisflg" disabled <el-form-item label="" prop="" class="checkbox-left">
<c-checkbox v-model="model.btdgrp.blk.docdisflg" disabled
>不符点描述修改</c-checkbox >不符点描述修改</c-checkbox
> >
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -191,13 +333,17 @@ ...@@ -191,13 +333,17 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.btdgrp.rec.approvcod" <el-form-item label="" prop="" class="checkbox-left">
<c-checkbox v-model="model.btdgrp.rec.approvcod"
>不符点寄单</c-checkbox >不符点寄单</c-checkbox
> >
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.bttp.cre752flg">收到开证行的MT752报文的状态登记</c-checkbox> <el-form-item label="" prop="" class="checkbox-left">
<c-checkbox v-model="model.bttp.cre752flg">收到开证行的MT752报文的状态登记</c-checkbox>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -226,26 +372,45 @@ ...@@ -226,26 +372,45 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.btdsnd.snd732" disabled <el-form-item label="" prop="" class="checkbox-left">
<c-checkbox v-model="model.btdsnd.snd732" disabled
>创建732报文</c-checkbox >创建732报文</c-checkbox
> >
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.rmbclmlate" <c-docpre
style="margin-top: 14px"
:model="model"
rol="docgrdmbe1"
:argadr="{
path: 'btdgrp.blk.prsdocbe1',
grp: 'bttp',
code: 'docpre',
}"
></c-docpre>
</c-col>
<c-col :span="12">
<el-form-item label="" prop="" class="checkbox-left">
<c-checkbox v-model="model.rmbclmlate"
>后期索汇</c-checkbox >后期索汇</c-checkbox
> >
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="12">
<c-checkbox <el-form-item label="" prop="" class="checkbox-left">
<c-checkbox
v-model="model.rmbclmnow" v-model="model.rmbclmnow"
:disabled="model.rmbclmlate !== ''" :disabled="model.rmbclmlate !== ''"
>即期索汇</c-checkbox >即期索汇</c-checkbox
> >
</el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</c-row> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api";
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
v-model="model.gidgrp.rec.delto" v-model="model.gidgrp.rec.delto"
style="width: 100%" style="width: 100%"
placeholder="请选择交付收款人" placeholder="请选择交付收款人"
:code="codes.delto" :code="getValues('gidgrp.rec.delto','delto1')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -222,6 +222,8 @@ ...@@ -222,6 +222,8 @@
</div> </div>
</template> </template>
<script> <script>
import _ from "lodash";
import Api from "~/service/Api"; import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
...@@ -250,6 +252,7 @@ export default { ...@@ -250,6 +252,7 @@ export default {
Utils.copyValueFromVO(this.model, rtnmsg.data); Utils.copyValueFromVO(this.model, rtnmsg.data);
} }
}, },
}, },
created: function () {}, created: function () {},
}; };
......
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