Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
be2612ce
Commit
be2612ce
authored
Nov 01, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
前端js调整
parent
0041f961
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
424 additions
and
437 deletions
+424
-437
memorandumList.vue
src/components/Hotel/memorandum/memorandumList.vue
+420
-413
productQuery.vue
src/components/SalesModule/productQuery.vue
+2
-20
ShareMeDocuments.vue
src/components/administrative/ShareMeDocuments.vue
+0
-2
appMenuManagement.vue
src/components/platformModule/appMenuManagement.vue
+1
-1
menuManagement.vue
src/components/platformModule/menuManagement.vue
+1
-1
No files found.
src/components/Hotel/memorandum/memorandumList.vue
View file @
be2612ce
...
...
@@ -16,6 +16,7 @@
.zidingyiFz
i
{
font-size
:
14px
!important
;
}
.page_addFD
{
margin-top
:
20px
;
position
:
relative
;
...
...
@@ -268,7 +269,8 @@
._addUpload_box
>
div
:hover
{
background-color
:
#f5f5f5
;
}
/
deep
/
._addUpload_box
.el-upload-dragger
{
/
deep
/
._addUpload_box
.el-upload-dragger
{
width
:
126px
!important
;
height
:
80px
!important
;
}
...
...
@@ -366,8 +368,9 @@
top
:
10px
;
cursor
:
pointer
;
}
</
style
>
<
template
>
</
style
>
<
template
>
<div
class=
"flexOne"
>
<div
class=
"query-box"
>
<ul
class=
"user_time_picker"
>
...
...
@@ -378,9 +381,11 @@
</li>
<li>
<span><em>
{{
$t
(
'objFill.v101.administrative.kaishi'
)
}}
/
{{
$t
(
'MarketingActi.endTime'
)
}}
</em>
<el-date-picker
v-model=
"msg.QStartDate"
value-format=
"yyyy-MM-dd"
class=
"w150"
type=
"date"
:clearable=
"false"
></el-date-picker>
<el-date-picker
v-model=
"msg.QStartDate"
value-format=
"yyyy-MM-dd"
class=
"w150"
type=
"date"
:clearable=
"false"
></el-date-picker>
-
<el-date-picker
v-model=
"msg.QEndDate"
value-format=
"yyyy-MM-dd"
class=
"w150"
type=
"date"
:clearable=
"false"
></el-date-picker>
<el-date-picker
v-model=
"msg.QEndDate"
value-format=
"yyyy-MM-dd"
class=
"w150"
type=
"date"
:clearable=
"false"
></el-date-picker>
</span>
</li>
<li>
...
...
@@ -411,7 +416,8 @@
<td
width=
"150px"
>
{{
item
.
Name
}}
</td>
<td
style=
"min-width: 200px;max-width: 400px;cursor: pointer;"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"item.Content"
placement=
"bottom"
>
<div
style=
"overflow: hidden;white-space: wrap;width: 100%;text-overflow: ellipsis;"
>
{{
item
.
Content
}}
</div>
<div
style=
"overflow: hidden;white-space: wrap;width: 100%;text-overflow: ellipsis;"
>
{{
item
.
Content
}}
</div>
</el-tooltip>
</td>
<td
width=
"200px"
>
...
...
@@ -424,8 +430,7 @@
</div>
<div
v-if=
"file.FileType==2"
style=
"width: 30px;height: 30px;"
@
click=
"showUpLoadFile(file)"
>
<div
class=
"iconfont "
style=
"line-height: 19px;font-size: 18px;"
:class=
"file.Name.substring(file.Name.lastIndexOf('.')+1,file.Name.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
>
:class=
"file.Name.substring(file.Name.lastIndexOf('.')+1,file.Name.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
>
</div>
</div>
<div
v-if=
"file.FileType==3"
style=
"width: 30px;height: 30px;"
@
click=
"showUpLoadFile(file)"
>
...
...
@@ -460,8 +465,7 @@
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"total"
>
</el-pagination>
<el-dialog
custom-class=
"w800"
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
:close=
"closeChangeMachie"
>
<el-dialog
custom-class=
"w800"
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
:close=
"closeChangeMachie"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"100px"
>
<table
class=
"layerTable layerNoIcon"
>
<tr>
...
...
@@ -473,7 +477,8 @@
</td>
<td>
<el-form-item
:label=
"$t('pub.date')"
prop=
"Date"
style=
"margin-bottom: 10px;"
>
<el-date-picker
value-format=
"yyyy-MM-dd"
class=
"w217"
v-model=
"addMsg.Date"
type=
"date"
:clearable=
"false"
>
<el-date-picker
value-format=
"yyyy-MM-dd"
class=
"w217"
v-model=
"addMsg.Date"
type=
"date"
:clearable=
"false"
>
</el-date-picker>
</el-form-item>
</td>
...
...
@@ -547,8 +552,8 @@
</div>
</div>
</template>
<
script
>
</template>
<
script
>
export
default
{
data
()
{
return
{
...
...
@@ -605,7 +610,7 @@
};
},
mounted
()
{
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
msg
.
QStartDate
=
this
.
getYMD
()
this
.
addMsg
.
Date
=
this
.
getYMD
()
this
.
getList
();
...
...
@@ -670,7 +675,7 @@
typeOk
=
true
;
}
})
let
FileName
=
file
.
file
.
name
.
substring
(
0
,
file
.
file
.
name
.
lastIndexOf
(
"."
))
let
FileName
=
file
.
file
.
name
.
substring
(
0
,
file
.
file
.
name
.
lastIndexOf
(
"."
))
if
(
!
typeOk
)
return
this
.
$message
.
error
(
this
.
$t
(
'tips.qscWEfile'
));
let
newArr
=
[];
newArr
.
push
(
file
.
file
)
...
...
@@ -693,7 +698,7 @@
let
myToday
=
myDate
.
getDate
();
//获取当前日(1-31)
myMonth
=
myMonth
>
9
?
myMonth
:
'0'
+
myMonth
myToday
=
myToday
>
9
?
myToday
:
'0'
+
myToday
let
nowDate
=
myYear
+
'-'
+
myMonth
+
'-'
+
myToday
let
nowDate
=
myYear
+
'-'
+
myMonth
+
'-'
+
myToday
return
nowDate
},
getList
()
{
...
...
@@ -712,7 +717,7 @@
err
=>
{}
);
},
addClick
()
{
addClick
()
{
this
.
addMsg
=
{
Id
:
0
,
Date
:
this
.
getYMD
(),
...
...
@@ -722,7 +727,7 @@
}
},
addData
()
{
if
(
this
.
isleaveBtn
)
return
if
(
this
.
isleaveBtn
)
return
this
.
isleaveBtn
=
true
;
this
.
apipost
(
"hotel_get_SetHotelMemo"
,
...
...
@@ -738,11 +743,13 @@
}
this
.
isleaveBtn
=
false
},
err
=>
{
this
.
isleaveBtn
=
false
}
err
=>
{
this
.
isleaveBtn
=
false
}
);
this
.
getList
();
},
deleteData
(
item
)
{
deleteData
(
item
)
{
let
that
=
this
;
that
.
$confirm
(
this
.
$t
(
'objFill.v101.hote.shifousc'
),
this
.
$t
(
'tips.tips'
),
{
confirmButtonText
:
this
.
$t
(
'pub.sureBtn'
),
...
...
@@ -819,4 +826,4 @@
}
};
</
script
>
</
script
>
src/components/SalesModule/productQuery.vue
View file @
be2612ce
...
...
@@ -2280,7 +2280,7 @@
}}
</td>
<td>
{{ priceFormat
2
(item.VisaPrice) }}(-{{
{{ priceFormat(item.VisaPrice) }}(-{{
item.BackVisaPrice | priceFormat(item.BackVisaPrice)
}})
</td>
...
...
@@ -2942,25 +2942,7 @@ export default {
}
return
x1
+
x2
;
},
priceFormat2
(
value
)
{
if
(
value
==
null
)
{
return
this
.
$t
(
'objFill.yibaohan'
);
}
let
nStr
=
value
.
toFixed
(
2
);
nStr
+=
""
;
let
x
=
nStr
.
split
(
"."
);
let
x1
=
x
[
0
];
let
x2
=
x
.
length
>
1
?
"."
+
x
[
1
]
:
""
;
var
rgx
=
/
(\d
+
)(\d{3})
/
;
while
(
rgx
.
test
(
x1
))
{
x1
=
x1
.
replace
(
rgx
,
"$1"
+
","
+
"$2"
);
}
let
result
=
x1
+
x2
;
if
(
result
===
"0.00"
)
{
result
=
this
.
$t
(
'objFill.yibaohan'
);
}
return
result
;
},
},
methods
:
{
GetSupperOrderEditAuth
()
{
...
...
src/components/administrative/ShareMeDocuments.vue
View file @
be2612ce
...
...
@@ -28,8 +28,6 @@
<span
@
click=
"resGetList"
>
{{
$t
(
'objFill.v101.administrative.fenxianggwd'
)
}}
</span>
<span
v-for=
"(item,index) in NavList"
@
click=
"getNavTree(item,index)"
>
{{
item
.
name
}}
</span>
</div>
<table
class=
"singeRowTable myDocumentsTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tbody
v-if=
'!isChildFiles'
>
<tr>
...
...
src/components/platformModule/appMenuManagement.vue
View file @
be2612ce
...
...
@@ -84,7 +84,7 @@
<tr
v-for=
"(item,index) in DataList"
>
<td>
{{
item
.
MenuName
}}
</td>
<td>
{{
item
.
MenuUrl
}}
</td>
<td>
{{
item
.
Tier
|
tierFormat
(
item
.
Tier
)
}}
</td>
<td>
{{
tierFormat
(
item
.
Tier
)
}}
</td>
<td>
{{
item
.
MenuStatus
==
0
?
$t
(
'pub.openSel'
):
$t
(
'pub.closeSel'
)
}}
</td>
<td>
{{
item
.
Sort
}}
</td>
<td>
{{
item
.
LowVersion
}}
</td>
...
...
src/components/platformModule/menuManagement.vue
View file @
be2612ce
...
...
@@ -60,7 +60,7 @@
<tr
v-for=
"(item,index) in DataList"
>
<td>
{{
item
.
MenuName
}}
</td>
<td>
{{
item
.
MenuUrl
}}
</td>
<td>
{{
item
.
Tier
|
tierFormat
(
item
.
Tier
)
}}
</td>
<td>
{{
tierFormat
(
item
.
Tier
)
}}
</td>
<td>
{{
item
.
MenuStatus
==
0
?
$t
(
'pub.openSel'
):
$t
(
'pub.closeSel'
)
}}
</td>
<td>
{{
item
.
GroupingCode
}}
...
...
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