Merge branch 'master' of http://gitlab.oytour.com/zk123/hotelproject

src/components/assetsman/HotelList.vue

@@ -97,7 +97,7 @@
           pageSize: 15,
           SHotelName: "", //酒店名称
           Status: -1, //酒店状态
-          SCountryId: 0, //国家编号
+          SCountryId: 651, //国家编号
           SProvinceId: 0, //省份编号
           SCityId: 0, //城市编号
         },

src/components/assetsman/HotelOrder.vue

 <template>
-    <div>
-        123
+  <div class="assetsList">
+    <div class="routerTitle">
+      <span class="pageTitle">酒店订单</span>
+    
     </div>
-</template>
+  
\ No newline at end of file
+  </div>
+</template>
+<script>
+  import moment from 'moment'
+  export default {
+    name: "assetsList",
+    components: {},
+    data() {
+      return {
+        currentPage: 1,
+        dataList: [],
+        loading: false,
+        morequery: false,
+        total: 0,
+        msg: {
+          pageIndex: 1,
+          pageSize: 15,
+          HotelId:0,
+          RoomId:0,
+          RoomType:0,
+          StartTime:"",
+          EndTime:"",
+          OrderStatus:0,
+          CreateBy:0,
+          OrderForm:0
+        },
+ 
+      };
+    },
+    mounted() {
+      this.getCountryList();
+      this.getList();
+    },
+    methods: {
+      currentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      getList() {
+        this.apipost("scm_get_GetSCMHotelOrderPageList", this.msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data.pageData;
+              this.total = res.data.data.count;
+              console.log("this.dataList", this.dataList)
+            } else {
+              this.Error(res.data.message);
+            }
+          });
+      },
+      getProvinceList(ID, type) {
+        //根据省份获取城市
+        let msg = {
+          Id: ID
+        };
+        if (type == 1) {
+          this.msg.SProvinceId = 0;
+          this.msg.SCityId = 0;
+        } else if (type == 2) {
+          this.msg.SCityId = 0;
+        }
+        if (this.msg.SCountryId !== 0) {
+          this.apipost(
+            "dict_post_Destination_GetChildList",
+            msg,
+            res => {
+              if (type == 1) {
+                this.provinceList = res.data.data;
+              } else if (type == 2) {
+                this.cityList = res.data.data;
+              }
+            },
+            err => {}
+          );
+        }
+      },
+      //获取国家
+      getCountryList() {
+        this.apipost(
+          "dict_post_Destination_GetCountry", {},
+          res => {
+            this.countryList = res.data.data;
+          },
+          err => {}
+        );
+      },
+      addHotel() {
+        this.$router.push({
+          path: 'HotelInfo'
+        })
+      },
+      getDate(date) {
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      },
+      //修改
+      Edit(item) {
+        this.$router.push({
+          path: 'HotelInfo',
+          query: {
+            SID: item.SID
+          }
+        })
+      },
+    }
+  };
+
+</script>
+
+<style>
+  .assetsList .MyEditForm .baseform .el-form-item:nth-child(4n) {
+    margin-right: 0;
+  }
+
+  .assetsList .zczt1 {
+    background: #ffe4d5;
+    color: #ffa87c;
+  }
+
+  .assetsList .zczt2 {
+    background: #beeff0;
+    color: #089bab;
+  }
+
+  .assetsList .zczt3 {
+    background: #ffd6d5;
+    color: #ff7874;
+  }
+
+  .assetsList .zczt4 {
+    background: #d7d6ff;
+    color: #7b78ff;
+  }
+
+  .assetsList .Commonzczt {
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
+    text-align: center;
+    border-radius: 50%;
+    font-size: 12px;
+    font-family: "Microsoft YaHei";
+  }
+
+  .assetsList {
+    width: 100%;
+    height: 100%;
+  }
+
+</style>