@@ -126,6 +126,7 @@ | |||||
}, | }, | ||||
orderMainCopy: {}, | orderMainCopy: {}, | ||||
hotelListObj: { | hotelListObj: { | ||||
prod_type: 'hotel', | |||||
hotel_id: '', | hotel_id: '', | ||||
room_id: '', | room_id: '', | ||||
plan_id: '', | plan_id: '', | ||||
@@ -153,6 +154,7 @@ | |||||
}, | }, | ||||
hotelList: [], | hotelList: [], | ||||
hotelotherListObj: { | hotelotherListObj: { | ||||
prod_type: 'item', | |||||
item_id: '', | item_id: '', | ||||
item_name: '', | item_name: '', | ||||
item_unit: '', | item_unit: '', | ||||
@@ -355,4 +357,8 @@ | |||||
.left { | .left { | ||||
text-align: left; | text-align: left; | ||||
} | } | ||||
.card { | |||||
overflow-x: scroll; | |||||
} | |||||
</style> | </style> |
@@ -20,11 +20,11 @@ | |||||
</template> | </template> | ||||
<el-form ref="form" :model="dataObj" label-width="100px" :disabled="disable"> | <el-form ref="form" :model="dataObj" label-width="100px" :disabled="disable"> | ||||
<el-row style="margin-top: 25px;padding-right: 20px;"> | |||||
<el-col :span="8"> | |||||
<el-row style="margin-top: 25px;"> | |||||
<el-col :span="10"> | |||||
<el-form-item label="酒店名称"> | <el-form-item label="酒店名称"> | ||||
<el-select v-model="dataObj.hotel_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-select style="width: 100%" v-model="dataObj.hotel_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-option | <el-option | ||||
v-for="item in hotelListOpt" | v-for="item in hotelListOpt" | ||||
:key="'hotel_id'+item.id" | :key="'hotel_id'+item.id" | ||||
@@ -36,7 +36,7 @@ | |||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | <el-col :span="8"> | ||||
<el-form-item label="房型名称"> | <el-form-item label="房型名称"> | ||||
<el-select v-model="dataObj.room_id" filterable placeholder="请选择" @change="roomselectChange"> | |||||
<el-select style="width: 100%" v-model="dataObj.room_id" filterable placeholder="请选择" @change="roomselectChange"> | |||||
<el-option | <el-option | ||||
v-for="item in roomListOpt" | v-for="item in roomListOpt" | ||||
:key="'room_id'+item.id" | :key="'room_id'+item.id" | ||||
@@ -46,9 +46,9 @@ | |||||
</el-select> | </el-select> | ||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | |||||
<el-col :span="6"> | |||||
<el-form-item label="价格方案"> | <el-form-item label="价格方案"> | ||||
<el-select v-model="dataObj.plan_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-select style="width: 100%" v-model="dataObj.plan_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-option | <el-option | ||||
v-for="item in roomPlan" | v-for="item in roomPlan" | ||||
:key="item.id" | :key="item.id" | ||||
@@ -90,7 +90,7 @@ | |||||
height="500" | height="500" | ||||
:summary-method="getSummaries" | :summary-method="getSummaries" | ||||
show-summary | show-summary | ||||
style="width: 100%; margin-top: 20px"> | |||||
style="width: 100%;min-width:890px; margin-top: 20px"> | |||||
<el-table-column | <el-table-column | ||||
prop="run_date" | prop="run_date" | ||||
label="日期" | label="日期" | ||||
@@ -100,21 +100,21 @@ | |||||
prop="price" | prop="price" | ||||
label="售卖价"> | label="售卖价"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.price"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.price"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
prop="cost" | prop="cost" | ||||
label="成本价"> | label="成本价"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.cost"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.cost"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
prop="count" | prop="count" | ||||
label="数量"> | label="数量"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.count"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.count"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
@@ -128,7 +128,7 @@ | |||||
prop="note" | prop="note" | ||||
label="备注"> | label="备注"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-model="scope.row.note"></el-input> | |||||
<el-input type="textarea" v-model="scope.row.note"></el-input> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table> | </el-table> | ||||
@@ -180,11 +180,11 @@ | |||||
<template v-else> | <template v-else> | ||||
<el-form ref="form" :model="dataObj" label-width="100px" :disabled="disable"> | <el-form ref="form" :model="dataObj" label-width="100px" :disabled="disable"> | ||||
<el-row style="margin-top: 25px;padding-right: 20px;"> | |||||
<el-col :span="8"> | |||||
<el-row style="margin-top: 25px;"> | |||||
<el-col :span="10"> | |||||
<el-form-item label="酒店名称"> | <el-form-item label="酒店名称"> | ||||
<el-select v-model="dataObj.hotel_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-select style="width: 100%" v-model="dataObj.hotel_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-option | <el-option | ||||
v-for="item in hotelListOpt" | v-for="item in hotelListOpt" | ||||
:key="item.id" | :key="item.id" | ||||
@@ -196,7 +196,7 @@ | |||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | <el-col :span="8"> | ||||
<el-form-item label="房型名称"> | <el-form-item label="房型名称"> | ||||
<el-select v-model="dataObj.room_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-select style="width: 100%" v-model="dataObj.room_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-option | <el-option | ||||
v-for="item in roomListOpt" | v-for="item in roomListOpt" | ||||
:key="item.id" | :key="item.id" | ||||
@@ -206,9 +206,9 @@ | |||||
</el-select> | </el-select> | ||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | |||||
<el-col :span="6"> | |||||
<el-form-item label="价格方案"> | <el-form-item label="价格方案"> | ||||
<el-select v-model="dataObj.plan_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-select style="width: 100%" v-model="dataObj.plan_id" filterable placeholder="请选择" @change="selectChange"> | |||||
<el-option | <el-option | ||||
v-for="item in roomPlan" | v-for="item in roomPlan" | ||||
:key="item.id" | :key="item.id" | ||||
@@ -227,6 +227,7 @@ | |||||
type="daterange" | type="daterange" | ||||
value-format="yyyy-MM-dd HH:mm:ss" | value-format="yyyy-MM-dd HH:mm:ss" | ||||
range-separator="-" | range-separator="-" | ||||
style="width: 100%" | |||||
start-placeholder="入住日期" | start-placeholder="入住日期" | ||||
end-placeholder="离店日期"> | end-placeholder="离店日期"> | ||||
</el-date-picker> | </el-date-picker> | ||||
@@ -251,7 +252,7 @@ | |||||
:summary-method="getSummaries" | :summary-method="getSummaries" | ||||
:span-method="arraySpanMethod" | :span-method="arraySpanMethod" | ||||
show-summary | show-summary | ||||
style="width: 100%; margin-top: 20px"> | |||||
style="width: 100%;min-width:890px; margin-top: 20px"> | |||||
<el-table-column | <el-table-column | ||||
prop="run_date" | prop="run_date" | ||||
label="日期" | label="日期" | ||||
@@ -261,21 +262,21 @@ | |||||
prop="price" | prop="price" | ||||
label="售卖价"> | label="售卖价"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.price"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.price"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
prop="cost" | prop="cost" | ||||
label="成本价"> | label="成本价"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.cost"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.cost"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
prop="count" | prop="count" | ||||
label="数量"> | label="数量"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.count" @change="changeNum"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.count" @change="changeNum"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
@@ -289,7 +290,7 @@ | |||||
prop="note" | prop="note" | ||||
label="备注"> | label="备注"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-model="scope.row.note" @change="changeNote"></el-input> | |||||
<el-input type="textarea" v-model="scope.row.note" @change="changeNote"></el-input> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table> | </el-table> | ||||
@@ -20,8 +20,8 @@ | |||||
</template> | </template> | ||||
<el-form ref="form" :model="dataObj" label-width="100px" :disabled="disable"> | <el-form ref="form" :model="dataObj" label-width="100px" :disabled="disable"> | ||||
<el-row style="margin-top: 25px;padding-right: 20px;"> | |||||
<el-col :span="8"> | |||||
<el-row style="margin-top: 25px;"> | |||||
<el-col :span="10"> | |||||
<el-form-item label="附加项目类型"> | <el-form-item label="附加项目类型"> | ||||
<el-select style="width: 100%" v-model="dataObj.item_id" filterable placeholder="请选择" | <el-select style="width: 100%" v-model="dataObj.item_id" filterable placeholder="请选择" | ||||
@change="changeItem"> | @change="changeItem"> | ||||
@@ -36,16 +36,12 @@ | |||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | <el-col :span="8"> | ||||
<el-form-item label="附加项目名称"> | <el-form-item label="附加项目名称"> | ||||
<div class="left"> | |||||
{{dataObjTemp.item_name}} | |||||
</div> | |||||
<el-input readonly v-model="dataObjTemp.item_name"></el-input> | |||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | |||||
<el-col :span="6"> | |||||
<el-form-item label="计价单位"> | <el-form-item label="计价单位"> | ||||
<div class="left"> | |||||
{{dataObjTemp.item_unit}} | |||||
</div> | |||||
<el-input readonly v-model="dataObjTemp.item_unit"></el-input> | |||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
</el-row> | </el-row> | ||||
@@ -76,7 +72,7 @@ | |||||
height="500" | height="500" | ||||
:summary-method="getSummaries" | :summary-method="getSummaries" | ||||
show-summary | show-summary | ||||
style="width: 100%; margin-top: 20px"> | |||||
style="width: 100%;min-width:890px; margin-top: 20px"> | |||||
<el-table-column | <el-table-column | ||||
prop="run_date" | prop="run_date" | ||||
label="日期" | label="日期" | ||||
@@ -86,21 +82,21 @@ | |||||
prop="price" | prop="price" | ||||
label="售卖价"> | label="售卖价"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.price"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.price"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
prop="cost" | prop="cost" | ||||
label="成本价"> | label="成本价"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.cost"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.cost"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
prop="count" | prop="count" | ||||
label="数量"> | label="数量"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.count"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.count"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
@@ -114,7 +110,7 @@ | |||||
prop="note" | prop="note" | ||||
label="备注"> | label="备注"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-model="scope.row.note"></el-input> | |||||
<el-input type="textarea" v-model="scope.row.note"></el-input> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table> | </el-table> | ||||
@@ -160,8 +156,8 @@ | |||||
</el-collapse> | </el-collapse> | ||||
<template v-else> | <template v-else> | ||||
<el-form ref="form" :model="dataObj" label-width="100px" :disabled="disable"> | <el-form ref="form" :model="dataObj" label-width="100px" :disabled="disable"> | ||||
<el-row style="margin-top: 25px;padding-right: 20px;"> | |||||
<el-col :span="8"> | |||||
<el-row style="margin-top: 25px;"> | |||||
<el-col :span="10"> | |||||
<el-form-item label="附加项目类型"> | <el-form-item label="附加项目类型"> | ||||
<el-select style="width: 100%" v-model="dataObj.item_id" filterable placeholder="请选择"> | <el-select style="width: 100%" v-model="dataObj.item_id" filterable placeholder="请选择"> | ||||
<el-option | <el-option | ||||
@@ -175,28 +171,20 @@ | |||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | <el-col :span="8"> | ||||
<el-form-item label="附加项目名称"> | <el-form-item label="附加项目名称"> | ||||
<div class="left"> | |||||
{{dataObjTemp.item_name}} | |||||
</div> | |||||
<!-- <el-input v-model="dataObjTemp.item_name"></el-input>--> | |||||
<el-input readonly v-model="dataObjTemp.item_name"></el-input> | |||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | |||||
<el-col :span="6"> | |||||
<el-form-item label="计价单位"> | <el-form-item label="计价单位"> | ||||
<div class="left"> | |||||
{{dataObjTemp.item_unit}} | |||||
</div> | |||||
<!-- <el-input v-model="dataObjTemp.item_unit"></el-input>--> | |||||
<el-input readonly v-model="dataObjTemp.item_unit"></el-input> | |||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
</el-row> | </el-row> | ||||
<el-row> | <el-row> | ||||
<el-col :span="10"> | <el-col :span="10"> | ||||
<el-form-item label="使用日期"> | <el-form-item label="使用日期"> | ||||
<el-col :span="11"> | |||||
<el-date-picker type="date" placeholder="选择日期" v-model="check_in_date" | <el-date-picker type="date" placeholder="选择日期" v-model="check_in_date" | ||||
style="width: 100%;"></el-date-picker> | style="width: 100%;"></el-date-picker> | ||||
</el-col> | |||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
<el-col :span="8"> | <el-col :span="8"> | ||||
@@ -218,7 +206,7 @@ | |||||
:summary-method="getSummaries" | :summary-method="getSummaries" | ||||
:span-method="arraySpanMethod" | :span-method="arraySpanMethod" | ||||
show-summary | show-summary | ||||
style="width: 100%; margin-top: 20px"> | |||||
style="width: 100%;min-width:890px; margin-top: 20px"> | |||||
<el-table-column | <el-table-column | ||||
prop="run_date" | prop="run_date" | ||||
label="日期" | label="日期" | ||||
@@ -228,21 +216,21 @@ | |||||
prop="price" | prop="price" | ||||
label="售卖价"> | label="售卖价"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.price"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.price"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
prop="cost" | prop="cost" | ||||
label="成本价"> | label="成本价"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.cost"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.cost"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
prop="count" | prop="count" | ||||
label="数量"> | label="数量"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input-number v-model="scope.row.count" @change="changeNum"></el-input-number> | |||||
<el-input-number size="small" v-model="scope.row.count" @change="changeNum"></el-input-number> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
@@ -256,7 +244,7 @@ | |||||
prop="note" | prop="note" | ||||
label="备注"> | label="备注"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-model="scope.row.note" @change="changeNote"></el-input> | |||||
<el-input type="textarea" v-model="scope.row.note" @change="changeNote"></el-input> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table> | </el-table> | ||||