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
cde20a43
Commit
cde20a43
authored
Nov 11, 2021
by
潘际乾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
账务第二个表格的detail弹框优化
parent
245486e4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
347 additions
and
373 deletions
+347
-373
GridEtyPromptDialog.vue
src/components/GridEtyPromptDialog.vue
+0
-1
index.vue
src/views/Business/Ditopn/index.vue
+1
-3
Setpan.vue
src/views/Public/Setpan.vue
+7
-6
SetpanDialog.vue
src/views/Public/SetpanDialog.vue
+339
-363
No files found.
src/components/GridEtyPromptDialog.vue
View file @
cde20a43
...
...
@@ -65,7 +65,6 @@ export default {
const
obj
=
{}
for
(
let
i
=
0
;
i
<
lines
.
length
;
i
++
)
{
let
line
=
lines
[
i
];
line
=
line
.
replace
(
/Quote/g
,
"
\"
"
);
if
(
etyReg
.
test
(
line
))
{
const
gs
=
line
.
match
(
etyReg
)
const
columnName
=
gs
[
1
]
...
...
src/views/Business/Ditopn/index.vue
View file @
cde20a43
...
...
@@ -172,15 +172,13 @@ export default {
},
methods
:{
},
moun
ted
:
async
function
(){
crea
ted
:
async
function
(){
console
.
log
(
"进入ditopn交易"
);
let
rtnmsg
=
await
this
.
init
(
this
.
$route
.
query
)
if
(
rtnmsg
.
respCode
==
SUCCESS
)
{
//更新数据
console
.
log
(
rtnmsg
)
Utils
.
copyValueFromVO
(
this
.
model
,
rtnmsg
.
data
)
console
.
log
(
this
.
model
);
if
(
this
.
isInDisplay
){
this
.
restoreDisplay
()
}
...
...
src/views/Public/Setpan.vue
View file @
cde20a43
...
...
@@ -292,7 +292,7 @@
</el-table-column>
</c-table>
</c-col>
<setpan-dialog
v-if=
"dialogVisible2"
:visible=
"dialogVisible2
"
:model=
"model"
:idx=
"index"
:codes=
"codes"
/>
<setpan-dialog
ref=
"setpanDialog
"
:model=
"model"
:idx=
"index"
:codes=
"codes"
/>
<c-col
:span=
"24"
style=
"text-align: left"
>
<el-form-item
label=
"Settlement:"
label-width=
"100px"
>
</el-form-item>
...
...
@@ -403,7 +403,6 @@ export default {
data
()
{
return
{
dialogVisible
:
false
,
dialogVisible2
:
false
,
dialog
:
{
payee
:
""
,
ptydbt
:
""
,
...
...
@@ -449,10 +448,12 @@ export default {
},
// 第三个表格
detail2
(
index
,
row
)
{
this
.
executeRule
(
"det"
).
then
(
res
=>
{
this
.
dialogVisible2
=
true
;
this
.
index
=
index
;
this
.
dialog2
=
row
const
that
=
this
;
that
.
executeRule
(
"det"
).
then
(
res
=>
{
that
.
$refs
.
setpanDialog
.
visiable
=
true
;
that
.
$refs
.
setpanDialog
.
formData
=
Object
.
assign
({},
that
.
model
.
setmod
.
setfeg
.
setfel
[
index
]);
that
.
index
=
index
;
that
.
dialog2
=
row
})
},
},
...
...
src/views/Public/SetpanDialog.vue
View file @
cde20a43
<
template
>
<el-dialog
:visible
.
sync=
"visiable"
center
fullscreen
destroy-on-close
><c-col>
<el-form
v-model=
"model.setmod.setfeg.setfel[idx]"
inline
>
<el-dialog
v-if=
"visiable"
:visible
.
sync=
"visiable"
center
fullscreen
destroy-on-close
:before-close=
"beforeClose"
>
<c-col>
<el-form
v-model=
"formData"
inline
>
<c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"费用代码"
>
<c-input
v-model=
"formData.feecod"
disabled
/>
</el-form-item>
</c-col>
<c-col
:span=
"16"
>
<el-form-item
label=
"中文描述"
>
<c-input
v-model=
"formData.feetxt"
style=
"width: 350px"
/>
<c-input
v-model=
"formData.modflg"
disabled
style=
"width: 350px; margin-left: 100px"
/>
</el-form-item>
</c-col>
</c-col>
<c-col>
<c-col
:span=
"6"
>
<el-form-item
label=
"详细信息"
>
<c-input
v-model=
"formData.feetxtinf"
/>
</el-form-item>
</c-col>
<c-col
:span=
"6"
>
<el-form-item
label=
"起算时间"
>
<!--
<c-input
v-model=
"formData.dat1"
type=
"date"
/>
-->
<c-date-picker
type=
"date"
v-model=
"formData.dat1"
format=
"yyyy-MM-dd"
style=
"width: 100%"
placeholder=
"请选择起算时间"
></c-date-picker>
</el-form-item>
</c-col>
<c-col
:span=
"6"
>
<el-form-item
label=
"结束时间"
>
<c-date-picker
type=
"date"
v-model=
"formData.dat2"
format=
"yyyy-MM-dd"
style=
"width: 100%"
placeholder=
"请选择结束时间"
></c-date-picker>
</el-form-item>
</c-col>
<c-col
:span=
"6"
>
<el-form-item
label=
"收取份数"
>
<c-input
v-model=
"formData.unt"
/>
</el-form-item>
</c-col>
</c-col>
<c-col>
<el-form-item
label=
"费用换算"
>
<c-select
v-model=
"formData.usrcur"
>
<el-option
v-for=
"item in codes.cur"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
<c-input
v-model=
"formData.usramt"
style=
"width: 200px; margin-left: 50px"
/>
</el-form-item>
</c-col>
<c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"应收费用"
>
<c-input
v-model=
"formData.cur"
disabled
style=
"width: 100px; margin-right: 10px"
/>
<c-input
v-model=
"formData.ogiamt"
disabled
style=
"width: 200px"
/>
</el-form-item>
</c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"优惠百分比"
>
<c-input
v-model=
"formData.dctrat"
>
<template
#
append
>
%
</
template
>
</c-input>
</el-form-item>
</c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"Period calculation starting at"
>
<c-input
v-model=
"formData.datrefbeg"
disabled
/>
</el-form-item>
</c-col>
</c-col>
<c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"付款方"
>
<c-select
v-model=
"formData.rol"
>
<el-option
v-for=
"item in codes.setfelRol"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
</el-form-item>
</c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"优惠金额"
>
<c-input
v-model=
"formData.dctamt"
/>
</el-form-item>
</c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"优惠后实收费用金额"
>
<c-input
v-model=
"formData.amt"
/>
</el-form-item>
</c-col>
</c-col>
<c-col>
<el-form-item
:label=
"
idx == 0
? 'Per mile fee depending on duration'
: 'A fixed amount per unit is caculated. This type will, for example, be used for correspondence charges.'
"
/>
</c-col>
<c-col
:span=
"12"
>
<c-col
v-if=
"idx == 0"
>
<c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"费用代码"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].feecod"
disabled
/>
</el-form-item>
</c-col>
<c-col
:span=
"16"
>
<el-form-item
label=
"中文描述"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].feetxt"
style=
"width: 350px"
/>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].modflg"
disabled
style=
"width: 350px; margin-left: 100px"
/>
</el-form-item>
</c-col>
</c-col>
<c-col>
<c-col
:span=
"6"
>
<el-form-item
label=
"详细信息"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].feetxtinf"
/>
</el-form-item
>
</c-col>
<c-col
:span=
"6"
>
<el-form-item
label=
"起算时间"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].dat1"
type=
"date"
/>
</el-form-item
>
</c-col>
<c-col
:span=
"6"
>
<el-form-item
label=
"结束时间"
>
<c-input
v-model=
"
model.setmod.setfeg.setfel[idx].dat2
"
type=
"date"
/>
</el-form-item
>
</c-col>
<c-col
:span=
"6"
>
<el-form-item
label=
"收取份数"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].unt"
/>
</el-form-item
>
</c-col>
</c-col>
<c-col>
<el-form-item
label=
"费用换算"
>
<c-select
v-model=
"model.setmod.setfeg.setfel[idx].usrcur"
>
<el-option
v-for=
"item in codes.usrcur"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].usramt"
style=
"width: 200px; margin-left: 50px"
/>
</el-form-item>
</c-col>
<c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"应收费用"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].cur"
disabled
style=
"width: 100px; margin-right: 10px"
/>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].ogiamt"
disabled
style=
"width: 200px"
/>
</el-form-item
>
</c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"优惠百分比"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].dctrat"
>
<template
#
append
>
%
</
template
>
</c-input>
</el-form-item>
</c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"Period calculation starting at"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].datrefbeg"
disabled
/>
</el-form-item
>
</c-col>
</c-col>
<c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"付款方"
>
<c-select
v-model=
"model.setmod.setfeg.setfel[idx].rol"
>
<el-option
v-for=
"item in codes.rol"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
</el-form-item>
</c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"优惠金额"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].dctamt"
/>
</el-form-item>
</c-col>
<c-col
:span=
"8"
>
<el-form-item
label=
"优惠后实收费用金额"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].amt"
/>
</el-form-item>
</c-col>
</c-col>
<c-col>
<el-form-item
:label=
"idx==0?'Per mile fee depending on duration':
'A fixed amount per unit is caculated. This type will, for example, be used for correspondence charges.'"
/>
</c-col>
<c-col
:span=
"12"
>
<c-col
v-if=
"idx==0"
>
<c-col>
<el-form-item
label=
"千分率"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.ratcal"
style=
"width: 200px"
/>
</el-form-item>
</c-col>
<c-col>
<el-form-item
label=
"最小值"
>
<c-select
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.mincur"
style=
"width: 200px"
>
<el-option
v-for=
"item in codes.mincur"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
<!-- v-model="model.setmod.setfeg.setfel[idx].fecp1.fec.minamt" -->
<c-input
style=
"width: 200px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.minamt"
/>
<c-input
style=
"width: 200px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.minfcc"
/>
</el-form-item>
</c-col>
<c-col>
<el-form-item
label=
"最大值"
>
<c-select
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.maxcur"
style=
"width: 200px"
>
<el-option
v-for=
"item in codes.maxcur"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
<c-input
style=
"width: 200px;"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.maxamt"
/>
<c-input
style=
"width: 200px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.maxfcc"
/>
</el-form-item>
</c-col>
<c-col>
<el-form-item>
<c-checkbox
label=
"CG000652"
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.jnwshx"
/>
</el-form-item>
</c-col>
</c-col>
<c-col
v-else
>
<el-form-item
label=
"Amount"
>
<c-select
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.ratcur"
>
<el-option
v-for=
"item in codes.cur"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</c-select>
<c-input
style=
"width:200px;"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.untamt "
>
<el-form-item
label=
"千分率"
>
<c-input
v-model=
"formData.wrkfec.ratcal"
style=
"width: 200px"
/>
</el-form-item>
</c-col>
<c-col>
<el-form-item
label=
"最小值"
>
<c-select
v-model=
"formData.wrkfec.mincur"
style=
"width: 200px"
>
<el-option
v-for=
"item in codes.cur"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
<!-- v-model="formData.fecp1.fec.minamt" -->
<c-input
style=
"width: 200px"
v-model=
"formData.wrkfec.minamt"
/>
<!-- <c-input
style="width: 200px"
v-model="formData.wrkfec.minfcc"
/> -->
</el-form-item>
</c-col>
<c-col>
<el-form-item
label=
"最大值"
>
<c-select
v-model=
"formData.wrkfec.maxcur"
style=
"width: 200px"
>
<el-option
v-for=
"item in codes.cur"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
</c-input>
</el-form-item>
</c-col>
<c-col>
<el-form-item
label=
"销项税"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.taxrat"
disabled
style=
"width: 200px"
/>
</el-form-item>
</c-col>
<c-col>
<el-form-item
label=
"客户属性"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.custyp"
disabled
style=
"width: 200px"
/>
</el-form-item>
</c-col>
</c-col>
<c-col
v-if=
"idx==0"
:span=
"12"
>
<el-form-item
label=
"Caiculation Base"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.calcbs"
disabled
style=
"width: 200px"
/>
</el-form-item>
<el-form-item
label=
"Calc.Period"
>
<c-select
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.pertyp"
>
<el-option
v-for=
"item in codes.pertyp"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
</el-form-item>
<el-form-item
label=
"Min.Periods"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].fecp1.per"
style=
"width: 200px"
/>
</el-form-item>
<el-form-item
label=
"Rates to Apply per Period Tier"
/>
<el-form-item
label=
"from Perimod"
>
<c-input
style=
"width: 200px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.perbegtr2"
/>
<c-input
disabled
style=
"width: 200px; margin-left: 50px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.perrattr2"
/>
</el-form-item>
<el-form-item
label=
"from Perimod"
>
<c-input
disabled
style=
"width: 200px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.perbegtr3"
/>
<c-input
disabled
style=
"width: 200px; margin-left: 50px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.perrattr3"
/>
</el-form-item>
<el-form-item
label=
"from Perimod"
>
<c-input
disabled
style=
"width: 200px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.perbegtr4"
/>
<c-input
disabled
style=
"width: 200px; margin-left: 50px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.perrattr4"
/>
</el-form-item>
<el-form-item
label=
"from Perimod"
>
<c-input
disabled
style=
"width: 200px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.perbegtr5"
/>
<c-input
disabled
style=
"width: 200px; margin-left: 50px"
v-model=
"model.setmod.setfeg.setfel[idx].wrkfec.perrattr5"
/>
</el-form-item>
</c-col>
<c-col>
</c-col>
<c-col
:span=
"18"
:offset=
"6"
>
<el-form-item
label=
"收费的说明信息"
>
<c-input
v-model=
"model.setmod.setfeg.setfel[idx].inftxt"
disabled
rows=
"10"
type=
"textarea"
style=
"width: 500px;"
/>
</el-form-item>
</c-col>
</el-form>
<c-col
:span=
"4"
:offset=
"8"
>
<c-button
type=
"primary"
@
click=
"saveDialog"
>
确 定
</c-button>
</c-col>
<c-col
:span=
"6"
>
<c-button
@
click=
"visiable = false"
>
取 消
</c-button>
<c-input
style=
"width: 200px;"
v-model=
"formData.wrkfec.maxamt"
/>
<!-- <c-input
style="width: 200px"
v-model="formData.wrkfec.maxfcc"
/> -->
</el-form-item>
</c-col>
<c-col>
<el-form-item>
<c-checkbox
label=
"CG000652"
v-model=
"formData.fecp1.jnwshx"
/>
</el-form-item>
</c-col>
</c-col>
<c-col
v-else
>
<el-form-item
label=
"Amount"
>
<c-select
v-model=
"formData.wrkfec.ratcur"
>
<el-option
v-for=
"item in codes.cur"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</c-select>
<c-input
style=
"width:200px;"
v-model=
"formData.wrkfec.untamt"
>
</c-input>
</el-form-item>
</c-col>
<c-col>
<el-form-item
label=
"销项税"
>
<c-input
v-model=
"formData.fecp1.taxrat"
disabled
style=
"width: 200px"
/>
</el-form-item>
</c-col>
<c-col>
<el-form-item
label=
"客户属性"
>
<c-input
v-model=
"formData.fecp1.custyp"
disabled
style=
"width: 200px"
/>
</el-form-item>
</c-col>
</c-col>
</el-dialog>
<c-col
v-if=
"idx == 0"
:span=
"12"
>
<el-form-item
label=
"Caiculation Base"
>
<c-input
v-model=
"formData.wrkfec.calcbs"
disabled
style=
"width: 200px"
/>
</el-form-item>
<br
/>
<el-form-item
label=
"Calc.Period"
>
<c-select
v-model=
"formData.wrkfec.pertyp"
>
<el-option
v-for=
"item in codes.pertyp"
:label=
"item.label"
:value=
"item.value"
:key=
"item.value"
/>
</c-select>
</el-form-item>
<br
/>
<el-form-item
label=
"Min.Periods"
>
<c-input
v-model=
"formData.wrkfec.permin"
style=
"width: 200px"
/>
</el-form-item>
<br
/>
<el-form-item
label=
"Rates to Apply per Period Tier"
/>
<br
/>
<el-form-item
label=
"from Perimod"
>
<c-input
style=
"width: 200px"
v-model=
"formData.wrkfec.perbegtr2"
/>
<c-input
disabled
style=
"width: 200px; margin-left: 50px"
v-model=
"formData.wrkfec.perrattr2"
/>
</el-form-item>
<el-form-item
label=
"from Perimod"
>
<c-input
disabled
style=
"width: 200px"
v-model=
"formData.wrkfec.perbegtr3"
/>
<c-input
disabled
style=
"width: 200px; margin-left: 50px"
v-model=
"formData.wrkfec.perrattr3"
/>
</el-form-item>
<el-form-item
label=
"from Perimod"
>
<c-input
disabled
style=
"width: 200px"
v-model=
"formData.wrkfec.perbegtr4"
/>
<c-input
disabled
style=
"width: 200px; margin-left: 50px"
v-model=
"formData.wrkfec.perrattr4"
/>
</el-form-item>
<el-form-item
label=
"from Perimod"
>
<c-input
disabled
style=
"width: 200px"
v-model=
"formData.wrkfec.perbegtr5"
/>
<c-input
disabled
style=
"width: 200px; margin-left: 50px"
v-model=
"formData.wrkfec.perrattr5"
/>
</el-form-item>
</c-col>
<c-col>
</c-col>
<c-col
:span=
"18"
:offset=
"6"
>
<el-form-item
label=
"收费的说明信息"
>
<c-input
v-model=
"formData.inftxt"
disabled
rows=
"10"
type=
"textarea"
style=
"width: 500px;"
/>
</el-form-item>
</c-col>
</el-form>
<c-col
:span=
"4"
:offset=
"8"
>
<c-button
type=
"primary"
@
click=
"saveDialog"
>
确 定
</c-button>
</c-col>
<c-col
:span=
"6"
>
<c-button
@
click=
"visiable = false"
>
取 消
</c-button>
</c-col>
<c-col>
</c-col>
</c-col>
</el-dialog>
</template>
<
script
>
export
default
{
props
:
{
visible
:
Boolean
,
model
:
Object
,
idx
:
Number
,
codes
:
Object
,
},
methods
:
{
saveDialog
()
{
this
.
visiable
=
false
;
},
props
:
{
model
:
Object
,
idx
:
Number
,
codes
:
Object
,
},
data
()
{
return
{
formData
:
{},
visiable
:
false
,
};
},
methods
:
{
saveDialog
()
{
this
.
model
.
setmod
.
setfeg
.
setfel
[
this
.
idx
]
=
this
.
formData
;
this
.
visiable
=
false
;
},
computed
:{
visiable
:{
get
:
function
()
{
return
this
.
visible
;},
set
:
function
(
value
)
{
this
.
$parent
.
$parent
.
dialogVisible2
=
value
;
}
}
beforeClose
(
done
)
{
this
.
visiable
=
false
;
done
()
}
},
};
</
script
>
<
style
>
</
style
>
<
style
></
style
>
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