diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue index ed11071..7eaecc0 100644 --- a/src/components/HelloWorld.vue +++ b/src/components/HelloWorld.vue @@ -74,7 +74,8 @@ - + @@ -87,7 +88,7 @@ - + @@ -134,7 +135,7 @@ trade_order_number: '123456', confirm_status: '1', room_memo: '床型说明', - res_person: '资源负责人', + purchase_user_id: '资源负责人', plan_memo: '价格方案说明', total_price: '总金额', total_cost: '成本价', @@ -151,14 +152,14 @@ }, hotelList: [], hotelotherListObj: { - item_type: '附加项目类型', + item_id: '附加项目类型', item_name: '附加项目名称', item_unit: '计价单位', check_in_date: '', customer_name: '出游人姓名', confirm_no: '123456', trade_order_number: '123456', - res_person: '资源负责人', + purchase_user_id: '资源负责人', confirm_status: '1', item_memo: '附加项目说明', total_price: '总金额', @@ -177,6 +178,7 @@ hotelotherList: [], hotelListOpt: [], channelListOpt: [], + userOpt: [], } }, computed: { @@ -237,6 +239,12 @@ if (process.env.NODE_ENV !== 'production') { axios.defaults.baseURL = '/api' //关键代码 } + axios.get("/hotel.php/auth/admin/getList").then((res) => { + console.log(res) + this.userOpt = res.data.list + }).catch((err) => { + console.log(err) + }) axios.get("/hotel.php/cf_hotel_info/getHotelList").then((res) => { console.log(res) this.hotelListOpt = res.data.list diff --git a/src/components/hotel.vue b/src/components/hotel.vue index 220b664..93b8b19 100644 --- a/src/components/hotel.vue +++ b/src/components/hotel.vue @@ -151,7 +151,14 @@ - {{dataObj.res_person}} + + + + @@ -298,7 +305,14 @@ - {{dataObj.res_person}} + + + + @@ -318,7 +332,7 @@ export default { name: "hotel", - props: {type: String, saleCount: Number, dataObj: Object, hotelListOpt: Array}, + props: {userOpt: Array,type: String, saleCount: Number, dataObj: Object, hotelListOpt: Array}, data() { return { dataObjCopy: this.$lo.cloneDeep(this.dataObj), diff --git a/src/components/hotelother.vue b/src/components/hotelother.vue index 2248f57..52c919b 100644 --- a/src/components/hotelother.vue +++ b/src/components/hotelother.vue @@ -23,7 +23,14 @@ - + + + + @@ -115,7 +122,14 @@ - {{dataObj.res_person}} + + + + @@ -144,7 +158,14 @@ - + + + + @@ -237,7 +258,14 @@ - {{dataObj.res_person}} + + + + @@ -268,12 +296,13 @@ export default { name: "hotelother", - props: {type: String, saleCount: Number, dataObj: Object}, + props: {userOpt: Array, type: String, saleCount: Number, dataObj: Object}, data() { return { dataObjCopy: this.$lo.cloneDeep(this.dataObj), confirm_status: '未发单', check_in_date: '', + cf_itemOpt: [], day: [] } }, @@ -451,6 +480,12 @@ if (process.env.NODE_ENV !== 'production') { axios.defaults.baseURL = '/api' //关键代码 } + axios.get("/hotel.php/cf_item/getList").then((res) => { + console.log(res) + this.cf_itemOpt = res.data.list + }).catch((err) => { + console.log(err) + }) } }