From 2f3aecec16d7e4cba4ce28c6c3091c92641fd9f4 Mon Sep 17 00:00:00 2001
From: panziyi <1837755047@qq.com>
Date: Tue, 11 Oct 2022 17:24:15 +0800
Subject: [PATCH] gitopn修改
---
debug.log | 1 +
src/config/CodeTable/index.js | 5 +++++
src/views/Business/Getamc/index.vue | 2 ++
src/views/Business/Getame/Ovwp.vue | 3 +--
src/views/Business/Getame/Ptyp.vue | 5 +++++
src/views/Business/Getame/index.vue | 2 +-
src/views/Business/Gitopn/Detp.vue | 21 ++++++++++++++++++---
src/views/Business/Gitopn/Ovwp.vue | 5 +++++
src/views/Business/Gitopn/Ptyp.vue | 6 +++---
src/views/Business/Gitpop/Detp.vue | 19 +++++++++++++++++--
src/views/Business/Gitpop/Ovwp.vue | 11 ++++++++---
src/views/Business/Gitpop/Preperp.vue | 2 +-
12 files changed, 67 insertions(+), 15 deletions(-)
diff --git a/debug.log b/debug.log
index 8ea0e6f..3df2bc3 100644
--- a/debug.log
+++ b/debug.log
@@ -1,3 +1,4 @@
[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
[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
diff --git a/src/config/CodeTable/index.js b/src/config/CodeTable/index.js
index 66c4217..4ac07c0 100644
--- a/src/config/CodeTable/index.js
+++ b/src/config/CodeTable/index.js
@@ -7187,6 +7187,11 @@ const CodeTable = {
{label:"HK HONG KONG",value:"HK"},
{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: [
{ label: "经核验，证实电相符/印鉴相符。", value: "" },
{ label: "信用证真实性待核实。", value: "2" },
diff --git a/src/views/Business/Getamc/index.vue b/src/views/Business/Getamc/index.vue
index 8846108..f94755c 100644
--- a/src/views/Business/Getamc/index.vue
+++ b/src/views/Business/Getamc/index.vue
@@ -27,7 +27,9 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000017 -->
<el-tab-pane label="保兑" name="conp">
+ <c-content>
<m-conp :model="model" :codes="codes" />
+ </c-content>
</el-tab-pane>
<el-tab-pane label="概要" name="ovwp">
diff --git a/src/views/Business/Getame/Ovwp.vue b/src/views/Business/Getame/Ovwp.vue
index f6ca64e..bf00556 100644
--- a/src/views/Business/Getame/Ovwp.vue
+++ b/src/views/Business/Getame/Ovwp.vue
@@ -197,7 +197,6 @@
<c-col :span="24">
<el-form-item label="保函种类" prop="gidgrp.rec.gartyp">
<c-select
- disabled
v-model="model.gidgrp.rec.gartyp"
style="width: 100%"
placeholder="请选择保函种类"
@@ -343,7 +342,7 @@
<c-col :span="24">
<el-form-item label="保函文本格式" prop="gidgrp.rec.gtxinr">
<c-select
- disabled
+
v-model="model.gidgrp.rec.gtxinr"
style="width: 100%"
placeholder="请选择保函文本格式"
diff --git a/src/views/Business/Getame/Ptyp.vue b/src/views/Business/Getame/Ptyp.vue
index 42addbc..c1a2be9 100644
--- a/src/views/Business/Getame/Ptyp.vue
+++ b/src/views/Business/Getame/Ptyp.vue
@@ -63,6 +63,7 @@
<c-input
v-model="model.gidgrp.con.pts.ref"
maxlength="16"
+ disabled
placeholder="请输入申请人参考号"
></c-input>
</el-form-item>
@@ -77,6 +78,7 @@
<c-input
v-model="model.gidgrp.con.pts.extkey"
maxlength="16"
+ disabled
placeholder="请输入"
@keyup.enter.native="
showGridPromptDialog(`gidgrp.con.pts.extkey`)
@@ -113,6 +115,7 @@
<c-input
type="textarea"
rows="4"
+ disabled
v-model="model.gidgrp.con.pts.adrblk"
maxlength="140"
show-word-limit
@@ -130,6 +133,7 @@
<c-input
v-model="model.gidgrp.con.pts.ref"
maxlength="16"
+ disabled
placeholder="请输入保兑行参考号"
></c-input>
</el-form-item>
@@ -208,6 +212,7 @@
<c-input
v-model="model.gidgrp.ben.pts.extkey"
maxlength="16"
+ :disabled="model.gidgrp.ben.pts.adrblk!=''"
placeholder="请输入"
@keyup.enter.native="
showGridPromptDialog(`gidgrp.ben.pts.extkey`)
diff --git a/src/views/Business/Getame/index.vue b/src/views/Business/Getame/index.vue
index fd4084c..70d5cd7 100644
--- a/src/views/Business/Getame/index.vue
+++ b/src/views/Business/Getame/index.vue
@@ -49,7 +49,7 @@
</el-tab-pane>
<!--gitp PD000727 Presentation/ Delivery -->
<el-tab-pane
- v-if="model.gitp.swiftflg == 'Y'"
+ v-if="false"
label="演示/交付"
name="preperp"
>
diff --git a/src/views/Business/Gitopn/Detp.vue b/src/views/Business/Gitopn/Detp.vue
index 44f85ee..435296a 100644
--- a/src/views/Business/Gitopn/Detp.vue
+++ b/src/views/Business/Gitopn/Detp.vue
@@ -194,7 +194,7 @@
<c-col :span="24">
<c-col :span="12">
- <el-form-item label=""合同币种和金额" " prop="gidgrp.rec.orccur">
+ <el-form-item label="合同币种和金额" prop="gidgrp.rec.orccur">
<c-select
disabled
v-model="model.gidgrp.rec.orccur"
@@ -299,12 +299,14 @@
label="仲裁法律"
prop="gidgrp.rec.jurlaw"
>
- <c-input
+ <c-select
disabled
v-model="model.gidgrp.rec.jurlaw"
maxlength="35"
+ :code="codes.ctytxt2"
+ style="width: 100%"
placeholder="请输入仲裁法律"
- ></c-input>
+ ></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
@@ -658,6 +660,19 @@ export default {
return {};
},
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 () {},
};
</script>
diff --git a/src/views/Business/Gitopn/Ovwp.vue b/src/views/Business/Gitopn/Ovwp.vue
index 0c7e8f3..213790e 100644
--- a/src/views/Business/Gitopn/Ovwp.vue
+++ b/src/views/Business/Gitopn/Ovwp.vue
@@ -1981,6 +1981,11 @@ export default {
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: {
...Event,
diff --git a/src/views/Business/Gitopn/Ptyp.vue b/src/views/Business/Gitopn/Ptyp.vue
index 1f36963..5db30c9 100644
--- a/src/views/Business/Gitopn/Ptyp.vue
+++ b/src/views/Business/Gitopn/Ptyp.vue
@@ -386,13 +386,13 @@
(model.gidgrp.rec.purposin == 'ISSU' ||
model.gidgrp.rec.purposin == '')
"
- label=""账户/对象"参考号"
+ label="账户/对象参考号"
prop="gidgrp.ctr.pts.ref"
>
<c-input
v-model="model.gidgrp.ctr.pts.ref"
maxlength="16"
- placeholder="请输入"账户/对象"参考号"
+ placeholder="请输入账户/对象参考号"
></c-input>
</el-form-item>
</c-col>
@@ -403,7 +403,7 @@
(model.gidgrp.rec.purposin == 'ISSU' ||
model.gidgrp.rec.purposin == '')
"
- label=""账户/对象""
+ label="账户/对象"
prop="gidgrp.ctr.pts.extkey"
>
<c-fullbox>
diff --git a/src/views/Business/Gitpop/Detp.vue b/src/views/Business/Gitpop/Detp.vue
index 4c22794..585439a 100644
--- a/src/views/Business/Gitpop/Detp.vue
+++ b/src/views/Business/Gitpop/Detp.vue
@@ -300,12 +300,14 @@
<c-col :span="24">
<el-form-item label="仲裁法律" prop="gidgrp.rec.jurlaw">
- <c-input
+ <c-select
disabled
v-model="model.gidgrp.rec.jurlaw"
maxlength="35"
+ :code="codes.ctytxt2"
placeholder="请输入仲裁法律"
- ></c-input>
+ style="width:100%"
+ ></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
@@ -508,6 +510,19 @@ export default {
};
},
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 () {},
};
</script>
diff --git a/src/views/Business/Gitpop/Ovwp.vue b/src/views/Business/Gitpop/Ovwp.vue
index 80a153a..c5e5f0c 100644
--- a/src/views/Business/Gitpop/Ovwp.vue
+++ b/src/views/Business/Gitpop/Ovwp.vue
@@ -1554,7 +1554,7 @@ export default {
}
},
},
- created: function () {},
+ created: function () {},
watch: {
"model.gidgrp.rec.expflg": function () {
if (
@@ -1564,8 +1564,13 @@ export default {
this.model.gidgrp.rec.liaflg = "X";
}
},
- declareParams() {},
- },
+ declareParams() {},
+"model.gidgrp.rec.gartyp": function() {
+ if(this.model.gidgrp.rec.gartyp=='1'){
+ this.model.gidgrp.rec.gtxinr="<NILTXT>"
+ }
+ }
+ },
};
</script>
<style>
diff --git a/src/views/Business/Gitpop/Preperp.vue b/src/views/Business/Gitpop/Preperp.vue
index e5e0620..606d556 100644
--- a/src/views/Business/Gitpop/Preperp.vue
+++ b/src/views/Business/Gitpop/Preperp.vue
@@ -126,7 +126,7 @@
placeholder="请选择费用承担人"
>
<el-option
- v-for="item in codes.chato"
+ v-for="item in codes.gitopn_chato"
:key="item.value"
:label="item.label"
:value="item.value"
--
libgit2 0.26.0