Commit 9f6039e3 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 dee72564 648d82f1
...@@ -2,18 +2,22 @@ import Api from "~/service/Api" ...@@ -2,18 +2,22 @@ import Api from "~/service/Api"
import Utils from "~/utils" import Utils from "~/utils"
export default { export default {
async onAttpGetref(){ async onAttpGetref(){
let rtnmsg = await this.executeRule("attp.getref") let rtnmsg = await this.executeRule("attp.getref")
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
Utils.copyValueFromVO(this.model, rtnmsg.data);
} this.$message({
else type: 'success',
{ message: '获取成功!'
this.$notify.error({title: '错误',message: '服务请求失败!'}); });
} }
}, else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onAttpSelbut1(){ async onAttpSelbut1(){
let rtnmsg = await this.executeRule("attp.selbut1") let rtnmsg = await this.executeRule("attp.selbut1")
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
......
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
<c-col :span="11"> <c-col :span="11">
<c-col :span="20"> <c-col :span="20">
<el-form-item label="托收行" prop="colbnk" style="width:100%"> <el-form-item label="托收行" prop="colbnk" style="width:100%">
<c-select v-model="model.colbnk" style="width: 100%" placeholder="请选择托收行"> <c-select v-model="model.colbnk" style="width: 100%" placeholder="请选择托收行" :disabled="model.cldgrp.rec.colflg == 'G'">
<el-option v-for="item in codes.colbnk" :key="item.value" :label="item.label" <el-option v-for="item in codes.colbnk" :key="item.value" :label="item.label"
:value="item.value" :disabled="model.cldgrp.rec.colflg == 'G'"> :value="item.value" >
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
size="small" size="small"
type="primary" type="primary"
:disabled="this.flag" :disabled="this.flag"
@click="OnAttpGetref" @click="onAttpGetref"
> >
获取 获取
</c-button> </c-button>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
>附加金额</c-checkbox >附加金额</c-checkbox
> >
</c-col> </c-col>
<c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="保函余额" prop="gidgrp.cbs.opn1.cur"> <el-form-item label="保函余额" prop="gidgrp.cbs.opn1.cur">
<c-select <c-select
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
></c-input-currency> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="接收目的" prop="gidgrp.rec.purposin"> <el-form-item label="接收目的" prop="gidgrp.rec.purposin">
<c-select <c-select
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
</el-form> </el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"> <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog> </c-grid-ety-prompt-dialog>
<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">备忘录</el-button>
<el-button size="small">影像信息</el-button> <el-button size="small">影像信息</el-button>
...@@ -105,7 +106,7 @@ export default { ...@@ -105,7 +106,7 @@ export default {
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
tabVal: "gitsetp1", tabVal: "ovwp",
activeNames: ["engp"], activeNames: ["engp"],
trnName: "gitcrq", trnName: "gitcrq",
model: new Gitcrq().data, model: new Gitcrq().data,
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
:model="model.gidgrp.blk.gidtxt" :model="model.gidgrp.blk.gidtxt"
maxlength="65" maxlength="65"
show-word-limit show-word-limit
@change="setTxt1"
placeholder="请输入保函文本可变因素" placeholder="请输入保函文本可变因素"
></i-stream-input> ></i-stream-input>
</el-form-item> </el-form-item>
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
rows="15" rows="15"
maxlength="65" maxlength="65"
show-word-limit show-word-limit
@change="setTxt2"
placeholder="请输入保函文本可变因素" placeholder="请输入保函文本可变因素"
></i-stream-input> ></i-stream-input>
</el-form-item> </el-form-item>
...@@ -41,6 +43,7 @@ ...@@ -41,6 +43,7 @@
v-model="model.gitp.gidtxtmodflg" v-model="model.gitp.gidtxtmodflg"
style="margin: 0 0 0 10px" style="margin: 0 0 0 10px"
class="checkbox-left" class="checkbox-left"
@change="modflgChange"
>修改保函文本</c-checkbox >修改保函文本</c-checkbox
> >
</c-col> </c-col>
...@@ -139,7 +142,38 @@ export default { ...@@ -139,7 +142,38 @@ export default {
data() { data() {
return {}; return {};
}, },
methods: { ...Event }, methods: {async setTxt1(){
// this.executeDefault("gitp.gidgrp.blk.gidtxt").then((res) => {
// if ((res.respCode == SUCCESS)) {
// Utils.copyValueFromVO(this.model, res.data);
// }
// });
this.executeRule("gitp.gidgrp.blk.gidtxt").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
async setTxt2(){
// this.executeDefault("gitp.gidgrp.blk.gtxgidtxt").then((res) => {
// if ((res.respCode == SUCCESS)) {
// Utils.copyValueFromVO(this.model, res.data);
// }
// });
this.executeRule("gitp.gidgrp.blk.gtxgidtxt").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
...Event ,
async modflgChange() {
const rtnmsg = await this.executeRule("gitp.gidtxtmodflg");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},},
created: function () {}, created: function () {},
}; };
</script> </script>
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
prop="gidgrp.con.pts.adrblk" prop="gidgrp.con.pts.adrblk"
> >
<c-input <c-input
:disabled="model.gidgrp.con.pts.adrblk != ''" disabled
type="textarea" type="textarea"
rows="4" rows="4"
v-model="model.gidgrp.con.pts.adrblk" v-model="model.gidgrp.con.pts.adrblk"
......
...@@ -26,24 +26,30 @@ ...@@ -26,24 +26,30 @@
</c-button> </c-button>
</c-col> </c-col>
<c-col :span="24" class="letnot_adcp_cheak"> <c-col :span="24">
<c-checkbox v-model="model.ledgrp.rec.spcbenflg" <el-form-item prop="ledgrp.rec.spcbenflg" class="checkbox-left" >
:disabled="model.ledgrp.blk.spcben!=''"> <c-checkbox v-model="model.ledgrp.rec.spcbenflg"
受益人特殊付款条款</c-checkbox :disabled="model.ledgrp.blk.spcben!=''">
> 受益人特殊付款条款</c-checkbox
>
</el-form-item>
</c-col> </c-col>
<c-col :span="24" class="letnot_adcp_cheak"> <c-col :span="24">
<c-checkbox v-model="model.ledgrp.rec.spcrcbflg" <el-form-item prop="ledgrp.rec.spcrcbflg" class="checkbox-left">
:disabled="model.ledgrp.blk.spcrcb!=''"> <c-checkbox v-model="model.ledgrp.rec.spcrcbflg"
收款银行特殊付款条款</c-checkbox :disabled="model.ledgrp.blk.spcrcb!=''">
> 收款银行特殊付款条款</c-checkbox
>
</el-form-item>
</c-col> </c-col>
<c-col :span="24" class="letnot_adcp_cheak"> <c-col :span="24">
<c-checkbox v-model="model.ledgrp.rec.redclsflg"> <el-form-item prop="ledgrp.rec.redclsflg" class="checkbox-left">
红、绿条款选项 <c-checkbox v-model="model.ledgrp.rec.redclsflg">
</c-checkbox> 红、绿条款选项
</c-checkbox>
</el-form-item>
</c-col> </c-col>
<c-col :span="20"> <c-col :span="20">
...@@ -90,7 +96,5 @@ export default { ...@@ -90,7 +96,5 @@ export default {
}; };
</script> </script>
<style> <style>
.letnot_adcp_cheak {
margin: 0px 0 10px 150px;
}
</style> </style>
...@@ -202,6 +202,7 @@ ...@@ -202,6 +202,7 @@
maxlength="65" maxlength="65"
show-word-limit show-word-limit
placeholder="请输入装运期" placeholder="请输入装运期"
:disabled="model.ledgrp.rec.shpdat!=''"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -273,6 +273,7 @@ ...@@ -273,6 +273,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择装运日期" placeholder="请选择装运日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:disabled="model.ledgrp.blk.shpper!=''"
> >
</c-date-picker> </c-date-picker>
</el-form-item> </el-form-item>
......
...@@ -26,21 +26,27 @@ ...@@ -26,21 +26,27 @@
</c-col> --> </c-col> -->
<!-- Special payment conditions for beneficiary --> <!-- Special payment conditions for beneficiary -->
<c-col :span="24" class="letopn_adcp_cheak"> <c-col :span="24">
<c-checkbox v-model="model.ledgrp.rec.spcbenflg" <el-form-item prop="ledgrp.rec.spcbenflg" class="checkbox-left" >
>受益人特殊付款条款</c-checkbox <c-checkbox v-model="model.ledgrp.rec.spcbenflg"
> >受益人特殊付款条款</c-checkbox
>
</el-form-item>
</c-col> </c-col>
<!-- Special payment conditions for receiving bank --> <!-- Special payment conditions for receiving bank -->
<c-col :span="24" class="letopn_adcp_cheak"> <c-col :span="24">
<c-checkbox v-model="model.ledgrp.rec.spcrcbflg"> <el-form-item prop="ledgrp.rec.spcrcbflg" class="checkbox-left">
收款银行特殊付款条款</c-checkbox <c-checkbox v-model="model.ledgrp.rec.spcrcbflg">
> 收款银行特殊付款条款</c-checkbox
>
</el-form-item>
</c-col> </c-col>
<c-col :span="24" class="letopn_adcp_cheak"> <c-col :span="24">
<c-checkbox v-model="model.ledgrp.rec.redclsflg">红/绿条款</c-checkbox> <el-form-item prop="ledgrp.rec.redclsflg" class="checkbox-left">
<c-checkbox v-model="model.ledgrp.rec.redclsflg">红/绿条款</c-checkbox>
</el-form-item>
</c-col> </c-col>
<c-blkTextarea :model="model" v-bind="blk1"> </c-blkTextarea> <c-blkTextarea :model="model" v-bind="blk1"> </c-blkTextarea>
<!-- Instructions to Pay,accept,negot,bank --> <!-- Instructions to Pay,accept,negot,bank -->
...@@ -108,9 +114,11 @@ export default { ...@@ -108,9 +114,11 @@ export default {
}; };
</script> </script>
<style> <style>
/*
.letopn_adcp_cheak { .letopn_adcp_cheak {
margin: 0px 0 10px 120px; margin: 0px 0 10px 120px;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
} }
*/
</style> </style>
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<el-form-item label="Service Types to be handled:"> <el-form-item label="Service Types to be handled:">
<c-fullbox> <c-fullbox>
<c-col :span="6"> <c-col :span="6">
<c-checkbox v-model="model.srvswi.exeflg">Incoming SWIFT</c-checkbox> <c-checkbox v-model="model.srvswi.exeflg" checked>Incoming SWIFT</c-checkbox>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<c-checkbox v-model="model.srvtli.exeflg">Incoming Telex</c-checkbox> <c-checkbox v-model="model.srvtli.exeflg" >Incoming Telex</c-checkbox>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<c-checkbox v-model="model.srvdta.exeflg">DTA Import L/C</c-checkbox> <c-checkbox v-model="model.srvdta.exeflg">DTA Import L/C</c-checkbox>
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
<el-form-item label=""> <el-form-item label="">
<c-fullbox> <c-fullbox>
<c-col :span="6"> <c-col :span="6">
<c-checkbox v-model="model.srvemi.exeflg">Incoming Email</c-checkbox> <c-checkbox v-model="model.srvemi.exeflg" checked>Incoming Email</c-checkbox>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<c-checkbox v-model="model.srvdte.exeflg">DTA Export L/C</c-checkbox> <c-checkbox v-model="model.srvdte.exeflg" >DTA Export L/C</c-checkbox>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<c-checkbox v-model="model.srveli.exeflg">ECL Import L/C</c-checkbox> <c-checkbox v-model="model.srveli.exeflg" checked>ECL Import L/C</c-checkbox>
</c-col> </c-col>
</c-fullbox> </c-fullbox>
......
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