Commit 2f3aecec by panziyi

gitopn修改

parent d8b4a7e1
[0908/094200.007:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event [0908/094200.007:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[0908/141403.897:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event [0908/141403.897:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[0909/090947.311:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event [0909/090947.311:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[1011/090658.486:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
...@@ -7187,6 +7187,11 @@ const CodeTable = { ...@@ -7187,6 +7187,11 @@ const CodeTable = {
{label:"HK HONG KONG",value:"HK"}, {label:"HK HONG KONG",value:"HK"},
{label:"GB Great Britain",value:"GB"}, {label:"GB Great Britain",value:"GB"},
], ],
ctytxt2:[
{label:"People's Republic of China",value:"CN"},
{label:"HONG KONG",value:"HK"},
{label:"Great Britain",value:"GB"},
],
trndoc_advdoc: [ trndoc_advdoc: [
{ label: "经核验,证实电相符/印鉴相符。", value: "" }, { label: "经核验,证实电相符/印鉴相符。", value: "" },
{ label: "信用证真实性待核实。", value: "2" }, { label: "信用证真实性待核实。", value: "2" },
......
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000017 --> <!--PD000017 -->
<el-tab-pane label="保兑" name="conp"> <el-tab-pane label="保兑" name="conp">
<c-content>
<m-conp :model="model" :codes="codes" /> <m-conp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="概要" name="ovwp"> <el-tab-pane label="概要" name="ovwp">
......
...@@ -197,7 +197,6 @@ ...@@ -197,7 +197,6 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="保函种类" prop="gidgrp.rec.gartyp"> <el-form-item label="保函种类" prop="gidgrp.rec.gartyp">
<c-select <c-select
disabled
v-model="model.gidgrp.rec.gartyp" v-model="model.gidgrp.rec.gartyp"
style="width: 100%" style="width: 100%"
placeholder="请选择保函种类" placeholder="请选择保函种类"
...@@ -343,7 +342,7 @@ ...@@ -343,7 +342,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="保函文本格式" prop="gidgrp.rec.gtxinr"> <el-form-item label="保函文本格式" prop="gidgrp.rec.gtxinr">
<c-select <c-select
disabled
v-model="model.gidgrp.rec.gtxinr" v-model="model.gidgrp.rec.gtxinr"
style="width: 100%" style="width: 100%"
placeholder="请选择保函文本格式" placeholder="请选择保函文本格式"
......
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
<c-input <c-input
v-model="model.gidgrp.con.pts.ref" v-model="model.gidgrp.con.pts.ref"
maxlength="16" maxlength="16"
disabled
placeholder="请输入申请人参考号" placeholder="请输入申请人参考号"
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -77,6 +78,7 @@ ...@@ -77,6 +78,7 @@
<c-input <c-input
v-model="model.gidgrp.con.pts.extkey" v-model="model.gidgrp.con.pts.extkey"
maxlength="16" maxlength="16"
disabled
placeholder="请输入" placeholder="请输入"
@keyup.enter.native=" @keyup.enter.native="
showGridPromptDialog(`gidgrp.con.pts.extkey`) showGridPromptDialog(`gidgrp.con.pts.extkey`)
...@@ -113,6 +115,7 @@ ...@@ -113,6 +115,7 @@
<c-input <c-input
type="textarea" type="textarea"
rows="4" rows="4"
disabled
v-model="model.gidgrp.con.pts.adrblk" v-model="model.gidgrp.con.pts.adrblk"
maxlength="140" maxlength="140"
show-word-limit show-word-limit
...@@ -130,6 +133,7 @@ ...@@ -130,6 +133,7 @@
<c-input <c-input
v-model="model.gidgrp.con.pts.ref" v-model="model.gidgrp.con.pts.ref"
maxlength="16" maxlength="16"
disabled
placeholder="请输入保兑行参考号" placeholder="请输入保兑行参考号"
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -208,6 +212,7 @@ ...@@ -208,6 +212,7 @@
<c-input <c-input
v-model="model.gidgrp.ben.pts.extkey" v-model="model.gidgrp.ben.pts.extkey"
maxlength="16" maxlength="16"
:disabled="model.gidgrp.ben.pts.adrblk!=''"
placeholder="请输入" placeholder="请输入"
@keyup.enter.native=" @keyup.enter.native="
showGridPromptDialog(`gidgrp.ben.pts.extkey`) showGridPromptDialog(`gidgrp.ben.pts.extkey`)
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-tab-pane> </el-tab-pane>
<!--gitp PD000727 Presentation/ Delivery --> <!--gitp PD000727 Presentation/ Delivery -->
<el-tab-pane <el-tab-pane
v-if="model.gitp.swiftflg == 'Y'" v-if="false"
label="演示/交付" label="演示/交付"
name="preperp" name="preperp"
> >
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label=""合同币种和金额" " prop="gidgrp.rec.orccur"> <el-form-item label="合同币种和金额" prop="gidgrp.rec.orccur">
<c-select <c-select
disabled disabled
v-model="model.gidgrp.rec.orccur" v-model="model.gidgrp.rec.orccur"
...@@ -299,12 +299,14 @@ ...@@ -299,12 +299,14 @@
label="仲裁法律" label="仲裁法律"
prop="gidgrp.rec.jurlaw" prop="gidgrp.rec.jurlaw"
> >
<c-input <c-select
disabled disabled
v-model="model.gidgrp.rec.jurlaw" v-model="model.gidgrp.rec.jurlaw"
maxlength="35" maxlength="35"
:code="codes.ctytxt2"
style="width: 100%"
placeholder="请输入仲裁法律" placeholder="请输入仲裁法律"
></c-input> ></c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -658,6 +660,19 @@ export default { ...@@ -658,6 +660,19 @@ export default {
return {}; return {};
}, },
methods: { ...Event }, methods: { ...Event },
watch:{
"model.gidgrp.rec.jurlaws20": function(){
if(this.model.gidgrp.rec.jurlaws20=="GB"){
this.model.gidgrp.rec.jurlaw="GB"
}else if(this.model.gidgrp.rec.jurlaws20=="CN"){
this.model.gidgrp.rec.jurlaw="CN"
}else if(this.model.gidgrp.rec.jurlaws20=="HK"){
this.model.gidgrp.rec.jurlaw="HK"
}else if(this.model.gidgrp.rec.jurlaws20==""){
this.model.gidgrp.rec.jurlaw=""
}
}
},
created: function () {}, created: function () {},
}; };
</script> </script>
......
...@@ -1981,6 +1981,11 @@ export default { ...@@ -1981,6 +1981,11 @@ export default {
this.model.gidgrp.rec.liaflg = "X"; this.model.gidgrp.rec.liaflg = "X";
} }
}, },
"model.gidgrp.rec.gartyp": function() {
if(this.model.gidgrp.rec.gartyp=='1'){
this.model.gidgrp.rec.gtxinr="<NILTXT>"
}
}
}, },
methods: { methods: {
...Event, ...Event,
......
...@@ -386,13 +386,13 @@ ...@@ -386,13 +386,13 @@
(model.gidgrp.rec.purposin == 'ISSU' || (model.gidgrp.rec.purposin == 'ISSU' ||
model.gidgrp.rec.purposin == '') model.gidgrp.rec.purposin == '')
" "
label=""账户/对象"参考号" label="账户/对象参考号"
prop="gidgrp.ctr.pts.ref" prop="gidgrp.ctr.pts.ref"
> >
<c-input <c-input
v-model="model.gidgrp.ctr.pts.ref" v-model="model.gidgrp.ctr.pts.ref"
maxlength="16" maxlength="16"
placeholder="请输入"账户/对象"参考号" placeholder="请输入账户/对象参考号"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -403,7 +403,7 @@ ...@@ -403,7 +403,7 @@
(model.gidgrp.rec.purposin == 'ISSU' || (model.gidgrp.rec.purposin == 'ISSU' ||
model.gidgrp.rec.purposin == '') model.gidgrp.rec.purposin == '')
" "
label=""账户/对象"" label="账户/对象"
prop="gidgrp.ctr.pts.extkey" prop="gidgrp.ctr.pts.extkey"
> >
<c-fullbox> <c-fullbox>
......
...@@ -300,12 +300,14 @@ ...@@ -300,12 +300,14 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="仲裁法律" prop="gidgrp.rec.jurlaw"> <el-form-item label="仲裁法律" prop="gidgrp.rec.jurlaw">
<c-input <c-select
disabled disabled
v-model="model.gidgrp.rec.jurlaw" v-model="model.gidgrp.rec.jurlaw"
maxlength="35" maxlength="35"
:code="codes.ctytxt2"
placeholder="请输入仲裁法律" placeholder="请输入仲裁法律"
></c-input> style="width:100%"
></c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -508,6 +510,19 @@ export default { ...@@ -508,6 +510,19 @@ export default {
}; };
}, },
methods: { ...Event }, methods: { ...Event },
watch:{
"model.gidgrp.rec.jurlaws20": function(){
if(this.model.gidgrp.rec.jurlaws20=="GB"){
this.model.gidgrp.rec.jurlaw="GB"
}else if(this.model.gidgrp.rec.jurlaws20=="CN"){
this.model.gidgrp.rec.jurlaw="CN"
}else if(this.model.gidgrp.rec.jurlaws20=="HK"){
this.model.gidgrp.rec.jurlaw="HK"
}else if(this.model.gidgrp.rec.jurlaws20==""){
this.model.gidgrp.rec.jurlaw=""
}
}
},
created: function () {}, created: function () {},
}; };
</script> </script>
......
...@@ -1565,6 +1565,11 @@ export default { ...@@ -1565,6 +1565,11 @@ export default {
} }
}, },
declareParams() {}, declareParams() {},
"model.gidgrp.rec.gartyp": function() {
if(this.model.gidgrp.rec.gartyp=='1'){
this.model.gidgrp.rec.gtxinr="<NILTXT>"
}
}
}, },
}; };
</script> </script>
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
placeholder="请选择费用承担人" placeholder="请选择费用承担人"
> >
<el-option <el-option
v-for="item in codes.chato" v-for="item in codes.gitopn_chato"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
......
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