diff --git a/src/model/Botame/Pattern.js b/src/model/Botame/Pattern.js
index a6a1e41..c9920ba 100644
--- a/src/model/Botame/Pattern.js
+++ b/src/model/Botame/Pattern.js
@@ -52,7 +52,7 @@ export default {
"oldbodgrp.rec.matdat":[
- {type: "date", required: false, message: "输入正确的日期"}
+ //{type: "date", required: false, message: "输入正确的日期"}
],
"trnmod.swiadd.newmatdat":[
//{type: "date", required: false, message: "输入正确的日期"}
@@ -122,7 +122,7 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bodgrp.drr.pts.adrblk":[
- {type: "string", required: true, message: "必输项"},
+ //{type: "string", required: true, message: "必输项"},
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.drr.dbfadrblkcn":[
@@ -173,7 +173,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bodgrp.col.pts.adrblk":[
- {type: "string", required: true, message: "必输项"},
+ //{type: "string", required: true, message: "必输项"},
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.col.dbfadrblkcn":[
@@ -230,7 +230,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bodgrp.dre.pts.adrblk":[
- {type: "string", required: true, message: "必输项"},
+ //{type: "string", required: true, message: "必输项"},
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.dre.dbfadrblkcn":[
@@ -249,7 +249,7 @@ export default {
"bodgrp.blk.colins":[
{type: "string", required: true, message: "必输项"},
- {max: 65,message:"长度不能超过65"}
+ {max: 3250,message:"长度不能超过3250"}
],
diff --git a/src/model/Botset/Pattern.js b/src/model/Botset/Pattern.js
index 0c30256..8a20856 100644
--- a/src/model/Botset/Pattern.js
+++ b/src/model/Botset/Pattern.js
@@ -1,7 +1,7 @@
export default {
"bodgrp.blk.colins":[
{type: "string", required: true, message: "必输项"},
- {max: 65,message:"长度不能超过65"}
+ {max: 3250,message:"长度不能超过3250"}
],
@@ -82,7 +82,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bodgrp.drr.pts.adrblk":[
- {type: "string", required: true, message: "必输项"},
+ //{type: "string", required: true, message: "必输项"},
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.drr.dbfadrblkcn":[
@@ -90,7 +90,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bodgrp.col.pts.adrblk":[
- {type: "string", required: true, message: "必输项"},
+ //{type: "string", required: true, message: "必输项"},
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.col.dbfadrblkcn":[
@@ -127,7 +127,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bodgrp.dre.pts.adrblk":[
- {type: "string", required: true, message: "必输项"},
+ //{type: "string", required: true, message: "必输项"},
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.dre.dbfadrblkcn":[
@@ -441,8 +441,8 @@ export default {
"bopmod.dbdgrp.bas.actiondesc":[
- {type: "string", required: true, message: "必输项"},
- {max: 32,message:"长度不能超过32"}
+ //{type: "string", required: true, message: "必输项"},
+ //{max: 32,message:"长度不能超过32"}
],
@@ -519,8 +519,8 @@ export default {
"bopmod.dbagrp.bas.actiondesc":[
- {type: "string", required: true, message: "必输项"},
- {max: 32,message:"长度不能超过32"}
+ //{type: "string", required: true, message: "必输项"},
+ //{max: 32,message:"长度不能超过32"}
],
diff --git a/src/views/Business/Bdtcan/Canp.vue b/src/views/Business/Bdtcan/Canp.vue
index 26b6bb8..9d89bec 100644
--- a/src/views/Business/Bdtcan/Canp.vue
+++ b/src/views/Business/Bdtcan/Canp.vue
@@ -324,7 +324,7 @@
placeholder="请选择Booking Procedure"
>
<el-option
- v-for="item in codes.rebkpflg"
+ v-for="item in rebkpflg"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -346,7 +346,12 @@ export default {
props: ["model", "codes"],
mixins: [commonProcess],
data() {
- return {};
+ return {
+ rebkpflg: [
+ { label: "Reverse Booking (Document Set)", value: "N" },
+ { label: "Reverse Booking (Doc. Set, L/C)", value: "B" },
+ ],
+ };
},
methods: { ...Event, changed(e) {} },
created: function () {},
diff --git a/src/views/Business/Botame/Inst.vue b/src/views/Business/Botame/Inst.vue
index 455e3ad..c37c067 100644
--- a/src/views/Business/Botame/Inst.vue
+++ b/src/views/Business/Botame/Inst.vue
@@ -5,7 +5,7 @@
<c-col :span="23">
<el-form-item label="Delivery of Documents Instructions" style="padding-top:15px">
<c-fullbox>
- <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit
+ <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="3250" show-word-limit
placeholder="请输入Collection Instructions" >
</c-input>
<template slot="footer">
diff --git a/src/views/Business/Botame/Ovwp.vue b/src/views/Business/Botame/Ovwp.vue
index 8409aed..322c827 100644
--- a/src/views/Business/Botame/Ovwp.vue
+++ b/src/views/Business/Botame/Ovwp.vue
@@ -344,6 +344,8 @@
rol: 'drr',
}"
:disabled="true"
+ :disabledRef="true"
+ :disabledExtkey="true"
>
</c-ptap>
<c-ptap
diff --git a/src/views/Business/Botame/Ptyp.vue b/src/views/Business/Botame/Ptyp.vue
index 5109612..ec7b79e 100644
--- a/src/views/Business/Botame/Ptyp.vue
+++ b/src/views/Business/Botame/Ptyp.vue
@@ -9,6 +9,8 @@
rol: 'drr',
}"
:disabled="true"
+ :disabledRef="true"
+ :disabledExtkey="true"
>
</c-ptap>
diff --git a/src/views/Business/Botame/index.vue b/src/views/Business/Botame/index.vue
index bfba153..c674842 100644
--- a/src/views/Business/Botame/index.vue
+++ b/src/views/Business/Botame/index.vue
@@ -60,7 +60,9 @@
<!--Settlement -->
<el-tab-pane label="Settlement" name="setpan">
+ <c-content>
<m-setpan :model="model" :codes="codes"/>
+ </c-content>
</el-tab-pane>
<!--Bookings -->
diff --git a/src/views/Business/Botset/Inst.vue b/src/views/Business/Botset/Inst.vue
index f9bd864..1c0e7d0 100644
--- a/src/views/Business/Botset/Inst.vue
+++ b/src/views/Business/Botset/Inst.vue
@@ -5,11 +5,11 @@
<c-col :span="23">
<el-form-item label="Delivery of Documents Instructions" style="padding-top:15px">
<c-fullbox>
- <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit
- placeholder="请输入Collection Instructions" :disabled="model.bodgrp.blk.colinsflg !='X'">
+ <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="3250" show-word-limit
+ placeholder="请输入Collection Instructions" disabled>
</c-input>
<template slot="footer">
- <c-button size="small" type="primary">
+ <c-button size="small" type="primary" disabled>
...
</c-button>
</template>
@@ -75,7 +75,7 @@
placeholder="请输入Draft Instructions">
</c-input>
<template slot="footer">
- <c-button size="small" type="primary">
+ <c-button size="small" type="primary" disabled>
...
</c-button>
</template>
@@ -108,7 +108,7 @@
placeholder="请输入Protest Instructions">
</c-input>
<template slot="footer">
- <c-button size="small" type="primary">
+ <c-button size="small" type="primary" disabled>
...
</c-button>
</template>
@@ -143,7 +143,7 @@
placeholder="请输入Other Instructions">
</c-input>
<template slot="footer">
- <c-button size="small" type="primary">
+ <c-button size="small" type="primary" disabled>
...
</c-button>
</template>
@@ -174,7 +174,7 @@
placeholder="请输入Warehouse/Insurance instruction">
</c-input>
<template slot="footer">
- <c-button size="small" type="primary">
+ <c-button size="small" type="primary" disabled>
...
</c-button>
</template>
diff --git a/src/views/Business/Botset/Ptyp.vue b/src/views/Business/Botset/Ptyp.vue
index 71d9c0d..541fe5f 100644
--- a/src/views/Business/Botset/Ptyp.vue
+++ b/src/views/Business/Botset/Ptyp.vue
@@ -9,6 +9,8 @@
rol: 'drr',
}"
:disabled="true"
+ :disabledRef="true"
+ :disabledExtkey="true"
>
</c-ptap>
@@ -20,6 +22,8 @@
rol: 'dre',
}"
:disabled="true"
+ :disabledRef="true"
+ :disabledExtkey="true"
>
</c-ptap>
</c-col>
@@ -32,6 +36,8 @@
rol: 'col',
}"
:disabled="true"
+ :disabledRef="true"
+ :disabledExtkey="true"
>
</c-ptap>
</c-col>
diff --git a/src/views/Business/Botset/index.vue b/src/views/Business/Botset/index.vue
index 62d240a..47ef84d 100644
--- a/src/views/Business/Botset/index.vue
+++ b/src/views/Business/Botset/index.vue
@@ -45,7 +45,9 @@
<!--Settlement -->
<el-tab-pane label="Settlement" name="setpan">
+ <c-content>
<m-setpan :model="model" :codes="codes"/>
+ </c-content>
</el-tab-pane>
<!--Bookings -->