diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index a0a1a7f..78841d9 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -1,242 +1,293 @@
:root {
- /* 白色 */
- /* --bgcolor: #fff;
+ /* 白色 */
+ /* --bgcolor: #fff;
--sidecolor: #fff;
--darkbgcolor: rgb(232, 232, 232); */
- /* 灰灰 */
- /* --bgcolor: #f8f8f5;
+ /* 灰灰 */
+ /* --bgcolor: #f8f8f5;
--sidecolor: #fafafa;
--darkbgcolor: rgb(232, 232, 232); */
- /* 淺綠色 */
- /* --bgcolor: #dff9fb;
+ /* 淺綠色 */
+ /* --bgcolor: #dff9fb;
--sidecolor: #c7ecee;
--darkbgcolor: rgb(232, 232, 232); */
- /* 淡黄色 */
- /* --bgcolor: #f5f5d5;
+ /* 淡黄色 */
+ /* --bgcolor: #f5f5d5;
--sidecolor: #f5f5d5;
--darkbgcolor: rgb(232, 232, 232); */
- /* 绿色 */
-
- /* --bgcolor: #ccffcc;
+ /* 绿色 */
+
+ /* --bgcolor: #ccffcc;
--sidecolor: #ccffcc;
--darkbgcolor: rgb(232, 232, 232); */
- /* --bgcolor: #ccffff;
+ /* --bgcolor: #ccffff;
--sidecolor: #64d7eb;
--darkbgcolor: rgb(232, 232, 232); */
- /* 蓝色系 */
- --bgcolor: #f7faff;
- /* #E3F3FF; */
- --sidecolor: #fff;
- /* #E3F3FF; */
- --darkbgcolor: #f4f5fa;
- /* rgb(232, 232, 232); */
- --lineheight: 24px;
- --normalfont: 12px;
- /* --themecolor: #1561E0; */
- --themecolor: #1561E0;
- }
- #app {
- font-family: Helvetica, sans-serif;
- display: flex;
- flex-direction: column;
- }
- .e-table-wrapper{
- display: flex;
- flex-direction: column;
- }
- .e-table-wrapper .el-table {
- flex:1;
- }
- /* 配色 */
- /* .fold {
+ /* 蓝色系 */
+ --bgcolor: #f7faff;
+ /* #E3F3FF; */
+ --sidecolor: #fff;
+ /* #E3F3FF; */
+ --darkbgcolor: #f4f5fa;
+ /* rgb(232, 232, 232); */
+ --lineheight: 32px;
+ --normalfont: 12px;
+ /* --themecolor: #1561E0; */
+ --themecolor: #1561E0;
+}
+
+#app {
+ font-family: Helvetica, sans-serif;
+ display: flex;
+ flex-direction: column;
+}
+
+.e-table-wrapper {
+ display: flex;
+ flex-direction: column;
+}
+
+.e-table-wrapper .el-table {
+ flex: 1;
+}
+
+/* 配色 */
+/* .fold {
background-color: var(--color);
} */
-
- /* .unfold {
+
+/* .unfold {
background-color: var(--color);
} */
- .m-app-main {
- /* background-color: var(--bgcolor); */
- }
- .m-app {
- background-color: var(--darkbgcolor);
- }
- .fold {
- width: 60px !important;
- }
- /* sidemenu */
- .el-menu {
- background: var(--sidecolor);
- }
- .el-menu-item.is-active {
- color: #fff;
- background-color: var(--themecolor);
- }
- .eContainer-menu-search {
- background: var(--sidecolor);
- }
- .eContainer-menu-search button {
- background: var(--sidecolor);
- }
- .eContainer-scroller {
- background: var(--sidecolor);
- }
-
- .topbtnbar{
- position: absolute;
- top: 20px;
- right: 60px;
- z-index: 90;
- display: inline-block;
- }
- .topbtnbar > span{
- display: inline-block;
- }
-
- /* 页签样式调整 */
- .el-tabs .el-tabs__header {
- margin: 0;
- }
- .el-tabs .el-tabs__content {
- /* background: #fff; */
- padding: 10px;
- }
- .el-tabs--card>.el-tabs__header .el-tabs__item {
- border-left: 1px solid #ccc;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
- font-size: var(--normalfont);
- border-bottom: 1px solid var(--themecolor);
- /* border-top: 1px solid #ccc; */
- background-image: linear-gradient(#fff,#dedede);
- }
- .el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:nth-child(2) {
- padding-left: 10px;
- }
- .el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:last-child {
- padding-right: 10px;
- }
- .el-tabs--card>.el-tabs__header {
- border-bottom: 2px solid var(--themecolor);
- }
- .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
- border-left: 1px solid var(--themecolor);
- border-right: 1px solid var(--themecolor);
- border-top: 1px solid var(--themecolor);
- background-image: linear-gradient(#fff,#fff);
- color: var(--themecolor);
- border-bottom: 1px solid #fff;
- box-sizing: content-box;
- }
- .el-tabs--card .el-tabs__nav-wrap {
- margin-bottom: -2px;
- }
- .el-form-item--small .el-form-item__label {
- font-size: var(--normalfont);
- height: var(--lineheight);
- line-height: var(--lineheight);
- }
- .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
- margin-bottom: 12px;
- }
- .el-input--small .el-input__inner {
- height: var(--lineheight);
- line-height: var(--lineheight);
- font-size: var(--normalfont);
- }
- .el-form-item--small .el-form-item__content, .el-form-item--small .el-form-item__label {
- line-height: var(--lineheight);
- }
- .el-select .el-input .el-select__caret {
- font-size: var(--normalfont);
- }
- .el-input--small .el-input__icon {
- line-height: var(--lineheight);
- }
- .el-input-number--small {
- line-height: var(--lineheight);
- }
- .el-textarea__inner {
- font-size: 12px;
- }
- .el-button--small, .el-button--small.is-round {
- padding: 0px 15px;
- font-size: 12px;
- line-height: 22px;
- }
- .el-button--small.el-button--text {
- padding-left: 0;
- padding-right: 0;
- }
- .el-button--primary{
- color: #FFF;
- background-color: #1561E0;
- border-color: #1561E0;
- }
- .el-card {
- margin-bottom: 8px;
- }
- .m-inputbtn {
- position: relative;
- }
- .m-inputbtn-input {
- padding-right: 64px;
- display: inline-block;
- }
- .m-inputbtn-btn {
- position: absolute;
- right: 0;
- }
- .m-inputbtn-double {
- position: relative;
- }
- .m-inputbtn-input-double {
- padding-right: 90px;
- display: inline-block;
- }
- .m-inputbtn-btn-double {
- position: absolute;
- right: 0;
- top: 0;
- }
- .m-inputbtn-btn-double .el-button {
- padding: 0 8px;
- }
- .m-inputbtn-double .el-button+.el-button {
- margin-left: 0;
- }
- .el-radio__label {
- font-size: 12px;
- }
- .el-checkbox__label {
- font-size: 12px;
- }
- .el-checkbox__input.is-checked+.el-checkbox__label {
- color: #1561E0;
- }
- .el-checkbox__input.is-checked .el-checkbox__inner {
- background-color: #1561E0;
- border-color: #1561E0;
- }
- .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- background-color: #1561E0;
- border-color: #1561E0;
- }
- .c-title {
- /* color: rgba(0, 0, 0, 0.65); */
- /* font-weight: 600; */
- /* font-size: 12px; */
- color: rgb(0, 0, 0);
- font-size: 14px;
- font-weight: 500;
- padding-bottom: 10px;
- }
- .el-dialog__body {
- padding: 10px 20px 20px;
- }
-
- /* form 必填项的内容区域颜色突出显示 *
+.m-app-main {
+ /* background-color: var(--bgcolor); */
+}
+
+.m-app {
+ background-color: var(--darkbgcolor);
+}
+
+.fold {
+ width: 60px !important;
+}
+
+/* sidemenu */
+.el-menu {
+ background: var(--sidecolor);
+}
+
+.el-menu-item.is-active {
+ color: #fff;
+ background-color: var(--themecolor);
+}
+
+.eContainer-menu-search {
+ background: var(--sidecolor);
+}
+
+.eContainer-menu-search button {
+ background: var(--sidecolor);
+}
+
+.eContainer-scroller {
+ background: var(--sidecolor);
+}
+
+.topbtnbar {
+ position: absolute;
+ top: 20px;
+ right: 60px;
+ z-index: 90;
+ display: inline-block;
+}
+
+.topbtnbar>span {
+ display: inline-block;
+}
+
+/* 页签样式调整 */
+.el-tabs .el-tabs__header {
+ margin: 0;
+}
+
+.el-tabs .el-tabs__content {
+ /* background: #fff; */
+ padding: 10px;
+}
+
+.el-tabs--card>.el-tabs__header .el-tabs__item {
+ border-left: 1px solid #ccc;
+ padding: 0 10px;
+ height: 40px;
+ line-height: 40px;
+ font-size: 16px;
+ border-bottom: 1px solid var(--themecolor);
+ /* border-top: 1px solid #ccc; */
+ background-image: linear-gradient(#fff, #dedede);
+}
+
+.el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:nth-child(2) {
+ padding-left: 10px;
+}
+
+.el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:last-child {
+ padding-right: 10px;
+}
+
+.el-tabs--card>.el-tabs__header {
+ border-bottom: 2px solid var(--themecolor);
+}
+
+.el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
+ border-left: 1px solid var(--themecolor);
+ border-right: 1px solid var(--themecolor);
+ border-top: 1px solid var(--themecolor);
+ background-image: linear-gradient(#fff, #fff);
+ color: var(--themecolor);
+ border-bottom: 1px solid #fff;
+ box-sizing: content-box;
+ font-weight: bold;
+}
+
+.el-tabs--card .el-tabs__nav-wrap {
+ margin-bottom: -2px;
+}
+
+.el-form-item--small .el-form-item__label {
+ font-size: var(--normalfont);
+ height: var(--lineheight);
+ line-height: var(--lineheight);
+}
+
+.el-form-item--mini.el-form-item,
+.el-form-item--small.el-form-item {
+ margin-bottom: 12px;
+ margin-top: 20px;
+}
+
+.el-input--small .el-input__inner {
+ height: var(--lineheight);
+ line-height: var(--lineheight);
+ font-size: var(--normalfont);
+}
+
+.el-form-item--small .el-form-item__content,
+.el-form-item--small .el-form-item__label {
+ line-height: var(--lineheight);
+}
+
+.el-select .el-input .el-select__caret {
+ font-size: var(--normalfont);
+}
+
+.el-input--small .el-input__icon {
+ line-height: var(--lineheight);
+}
+
+.el-input-number--small {
+ line-height: var(--lineheight);
+}
+
+.el-textarea__inner {
+ font-size: 12px;
+}
+
+.el-button--small,
+.el-button--small.is-round {
+ padding: 0px 15px;
+ font-size: 12px;
+ line-height: 22px;
+}
+
+.el-button--small.el-button--text {
+ padding-left: 0;
+ padding-right: 0;
+}
+
+.el-button--primary {
+ color: #FFF;
+ background-color: #1561E0;
+ border-color: #1561E0;
+}
+
+.el-card {
+ margin-bottom: 8px;
+}
+
+.m-inputbtn {
+ position: relative;
+}
+
+.m-inputbtn-input {
+ padding-right: 64px;
+ display: inline-block;
+}
+
+.m-inputbtn-btn {
+ position: absolute;
+ right: 0;
+}
+
+.m-inputbtn-double {
+ position: relative;
+}
+
+.m-inputbtn-input-double {
+ padding-right: 90px;
+ display: inline-block;
+}
+
+.m-inputbtn-btn-double {
+ position: absolute;
+ right: 0;
+ top: 0;
+}
+
+.m-inputbtn-btn-double .el-button {
+ padding: 0 8px;
+}
+
+.m-inputbtn-double .el-button+.el-button {
+ margin-left: 0;
+}
+
+.el-radio__label {
+ font-size: 12px;
+}
+
+.el-checkbox__label {
+ font-size: 12px;
+}
+
+.el-checkbox__input.is-checked+.el-checkbox__label {
+ color: #1561E0;
+}
+
+.el-checkbox__input.is-checked .el-checkbox__inner {
+ background-color: #1561E0;
+ border-color: #1561E0;
+}
+
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ background-color: #1561E0;
+ border-color: #1561E0;
+}
+
+.c-title {
+ /* color: rgba(0, 0, 0, 0.65); */
+ /* font-weight: 600; */
+ /* font-size: 12px; */
+ color: rgb(0, 0, 0);
+ font-size: 14px;
+ font-weight: 500;
+ padding-bottom: 10px;
+}
+
+.el-dialog__body {
+ padding: 10px 20px 20px;
+}
+
+/* form 必填项的内容区域颜色突出显示 *
暂时封掉
.el-form-item.is-required .el-form-item__content .el-input__inner,
.el-form-item.is-required .el-form-item__content .el-textarea__inner,
@@ -246,65 +297,91 @@
background-color: #f3f3bf87;
}*/
- /* form 必填项红星星靠右 */
- .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
- content: none;
- }
- .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:after, .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:after {
-
- content: '*';
- color: #F56C6C;
- margin-left: 4px;
- }
-
- .el-tree-node__label {
- font-size: 12px;
- }
- .c-w-100 {
- width: 100%;
- }
- .m-ureport-actions {
- width: 100%;
- text-align: center;
- }
- .m-ureport-actions .el-button--small {
- padding: 0px 15px;
- font-size: 12px;
- line-height: 22px;
- }
- .el-table th {
- user-select: initial;
- }
- .el-tooltip__popper.is-dark {
- max-width: 600px;
- }
- .el-date-editor.el-range-editor--small.el-input__inner {
- height: 24px;
- font-size: 13px;
- }
- .el-date-editor.el-range-editor--small .el-range__close-icon, .el-range-editor--small .el-range__icon {
- line-height: 16px;
- font-size: 12px;
- }
- .el-date-editor.el-range-editor--small .el-range-separator {
- line-height: 16px;
- font-size: 12px;
- }
- .el-table__fixed,
- .el-table__fixed-right {
+/* form 必填项红星星靠右 */
+.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:before,
+.el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
+ content: none;
+}
+
+.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:after,
+.el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:after {
+
+ content: '*';
+ color: #F56C6C;
+ margin-left: 4px;
+}
+
+.el-tree-node__label {
+ font-size: 12px;
+}
+
+.c-w-100 {
+ width: 100%;
+}
+
+.m-ureport-actions {
+ width: 100%;
+ text-align: center;
+}
+
+.m-ureport-actions .el-button--small {
+ padding: 0px 15px;
+ font-size: 12px;
+ line-height: 22px;
+}
+
+.el-table th {
+ user-select: initial;
+}
+
+.el-tooltip__popper.is-dark {
+ max-width: 600px;
+}
+
+.el-date-editor.el-range-editor--small.el-input__inner {
+ height: 24px;
+ font-size: 13px;
+}
+
+.el-date-editor.el-range-editor--small .el-range__close-icon,
+.el-range-editor--small .el-range__icon {
+ line-height: 16px;
+ font-size: 12px;
+}
+
+.el-date-editor.el-range-editor--small .el-range-separator {
+ line-height: 16px;
+ font-size: 12px;
+}
+
+.el-table__fixed,
+.el-table__fixed-right {
height: 100% !important;
- bottom:17px;
- }
+ bottom: 17px;
+}
/* medium_button_change_small */
-.medium_bcs{
+.medium_bcs {
padding: 8px 15px;
margin-top: 5px;
margin-left: 7px;
}
-.busnavbar-items{
-/*TODO完善按钮间隔等样式 */
-margin-left:7px;
-padding-left: 3px;
+.busnavbar-items {
+ /*TODO完善按钮间隔等样式 */
+ margin-left: 7px;
+ padding-left: 3px;
+}
+
+.el-collapse .el-collapse-item__wrap{
+ background-color: var(--bgcolor);
+}
+
+.el-collapse-item__header{
+ background-color: var(--bgcolor);
+}
+
+.el-collapse-item__header.is-active{
+ font-size: 15px;
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/src/components/FunctionBtn.vue b/src/components/FunctionBtn.vue
index d337ed1..e3589f6 100644
--- a/src/components/FunctionBtn.vue
+++ b/src/components/FunctionBtn.vue
@@ -127,10 +127,11 @@ export default {
display: flex; /*flex布局*/
flex-direction: row;
flex-wrap: nowrap;
- justify-content: space-between;
+ justify-content: center;
align-items: flex-start;
height: 24px;
- margin-bottom: 5px;
+ text-align: center;
+ margin-right:10px;
}
.m-funcBtn-eContainer {
order: 1;
@@ -144,7 +145,7 @@ export default {
.m-funcBtn-eContainer button,
.m-funcBtn-eContainer .el-button + .el-button {
- margin: 0px 0px 0px 0px;
+ margin: 0px 10px 0px 0px;
}
.m-funcBtn-eContainer .el-button--default {
background-image: linear-gradient(#fff,#dedede);
@@ -186,4 +187,12 @@ export default {
background-color: #b3d8ff;
color: #606266;
}
+
+/* ui美化 */
+.m-Btn-eContainer .el-button--small,.m-Btn-eContainer .el-button--small.is-round {
+ padding: 10px 30px;
+ font-size: 16px;
+ height: 40px;
+ font-weight:bold;
+}
</style>
diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index 69f1b34..69147e3 100644
--- a/src/components/SearchInput.vue
+++ b/src/components/SearchInput.vue
@@ -5,7 +5,7 @@
placeholder="全局搜索"
v-model="searchContent"
:clearable="true"
-
+
@keyup.enter.native="searchEvent"
@keydown.up.native="preDownEvent"
@keyup.up.native="preUpEvent"
@@ -259,9 +259,17 @@ export default {
}
.search-wrapper >>> .el-input {
z-index: 101;
+ /* position:absolute; */
}
+.search-wrapper >>> .el-input input::-ms-input-placeholder{text-align: center;}
+.search-wrapper >>> .el-input input::-webkit-input-placeholder{text-align: center;}
.search-wrapper >>> .el-input .el-input__inner {
- height: 30px;
+ /* height: 30px; */
+ padding: 10px 20px;
+ /* position:relative;
+ top:-3px; */
+
+
}
.search-sug {
position: absolute;
diff --git a/src/components/c-page.vue b/src/components/c-page.vue
index 81d3c7a..91e9458 100644
--- a/src/components/c-page.vue
+++ b/src/components/c-page.vue
@@ -4,7 +4,7 @@
<i class="el-icon-location" style="color: #409eff;"></i>
<span>{{ title }}</span>
</div> -->
- <div style="flex: 1; padding: 5px 15px; position: relative">
+ <div style="flex: 1; padding: 0px 15px 5px; position: relative">
<slot></slot>
</div>
</div>
diff --git a/src/views/Business/Infbed/index.vue b/src/views/Business/Infbed/index.vue
index 0df564d..a671f98 100644
--- a/src/views/Business/Infbed/index.vue
+++ b/src/views/Business/Infbed/index.vue
@@ -201,6 +201,6 @@ export default {
background-color: #f7faff;
}
.eContainer {
- padding: 3px 15px;
+ padding: 0px 15px 3px;
}
</style>
diff --git a/src/views/Business/Infbrd/Infsea.vue b/src/views/Business/Infbrd/Infsea.vue
index af888a1..ffd7441 100644
--- a/src/views/Business/Infbrd/Infsea.vue
+++ b/src/views/Business/Infbrd/Infsea.vue
@@ -452,9 +452,6 @@ export default {
.m-table-search {
padding: 20px 0px 10px 0px;
}
-.el-form-item__label{
- text-align: left!important;
-}
.el-row > .el-col {
padding-right: 10px!important;
}
diff --git a/src/views/Business/Inflid/Infsea.vue b/src/views/Business/Inflid/Infsea.vue
index ab63a88..de0a96c 100644
--- a/src/views/Business/Inflid/Infsea.vue
+++ b/src/views/Business/Inflid/Infsea.vue
@@ -735,9 +735,6 @@ export default {
.m-table-search {
padding: 20px 0px 10px 0px;
}
-.el-form-item__label{
- text-align: left!important;
-}
.el-row > .el-col {
padding-right: 10px!important;
}
diff --git a/src/views/Business/Litacp/Detp.vue b/src/views/Business/Litacp/Detp.vue
index b978add..75905d1 100644
--- a/src/views/Business/Litacp/Detp.vue
+++ b/src/views/Business/Litacp/Detp.vue
@@ -136,13 +136,13 @@
<c-col :span="12">
- <el-form-item label="始发（航空）站"" prop="lidgrp.rec.porloa">
+ <el-form-item label="始发（航空）站" prop="lidgrp.rec.porloa">
<c-input disabled v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入Air-/Port of Departure"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
- <el-form-item label="终点（航空）站"" prop="lidgrp.rec.pordis">
+ <el-form-item label="终点（航空）站" prop="lidgrp.rec.pordis">
<c-input disabled v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入Air-/Port of Destination"></c-input>
</el-form-item>
</c-col>
diff --git a/src/views/Business/Litame/Detp.vue b/src/views/Business/Litame/Detp.vue
index 8f76b92..7a056b7 100644
--- a/src/views/Business/Litame/Detp.vue
+++ b/src/views/Business/Litame/Detp.vue
@@ -153,13 +153,13 @@
<c-col :span="24">
- <el-form-item label="始发（航空）站"" prop="lidgrp.rec.porloa">
+ <el-form-item label="始发（航空）站" prop="lidgrp.rec.porloa">
<c-input v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入Air-/Port of Departure"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
- <el-form-item label="终点（航空）站"" prop="lidgrp.rec.pordis">
+ <el-form-item label="终点（航空）站" prop="lidgrp.rec.pordis">
<c-input v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入Air-/Port of Destination"></c-input>
</el-form-item>
</c-col>
diff --git a/src/views/Business/Litdla/Detp.vue b/src/views/Business/Litdla/Detp.vue
index 61e3abb..1f9ab1c 100644
--- a/src/views/Business/Litdla/Detp.vue
+++ b/src/views/Business/Litdla/Detp.vue
@@ -111,13 +111,13 @@
<c-col :span="12">
- <el-form-item label="始发（航空）站"" prop="lidgrp.rec.porloa">
+ <el-form-item label="始发（航空）站" prop="lidgrp.rec.porloa">
<c-input disabled v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入Air-/Port of Departure"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
- <el-form-item label="终点（航空）站"" prop="lidgrp.rec.pordis">
+ <el-form-item label="终点（航空）站" prop="lidgrp.rec.pordis">
<c-input disabled v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入Air-/Port of Destination"></c-input>
</el-form-item>
</c-col>
diff --git a/src/views/Business/Litopn/Addbcb.vue b/src/views/Business/Litopn/Addbcb.vue
index 43faa9e..9772ecb 100644
--- a/src/views/Business/Litopn/Addbcb.vue
+++ b/src/views/Business/Litopn/Addbcb.vue
@@ -1,39 +1,40 @@
<template>
<div class="eibs-tab">
- <c-col :span="24">
- <el-col :span="12">
- <el-form-item label="货物简称" prop="godnam">
- <c-input
- v-model="model.godnam"
- maxlength="40"
- style="width: 50%"
- placeholder="请输入货物简称"
- ></c-input>
- </el-form-item>
- </el-col>
- </c-col>
+ <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse-item title="备查表" name="1">
+ <c-col :span="24">
+ <el-col :span="12">
+ <el-form-item label="货物简称" prop="godnam">
+ <c-input
+ v-model="model.godnam"
+ maxlength="40"
+ style="width: 50%"
+ placeholder="请输入货物简称"
+ ></c-input>
+ </el-form-item>
+ </el-col>
+ </c-col>
- <c-col :span="24">
- <el-form-item label="备案表类型">
- <c-checkbox v-model="model.bcbtyp1">不在名录</c-checkbox>
- <c-checkbox v-model="model.bcbtyp2">异地付汇</c-checkbox>
- <c-checkbox v-model="model.bcbtyp3">转口贸易</c-checkbox>
- <c-checkbox v-model="model.bcbtyp4">90天以上信用证</c-checkbox>
- <c-checkbox v-model="model.bcbtyp5">不需要</c-checkbox>
- <c-checkbox v-model="model.bcbtyp6">其它</c-checkbox>
-
- </el-form-item>
- <el-form-item label="" prop="bcbtyp7" v-if="model.bcbtyp6">
- <c-input
- v-model="model.bcbtyp7"
- maxlength="30"
- style="width: 21.8%"
- placeholder="请输入备查表类型填写文本框"
- ></c-input>
- </el-form-item>
- </c-col>
+ <c-col :span="24">
+ <el-form-item label="备案表类型">
+ <c-checkbox v-model="model.bcbtyp1">不在名录</c-checkbox>
+ <c-checkbox v-model="model.bcbtyp2">异地付汇</c-checkbox>
+ <c-checkbox v-model="model.bcbtyp3">转口贸易</c-checkbox>
+ <c-checkbox v-model="model.bcbtyp4">90天以上信用证</c-checkbox>
+ <c-checkbox v-model="model.bcbtyp5">不需要</c-checkbox>
+ <c-checkbox v-model="model.bcbtyp6">其它</c-checkbox>
+ </el-form-item>
+ <el-form-item label="" prop="bcbtyp7" v-if="model.bcbtyp6">
+ <c-input
+ v-model="model.bcbtyp7"
+ maxlength="30"
+ style="width: 21.8%"
+ placeholder="请输入备查表类型填写文本框"
+ ></c-input>
+ </el-form-item>
+ </c-col>
- <!-- <c-col :span="4" class=".centerLable">
+ <!-- <c-col :span="4" class=".centerLable">
<c-checkbox v-model="model.bcbtyp1">不在名录</c-checkbox>
</c-col>
@@ -57,23 +58,20 @@
<c-checkbox v-model="model.bcbtyp6">其它</c-checkbox>
</c-col> -->
- <c-col :span="10" :pull=5>
-
- </c-col>
+ <c-col :span="10" :pull="5"> </c-col>
- <c-col :span="18">
- <el-form-item label="备案表效期" prop="bcbdat">
- <c-date-picker
- type="date"
- v-model="model.bcbdat"
- style="width: 30.75%"
- placeholder="请选择备案表效期"
- ></c-date-picker>
- </el-form-item>
- </c-col>
+ <c-col :span="18">
+ <el-form-item label="备案表效期" prop="bcbdat">
+ <c-date-picker
+ type="date"
+ v-model="model.bcbdat"
+ style="width: 30.75%"
+ placeholder="请选择备案表效期"
+ ></c-date-picker>
+ </el-form-item>
+ </c-col>
-
- <!--
+ <!--
<c-col :span="15" :push="1">
<el-form-item label="1、申请人与我行已签署贸易融资协议（如需）;" label-width="360px"></el-form-item>
</c-col>
@@ -90,25 +88,34 @@
<el-form-item label="4、占用授信额度的开证业务;" label-width="360px"></el-form-item>
</c-col>
-->
- <el-col :span="24">
- <el-form-item label="交易银行部意见">
- <div
- v-text="model.label1"
- data-path=".label1"
- class="lableSize"
- ></div>
-
- <div v-text="model.label2" data-path=".label2" class="lableSize">
- </div>
+ <el-col :span="24">
+ <el-form-item label="交易银行部意见">
+ <div
+ v-text="model.label1"
+ data-path=".label1"
+ class="lableSize"
+ ></div>
- <div v-text="model.label3" data-path=".label3" class="lableSize">
- </div>
- <div v-text="model.label4" data-path=".label4" class="lableSize">
- </div>
- </el-form-item>
- </el-col>
+ <div
+ v-text="model.label2"
+ data-path=".label2"
+ class="lableSize"
+ ></div>
- <!-- <c-col :span="15" :push="1">
+ <div
+ v-text="model.label3"
+ data-path=".label3"
+ class="lableSize"
+ ></div>
+ <div
+ v-text="model.label4"
+ data-path=".label4"
+ class="lableSize"
+ ></div>
+ </el-form-item>
+ </el-col>
+
+ <!-- <c-col :span="15" :push="1">
<span v-text="model.label2" data-path=".label2" class="lableSize"> </span>
</c-col>
@@ -121,24 +128,24 @@
</c-col>
-->
- <c-col :span="24">
- <el-form-item label="" prop="label5">
- <c-select
- v-model="model.label5"
- style="width: 33%"
- placeholder="请选择国际部意见"
- :code="codes.label5"
- >
- </c-select>
- </el-form-item>
- </c-col>
- <!--
+ <c-col :span="24">
+ <el-form-item label="" prop="label5">
+ <c-select
+ v-model="model.label5"
+ style="width: 33%"
+ placeholder="请选择国际部意见"
+ :code="codes.label5"
+ >
+ </c-select>
+ </el-form-item>
+ </c-col>
+ <!--
<c-col :span="12">
<span v-text="model.label6" data-path=".label6" > </span>
</c-col>
-->
- <!-- <c-col :span="24">
+ <!-- <c-col :span="24">
<el-form-item label="异地通知" prop="bccls1" label-width="270px">
<c-select v-model="model.bccls1" style="width:30%" placeholder="请选择异地通知" :code="codes.bccls1">
</c-select>
@@ -186,6 +193,12 @@
</c-select>
</el-form-item>
</c-col> -->
+ </el-collapse-item>
+ <el-collapse-item title="附言" name="2">
+ <!-- 附言 -->
+ <m-coninfp :model="model" :codes="codes" />
+ </el-collapse-item>
+ </el-collapse>
</div>
</template>
<script>
@@ -193,15 +206,26 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Litopn/Event";
+import Coninfp from "~/views/Public/Coninfp";
export default {
+ components: {
+ "m-coninfp": Coninfp,
+ },
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
- return {};
+ return {
+ activeNames: ["1"],
+ };
+ },
+ methods: {
+ ...Event,
+ handleChange(val) {
+ console.log(val);
+ },
},
- methods: { ...Event },
created: function () {},
};
</script>
diff --git a/src/views/Business/Litopn/Detp.vue b/src/views/Business/Litopn/Detp.vue
index f8967c9..8b9bedb 100644
--- a/src/views/Business/Litopn/Detp.vue
+++ b/src/views/Business/Litopn/Detp.vue
@@ -217,13 +217,13 @@
<c-col :span="24">
- <el-form-item label="始发（航空）站"" prop="lidgrp.rec.porloa">
+ <el-form-item label="始发（航空）站" prop="lidgrp.rec.porloa">
<c-input v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入地址"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
- <el-form-item label="终点（航空）站"" prop="lidgrp.rec.pordis">
+ <el-form-item label="终点（航空）站" prop="lidgrp.rec.pordis">
<c-input v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入地址"></c-input>
</el-form-item>
</c-col>
diff --git a/src/views/Business/Litopn/Ovwp.vue b/src/views/Business/Litopn/Ovwp.vue
index cd40ae2..2434968 100644
--- a/src/views/Business/Litopn/Ovwp.vue
+++ b/src/views/Business/Litopn/Ovwp.vue
@@ -1,438 +1,429 @@
<template>
<div class="eibs-tab">
- <!-- ======================= 左 ========================= -->
-
- <c-col :span="11">
- <el-col :spam="24">
- <el-form-item
- label="信用证编号"
- prop="lidgrp.rec.ownref"
- style="width: 100%"
- >
- <c-fullbox>
- <c-input
- v-model="model.lidgrp.rec.ownref"
- maxlength="16"
- disabled
- placeholder=""
- ></c-input>
- <template slot="footer">
- <c-button
- style="margin: 0 10px 0 10px; padding: 0 12px"
- size="small"
- type="primary"
- @click="onSeainf"
- icon="el-icon-search"
- >
- <span style="font-family: '宋体'; font-weight: bold"></span>
- </c-button>
- <c-button
- style="margin: 0 0"
- size="small"
- type="primary"
- :disabled="this.flag1"
- @click="onLitpButgetref"
+ <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse-item title="概要" name="1">
+ <!-- ======================= 左 ========================= -->
+
+ <c-col :span="11">
+ <el-col :spam="24">
+ <el-form-item
+ label="信用证编号"
+ prop="lidgrp.rec.ownref"
+ style="width: 100%"
+ >
+ <c-fullbox>
+ <c-input
+ v-model="model.lidgrp.rec.ownref"
+ maxlength="16"
+ disabled
+ placeholder=""
+ ></c-input>
+ <template slot="footer">
+ <c-button
+ style="margin: 0 10px 0 10px; padding: 0 12px"
+ size="small"
+ type="primary"
+ @click="onSeainf"
+ icon="el-icon-search"
+ >
+ <span style="font-family: '宋体'; font-weight: bold"></span>
+ </c-button>
+ <c-button
+ style="margin: 0 0"
+ size="small"
+ type="primary"
+ :disabled="this.flag1"
+ @click="onLitpButgetref"
+ >
+ 获取
+ </c-button>
+ </template>
+ </c-fullbox>
+ </el-form-item>
+ </el-col>
+
+ <c-col :span="24">
+ <el-form-item label="信用证类型" prop="lidgrp.rec.lcrtyp">
+ <c-select
+ v-model="model.lidgrp.rec.lcrtyp"
+ placeholder="请选择信用证类型"
+ style="width: 100%"
+ :code="codes.lcrtyp"
>
- 获取
- </c-button>
- </template>
- </c-fullbox>
- </el-form-item>
- </el-col>
-
- <c-col :span="24">
- <el-form-item label="信用证类型" prop="lidgrp.rec.lcrtyp">
- <c-select
- v-model="model.lidgrp.rec.lcrtyp"
- placeholder="请选择信用证类型"
- style="width: 100%"
- :code="codes.lcrtyp "
- >
- </c-select>
- </el-form-item>
- </c-col>
- <c-col :span="24">
- <el-form-item
- label="客户经理"
- prop="litp.usr.extkey"
- style="width: 100%"
- >
- <c-fullbox>
- <c-input
- v-model="model.litp.usr.extkey"
- maxlength="8"
- disabled
- placeholder="请输入客户经理"
-
- ></c-input>
- <template slot="footer">
- <c-button
- size="small"
- style="margin-left: 10px; padding: 0 12px"
- type="primary"
- icon="el-icon-search"
- @click="onExtkey">
- <span style="font-family: '宋体';
- font-weight: bold"></span>
- </c-button>
- </template>
- </c-fullbox>
- </el-form-item>
- </c-col>
-
- <!-- LITPOP INFLID 显示-->
- <!--
+ </c-select>
+ </el-form-item>
+ </c-col>
+ <c-col :span="24">
+ <el-form-item
+ label="客户经理"
+ prop="litp.usr.extkey"
+ style="width: 100%"
+ >
+ <c-fullbox>
+ <c-input
+ v-model="model.litp.usr.extkey"
+ maxlength="8"
+ disabled
+ placeholder="请输入客户经理"
+ ></c-input>
+ <template slot="footer">
+ <c-button
+ size="small"
+ style="margin-left: 10px; padding: 0 12px"
+ type="primary"
+ icon="el-icon-search"
+ @click="onExtkey"
+ >
+ <span style="font-family: '宋体'; font-weight: bold"></span>
+ </c-button>
+ </template>
+ </c-fullbox>
+ </el-form-item>
+ </c-col>
+
+ <!-- LITPOP INFLID 显示-->
+ <!--
<c-col :span="12">
<c-checkbox v-model="model.lidgrp.rec.resflg">Reserved Contract</c-checkbox>
</c-col>
-->
- <el-col :span="24">
- <c-col :span="11">
- <el-form-item label="名义金额" prop="lidgrp.cbs.nom1.cur">
- <c-select
- v-model="model.lidgrp.cbs.nom1.cur"
- style="width: 100%"
- placeholder="币种"
- :code="codes.cur"
- @keyup.enter.native="nom1CurEvent"
- >
- <el-option
- v-for="item in codes.curtxt1"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ <el-col :span="24">
+ <c-col :span="11">
+ <el-form-item label="名义金额" prop="lidgrp.cbs.nom1.cur">
+ <c-select
+ v-model="model.lidgrp.cbs.nom1.cur"
+ style="width: 100%"
+ placeholder="币种"
+ :code="codes.cur"
+ @keyup.enter.native="nom1CurEvent"
+ >
+ <el-option
+ v-for="item in codes.cur"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </c-select>
+ </el-form-item>
+ </c-col>
+ <c-col :span="9">
+ <el-form-item
+ style="text-align: left"
+ label-width="20px"
+ prop="lidgrp.cbs.nom1.amt"
+ >
+ <c-input
+ v-model="model.lidgrp.cbs.nom1.amt"
+ style="text-align: left; width: 100%"
+ placeholder="请输入金额"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="4">
+ <template>
+ <c-checkbox
+ @change="open"
+ v-model="model.litp.aamp.aammod.addamtflg"
+ style="padding-left: 5px"
+ >附加金额</c-checkbox
+ >
+ </template>
+ </c-col>
+ </el-col>
+ <c-col :span="14">
+ <el-form-item label="溢短装" prop="lidgrp.rec.nomtop">
+ <c-input
+ v-model="model.lidgrp.rec.nomtop"
+ maxlength="2"
+ placeholder="0"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+ <c-col :span="10" style="text-align: left">
+ <el-form-item
+ label="-"
+ style="text-align: left; margin-left: 12px"
+ label-width="20px"
+ prop="lidgrp.rec.nomton"
>
- </el-option>
- </c-select>
- </el-form-item>
- </c-col>
- <c-col :span="9">
- <el-form-item
- style="text-align: left"
- label-width="20px"
- prop="lidgrp.cbs.nom1.amt"
- >
- <c-input
- v-model="model.lidgrp.cbs.nom1.amt"
- style="text-align: left; width: 100%"
- placeholder="请输入金额"
- ></c-input>
- </el-form-item>
- </c-col>
-
- <c-col :span="4" >
- <template>
- <c-checkbox
-
- @change="open"
- v-model="model.litp.aamp.aammod.addamtflg"
- style="padding-left:5px;"
- >附加金额</c-checkbox>
- </template>
- </c-col>
- </el-col>
- <c-col :span="14">
- <el-form-item label="溢短装" prop="lidgrp.rec.nomtop">
- <c-input
- v-model="model.lidgrp.rec.nomtop"
- maxlength="2"
- placeholder="0"
- ></c-input>
- </el-form-item>
- </c-col>
- <c-col :span="10" style="text-align: left">
- <el-form-item
- label="-"
- style="text-align: left; margin-left: 12px"
- label-width="20px"
- prop="lidgrp.rec.nomton"
- >
- <c-input
- v-model="model.lidgrp.rec.nomton"
- maxlength="2"
- placeholder="0"
- ></c-input>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="金额限额表述" prop="lidgrp.rec.nomspc">
- <c-select
- v-model="model.lidgrp.rec.nomspc"
- style="width: 100%"
- disabled
- placeholder="请选择"
- :code="codes.nomspc"
- >
- </c-select>
- </el-form-item>
- </c-col>
-
- <c-col :span="13">
- <el-form-item label="最大金额" prop="lidgrp.cbs.max.cur">
- <c-select
- v-model="model.lidgrp.cbs.max.cur"
- style="width: 100%"
- disabled
- placeholder="请选择币种"
- @keyup.enter.native="nom1CurEvent"
- >
- <el-option
- v-for="item in codes.cur"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ <c-input
+ v-model="model.lidgrp.rec.nomton"
+ maxlength="2"
+ placeholder="0"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="金额限额表述" prop="lidgrp.rec.nomspc">
+ <c-select
+ v-model="model.lidgrp.rec.nomspc"
+ style="width: 100%"
+ disabled
+ placeholder="请选择"
+ :code="codes.nomspc"
+ >
+ </c-select>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="13">
+ <el-form-item label="最大金额" prop="lidgrp.cbs.max.cur">
+ <c-select
+ v-model="model.lidgrp.cbs.max.cur"
+ style="width: 100%"
+ disabled
+ placeholder="请选择币种"
+ @keyup.enter.native="nom1CurEvent"
+ >
+ <el-option
+ v-for="item in codes.cur"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </c-select>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="11">
+ <el-form-item label="" label-width="5px" prop="lidgrp.cbs.max.amt">
+ <c-input
+ v-model="model.lidgrp.cbs.max.amt"
+ disabled
+ placeholder="请输入信用证最大金额"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="13">
+ <el-form-item label="开证日期" prop="lidgrp.rec.opndat">
+ <c-date-picker
+ type="date"
+ v-model="model.lidgrp.rec.opndat"
+ style="width: 100%"
+ placeholder="请选择日期"
+ value-format="yyyy-MM-dd"
+ ></c-date-picker>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="11">
+ <el-form-item label="预先通知日期" prop="lidgrp.rec.preadvdt">
+ <c-date-picker
+ type="date"
+ v-model="model.lidgrp.rec.preadvdt"
+ style="width: 100%"
+ disabled
+ placeholder="请选择日期"
+ ></c-date-picker>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="19">
+ <el-form-item label="最迟装船日期" prop="lidgrp.rec.shpdat">
+ <c-date-picker
+ type="date"
+ v-model="model.lidgrp.rec.shpdat"
+ style="width: 100%"
+ placeholder="请选择日期"
+ ></c-date-picker>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="5" class="centerLable">
+ <c-checkbox
+ v-model="model.lidgrp.rec.dkflg"
+ style="margin-left: 17px; padding: 0 10px"
+ disabled
+ >是否代开</c-checkbox
>
- </el-option>
- </c-select>
- </el-form-item>
- </c-col>
-
- <c-col :span="11">
- <el-form-item
- label=""
- label-width="5px"
- prop="lidgrp.cbs.max.amt"
- >
- <c-input
- v-model="model.lidgrp.cbs.max.amt"
- disabled
- placeholder="请输入信用证最大金额"
- ></c-input>
- </el-form-item>
- </c-col>
-
- <c-col :span="13">
- <el-form-item label="开证日期" prop="lidgrp.rec.opndat">
- <c-date-picker
- type="date"
- v-model="model.lidgrp.rec.opndat"
- style="width: 100%"
- placeholder="请选择日期"
- value-format="yyyy-MM-dd"
- ></c-date-picker>
- </el-form-item>
- </c-col>
-
- <c-col :span="11">
- <el-form-item
- label="预先通知日期"
- prop="lidgrp.rec.preadvdt"
- >
- <c-date-picker
- type="date"
- v-model="model.lidgrp.rec.preadvdt"
- style="width: 100%"
- disabled
- placeholder="请选择日期"
- ></c-date-picker>
- </el-form-item>
- </c-col>
-
- <c-col :span="19">
- <el-form-item label="最迟装船日期" prop="lidgrp.rec.shpdat">
- <c-date-picker
- type="date"
- v-model="model.lidgrp.rec.shpdat"
- style="width: 100%"
- placeholder="请选择日期"
- ></c-date-picker>
- </el-form-item>
- </c-col>
-
- <c-col :span="5" class="centerLable">
- <c-checkbox
- v-model="model.lidgrp.rec.dkflg"
- style="margin-left:17px;padding: 0 10px;"
- disabled
- >是否代开</c-checkbox
- >
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="有效日期" prop="lidgrp.rec.expdat">
- <c-date-picker
- type="date"
- v-model="model.lidgrp.rec.expdat"
- style="width: 100%"
- placeholder="请选择日期"
- ></c-date-picker>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="交单地点" prop="lidgrp.rec.expplc">
- <c-input
- v-model="model.lidgrp.rec.expplc"
- maxlength="29"
- placeholder="请输入地址"
- ></c-input>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="分批装运条款" prop="lidgrp.rec.shppar">
- <c-select
- v-model="model.lidgrp.rec.shppar"
- style="width: 100%"
- placeholder="请选择分批装运条款"
- :code="codes.shptrss18"
- >
- </c-select>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="转运条款" prop="lidgrp.rec.shptrss18">
- <c-select
- v-model="model.lidgrp.rec.shptrss18"
- style="width: 100%"
- placeholder="请选择转运条款"
- :code="codes.shptrss18"
- >
- </c-select>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="适用规则" prop="lidgrp.rec.apprul">
- <c-select
- v-model="model.lidgrp.rec.apprul"
- style="width: 100%"
- placeholder="请选择适用规则"
- :code="codes.apprul1"
- >
- </c-select>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item
- label="其他适用规则"
- prop="lidgrp.rec.apprultxt"
- >
- <c-input
- v-model="model.lidgrp.rec.apprultxt"
- maxlength="35"
- :disabled="this.flag"
- placeholder="请输入其他适用规则"
- ></c-input>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="保兑指示" prop="lidgrp.rec.cnfdet">
- <c-select
- v-model="model.lidgrp.rec.cnfdet"
- style="width: 100%"
- placeholder="请选择保兑指示"
- :code="codes.cnfflg1"
- >
- </c-select>
- </el-form-item>
- </c-col>
- <!--
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="有效日期" prop="lidgrp.rec.expdat">
+ <c-date-picker
+ type="date"
+ v-model="model.lidgrp.rec.expdat"
+ style="width: 100%"
+ placeholder="请选择日期"
+ ></c-date-picker>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="交单地点" prop="lidgrp.rec.expplc">
+ <c-input
+ v-model="model.lidgrp.rec.expplc"
+ maxlength="29"
+ placeholder="请输入地址"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="分批装运条款" prop="lidgrp.rec.shppar">
+ <c-select
+ v-model="model.lidgrp.rec.shppar"
+ style="width: 100%"
+ placeholder="请选择分批装运条款"
+ :code="codes.shptrss18"
+ >
+ </c-select>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="转运条款" prop="lidgrp.rec.shptrss18">
+ <c-select
+ v-model="model.lidgrp.rec.shptrss18"
+ style="width: 100%"
+ placeholder="请选择转运条款"
+ :code="codes.shptrss18"
+ >
+ </c-select>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="适用规则" prop="lidgrp.rec.apprul">
+ <c-select
+ v-model="model.lidgrp.rec.apprul"
+ style="width: 100%"
+ placeholder="请选择适用规则"
+ :code="codes.apprul"
+ >
+ </c-select>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="其他适用规则" prop="lidgrp.rec.apprultxt">
+ <c-input
+ v-model="model.lidgrp.rec.apprultxt"
+ maxlength="35"
+ :disabled="this.flag"
+ placeholder="请输入其他适用规则"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="保兑指示" prop="lidgrp.rec.cnfdet">
+ <c-select
+ v-model="model.lidgrp.rec.cnfdet"
+ style="width: 100%"
+ placeholder="请选择保兑指示"
+ :code="codes.cnfflg1"
+ >
+ </c-select>
+ </el-form-item>
+ </c-col>
+ <!--
<c-col :span="12">
<span v-text="model.litp.oppbnkl" data-path=".litp.oppbnkl" > </span>
</c-col>
-->
- <c-col :span="12">
- <el-form-item label="对手行代码" prop="lidgrp.rec.oppbnk" v-if="zmqflg">
- <!--自贸区标志 -->
- <c-input
- v-model="model.lidgrp.rec.oppbnk"
- maxlength="12"
- placeholder="请输入对手行代码"
- ></c-input>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="货押标志" prop="lidgrp.rec.guaflg">
- <c-select
- v-model="model.lidgrp.rec.guaflg"
- style="width: 100%"
- placeholder="请选择货押标志"
- :code="codes.guaflg"
- >
- </c-select>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="注册编码" prop="lidgrp.rec.regref">
- <c-input
- v-model="model.lidgrp.rec.regref"
- maxlength="16"
- disabled
- placeholder="请输入注册编码"
- ></c-input>
- </el-form-item>
- </c-col>
- </c-col>
-
- <!-- ======================右边====================== -->
- <c-col :span="11" :offset="1">
- <c-col :span="24">
- <el-form-item label="简略信息" prop="lidgrp.rec.nam">
- <c-input
- v-model="model.lidgrp.rec.nam"
- maxlength="40"
- disabled
- placeholder="请输入简略信息"
- ></c-input>
- </el-form-item>
- </c-col>
- <c-col :span="24">
- <el-form-item
- label="申请人参考号"
- prop="lidgrp.apl.pts.ref"
- >
- <c-input
- v-model="model.lidgrp.apl.pts.ref"
- maxlength="16"
- style="width: 100%"
- placeholder="请输入申请人参考号"
- ></c-input>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="申请人" prop="lidgrp.apl.pts.extkey">
- <c-fullbox>
- <c-input
- v-model="model.lidgrp.apl.pts.extkey"
- maxlength="50"
- placeholder="请输入申请人地址编码"
- @keyup.enter.native="showGridPromptDialog('lidgrp.apl.pts.extkey')"
- ></c-input>
- <template slot="footer">
- <c-button
- style="margin:0 10px 0 10px;padding: 0 12px;"
- size="small"
- type="primary"
- @click="onSeainf('lidgrp.apl.pts.extkey')"
- icon="el-icon-search"
- >
- <span style="font-family:'宋体'; font-weight:bold"></span>
- </c-button>
- <c-button
- style="margin:0 0;"
- size="small"
- type="primary"
-
- @click="onAplpDet"
- icon="el-icon-info"
- >
-
- </c-button>
- </template>
- </c-fullbox>
- </el-form-item>
-
- </c-col>
-
- <!-- <c-col :span="8">
+ <c-col :span="12">
+ <el-form-item
+ label="对手行代码"
+ prop="lidgrp.rec.oppbnk"
+ v-if="zmqflg"
+ >
+ <!--自贸区标志 -->
+ <c-input
+ v-model="model.lidgrp.rec.oppbnk"
+ maxlength="12"
+ placeholder="请输入对手行代码"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="货押标志" prop="lidgrp.rec.guaflg">
+ <c-select
+ v-model="model.lidgrp.rec.guaflg"
+ style="width: 100%"
+ placeholder="请选择货押标志"
+ :code="codes.guaflg"
+ >
+ </c-select>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="注册编码" prop="lidgrp.rec.regref">
+ <c-input
+ v-model="model.lidgrp.rec.regref"
+ maxlength="16"
+ disabled
+ placeholder="请输入注册编码"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+ </c-col>
+
+ <!-- ======================右边====================== -->
+ <c-col :span="11" :offset="1">
+ <c-col :span="24">
+ <el-form-item label="简略信息" prop="lidgrp.rec.nam">
+ <c-input
+ v-model="model.lidgrp.rec.nam"
+ maxlength="40"
+ disabled
+ placeholder="请输入简略信息"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+ <c-col :span="24">
+ <el-form-item label="申请人参考号" prop="lidgrp.apl.pts.ref">
+ <c-input
+ v-model="model.lidgrp.apl.pts.ref"
+ maxlength="16"
+ style="width: 100%"
+ placeholder="请输入申请人参考号"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="申请人" prop="lidgrp.apl.pts.extkey">
+ <c-fullbox>
+ <c-input
+ v-model="model.lidgrp.apl.pts.extkey"
+ maxlength="50"
+ placeholder="请输入申请人地址编码"
+ @keyup.enter.native="
+ showGridPromptDialog('lidgrp.apl.pts.extkey')
+ "
+ ></c-input>
+ <template slot="footer">
+ <c-button
+ style="margin: 0 10px 0 10px; padding: 0 12px"
+ size="small"
+ type="primary"
+ @click="onSeainf('lidgrp.apl.pts.extkey')"
+ icon="el-icon-search"
+ >
+ <span style="font-family: '宋体'; font-weight: bold"></span>
+ </c-button>
+ <c-button
+ style="margin: 0 0"
+ size="small"
+ type="primary"
+ @click="onAplpDet"
+ icon="el-icon-info"
+ >
+ </c-button>
+ </template>
+ </c-fullbox>
+ </el-form-item>
+ </c-col>
+
+ <!-- <c-col :span="8">
<el-form-item label="" label-width="15px">
<c-button
size="small"
@@ -446,20 +437,20 @@
</el-form-item>
</c-col> -->
- <c-col :span="24">
- <el-form-item label="申请人名称地址" prop="lidgrp.apl.pts.adrblk">
- <c-input
- type="textarea"
- :rows="4"
- v-model="model.lidgrp.apl.pts.adrblk"
- maxlength="50"
- disabled
- show-word-limit
- placeholder="请输入名称地址"
- ></c-input>
- </el-form-item>
- </c-col>
- <!-- 需要处理
+ <c-col :span="24">
+ <el-form-item label="申请人名称地址" prop="lidgrp.apl.pts.adrblk">
+ <c-input
+ type="textarea"
+ :rows="4"
+ v-model="model.lidgrp.apl.pts.adrblk"
+ maxlength="50"
+ disabled
+ show-word-limit
+ placeholder="请输入名称地址"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+ <!-- 需要处理
<c-col :span="12">
<el-form-item label="Chinese address" prop="lidgrp.apl.dbfadrblkcn">
<c-input type="textarea" v-model="model.lidgrp.apl.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
@@ -467,7 +458,7 @@
</c-col>
-->
- <!--
+ <!--
<c-col :span="12">
<el-form-item label="名称" prop="lidgrp.apl.namelc">
<c-input type="textarea" v-model="model.lidgrp.apl.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
@@ -481,54 +472,57 @@
</c-col>
-->
- <c-col :span="24">
- <el-form-item label="通知行参考号" prop="lidgrp.adv.pts.ref">
- <c-input
- v-model="model.lidgrp.adv.pts.ref"
- maxlength="16"
- style="width: 100%"
- placeholder="请输入参考号"
- ></c-input>
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="通知行" prop="lidgrp.adv.pts.extkey" style="width:100%">
- <c-fullbox>
- <c-input
- v-model="model.lidgrp.adv.pts.extkey"
- maxlength="50"
- style="width:100%"
- placeholder="请输入通知行地址编码"
- @keyup.enter.native="showGridPromptDialog('lidgrp.adv.pts.extkey')"
- ></c-input>
- <template slot="footer">
- <c-button
- style="margin:0 10px 0 10px;padding: 0 12px;"
- size="small"
- type="primary"
- @click="onSeainf('lidgrp.adv.pts.extkey')"
- icon="el-icon-search"
- >
- <span style="font-family:'宋体';font-weight:bold"></span>
- </c-button>
- <c-button
- style="margin:0 0;"
- size="small"
- type="primary"
-
- @click="onAdvpDet"
- icon="el-icon-info"
- >
-
- </c-button>
- </template>
-
- </c-fullbox>
- </el-form-item>
- </c-col>
-
- <!-- <c-col :span="8">
+ <c-col :span="24">
+ <el-form-item label="通知行参考号" prop="lidgrp.adv.pts.ref">
+ <c-input
+ v-model="model.lidgrp.adv.pts.ref"
+ maxlength="16"
+ style="width: 100%"
+ placeholder="请输入参考号"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item
+ label="通知行"
+ prop="lidgrp.adv.pts.extkey"
+ style="width: 100%"
+ >
+ <c-fullbox>
+ <c-input
+ v-model="model.lidgrp.adv.pts.extkey"
+ maxlength="50"
+ style="width: 100%"
+ placeholder="请输入通知行地址编码"
+ @keyup.enter.native="
+ showGridPromptDialog('lidgrp.adv.pts.extkey')
+ "
+ ></c-input>
+ <template slot="footer">
+ <c-button
+ style="margin: 0 10px 0 10px; padding: 0 12px"
+ size="small"
+ type="primary"
+ @click="onSeainf('lidgrp.adv.pts.extkey')"
+ icon="el-icon-search"
+ >
+ <span style="font-family: '宋体'; font-weight: bold"></span>
+ </c-button>
+ <c-button
+ style="margin: 0 0"
+ size="small"
+ type="primary"
+ @click="onAdvpDet"
+ icon="el-icon-info"
+ >
+ </c-button>
+ </template>
+ </c-fullbox>
+ </el-form-item>
+ </c-col>
+
+ <!-- <c-col :span="8">
<el-form-item label="" label-width="15px">
<c-button
size="small"
@@ -542,20 +536,20 @@
</el-form-item>
</c-col> -->
- <c-col :span="24">
- <el-form-item label="通知行名称地址" prop="lidgrp.adv.pts.adrblk">
- <c-input
- type="textarea"
- :rows="4"
- v-model="model.lidgrp.adv.pts.adrblk"
- maxlength="80"
- disabled
- show-word-limit
- placeholder="请输入名称地址"
- ></c-input>
- </el-form-item>
- </c-col>
- <!--需要处理
+ <c-col :span="24">
+ <el-form-item label="通知行名称地址" prop="lidgrp.adv.pts.adrblk">
+ <c-input
+ type="textarea"
+ :rows="4"
+ v-model="model.lidgrp.adv.pts.adrblk"
+ maxlength="80"
+ disabled
+ show-word-limit
+ placeholder="请输入名称地址"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+ <!--需要处理
<c-col :span="12">
<el-form-item label="Chinese address" prop="lidgrp.adv.dbfadrblkcn">
<c-input type="textarea" v-model="model.lidgrp.adv.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
@@ -563,7 +557,7 @@
</c-col>
-->
- <!--
+ <!--
<c-col :span="12">
<el-form-item label="名称" prop="lidgrp.adv.namelc">
<c-input type="textarea" v-model="model.lidgrp.adv.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
@@ -577,57 +571,53 @@
</c-col>
-->
- <c-col :span="24">
- <el-form-item
- label="受益人参考号"
- prop="lidgrp.ben.pts.ref"
- >
-
- <c-input
- v-model="model.lidgrp.ben.pts.ref"
- maxlength="16"
- style="width: 100%"
- placeholder="请输入参考号"
- ></c-input>
-
- </el-form-item>
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="受益人地址编码" prop="lidgrp.ben.pts.extkey">
- <c-fullbox>
- <c-input
- v-model="model.lidgrp.ben.pts.extkey"
- style="width:100%"
- maxlength="16"
- placeholder="请输入地址编码"
- @keyup.enter.native="showGridPromptDialog('lidgrp.ben.pts.extkey')"
- ></c-input>
- <template slot="footer">
- <c-button
- style="margin:0 10px 0 10px;padding: 0 12px;"
- size="small"
- type="primary"
- @click="onSeainf('lidgrp.ben.pts.extkey')"
- icon="el-icon-search"
- >
- <span style="font-family:'宋体';font-weight:bold"></span>
- </c-button>
- <c-button
- style="margin:0 0;"
- size="small"
- type="primary"
- @click="onBenpDet"
- icon="el-icon-info"
- >
-
- </c-button>
- </template>
- </c-fullbox>
- </el-form-item>
- </c-col>
-
- <!-- <c-col :span="8">
+ <c-col :span="24">
+ <el-form-item label="受益人参考号" prop="lidgrp.ben.pts.ref">
+ <c-input
+ v-model="model.lidgrp.ben.pts.ref"
+ maxlength="16"
+ style="width: 100%"
+ placeholder="请输入参考号"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="受益人地址编码" prop="lidgrp.ben.pts.extkey">
+ <c-fullbox>
+ <c-input
+ v-model="model.lidgrp.ben.pts.extkey"
+ style="width: 100%"
+ maxlength="16"
+ placeholder="请输入地址编码"
+ @keyup.enter.native="
+ showGridPromptDialog('lidgrp.ben.pts.extkey')
+ "
+ ></c-input>
+ <template slot="footer">
+ <c-button
+ style="margin: 0 10px 0 10px; padding: 0 12px"
+ size="small"
+ type="primary"
+ @click="onSeainf('lidgrp.ben.pts.extkey')"
+ icon="el-icon-search"
+ >
+ <span style="font-family: '宋体'; font-weight: bold"></span>
+ </c-button>
+ <c-button
+ style="margin: 0 0"
+ size="small"
+ type="primary"
+ @click="onBenpDet"
+ icon="el-icon-info"
+ >
+ </c-button>
+ </template>
+ </c-fullbox>
+ </el-form-item>
+ </c-col>
+
+ <!-- <c-col :span="8">
<el-form-item label="" label-width="15px">
<c-button
size="small"
@@ -641,26 +631,26 @@
</el-form-item>
</c-col> -->
- <c-col :span="24">
- <el-form-item label="受益人名称地址" prop="lidgrp.ben.pts.adrblk">
- <c-input
- type="textarea"
- :rows="4"
- v-model="model.lidgrp.ben.pts.adrblk"
- maxlength="80"
- show-word-limit
- placeholder="请输入名称地址"
- ></c-input>
- </el-form-item>
- </c-col>
- <!--需要处理
+ <c-col :span="24">
+ <el-form-item label="受益人名称地址" prop="lidgrp.ben.pts.adrblk">
+ <c-input
+ type="textarea"
+ :rows="4"
+ v-model="model.lidgrp.ben.pts.adrblk"
+ maxlength="80"
+ show-word-limit
+ placeholder="请输入名称地址"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+ <!--需要处理
<c-col :span="12">
<el-form-item label="Chinese address" prop="lidgrp.ben.dbfadrblkcn">
<c-input type="textarea" v-model="model.lidgrp.ben.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
</el-form-item>
</c-col>
-->
- <!--
+ <!--
<c-col :span="12">
<el-form-item label="名称" prop="lidgrp.ben.namelc">
<c-input type="textarea" v-model="model.lidgrp.ben.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
@@ -674,30 +664,56 @@
</c-col>
-->
- <c-col :span="24" class="centerLable marginLable">
- <c-checkbox v-model="model.lidgrp.rec.rmbflg" disabled
- style="margin-left:9px;padding: 0 10px;"
- >偿付行信息</c-checkbox
- >
- </c-col>
-
- <c-col :span="24" class="centerLable marginLable">
- <c-checkbox v-model="model.lidgrp.rec.revflg" disabled
- style="margin-left:9px;padding: 0 10px;"
- >循环信用证</c-checkbox
- >
- </c-col>
-
- <c-col :span="24">
- <el-form-item label="合同编号" prop="lidgrp.rec.rptref">
- <c-input
- v-model="model.lidgrp.rec.rptref"
- maxlength="25"
- placeholder="请输入合同编号"
- ></c-input>
- </el-form-item>
- </c-col>
- </c-col>
+ <c-col :span="24" class="centerLable marginLable">
+ <c-checkbox
+ v-model="model.lidgrp.rec.rmbflg"
+ disabled
+ style="margin-left: 9px; padding: 0 10px"
+ >偿付行信息</c-checkbox
+ >
+ </c-col>
+
+ <c-col :span="24" class="centerLable marginLable">
+ <c-checkbox
+ v-model="model.lidgrp.rec.revflg"
+ disabled
+ style="margin-left: 9px; padding: 0 10px"
+ >循环信用证</c-checkbox
+ >
+ </c-col>
+
+ <c-col :span="24">
+ <el-form-item label="合同编号" prop="lidgrp.rec.rptref">
+ <c-input
+ v-model="model.lidgrp.rec.rptref"
+ maxlength="25"
+ placeholder="请输入合同编号"
+ ></c-input>
+ </el-form-item>
+ </c-col>
+ </c-col>
+ </el-collapse-item>
+ <el-collapse-item title="详情" name="2">
+ <!-- 详情 -->
+ <m-detp :model="model" :codes="codes" />
+ </el-collapse-item>
+ <el-collapse-item title="当事人" name="3">
+ <!-- 当事人 -->
+ <m-ptyp :model="model" :codes="codes" />
+ </el-collapse-item>
+ <el-collapse-item title="货物" name="4">
+ <!-- 货物 -->
+ <m-doxp :model="model" :codes="codes" :dtyp="'dogp'" :rec="'lid'" />
+ </el-collapse-item>
+ <el-collapse-item title="单据" name="5">
+ <!-- 单据 -->
+ <m-doxp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
+ </el-collapse-item>
+ <el-collapse-item title="附加条件" name="6">
+ <!-- 附加条款 -->
+ <m-doxp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
+ </el-collapse-item>
+ </el-collapse>
</div>
</template>
<script>
@@ -705,58 +721,89 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Litopn/Event";
+import Detp from "./Detp";
+import Ptyp from "./Ptyp";
+import Dogp from "./Dogp";
+import Dorp from "./Dorp";
+import Adcp from "./Adcp";
+import Doxp from "~/views/Public/Doxp";
export default {
+ components: {
+ "m-detp": Detp,
+ "m-ptyp": Ptyp,
+ "m-dogp": Dogp,
+ "m-dorp": Dorp,
+ "m-adcp": Adcp,
+ "m-doxp": Doxp,
+ },
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
zmqflg: null,
- flag:true,
+ flag: true,
+ activeNames: ["1"],
};
},
- methods: { ...Event,
- open(val){
- if(val ==='' && !(this.model.lidgrp.cbs.max2.amt =='0.000'&& this.model.lidgrp.cbs.opn2.amt =='0.000' && this.model.lidgrp.blk.addamtcov==='') ){
- this.$confirm('Do you really want to delete the additional amount of this contract?','提示',{
- confirmButtonText: 'Yes',
- cancelButtonText: 'No',
- type: 'warning',
- showClose:false
- }).then(() => {//yes的执行在这里写
- this.model.lidgrp.cbs.max2.amt ='0.000';
- this.model.lidgrp.blk.addamtcov = '';
- this.model.lidgrp.cbs.opn2.amt ='0.000';
+ methods: {
+ ...Event,
+ open(val) {
+ if (
+ val === "" &&
+ !(
+ this.model.lidgrp.cbs.max2.amt == "0.000" &&
+ this.model.lidgrp.cbs.opn2.amt == "0.000" &&
+ this.model.lidgrp.blk.addamtcov === ""
+ )
+ ) {
+ this.$confirm(
+ "Do you really want to delete the additional amount of this contract?",
+ "提示",
+ {
+ confirmButtonText: "Yes",
+ cancelButtonText: "No",
+ type: "warning",
+ showClose: false,
+ }
+ )
+ .then(() => {
+ //yes的执行在这里写
+ this.model.lidgrp.cbs.max2.amt = "0.000";
+ this.model.lidgrp.blk.addamtcov = "";
+ this.model.lidgrp.cbs.opn2.amt = "0.000";
this.$message({
- type: 'success',
- message: '删除成功!'
+ type: "success",
+ message: "删除成功!",
});
-
- }).catch(() => {//No的功能在这里写
- this.model.litp.aamp.aammod.addamtflg ='X'
- this.$message({
- type: 'info',
- message: '已取消删除'
- });
- });
- }
-
- }
+ })
+ .catch(() => {
+ //No的功能在这里写
+ this.model.litp.aamp.aammod.addamtflg = "X";
+ this.$message({
+ type: "info",
+ message: "已取消删除",
+ });
+ });
+ }
+ },
+ handleChange(val) {
+ console.log(val);
+ },
},
created: function () {},
- watch:{
- "model.lidgrp.rec.apprul": {
- immediate:true,
- handler(val,oldVal){
- if(val == "OTHR"){
- this.flag=false;
- }else{
- this.flag=true;
- }
-
- }
+ watch: {
+ "model.lidgrp.rec.apprul": {
+ immediate: true,
+ handler(val, oldVal) {
+ if (val == "OTHR") {
+ this.flag = false;
+ } else {
+ this.flag = true;
}
+ },
+ },
},
computed: {
flag1() {
diff --git a/src/views/Business/Litopn/index.vue b/src/views/Business/Litopn/index.vue
index 8729daf..25d119b 100644
--- a/src/views/Business/Litopn/index.vue
+++ b/src/views/Business/Litopn/index.vue
@@ -1,24 +1,18 @@
<template>
<c-page title="进口信用证开立">
<div class="eContainer">
- <c-function-btn
- :handleSubmit="handleSubmit"
- :handleCheck="handleCheck"
- :handleStash="handleStash"
- >
- </c-function-btn>
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="160px"
size="small"
- label-position="left"
+ label-position="right"
:validate-on-rule-change="false"
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000001 -->
- <el-tab-pane :label="$t('litp.PD000001')" name="ovwp">
+ <el-tab-pane label="业务信息" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
@@ -27,102 +21,107 @@
<!--PD000001 -->
<el-tab-pane
v-if="model.litp.aamp.aammod.addamtflg"
- :label="$t('aamp.PD000001')"
+ label="附加金额"
name="aamp"
>
<m-aamp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000077 -->
- <el-tab-pane :label="$t('litp.PD000077')" name="detp">
+ <!-- <el-tab-pane label="详情" name="detp">
<c-content>
<m-detp :model="model" :codes="codes" />
</c-content>
- </el-tab-pane>
+ </el-tab-pane> -->
<!--PD000042 -->
- <el-tab-pane :label="$t('litp.PD000042')" name="ptyp">
+ <!-- <el-tab-pane label="当事人" name="ptyp">
<c-content>
<m-ptyp :model="model" :codes="codes" />
</c-content>
- </el-tab-pane>
+ </el-tab-pane> -->
<!--PD000057 -->
- <el-tab-pane :label="$t('litp.PD000057')" name="dogp">
+ <!-- <el-tab-pane label="货物" name="dogp">
<c-content>
<m-doxp :model="model" :codes="codes" :dtyp="'dogp'" :rec="'lid'"
/>
</c-content>
- </el-tab-pane>
+ </el-tab-pane> -->
<!--PD000060 -->
- <el-tab-pane :label="$t('litp.PD000060')" name="dorp">
+ <!-- <el-tab-pane label="单据" name="dorp">
<c-content>
<m-doxp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'"
/>
</c-content>
- </el-tab-pane>
+ </el-tab-pane> -->
<!--PD000073 -->
- <el-tab-pane :label="$t('litp.PD000074')" name="adcp">
+ <!-- <el-tab-pane label="附加条款" name="adcp">
<c-content>
<m-doxp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'"
/>
</c-content>
+ </el-tab-pane> -->
+
+ <!--PD000001 -->
+ <el-tab-pane label="保证金" name="ccvpan">
+ <m-ccvpan :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000001 -->
+ <el-tab-pane label="统一授信" name="limitbody">
+ <m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000027 -->
- <el-tab-pane :label="$t('liaall.PD000027')" name="engp">
+ <el-tab-pane label="费用/账务" name="engp">
<c-content>
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
- <!--PD000001 -->
- <el-tab-pane :label="$t('liaccv.PD000001')" name="ccvpan">
- <m-ccvpan :model="model" :codes="codes" />
- </el-tab-pane>
-
<!--PD000000 -->
- <el-tab-pane :label="$t('setmod.PD000000')" name="setpan">
+ <!-- <el-tab-pane label="结算" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
- </el-tab-pane>
+ </el-tab-pane> -->
<!--PD000001 -->
- <el-tab-pane :label="$t('glemod.PD000001')" name="glepan">
+ <!-- <el-tab-pane label="会计分录" name="glepan">
<m-glepan :model="model" :codes="codes" />
- </el-tab-pane>
+ </el-tab-pane> -->
<!--PD000510 -->
- <el-tab-pane :label="$t('litopn.PD000510')" name="addbcb">
+ <el-tab-pane label="备查/附言" name="addbcb">
<m-addbcb :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000000 -->
- <el-tab-pane :label="$t('coninf.PD000000')" name="coninfp">
+ <!-- <el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
- </el-tab-pane>
+ </el-tab-pane> -->
<!--PD000529 -->
- <el-tab-pane :label="$t('trndoc.PD000529')" name="docpan">
+ <el-tab-pane label="报文/面函" name="docpan">
<m-docpan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000546 -->
- <el-tab-pane :label="$t('trndoc.PD000546')" name="doctre">
+ <el-tab-pane label="附件信息" name="doctre">
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000002 -->
- <el-tab-pane :label="$t('cnybop.PD000002')" name="cnyp">
+ <el-tab-pane label="申报信息" name="cnyp">
<m-cnyp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000110 -->
<el-tab-pane
- :label="$t('cnybop.PD000110')"
+ label="2106银行跟单结算及表外融资"
name="libp"
v-if="this.model.cnybop.libflg == '1'"
>
@@ -132,7 +131,7 @@
<!--PD000346 -->
<el-tab-pane
v-if="model.lidgrp.rec.spcrcbflg"
- :label="$t('litp.PD000422')"
+ label="仅适用于指定银行的特殊付款条件"
name="spcrcvp"
>
<m-spcrcvp :model="model" :codes="codes" />
@@ -152,10 +151,7 @@
<m-namp :model="model" :codes="codes"/>
</el-tab-pane> -->
- <!--PD000001 -->
- <el-tab-pane :label="$t('limmod.PD000001')" name="limitbody">
- <m-limitbody :model="model" :codes="codes" />
- </el-tab-pane>
+
<!--PD001033 -->
<!--
@@ -191,6 +187,13 @@
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
+
+ <c-function-btn
+ :handleSubmit="handleSubmit"
+ :handleCheck="handleCheck"
+ :handleStash="handleStash"
+ >
+ </c-function-btn>
</div>
</c-page>
</template>
diff --git a/src/views/Business/Ordrel/Menu.vue b/src/views/Business/Ordrel/Menu.vue
index 53b1d12..1eb1df1 100644
--- a/src/views/Business/Ordrel/Menu.vue
+++ b/src/views/Business/Ordrel/Menu.vue
@@ -478,9 +478,6 @@ export default {
.m-table-search {
padding: 20px 0px 10px 0px;
}
-.el-form-item__label{
- text-align: left!important;
-}
.el-row > .el-col {
padding-right: 10px!important;
}
diff --git a/src/views/Business/index.vue b/src/views/Business/index.vue
index d6e69a4..cc11c5b 100644
--- a/src/views/Business/index.vue
+++ b/src/views/Business/index.vue
@@ -36,10 +36,9 @@ export default {
<style>
#business_container {
- /* height: 100%; */
- padding: 5px 15px;
- /* width: 100%; */
flex: 1;
+ width: 85%;
+ margin: 40px auto 0;
}
#business_container .eibs-tab {
padding: 0 15px;
diff --git a/src/views/Layout/Header.vue b/src/views/Layout/Header.vue
index e1dd84c..85dd78f 100644
--- a/src/views/Layout/Header.vue
+++ b/src/views/Layout/Header.vue
@@ -4,10 +4,10 @@
<img src="../../assets/logo.png" alt="" style="height: 100%" />
</div>
<div class="self_header_label">
- <h2>国际结算系统</h2>
+ <h2 style="font-size: 30px">国际结算系统</h2>
</div>
<div class="header-tool">
- <div class="header-subInstName">
+ <div class="header-subInstName">
<!-- <marquee
v-if="subInstName.length > 12"
behavior="scroll"
@@ -431,7 +431,7 @@ export default {
color: #fff;
/* margin-top: 10px !important; */
position: relative;
- top: 22px;
+ top: 12.778px;
/* left: 10px; */
padding: 0px 15px;
display: inline-table;
@@ -439,6 +439,8 @@ export default {
font-family: "黑体";
/* border-left: 1px solid antiquewhite; */
border-left: 1px solid #fff;
+ /* ui美化 */
+ font-size: 30px;
}
.self_header_label p {
font-family: "Times New Roman", Times, serif;
diff --git a/src/views/Layout/SideMenu.vue b/src/views/Layout/SideMenu.vue
index 4b8326c..cb68ecc 100644
--- a/src/views/Layout/SideMenu.vue
+++ b/src/views/Layout/SideMenu.vue
@@ -326,7 +326,7 @@ export default {
.eContainer-menu-search .el-button {
border: none;
font-size: 20px;
- padding: 12px 20px;
+ padding: 9.01px 20px;
}
.eContainer-menu-search .el-input {
@@ -406,9 +406,12 @@ export default {
.el-submenu__title,
.el-menu-item,
.el-submenu .el-menu-item {
- font-size: 12px;
- height: 35px;
- line-height: 35px;
+ font-size: 14px;
+ height: 40px;
+ line-height: 40px;
+}
+.el-submenu__title.active{
+ font-weight: bold;
}
.el-menu-vertical-demo [class^="el-icon-caret-"] {
color: #606266;
diff --git a/src/views/Layout/components/TagsView/index.vue b/src/views/Layout/components/TagsView/index.vue
index 2364e38..e824d99 100644
--- a/src/views/Layout/components/TagsView/index.vue
+++ b/src/views/Layout/components/TagsView/index.vue
@@ -237,7 +237,7 @@ export default {
<style scoped>
.tags-view-container {
- height: 28px;
+ height: 29.002px;
width: 100%;
background: #f5f4f9;
border-bottom: 1px solid #d8dce5;
diff --git a/src/views/Public/Engp.vue b/src/views/Public/Engp.vue
index 77ad688..2ac0fa5 100644
--- a/src/views/Public/Engp.vue
+++ b/src/views/Public/Engp.vue
@@ -3,127 +3,136 @@
<!-- <c-col :span="24" style="margin-bottom:18px">
Liability
</c-col> -->
- <c-col :span="24" style="">
- <c-table
- :list="model.liaall.liaallg"
- style="width:80%,text-align:center,margin-bottom:18px"
- :border="true"
- >
- <el-table-column prop="bussec" label="业务" width="50px">
- </el-table-column>
- <el-table-column prop="cbtpfx" label="类型" width="60px">
- </el-table-column>
- <el-table-column prop="matdat" label="到期日" width="150px">
- <template slot-scope="scope">
- <el-form-item
- label-width="0"
- :prop="'liaall.liaallg.' + scope.$index + '.matdat'"
- >
- <c-date-picker
- type="date"
- v-model="scope.row.matdat"
- value-format="yyyy-MM-dd"
- placeholder="请选择日期"
- style="width: 100%"
- @change="executeDefault('liaall.liaallg.matdat')"
- :disabled="root.trnName== 'letopn'"
- >
- </c-date-picker>
- </el-form-item>
- </template>
- </el-table-column>
- <el-table-column prop="tenday" label="效期" width="70px">
- <template slot-scope="scope">
- <el-form-item
- label-width="0"
- :prop="'liaall.liaallg.' + scope.$index + '.tenday'"
- >
- <c-input
- v-model="scope.row.tenday"
- style="width: 100%"
- placeholder="请输入"
- >
- </c-input>
- </el-form-item>
- </template>
- </el-table-column>
- <el-table-column prop="rol" label="债务人" width="70px">
- </el-table-column>
- <!--
+ <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse-item title="表外记账" name="1">
+ <c-col :span="24" style="">
+ <c-table
+ :list="model.liaall.liaallg"
+ style="width:80%,text-align:center,margin-bottom:18px"
+ :border="true"
+ >
+ <el-table-column prop="bussec" label="业务" width="50px">
+ </el-table-column>
+ <el-table-column prop="cbtpfx" label="类型" width="60px">
+ </el-table-column>
+ <el-table-column prop="matdat" label="到期日" width="150px">
+ <template slot-scope="scope">
+ <el-form-item
+ label-width="0"
+ :prop="'liaall.liaallg.' + scope.$index + '.matdat'"
+ >
+ <c-date-picker
+ type="date"
+ v-model="scope.row.matdat"
+ value-format="yyyy-MM-dd"
+ placeholder="请选择日期"
+ style="width: 100%"
+ @change="executeDefault('liaall.liaallg.matdat')"
+ :disabled="root.trnName == 'letopn'"
+ >
+ </c-date-picker>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="tenday" label="效期" width="70px">
+ <template slot-scope="scope">
+ <el-form-item
+ label-width="0"
+ :prop="'liaall.liaallg.' + scope.$index + '.tenday'"
+ >
+ <c-input
+ v-model="scope.row.tenday"
+ style="width: 100%"
+ placeholder="请输入"
+ >
+ </c-input>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="rol" label="债务人" width="70px">
+ </el-table-column>
+ <!--
<el-table-column prop="nam" label="Name" width="300"> </el-table-column>
-->
- <el-table-column prop="cdtrol" label="债权人" width="70px">
- </el-table-column>
- <el-table-column prop="cur" label="币种" width="55px"> </el-table-column>
- <el-table-column prop="oldamt" label="原始金额" width="150px">
- <!-- <template slot-scope="scope">
+ <el-table-column prop="cdtrol" label="债权人" width="70px">
+ </el-table-column>
+ <el-table-column prop="cur" label="币种" width="55px">
+ </el-table-column>
+ <el-table-column prop="oldamt" label="原始金额" width="150px">
+ <!-- <template slot-scope="scope">
{{moneyFormat(scope.row.oldamt)}}
</template> -->
- </el-table-column>
- <el-table-column prop="amt" label="记账金额" width="100px">
- <!-- <template slot-scope="scope">
+ </el-table-column>
+ <el-table-column prop="amt" label="记账金额" width="100px">
+ <!-- <template slot-scope="scope">
{{moneyFormat(scope.row.amt)}}
</template> -->
- </el-table-column>
- <el-table-column prop="tenpct" label="%" width="80px">
- </el-table-column>
- <el-table-column prop="acc" label="核心账号" width="150px">
- <!-- check，需用el-form-item标签包起来 -->
- <template slot-scope="scope">
- <el-form-item
- label-width="0"
- :prop="'liaall.liaallg.' + scope.$index + '.acc'"
- >
- <!-- <c-input
+ </el-table-column>
+ <el-table-column prop="tenpct" label="%" width="80px">
+ </el-table-column>
+ <el-table-column prop="acc" label="核心账号" width="150px">
+ <!-- check，需用el-form-item标签包起来 -->
+ <template slot-scope="scope">
+ <el-form-item
+ label-width="0"
+ :prop="'liaall.liaallg.' + scope.$index + '.acc'"
+ >
+ <!-- <c-input
v-model="scope.row.acc"
style="width: 100%"
placeholder="请输入"
>
</c-input> -->
- </el-form-item>
- </template>
- </el-table-column>
- <el-table-column prop="valdat" label="起息日" width="200px">
- <template slot-scope="scope">
- {{ dateFormat(scope.row.valdat) }}
- </template>
- </el-table-column>
- <el-table-column label="" prop="det" width="80px" fixed="right">
- <template slot-scope="scope" slot="header">
- <el-button
- circle
- style="padding: 4px"
- class="el-icon-plus"
- size="mini"
- @click="addRow(scope)"
- >
- </el-button>
- <el-button
- style="padding: 4px"
- circle
- class="el-icon-minus"
- size="mini"
- @click="removeRow(scope)"
- >
- </el-button>
- </template>
- <template slot-scope="scoped">
- <c-button
- style="margin-left:0"
- size="small"
- type="primary"
- icon="el-icon-info"
- @click="detail1(scoped.$index, scoped.row)"></c-button>
- </template>
- </el-table-column>
- </c-table>
- </c-col>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="valdat" label="起息日" width="200px">
+ <template slot-scope="scope">
+ {{ dateFormat(scope.row.valdat) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="" prop="det" width="80px" fixed="right">
+ <template slot-scope="scope" slot="header">
+ <el-button
+ circle
+ style="padding: 4px"
+ class="el-icon-plus"
+ size="mini"
+ @click="addRow(scope)"
+ >
+ </el-button>
+ <el-button
+ style="padding: 4px"
+ circle
+ class="el-icon-minus"
+ size="mini"
+ @click="removeRow(scope)"
+ >
+ </el-button>
+ </template>
+ <template slot-scope="scoped">
+ <c-button
+ style="margin-left: 0"
+ size="small"
+ type="primary"
+ icon="el-icon-info"
+ @click="detail1(scoped.$index, scoped.row)"
+ ></c-button>
+ </template>
+ </el-table-column>
+ </c-table>
+ </c-col>
- <div style="height=500px">
- <engp-dialog ref="engpDialog" :model="model" :idx="index" :codes="codes" />
- </div>
+ <div style="height=500px">
+ <engp-dialog
+ ref="engpDialog"
+ :model="model"
+ :idx="index"
+ :codes="codes"
+ />
+ </div>
- <!-- <c-col :span="12">
+ <!-- <c-col :span="12">
<el-form-item label="Sight Amount">
<c-input style="width:50%" v-model="model.liaall.outamt" placeholder="请输入Sight Amount"></c-input>
</el-form-item>
@@ -141,34 +150,34 @@
</el-form-item>
</c-col> -->
- <c-col :span="16" style="margin-top: 10px">
- <el-form-item label="未分配金额">
- <c-input
- style="width: 15%"
- disabled
- v-model="model.liaall.concur"
- maxlength="3"
- placeholder=""
- ></c-input>
- <c-input
- style="width: 40%"
- disabled
- v-model="model.liaall.misamt"
- placeholder="请输入金额"
- ></c-input>
- <c-button
- style="width: 20%"
- size="small"
- disabled
- type="primary"
- @click="onLiaallButmisamt"
- >
- 添加到当前行
- </c-button>
- </el-form-item>
- </c-col>
+ <c-col :span="16" style="margin-top: 10px">
+ <el-form-item label="未分配金额">
+ <c-input
+ style="width: 15%"
+ disabled
+ v-model="model.liaall.concur"
+ maxlength="3"
+ placeholder=""
+ ></c-input>
+ <c-input
+ style="width: 40%"
+ disabled
+ v-model="model.liaall.misamt"
+ placeholder="请输入金额"
+ ></c-input>
+ <c-button
+ style="width: 20%"
+ size="small"
+ disabled
+ type="primary"
+ @click="onLiaallButmisamt"
+ >
+ 添加到当前行
+ </c-button>
+ </el-form-item>
+ </c-col>
- <!-- <c-col :span="1" style="text-align:left;margin-left:0">
+ <!-- <c-col :span="1" style="text-align:left;margin-left:0">
<el-form-item label="">
<c-button size="small" disabled type="primary" @click="onLiaallButmisamt">
Add to Current Line
@@ -176,7 +185,7 @@
</el-form-item>
</c-col> -->
- <!-- <c-col :span="12">
+ <!-- <c-col :span="12">
<el-form-item label="">
<c-button size="small" type="primary" @click="onLiaallButmissig">
Add to Sight Amount
@@ -195,6 +204,16 @@
<c-input style="width:50%" v-model="model.liaall.exttotamt" placeholder="请输入Total booking amount external assinged"></c-input>
</el-form-item>
</c-col> -->
+ </el-collapse-item>
+ <el-collapse-item title="结算" name="2">
+ <!-- 结算 -->
+ <m-setpan :model="model" :codes="codes" />
+ </el-collapse-item>
+ <el-collapse-item title="会计分录" name="3">
+ <!-- 会计分录 -->
+ <m-glepan :model="model" :codes="codes" />
+ </el-collapse-item>
+ </el-collapse>
</div>
</template>
<script>
@@ -202,21 +221,24 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import EngpDialog from "./EngpDialog.vue";
+import Setpan from "./Setpan";
+import Glepan from "./Glepan";
export default {
inject: ["root"],
- components: { EngpDialog },
+ components: {
+ EngpDialog,
+ "m-setpan": Setpan,
+ "m-glepan": Glepan,
+ },
mixins: [commonProcess],
props: ["model", "codes"],
data() {
return {
dialogVisible: false,
- dialog:{
-
- },
- index:0,
-
-
+ dialog: {},
+ index: 0,
+ activeNames: ["1"],
};
},
methods: {
@@ -230,15 +252,21 @@ export default {
},
detail1(index, row) {
- const that = this;
- const rule = "liaall.liaallg(" + (index + 1) + ").det";
- that.executeRule(rule).then(res => {
- that.$refs.engpDialog.visiable = true;
- that.$refs.engpDialog.formData = Object.assign({}, that.model.liaall.liaallg[index]);
- that.index = index;
- that.dialog = row
- })
- },
+ const that = this;
+ const rule = "liaall.liaallg(" + (index + 1) + ").det";
+ that.executeRule(rule).then((res) => {
+ that.$refs.engpDialog.visiable = true;
+ that.$refs.engpDialog.formData = Object.assign(
+ {},
+ that.model.liaall.liaallg[index]
+ );
+ that.index = index;
+ that.dialog = row;
+ });
+ },
+ handleChange(val) {
+ console.log(val);
+ },
},
created: function () {},
};