Skip to content

V
vue-gjjs
Commit 9fb1e02c by wangyanjiao
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 18918eb3 47cebe5a
Showing with 64 additions and 30 deletions
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"}
],
......
src/model/Botset/Pattern.js
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"}
],
......
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 () {},
......
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">
......
src/views/Business/Botame/Ovwp.vue
......@@ -344,6 +344,8 @@
rol: 'drr',
}"
:disabled="true"
:disabledRef="true"
:disabledExtkey="true"
>
</c-ptap>
<c-ptap
......
src/views/Business/Botame/Ptyp.vue
......@@ -9,6 +9,8 @@
rol: 'drr',
}"
:disabled="true"
:disabledRef="true"
:disabledExtkey="true"
>
</c-ptap>
......
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 -->
......
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>
......
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>
......
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 -->
......
src/views/Business/Ditdla/index.vue
......@@ -49,7 +49,9 @@
<!--PD000342 -->
<el-tab-pane label="条款" name="tk">
<m-tk :model="model" :codes="codes" />
<c-content>
<m-tk :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000021 -->
......@@ -93,7 +95,9 @@
<!--PD000000 -->
<el-tab-pane label="账务" name="setpan">
<m-setpan :model="model" :codes="codes" />
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="分录" name="glepan">
......
src/views/Business/Inflid/Infsea.vue
......@@ -441,8 +441,7 @@
</c-istream-table>
</c-col>
<m-busbtn ref="childs" :ownref="ownref" @onChoose="onChoose"
>11</m-busbtn
<m-busbtn ref="childs" :ownref="ownref" trnCode="litsel" :model="litselModel" ownrefPath="lidget.lid.ownref" @onChoose="onChoose"></m-busbtn
>
</div>
</template>
......@@ -452,6 +451,9 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Inflid/Event";
import Litsel from "~/model/Litsel"
import BusNavbar from "~/views/Public/BusNavbar";
export default {
......@@ -463,7 +465,7 @@ export default {
return {
curinr:"",
ownref: "",
litselModel: new Litsel().data,
initdialog: false,
dialogTableVisible: false,
trnData: {
......
src/views/Public/BusNavbar.vue
......@@ -30,6 +30,8 @@
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import _ from "~/utils/Lodash"
export default {
props: {
ownref: {
......@@ -105,8 +107,15 @@ export default {
this.navcode = [];
//请求按钮数据
this.model[this.ownrefPath].rec.ownref = this.ownref;
let rtnmsg = await this.executeRule(this.ownrefPath + ".rec.ownref"); //didgrp_rec_ownref
let rulePath
if (this.ownrefPath.endsWith(".ownref")) {
_.set(this.model, this.ownrefPath, this.ownref);
rulePath = this.ownrefPath
} else {
this.model[this.ownrefPath].rec.ownref = this.ownref;
rulePath = this.ownrefPath + ".rec.ownref"
}
let rtnmsg = await this.executeRule(rulePath); //didgrp_rec_ownref
if (rtnmsg.respCode == SUCCESS) {
//重置数组
this.navcode = [];
......
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