Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
vue-gjjs
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fukai
vue-gjjs
Commits
5171e445
Commit
5171e445
authored
Aug 08, 2022
by
lianyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
brtdck测试bug解决
parent
d40401fb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
85 additions
and
46 deletions
+85
-46
Pattern.js
src/model/Brtdck/Pattern.js
+4
-4
Brtdckp.vue
src/views/Business/Brtdck/Brtdckp.vue
+64
-22
Shpdet.vue
src/views/Business/Brtdck/Shpdet.vue
+17
-20
No files found.
src/model/Brtdck/Pattern.js
View file @
5171e445
...
@@ -124,7 +124,7 @@ export default {
...
@@ -124,7 +124,7 @@ export default {
],
],
"oldbrdgrp.cbs.max.amt"
:[
"oldbrdgrp.cbs.max.amt"
:[
{
type
:
"
number
"
,
required
:
false
,
message
:
"必输项"
},
{
type
:
"
string
"
,
required
:
false
,
message
:
"必输项"
},
{
max
:
18
,
message
:
"整数位不能超过14位"
},
{
max
:
18
,
message
:
"整数位不能超过14位"
},
{
pattern
:
/
(
^
\d
+$
)
|
(
^
\.\d{1,3}
$
)
|
(
^
\d
+
\.\d{1,3}
$
)
/
,
message
:
"小数位不能超过3位"
}
{
pattern
:
/
(
^
\d
+$
)
|
(
^
\.\d{1,3}
$
)
|
(
^
\d
+
\.\d{1,3}
$
)
/
,
message
:
"小数位不能超过3位"
}
],
],
...
@@ -148,7 +148,7 @@ export default {
...
@@ -148,7 +148,7 @@ export default {
],
],
"oldbrdgrp.cbs.max2.amt"
:[
"oldbrdgrp.cbs.max2.amt"
:[
{
type
:
"
number
"
,
required
:
false
,
message
:
"必输项"
},
{
type
:
"
string
"
,
required
:
false
,
message
:
"必输项"
},
{
max
:
18
,
message
:
"整数位不能超过14位"
},
{
max
:
18
,
message
:
"整数位不能超过14位"
},
{
pattern
:
/
(
^
\d
+$
)
|
(
^
\.\d{1,3}
$
)
|
(
^
\d
+
\.\d{1,3}
$
)
/
,
message
:
"小数位不能超过3位"
}
{
pattern
:
/
(
^
\d
+$
)
|
(
^
\.\d{1,3}
$
)
|
(
^
\d
+
\.\d{1,3}
$
)
/
,
message
:
"小数位不能超过3位"
}
],
],
...
@@ -217,7 +217,7 @@ export default {
...
@@ -217,7 +217,7 @@ export default {
"brdgrp.blk.docdis"
:[
"brdgrp.blk.docdis"
:[
{
type
:
"string"
,
required
:
true
,
message
:
"必输项"
},
{
type
:
"string"
,
required
:
true
,
message
:
"必输项"
},
{
max
:
50
,
message
:
"长度不能超过5
0"
}
{
max
:
3500
,
message
:
"长度不能超过350
0"
}
],
],
...
@@ -271,7 +271,7 @@ export default {
...
@@ -271,7 +271,7 @@ export default {
{
type
:
"date"
,
required
:
false
,
message
:
"输入正确的日期"
}
{
type
:
"date"
,
required
:
false
,
message
:
"输入正确的日期"
}
],
],
"brdgrp.blk.relstoadr"
:[
"brdgrp.blk.relstoadr"
:[
{
type
:
"string"
,
required
:
tru
e
,
message
:
"必输项"
},
{
type
:
"string"
,
required
:
fals
e
,
message
:
"必输项"
},
{
max
:
140
,
message
:
"长度不能超过140"
}
{
max
:
140
,
message
:
"长度不能超过140"
}
],
],
...
...
src/views/Business/Brtdck/Brtdckp.vue
View file @
5171e445
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
v-model=
"model.lidgrp.rec.expdat"
v-model=
"model.lidgrp.rec.expdat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"请输入Expiry"
placeholder=
"请输入Expiry"
value-format=
"yyyy-MM-dd"
disabled
disabled
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
...
@@ -102,27 +103,24 @@
...
@@ -102,27 +103,24 @@
<c-input
<c-input
v-model=
"model.brdgrp.cbs.max.amt"
v-model=
"model.brdgrp.cbs.max.amt"
placeholder=
""
placeholder=
""
class=
"m-input-currency"
disabled
disabled
></c-input>
></c-input>
</c-form-item>
</c-form-item>
</c-col>
</c-col>
</c-col>
</c-col>
<!-- <c-col :span="12">
<c-form-item label="" prop="oldbrdgrp.cbs.max.amt">
<c-input v-model="model.oldbrdgrp.cbs.max.amt" placeholder=""></c-input>
</c-form-item>
</c-col> -->
<!-- S0000199 : 单据余额 -->
<!-- S0000199 : 单据余额 -->
<c-col
:span=
"24"
>
<c-col
:span=
"24"
>
<c-col
:span=
"13"
>
<c-col
:span=
"13"
>
<c-form-item
label=
"Open Amount"
prop=
"brdgrp.cbs.opn1.cur"
>
<c-form-item
label=
"Open Amount"
prop=
"brdgrp.cbs.opn1.cur"
>
<c-
inpu
t
<c-
selec
t
v-model=
"model.brdgrp.cbs.opn1.cur"
v-model=
"model.brdgrp.cbs.opn1.cur"
maxlength=
"3"
maxlength=
"3"
placeholder=
"请输入Open Amount"
placeholder=
"请输入Open Amount"
:code=
"codes.curtxt1"
disabled
disabled
></c-
inpu
t>
></c-
selec
t>
</c-form-item>
</c-form-item>
</c-col>
</c-col>
...
@@ -131,6 +129,7 @@
...
@@ -131,6 +129,7 @@
<c-input
<c-input
v-model=
"model.brdgrp.cbs.opn1.amt"
v-model=
"model.brdgrp.cbs.opn1.amt"
placeholder=
""
placeholder=
""
class=
"m-input-currency"
disabled
disabled
></c-input>
></c-input>
</c-form-item>
</c-form-item>
...
@@ -145,6 +144,7 @@
...
@@ -145,6 +144,7 @@
v-model=
"model.brdgrp.rec.rcvdat"
v-model=
"model.brdgrp.rec.rcvdat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"请输入"
placeholder=
"请输入"
value-format=
"yyyy-MM-dd"
disabled
disabled
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
...
@@ -157,6 +157,7 @@
...
@@ -157,6 +157,7 @@
v-model=
"model.brdgrp.rec.advdat"
v-model=
"model.brdgrp.rec.advdat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"请输入Advised on"
placeholder=
"请输入Advised on"
value-format=
"yyyy-MM-dd"
disabled
disabled
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
...
@@ -169,6 +170,7 @@
...
@@ -169,6 +170,7 @@
v-model=
"model.brdgrp.rec.matdat"
v-model=
"model.brdgrp.rec.matdat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"请输入Maturity Date"
placeholder=
"请输入Maturity Date"
value-format=
"yyyy-MM-dd"
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
</c-col>
</c-col>
...
@@ -180,6 +182,7 @@
...
@@ -180,6 +182,7 @@
v-model=
"model.brdgrp.rec.stadat"
v-model=
"model.brdgrp.rec.stadat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"请输入 Start Date"
placeholder=
"请输入 Start Date"
value-format=
"yyyy-MM-dd"
disabled
disabled
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
...
@@ -255,6 +258,26 @@
...
@@ -255,6 +258,26 @@
<c-input
<c-input
v-model=
"model.brdgrp.cbs.max.amt"
v-model=
"model.brdgrp.cbs.max.amt"
placeholder=
""
placeholder=
""
class=
"m-input-currency"
></c-input>
</c-form-item>
</c-col>
</c-col>
<!-- =====================================当单据金额Document Amount没变时隐藏====================================================== -->
<c-col
:span=
"24"
>
<c-col
:span=
"13"
>
<span
v-text=
"model.oridoclab"
data-path=
".oridoclab"
class=
"span_oridoclab"
v-show=
"model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt"
>
</span>
</c-col>
<c-col
:span=
"11"
>
<c-form-item
label=
""
label-width=
"5px"
prop=
"oldbrdgrp.cbs.max.amt"
>
<c-input
v-model=
"model.oldbrdgrp.cbs.max.amt"
placeholder=
""
class=
"m-input-currency"
style=
"width: 100%"
disabled
v-show=
"model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt"
></c-input>
></c-input>
</c-form-item>
</c-form-item>
</c-col>
</c-col>
...
@@ -279,12 +302,31 @@
...
@@ -279,12 +302,31 @@
<c-form-item
label=
""
label-width=
"5px"
prop=
"brdgrp.cbs.max2.amt"
>
<c-form-item
label=
""
label-width=
"5px"
prop=
"brdgrp.cbs.max2.amt"
>
<c-input
<c-input
v-model=
"model.brdgrp.cbs.max2.amt"
v-model=
"model.brdgrp.cbs.max2.amt"
class=
"m-input-currency"
placeholder=
""
placeholder=
""
></c-input>
></c-input>
</c-form-item>
</c-form-item>
</c-col>
</c-col>
</c-col>
</c-col>
<!-- =====================================当附加金额没变时隐藏====================================================== -->
<c-col
:span=
"24"
>
<c-col
:span=
"13"
>
<span
v-text=
"model.oriaddlab"
data-path=
".oriaddlab"
class=
"span_oridoclab"
v-show=
"model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"
>
</span>
</c-col>
<c-col
:span=
"11"
>
<c-form-item
label=
""
label-width=
"5px"
prop=
"oldbrdgrp.cbs.max2.amt"
>
<c-input
v-model=
"model.oldbrdgrp.cbs.max2.amt"
:placeholder=
"$t('other.please_enter')+'Balance'"
class=
"m-input-currency"
style=
"width: 100%"
disabled
v-show=
"model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"
></c-input>
</c-form-item>
</c-col>
</c-col>
<!-- S0000081 : Presentation Date -->
<!-- S0000081 : Presentation Date -->
<c-col
:span=
"12"
>
<c-col
:span=
"12"
>
<el-form-item
label=
"Presentation Date"
prop=
"brdgrp.rec.predat"
>
<el-form-item
label=
"Presentation Date"
prop=
"brdgrp.rec.predat"
>
...
@@ -293,6 +335,7 @@
...
@@ -293,6 +335,7 @@
v-model=
"model.brdgrp.rec.predat"
v-model=
"model.brdgrp.rec.predat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"请输入Presentation Date"
placeholder=
"请输入Presentation Date"
value-format=
"yyyy-MM-dd"
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
</c-col>
</c-col>
...
@@ -304,6 +347,7 @@
...
@@ -304,6 +347,7 @@
v-model=
"model.brdgrp.rec.rcvdat"
v-model=
"model.brdgrp.rec.rcvdat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"请输入Received on"
placeholder=
"请输入Received on"
value-format=
"yyyy-MM-dd"
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
</c-col>
</c-col>
...
@@ -314,6 +358,7 @@
...
@@ -314,6 +358,7 @@
v-model=
"model.brdgrp.rec.matdat"
v-model=
"model.brdgrp.rec.matdat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"Maturity Date"
placeholder=
"Maturity Date"
value-format=
"yyyy-MM-dd"
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
</c-col>
</c-col>
...
@@ -325,6 +370,7 @@
...
@@ -325,6 +370,7 @@
v-model=
"model.brdgrp.rec.shpdat"
v-model=
"model.brdgrp.rec.shpdat"
style=
"width: 100%"
style=
"width: 100%"
placeholder=
"请输入Shipped on"
placeholder=
"请输入Shipped on"
value-format=
"yyyy-MM-dd"
></c-date-picker>
></c-date-picker>
</el-form-item>
</el-form-item>
</c-col>
</c-col>
...
@@ -372,8 +418,9 @@
...
@@ -372,8 +418,9 @@
</c-col>
</c-col>
<c-col
:span=
"12"
>
<c-col
:span=
"12"
>
<c-checkbox
<c-checkbox
v-model=
"dscinsflg"
v-model=
"
model.brdgrp.rec.
dscinsflg"
style=
"width: 100%; margin-left: 40px"
style=
"width: 100%; margin-left: 40px"
:disabled=
"model.brdgrp.blk.docdisflg!=''"
>
Enter Docs,Discrep,Instr and Shipping Detials
</c-checkbox
>
Enter Docs,Discrep,Instr and Shipping Detials
</c-checkbox
>
>
<!-- <c-checkbox
<!-- <c-checkbox
...
@@ -611,12 +658,6 @@
...
@@ -611,12 +658,6 @@
<c-input v-model="model.brtp.prbp.ptsget.sdamod.dadsnd" :placeholder="$t('other.please_enter')+'Drag Drop Sender'"></c-input>
<c-input v-model="model.brtp.prbp.ptsget.sdamod.dadsnd" :placeholder="$t('other.please_enter')+'Drag Drop Sender'"></c-input>
</c-form-item>
</c-form-item>
</c-col>
</c-col>
<c-col :span="12">
<c-col :span="12">
<c-form-item label="" prop="brtp.prbp.ptsget.sdamod.seainf">
<c-form-item label="" prop="brtp.prbp.ptsget.sdamod.seainf">
<c-input v-model="model.brtp.prbp.ptsget.sdamod.seainf" :placeholder="$t('other.please_enter')+''"></c-input>
<c-input v-model="model.brtp.prbp.ptsget.sdamod.seainf" :placeholder="$t('other.please_enter')+''"></c-input>
...
@@ -761,16 +802,17 @@ export default {
...
@@ -761,16 +802,17 @@ export default {
flag
()
{
flag
()
{
return
this
.
model
.
brdgrp
.
prb
.
pts
.
extkey
==
""
;
return
this
.
model
.
brdgrp
.
prb
.
pts
.
extkey
==
""
;
},
},
dscinsflg
:
{
get
()
{
return
this
.
model
.
brdgrp
.
rec
.
dscinsflg
!=
''
},
set
(
val
)
{
this
.
model
.
brdgrp
.
rec
.
dscinsflg
=
val
?
"X"
:
""
}
},
},
},
};
};
</
script
>
</
script
>
<
style
>
<
style
>
.span_oridoclab
{
margin-right
:
30px
;
height
:
24px
;
color
:
#606266
;
line-height
:
24px
;
font-size
:
12px
;
float
:
right
;
text-align
:
right
;
}
</
style
>
</
style
>
src/views/Business/Brtdck/Shpdet.vue
View file @
5171e445
...
@@ -20,12 +20,14 @@
...
@@ -20,12 +20,14 @@
<c-col
:span=
"12"
>
<c-col
:span=
"12"
>
<el-form-item
label=
"issue date"
prop=
"brdgrp.rec.relgoddat"
>
<el-form-item
label=
"issue date"
prop=
"brdgrp.rec.relgoddat"
>
<c-date-picker
type=
"date"
v-model=
"model.brdgrp.rec.relgoddat"
style=
"width:100%"
placeholder=
"请选择issue date"
></c-date-picker>
<c-date-picker
type=
"date"
v-model=
"model.brdgrp.rec.relgoddat"
style=
"width:100%"
placeholder=
"请选择issue date"
value-format=
"yyyy-MM-dd"
></c-date-picker>
</el-form-item>
</el-form-item>
</c-col>
</c-col>
<c-col
:span=
"12"
>
<c-col
:span=
"12"
>
<el-form-item
label=
"Expiry Date "
prop=
"brdgrp.rec.expdat"
>
<el-form-item
label=
"Expiry Date "
prop=
"brdgrp.rec.expdat"
>
<c-date-picker
type=
"date"
v-model=
"model.brdgrp.rec.expdat"
style=
"width:100%"
placeholder=
"请选择Expiry Date of Shipping Guarantee"
></c-date-picker>
<c-date-picker
type=
"date"
v-model=
"model.brdgrp.rec.expdat"
style=
"width:100%"
placeholder=
"请选择Expiry Date of Shipping Guarantee"
value-format=
"yyyy-MM-dd"
></c-date-picker>
</el-form-item>
</el-form-item>
</c-col>
</c-col>
...
@@ -44,7 +46,8 @@
...
@@ -44,7 +46,8 @@
<c-col
:span=
"24"
>
<c-col
:span=
"24"
>
<el-form-item
label=
"shipment date"
prop=
"brdgrp.rec.tradat"
>
<el-form-item
label=
"shipment date"
prop=
"brdgrp.rec.tradat"
>
<c-date-picker
type=
"date"
v-model=
"model.brdgrp.rec.tradat"
style=
"width:100%"
placeholder=
"请选择shipment date"
></c-date-picker>
<c-date-picker
type=
"date"
v-model=
"model.brdgrp.rec.tradat"
style=
"width:100%"
placeholder=
"请选择shipment date"
value-format=
"yyyy-MM-dd"
></c-date-picker>
</el-form-item>
</el-form-item>
</c-col>
</c-col>
...
@@ -128,8 +131,8 @@
...
@@ -128,8 +131,8 @@
</el-form-item>
</el-form-item>
</c-col>
</c-col>
<c-col
:span=
"4"
>
<c-col
:span=
"4"
>
<el-form-item
label=
""
label-width=
"
0
"
prop=
"brdgrp.rec.rtoaplflg"
>
<el-form-item
label=
""
label-width=
"
5px
"
prop=
"brdgrp.rec.rtoaplflg"
>
<c-checkbox
v-model=
"
rtoaplflg"
@
change=
"rtoaplflgChangeEvent
"
>
to Applicant
</c-checkbox>
<c-checkbox
v-model=
"
model.brdgrp.rec.rtoaplflg
"
>
to Applicant
</c-checkbox>
<!--
<el-input
v-model=
"model.brdgrp.rec.rtoaplflg"
></el-input>
-->
<!--
<el-input
v-model=
"model.brdgrp.rec.rtoaplflg"
></el-input>
-->
</el-form-item>
</el-form-item>
...
@@ -241,24 +244,18 @@ export default {
...
@@ -241,24 +244,18 @@ export default {
}
}
},
},
computed
:{
computed
:{
rtoaplflg
:{
// rtoaplflg:{
get
()
{
// get() {
return
this
.
model
.
brdgrp
.
rec
.
rtoaplflg
!=
''
// return this.model.brdgrp.rec.rtoaplflg != ''
},
// brdgrp.rec.rtoaplflg
set
(
val
)
{
// },
this
.
model
.
brdgrp
.
rec
.
rtoaplflg
=
val
?
"X"
:
""
// set(val) {
}
// this.model.brdgrp.rec.rtoaplflg = val ? "X" : ""
}
// }
// }
},
},
methods
:{
methods
:{
...
Event
,
...
Event
,
rtoaplflgChangeEvent
()
{
this
.
executeDefault
(
"brdgrp.rec.rtoaplflg"
).
then
((
res
)
=>
{
if
((
res
.
respCode
==
SUCCESS
))
{
Utils
.
copyValueFromVO
(
this
.
model
,
res
.
data
);
}
});
},
},
},
created
:
function
(){
created
:
function
(){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment