init

src/components/HelloWorld.vue

@@ -89,23 +89,23 @@
 					order_memo: "备注",
 				},
 				hotelListObj: {
-					hotelName: '酒店名称',
-					roomName: '房型名称',
-					price: '价格方案',
+					hotel_id: '酒店名称',
+					room_id: '房型名称',
+					plan_id: '价格方案',
 					check_in_date: '',
 					check_out_date: '',
-					travelerName: '出游人姓名',
-					confirmNo: '123456',
-					taOrderNo: '123456',
-					sourceState: '资源状态',
-					roomDesc: '床型说明',
-					sourceResponser: '资源负责人',
-					priceIntro: '价格方案说明',
-					total_amount: '总金额',
-					cost_amount: '成本价',
-					profit_amount: '利润',
+					customer_name: '出游人姓名',
+					confirm_no: '123456',
+					trade_order_number: '123456',
+					confirm_status: '未发单',
+					room_memo: '床型说明',
+					res_person: '资源负责人',
+					plan_memo: '价格方案说明',
+					total_price: '总金额',
+					total_cost: '成本价',
+					profit: '利润',
 					tableData: [{
-						date: '',
+						date: '请选择日期',
 						salePrice: '',
 						countPrice: '',
 						amount: '',
@@ -115,21 +115,21 @@
 				},
 				hotelList: [],
 				hotelotherListObj: {
-					fuStyle: '附加项目类型',
-					fuName: '附加项目名称',
-					countUnit: '计价单位',
+					item_type: '附加项目类型',
+					item_name: '附加项目名称',
+					item_unit: '计价单位',
 					use_date: '',
-					travelerName: '出游人姓名',
-					confirmNo: '123456',
-					taOrderNo: '123456',
-					sourceResponser: '资源负责人',
-					sourceState: '资源状态',
-					fuIntro: '附加项目说明',
-					total_amount: '总金额',
-					cost_amount: '成本价',
-					profit_amount: '利润',
+					customer_name: '出游人姓名',
+					confirm_no: '123456',
+					trade_order_number: '123456',
+					res_person: '资源负责人',
+					confirm_status: '未发单',
+					item_memo: '附加项目说明',
+					total_price: '总金额',
+					total_cost: '成本价',
+					profit: '利润',
 					tableData: [{
-						date: '',
+						date: '请选择日期',
 						salePrice: '',
 						countPrice: '',
 						amount: '',
@@ -173,7 +173,7 @@
 			}).catch((err) => {
 				console.log(err)
 			})
-			axios.get("hotel.php/cf_channel_info/getList").then((res) => {
+			axios.get("/hotel.php/cf_channel_info/getList").then((res) => {
 				console.log(res)
 				this.channelListOpt = res.data.list
 			}).catch((err) => {

src/components/hotel.vue

@@ -8,7 +8,7 @@
               <el-col :span="8">
                 <el-form-item label="酒店名称">
 
-                  <el-select v-model="dataObj.hotelName" filterable placeholder="请选择" @change="selectChange">
+                  <el-select v-model="dataObj.hotel_id" filterable placeholder="请选择" @change="selectChange">
                     <el-option
                       v-for="item in hotelListOpt"
                       :key="item.id"
@@ -20,7 +20,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="房型名称">
-                  <el-select v-model="dataObj.roomName" filterable placeholder="请选择" @change="selectChange">
+                  <el-select v-model="dataObj.room_id" filterable placeholder="请选择" @change="selectChange">
                     <el-option
                       v-for="item in roomListOpt"
                       :key="item.id"
@@ -32,7 +32,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="价格方案">
-                  <el-input v-model="dataObj.price"></el-input>
+                  <el-input v-model="dataObj.plan_id"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -52,12 +52,12 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label-width="100px" label="出游人姓名">
-                <el-input v-model="dataObj.travelerName"></el-input>
+                <el-input v-model="dataObj.customer_name"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="确认号">
-                <el-input v-model="dataObj.confirmNo"></el-input>
+                <el-input v-model="dataObj.confirm_no"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -105,29 +105,29 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label-width="100px" label="对方订单号">
-                <el-input v-model="dataObj.taOrderNo"></el-input>
+                <el-input v-model="dataObj.trade_order_number"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="资源状态">
-                <el-button-group v-model="dataObj.sourceState">
-                  <el-button type="primary">未发单</el-button>
-                  <el-button type="">已发单</el-button>
-                  <el-button type="">已确认</el-button>
-                  <el-button type="">已取消</el-button>
-                </el-button-group>
+                <el-radio-group v-model="dataObj.confirm_status" size="small" style="min-width: 270px;">
+                  <el-radio-button label="未发单" name="未发单"></el-radio-button>
+                  <el-radio-button label="已发单" name="已发单"></el-radio-button>
+                  <el-radio-button label="已确认" name="已确认"></el-radio-button>
+                  <el-radio-button label="已取消" name="已取消"></el-radio-button>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label-width="100px" label="床型说明">
-                <span>{{dataObj.roomDesc}}</span>
+                <span>{{dataObj.room_memo}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label-width="100px" label="资源负责人">
-                <span>{{dataObj.sourceResponser}}</span>
+                <span>{{dataObj.res_person}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -180,7 +180,7 @@
 			getAllDateCN(startTime, endTime) {
 				var date_all = []
 				var i = 0
-				while ((endTime.getTime() - startTime.getTime()) >= 0) {
+				while ((endTime.getTime() - startTime.getTime()) > 0) {
 					var year = startTime.getFullYear()
 					var month = startTime.getMonth() + 1
 					var day = startTime.getDate()
@@ -213,16 +213,16 @@
 							}
 						}, 0);
 						if (index == 1) {
-							this.dataObj.total_amount = sums[index];
-							this.$set(this.dataObj, 'total_amount', sums[index]);
+							this.dataObj.total_price = sums[index];
+							this.$set(this.dataObj, 'total_price', sums[index]);
 						}
 						if (index == 2) {
-							this.dataObj.cost_amount = sums[index];
-							this.$set(this.dataObj, 'cost_amount', sums[index]);
+							this.dataObj.total_cost = sums[index];
+							this.$set(this.dataObj, 'total_cost', sums[index]);
 						}
 						if (index == 4) {
-							this.dataObj.profit_amount = sums[index];
-							this.$set(this.dataObj, 'profit_amount', sums[index]);
+							this.dataObj.profit = sums[index];
+							this.$set(this.dataObj, 'profit', sums[index]);
 						}
 						sums[index] += ' 元';
 					} else {

src/components/hotelother.vue

@@ -7,17 +7,17 @@
             <el-row style="margin-top: 25px;padding-right: 20px;">
               <el-col :span="8">
                 <el-form-item label="附加项目类型">
-                  <el-input v-model="dataObj.fuStyle"></el-input>
+                  <el-input v-model="dataObj.item_type"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="附加项目名称">
-                  <el-input v-model="dataObj.fuName"></el-input>
+                  <el-input v-model="dataObj.item_name"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="计价单位">
-                  <el-input v-model="dataObj.countUnit"></el-input>
+                  <el-input v-model="dataObj.item_unit"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -33,12 +33,12 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label-width="100px" label="出游人姓名">
-                <el-input v-model="dataObj.travelerName"></el-input>
+                <el-input v-model="dataObj.customer_name"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="确认号">
-                <el-input v-model="dataObj.confirmNo"></el-input>
+                <el-input v-model="dataObj.confirm_no"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -86,17 +86,17 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label-width="100px" label="对方订单号">
-                <el-input v-model="dataObj.taOrderNo"></el-input>
+                <el-input v-model="dataObj.trade_order_number"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label-width="100px" label="资源负责人">
-                <span>{{dataObj.sourceResponser}}</span>
+                <span>{{dataObj.res_person}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="资源状态">
-                <el-button-group v-model="dataObj.sourceState">
+                <el-button-group v-model="dataObj.confirm_status">
                   <el-button type="primary">未发单</el-button>
                   <el-button type="">已发单</el-button>
                   <el-button type="">已确认</el-button>
@@ -108,7 +108,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label-width="100px" label="附加项目说明">
-                <span>{{dataObj.fuIntro}}</span>
+                <span>{{dataObj.item_memo}}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -187,16 +187,16 @@
 							}
 						}, 0);
 						if (index == 1) {
-							this.dataObj.total_amount = sums[index];
-							this.$set(this.dataObj, 'total_amount', sums[index]);
+							this.dataObj.total_price = sums[index];
+							this.$set(this.dataObj, 'total_price', sums[index]);
 						}
 						if (index == 2) {
-							this.dataObj.cost_amount = sums[index];
-							this.$set(this.dataObj, 'cost_amount', sums[index]);
+							this.dataObj.total_cost = sums[index];
+							this.$set(this.dataObj, 'total_cost', sums[index]);
 						}
 						if (index == 4) {
-							this.dataObj.profit_amount = sums[index];
-							this.$set(this.dataObj, 'profit_amount', sums[index]);
+							this.dataObj.profit = sums[index];
+							this.$set(this.dataObj, 'profit', sums[index]);
 						}
 						sums[index] += ' 元';
 					} else {

src/main.js

@@ -16,8 +16,8 @@ import {
   Input,
   // InputNumber,
   // Radio,
-  // RadioGroup,
-  // RadioButton,
+  RadioGroup,
+  RadioButton,
   // Checkbox,
   // CheckboxButton,
   // CheckboxGroup,
@@ -26,7 +26,7 @@ import {
   Option,
   OptionGroup,
   Button,
-  ButtonGroup,
+  // ButtonGroup,
   Table,
   TableColumn,
   DatePicker,
@@ -95,8 +95,8 @@ import {
 Vue.use(Input);
 // Vue.use(InputNumber);
 // Vue.use(Radio);
-// Vue.use(RadioGroup);
-// Vue.use(RadioButton);
+Vue.use(RadioGroup);
+Vue.use(RadioButton);
 // Vue.use(Checkbox);
 // Vue.use(CheckboxButton);
 // Vue.use(CheckboxGroup);
@@ -105,7 +105,7 @@ Vue.use(Select);
 Vue.use(Option);
 Vue.use(OptionGroup);
 Vue.use(Button);
-Vue.use(ButtonGroup);
+// Vue.use(ButtonGroup);
 Vue.use(Table);
 Vue.use(TableColumn);
 Vue.use(DatePicker);