Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HotelProject
Project
Project
Details
Activity
Releases
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
zhengke
HotelProject
Commits
fdbec09f
Commit
fdbec09f
authored
Mar 10, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
9bc35864
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
124 additions
and
66 deletions
+124
-66
jp.js
src/assets/common/jp.js
+29
-0
zh.js
src/assets/common/zh.js
+31
-0
HotelOrder.vue
src/components/assetsman/HotelOrder.vue
+3
-4
Quotation.vue
src/components/assetsman/Quotation.vue
+18
-18
RoomList.vue
src/components/assetsman/RoomList.vue
+40
-41
index.vue
src/components/global/index.vue
+1
-1
index.js
src/plugins/index.js
+2
-2
No files found.
src/assets/common/jp.js
View file @
fdbec09f
...
...
@@ -119,4 +119,33 @@ export const pub={
NeiBuPrice
:
"社内料金"
,
B2BPrice
:
"同業料金"
,
B2CPrice
:
"販売料金"
,
sfkxy
:
'喫煙室かどうか'
,
fou
:
'いいえ'
,
shi
:
'は'
,
canshi
:
'食事'
,
bednight
:
'ベッド/毎夜'
,
kefangshechi
:
'客室施設'
,
qingshuru
:
'入力してください'
,
qingxuanze
:
'選んでください'
,
qingshurulouceng
:
'フロアを入力してください'
,
sfszwxj
:
'下段に設定しますか?'
,
sfszwsj
:
'上段に設定しますか?'
,
tips
:
'ヒント'
,
queding
:
'を選択します'
,
shifoudelete
:
'削除するか?'
,
qingsctupian
:
'画像をアップロードしてください'
,
zaikuNumber
:
'在庫数量'
,
shifhanshui
:
'税込みかどうか'
,
buhanshui
:
'税抜き'
,
hanshui
:
'税込み'
,
shuijin
:
'税金'
,
qingshuruPrice
:
'販売価格を入力してください'
,
qingshujhjiage
:
'仕入れ値を入力してください'
,
qingshurkcsl
:
'在庫数を入力してください'
,
qingxzDate
:
'日付を選んでください'
,
}
\ No newline at end of file
src/assets/common/zh.js
View file @
fdbec09f
...
...
@@ -119,4 +119,35 @@ export const pub={
NeiBuPrice
:
"内部卖价"
,
B2BPrice
:
"同行卖价"
,
B2CPrice
:
"直客价格"
,
sfkxy
:
'是否可吸烟'
,
fou
:
'否'
,
shi
:
'是'
,
canshi
:
'餐食'
,
bednight
:
'床/毎夜'
,
kefangshechi
:
'客房设施'
,
qingshuru
:
'请输入'
,
qingxuanze
:
'请选择'
,
qingshurulouceng
:
'请输入楼层'
,
sfszwxj
:
'是否设置为下架?'
,
sfszwsj
:
'是否设置为上架?'
,
tips
:
'提示'
,
queding
:
'确定'
,
shifoudelete
:
'是否删除?'
,
qingsctupian
:
'请上传图片'
,
zaikuNumber
:
'在库数量'
,
shifhanshui
:
'是否含税'
,
buhanshui
:
'不含税'
,
hanshui
:
'含税'
,
shuijin
:
'税金'
,
qingshuruPrice
:
'请输入销售价格'
,
qingshujhjiage
:
'请输入进货价格'
,
qingshurkcsl
:
'请输入库存数量'
,
qingxzDate
:
'请选择日期'
,
}
\ No newline at end of file
src/components/assetsman/HotelOrder.vue
View file @
fdbec09f
...
...
@@ -361,9 +361,9 @@
},
//删除订单
DeleteOrder
(
item
)
{
this
.
$confirm
(
"この部屋のタイプを削除しますか?"
,
"ヒント"
,
{
confirmButtonText
:
"を選択します"
,
cancelButtonText
:
"キャンセル"
,
this
.
$confirm
(
this
.
$t
(
'pub.shifoudelete'
),
this
.
$t
(
'pub.tips'
)
,
{
confirmButtonText
:
this
.
$t
(
'pub.queding'
)
,
cancelButtonText
:
this
.
$t
(
'pub.cancel'
)
,
type
:
"warning"
})
.
then
(()
=>
{
...
...
@@ -379,7 +379,6 @@
});
})
.
catch
(()
=>
{
this
.
$message
.
info
(
"削除しました"
);
});
},
OperationCaozuo
(
item
)
{
...
...
src/components/assetsman/Quotation.vue
View file @
fdbec09f
...
...
@@ -186,37 +186,37 @@
:placeholder=
"$t('pub.B2CPrice')"
maxlength=
"7"
></el-input>
</td>
<td
title=
"直客价格"
class=
"tdRight"
>
在庫数量
{{$t('pub.zaikuNumber')}}
</td>
<td>
<el-input
@
keyup
.
native=
"checkInteger(addMsg,'Inventory')"
class=
"input"
v-model=
"addMsg.Inventory"
placeholder=
"在庫数量
"
maxlength=
"4"
></el-input>
:placeholder=
"$t('pub.zaikuNumber')
"
maxlength=
"4"
></el-input>
</td>
</tr>
<tr>
<td
title=
"是否含税"
class=
"tdRight"
>
税込みかどうか
{{$t('pub.shifhanshui')}}
</td>
<td>
<el-select
size=
"small"
v-model=
"addMsg.IsContainsTax"
class=
"w100"
placeholder=
"税込みかどうか
"
>
<el-option
label=
"税抜き
"
:value=
'0'
></el-option>
<el-option
label=
"税込み
"
:value=
'1'
></el-option>
<el-select
size=
"small"
v-model=
"addMsg.IsContainsTax"
class=
"w100"
:placeholder=
"$t('pub.shifhanshui')
"
>
<el-option
:label=
"$t('pub.buhanshui')
"
:value=
'0'
></el-option>
<el-option
:label=
"$t('pub.hanshui')
"
:value=
'1'
></el-option>
</el-select>
</td>
<td
title=
"税金"
v-if=
"addMsg.IsContainsTax==0"
class=
"tdRight"
>
税金
{{$t('pub.shuijin')}}
</td>
<td
v-if=
"addMsg.IsContainsTax==0"
>
<el-input
@
keyup
.
native=
"checkPrice(addMsg,'TaxPrice')"
class=
"input"
v-model=
"addMsg.TaxPrice"
placeholder=
"税金
"
maxlength=
"7"
></el-input>
:placeholder=
"$t('pub.shuijin')
"
maxlength=
"7"
></el-input>
</td>
</tr>
</table>
</div>
</div>
<div
class=
"btnformItem"
>
<span
v-loading=
"queryLoad"
class=
"submitBtn"
type=
"primary"
@
click=
"submitForm('addMsg')"
>
を選択します
</span>
<span
class=
"exitBtn"
@
click=
"clearAddMsg()"
>
キャンセル
</span>
<span
v-loading=
"queryLoad"
class=
"submitBtn"
type=
"primary"
@
click=
"submitForm('addMsg')"
>
{{this.$t('pub.queding')}}
</span>
<span
class=
"exitBtn"
@
click=
"clearAddMsg()"
>
{{this.$t('pub.cancel')}}
</span>
</div>
</el-form>
</div>
...
...
@@ -253,28 +253,28 @@
rules
:
{
Money
:
[{
required
:
true
,
message
:
"販売価格を入力してください"
,
message
:
this
.
$t
(
'pub.qingshuruPrice'
)
,
trigger
:
"blur"
}],
CostPrice
:
[{
required
:
true
,
message
:
"仕入れ値を入力してください"
,
message
:
this
.
$t
(
'pub.qingshujhjiage'
)
,
trigger
:
"blur"
}],
Inventory
:
[{
required
:
true
,
message
:
"在庫数を入力してください"
,
message
:
this
.
$t
(
'pub.qingshurkcsl'
)
,
trigger
:
"blur"
}],
B2BPrice
:
[{
required
:
true
,
message
:
"在庫数を入力してください"
,
message
:
this
.
$t
(
'pub.qingshuru'
)
,
trigger
:
"blur"
}],
B2CPrice
:
[{
required
:
true
,
message
:
"在庫数を入力してください"
,
message
:
this
.
$t
(
'pub.qingshuru'
)
,
trigger
:
"blur"
}],
},
...
...
@@ -347,11 +347,11 @@
DateList
:
this
.
addMsg
.
DateList
}
if
(
msg
.
DateList
.
length
==
0
)
{
this
.
Error
(
"日付を選んでください!"
);
this
.
Error
(
this
.
$t
(
'pub.qingxzDate'
)
);
return
;
}
var
that
=
this
;
this
.
Confirm
(
"削除するか?"
,
function
()
{
this
.
Confirm
(
this
.
$t
(
'pub.shifoudelete'
)
,
function
()
{
that
.
apipost
(
"scm_post_DelSCMHotelRoomPriceInfo"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
@@ -532,7 +532,7 @@
//删除报价
DeleteRoomPrice
(
item
)
{
var
that
=
this
;
this
.
Confirm
(
"削除するか?"
,
function
()
{
this
.
Confirm
(
this
.
$t
(
'pub.shifoudelete'
)
,
function
()
{
that
.
apipost
(
"scm_post_RemoveSCMHotelRoomPriceService"
,
{
Id
:
item
.
Id
},
...
...
src/components/assetsman/RoomList.vue
View file @
fdbec09f
This diff is collapsed.
Click to expand it.
src/components/global/index.vue
View file @
fdbec09f
...
...
@@ -52,7 +52,7 @@
<div
class=
"btnformItem"
style=
"text-align:center;margin:50px 0 20px 0;"
>
<span
class=
"chaxunSpan"
type=
"primary"
@
click=
"submitForm('passWordMsg')"
style=
"margin-right:20px;"
title=
"确定"
>
確定
</span>
<span
class=
"addSpan"
@
click=
"updateInfo = false,resetMsg()"
title=
"取消"
>
キャンセル
</span>
<span
class=
"addSpan"
@
click=
"updateInfo = false,resetMsg()"
title=
"取消"
>
{{
this
.
$t
(
'pub.cancel'
)
}}
</span>
</div>
</div>
</el-dialog>
...
...
src/plugins/index.js
View file @
fdbec09f
...
...
@@ -83,8 +83,8 @@ export default {
//Confirm
Vue
.
prototype
.
Confirm
=
function
(
msg
,
callback
)
{
this
.
$confirm
(
msg
,
"提示"
,
{
confirmButtonText
:
"確定"
,
cancelButtonText
:
"キャンセル"
,
confirmButtonText
:
this
.
$t
(
'pub.queding'
)
,
cancelButtonText
:
this
.
$t
(
'pub.cancel'
)
,
type
:
"warning"
})
.
then
(()
=>
{
...
...
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