Kaynağa Gözat

// 创建yyz分支

ZIPZAP 1 yıl önce
ebeveyn
işleme
de1223e137

+ 2 - 2
index.html

@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>趣旅宿酒店管理系统</title>
+  <title>宿四季酒店管理系统</title>
   <% if (process.env.NODE_ENV === 'production') { %>
     <!-- 生产环境 -->
     <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>
@@ -22,4 +22,4 @@
 <body>
   <div id="app"></div>
 </body>
-</html>
+</html>

+ 3 - 2
package.json

@@ -17,7 +17,7 @@
     "axios": "0.17.1",
     "babel-plugin-component": "0.10.1",
     "babel-polyfill": "6.26.0",
-    "element-ui": "2.8.2",
+    "element-ui": "^2.15.7",
     "file-saver": "^2.0.5",
     "gulp-concat": "2.6.1",
     "gulp-load-plugins": "1.5.0",
@@ -28,10 +28,11 @@
     "npm": "^6.9.0",
     "sass-loader": "6.0.6",
     "svg-sprite-loader": "3.7.3",
-    "vue": "2.5.16",
+    "vue": "^2.6.10",
     "vue-cookie": "1.1.4",
     "vue-json-excel": "^0.3.0",
     "vue-router": "3.0.1",
+    "vue-template-compiler": "^2.6.10",
     "vuex": "3.0.1",
     "xlsx": "^0.16.9"
   },

+ 2 - 1
src/main.js

@@ -3,7 +3,7 @@ import App from '@/App'
 import router from '@/router'                 // api: https://github.com/vuejs/vue-router
 import store from '@/store'                   // api: https://github.com/vuejs/vuex
 import VueCookie from 'vue-cookie'            // api: https://github.com/alfhen/vue-cookie
-import '@/element-ui'                         // api: https://github.com/ElemeFE/element
+import ElementUI from 'element-ui'
 import '@/icons'                              // api: http://www.iconfont.cn/
 import '@/element-ui-theme'
 import '@/assets/scss/index.scss'
@@ -12,6 +12,7 @@ import { isAuth } from '@/utils'
 import cloneDeep from 'lodash/cloneDeep'
 import XLSX from 'xlsx'
 
+Vue.use(ElementUI)
 Vue.use(XLSX)
 Vue.use(VueCookie)
 Vue.config.productionTip = false

+ 4 - 1
src/router/index.js

@@ -18,7 +18,10 @@ const _import = require('./import-' + process.env.NODE_ENV)
 // 全局路由(无需嵌套上左右整体布局)
 const globalRoutes = [
   { path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } },
-  { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } }
+  { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } },
+  { path: '/h5/login', component: _import('H5/login'), name: 'h5Login', meta: { title: 'h5登录' } },
+  { path: '/h5/home', component: _import('H5/home'), name: 'h5Home', meta: { title: 'h5首页' } },
+  { path: '/h5/order', component: _import('H5/order'), name: 'h5Order', meta: { title: 'h5订单列表' } }
 ]
 
 // 主入口路由(需嵌套上左右整体布局)

+ 56 - 0
src/views/H5/home.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="h5_home">
+    <div v-for="(item, index) in menus" :key="index">
+      <el-button type="primary" @click="handleJump(item.name)">
+        {{ item.label }}
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      menus: [
+        {
+          label: "订单列表",
+          name: "h5Order"
+        }
+      ]
+    };
+  },
+  mounted() {
+    this.$http({
+      url: this.$http.adornUrl("/sys/menu/nav"),
+      method: "get",
+      params: this.$http.adornParams()
+    }).then(({ data }) => {
+      if (data && data.code === 0) {
+        sessionStorage.setItem(
+          "permissions",
+          JSON.stringify(data.permissions || "[]")
+        );
+      } else {
+        sessionStorage.setItem("permissions", "[]");
+      }
+    });
+  },
+  methods: {
+    handleJump(name) {
+      this.$router.replace({ name: name });
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.h5_home {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+</style>

+ 154 - 0
src/views/H5/login.vue

@@ -0,0 +1,154 @@
+<template>
+  <div class="h5_login">
+    <el-card class="box-card">
+      <div class="login_box">
+        <div class="login_box_title">
+          宿四季酒店管理系统
+        </div>
+        <el-form
+          :model="dataForm"
+          :rules="dataRule"
+          ref="dataForm"
+          @keyup.enter.native="dataFormSubmit()"
+          status-icon
+          size="mini"
+        >
+          <el-form-item prop="userName">
+            <el-input
+              size="medium"
+              v-model="dataForm.userName"
+              placeholder="帐号"
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="password">
+            <el-input
+              size="medium"
+              v-model="dataForm.password"
+              type="password"
+              placeholder="密码"
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="captcha">
+            <el-row :gutter="5">
+              <el-col :span="14">
+                <el-input
+                  size="medium"
+                  v-model="dataForm.captcha"
+                  placeholder="验证码"
+                >
+                </el-input>
+              </el-col>
+              <el-col :span="10">
+                <img
+                  :src="captchaPath"
+                  @click="getCaptcha()"
+                  style="height: 36px;width: 100%;"
+                  alt=""
+                />
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              class="login-btn-submit"
+              style="width:100%;background: #ff6702;color:#fff"
+              size="medium"
+              @click="dataFormSubmit()"
+              >登 录</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getUUID } from "@/utils";
+export default {
+  data() {
+    return {
+      dataForm: {
+        userName: "",
+        password: "",
+        uuid: "",
+        captcha: ""
+      },
+      dataRule: {
+        userName: [
+          { required: true, message: "帐号不能为空", trigger: "blur" }
+        ],
+        password: [
+          { required: true, message: "密码不能为空", trigger: "blur" }
+        ],
+        captcha: [
+          { required: true, message: "验证码不能为空", trigger: "blur" }
+        ]
+      },
+      captchaPath: ""
+    };
+  },
+  created() {
+    this.getCaptcha();
+  },
+  methods: {
+    // 提交表单
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          this.$http({
+            url: this.$http.adornUrl("/sys/login"),
+            method: "post",
+            data: this.$http.adornData({
+              username: this.dataForm.userName,
+              password: this.dataForm.password,
+              uuid: this.dataForm.uuid,
+              captcha: this.dataForm.captcha
+            })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$cookie.set("token", data.token);
+              this.$router.replace({ name: "h5Home" });
+            } else {
+              this.getCaptcha();
+              this.$message.error(data.msg);
+            }
+          });
+        }
+      });
+    },
+    // 获取验证码
+    getCaptcha() {
+      this.dataForm.uuid = getUUID();
+      this.captchaPath = this.$http.adornUrl(
+        `/captcha.jpg?uuid=${this.dataForm.uuid}`
+      );
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.h5_login {
+  height: 100vh;
+  display: flex;
+  align-items: center;
+  .box-card {
+    .login_box {
+      width: 350px;
+      height: 320px;
+      background: rgba(255, 255, 255, 0.6);
+      padding: 10px 50px;
+      border-radius: 10px;
+      margin-left: auto;
+      margin-right: 10vw;
+      .login_box_title {
+        font-size: 20px;
+        font-weight: bold;
+        text-align: center;
+        padding: 10px 0;
+      }
+    }
+  }
+}
+</style>

+ 593 - 0
src/views/H5/order.vue

@@ -0,0 +1,593 @@
+<template>
+  <div>
+    <div style="display: flex;padding: 10px">
+      <el-button
+        icon="el-icon-back"
+        @click="$router.replace({ name: 'h5Home' })"
+      ></el-button>
+
+      <el-button
+        style="margin-left:auto"
+        type="primary"
+        icon="el-icon-refresh"
+        @click="getDataList()"
+      ></el-button>
+    </div>
+
+    <div style="margin-top:10px">
+      <el-table
+        :data="dataList"
+        border
+        v-loading="dataListLoading"
+        row-key="orderCode"
+        :expand-row-keys="expandRowKeys"
+        style="width: 100%"
+      >
+        <el-table-column type="expand">
+          <template slot-scope="props" :v-model="me">
+            <el-form
+              label-position="left"
+              inline
+              class="demo-table-expand"
+              style="padding:10px"
+            >
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="所属店铺">
+                    <span>{{ props.row.stName }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="酒店名称">
+                    <span>{{ props.row.hotelName }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="跟单人">
+                    <span>{{ props.row.username }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="预定时间">
+                    <span>{{ props.row.date }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="入离时间">
+                    <span>{{ dateStr(props.row) }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="订单类型">
+                    <span>{{ orderType(props.row) }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="订单金额">
+                    <span>{{ props.row.payPrice }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="采购金额">
+                    <span>{{ props.row.buyOrderPrice }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="酒店渠道">
+                    <span>{{ props.row.plantfrom }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="到店时间">
+                    <span>{{ props.row.earliestTime }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="采购渠道">
+                    <span>{{ buySource(props.row) }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="订单编号">
+                    <span>{{ props.row.orderCode }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="联系电话">
+                    <span>{{ props.row.phone }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="订单备注">
+                    <div
+                      :style="{
+                        color:
+                          props.row.note ==
+                            '注意!直连订单,毛利小于0,取消直连,请人工处理。' ||
+                          props.row.note ==
+                            '注意!直连订单,金额大于1000元,取消直连,请人工处理。' ||
+                          props.row.note == '注意!人工订单,毛利小于0。'
+                            ? '#FF0000'
+                            : '#000'
+                      }"
+                    >
+                      {{ props.row.note }}
+                    </div>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+            <div>
+              <el-button
+                :disabled="
+                  (props.row.dealOrderPeo == null &&
+                    props.row.orderStatus == 2 &&
+                    props.row.orderType == 0) ||
+                  (props.row.dealOrderPeo == null && props.row.buyStatus == -1)
+                    ? false
+                    : true
+                "
+                v-if="isAuth('ord:order:lock')"
+                size="small"
+                type="primary"
+                round
+                @click="lockOrder(props.row.id)"
+                >跟单</el-button
+              >
+              <el-button
+                :disabled="
+                  (props.row.buyStatus == 0 ||
+                    props.row.buyStatus == -1 ||
+                    props.row.buyStatus == 1) &&
+                  me == props.row.dealOrderPeo &&
+                  props.row.orderStatus == 2
+                    ? false
+                    : true
+                "
+                v-if="isAuth('ord:order:deal')"
+                type="primary"
+                round
+                size="small"
+                @click="dealWithOrder(props.row)"
+                >下单</el-button
+              >
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="hotelName"
+          header-align="center"
+          align="center"
+          label="酒店名称"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          header-align="center"
+          align="center"
+          label="联系人"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="orderStatus"
+          header-align="center"
+          align="center"
+          label="订单状态"
+          :formatter="statusOrder"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="buyStatus"
+          header-align="center"
+          align="center"
+          label="采购状态"
+          :formatter="statusBuy"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        style="margin-top:10px"
+        background
+        @size-change="sizeChangeHandle"
+        @current-change="currentChangeHandle"
+        :current-page="pageIndex"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageSize"
+        :total="totalPage"
+        layout="prev, pager, next"
+      >
+      </el-pagination>
+    </div>
+
+    <el-drawer title="我是标题" :visible.sync="drawer" direction="btt">
+      <div>
+        <el-table :data="rpData" style="width: 100%">
+          <el-table-column
+            :show-overflow-tooltip="true"
+            align="center"
+            label="名称"
+            prop="name"
+          >
+          </el-table-column>
+          <el-table-column align="center" label="客户支付" prop="payPrice">
+          </el-table-column>
+          <el-table-column align="center" label="分销支付" prop="buyPrice">
+          </el-table-column>
+          <el-table-column align="center">
+            <template slot-scope="scope">
+              <el-button
+                size="small"
+                @click="handleRecive(scope.$index, scope.row)"
+                >下单</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div class="button">
+          <el-col :span="4">
+            <el-input
+              size="small"
+              v-model="reciveOtherData.price"
+              placeholder="采购总价/分"
+              clearable
+            ></el-input>
+          </el-col>
+
+          <el-select
+            v-model="state"
+            size="small"
+            placeholder="线下人工采购渠道"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-button size="small" type="success" @click="handleReciveOther()"
+            >发货</el-button
+          >
+        </div>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dataForm: {
+        ordCode: "",
+        dateTime: null,
+        phone: ""
+      },
+      me: 0,
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false,
+      expandRowKeys: [],
+      drawer: false,
+
+      options: [
+        {
+          value: "3",
+          label: "线下"
+        }
+      ],
+      state: "",
+      rpData: [],
+      dealId: 0,
+      reciveOtherData: {
+        price: null
+      },
+      rules: {
+        price: [{ required: true, message: "价格不能为空", trigger: "blur" }],
+        orderCode: [
+          { required: true, message: "订单号不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  mounted() {
+    this.getDataList();
+  },
+  methods: {
+    // 日期拼接
+    date(data) {
+      return data.inDate + "~" + data.outDate;
+    },
+    // 预定总价
+    inAllPrice(data) {
+      let allPrice = 0;
+      let rate = data.rates;
+      for (var value of rate) {
+        allPrice += value.sellPrice * value.num;
+      }
+      return allPrice + "(分)";
+    },
+    // 采购总价计算
+    buyAllPrice(data) {
+      let allPrice = 0;
+      let rate = data.rates;
+      for (var value of rate) {
+        allPrice += value.buyPrice * value.num;
+      }
+      return allPrice;
+    },
+    // 利润
+    getPrice(data) {
+      let buyPrice = data.payPrice;
+      let sellPrice = 0;
+      let rate = data.rates;
+      for (var value of rate) {
+        sellPrice += value.sellPrice * value.num;
+      }
+      return buyPrice - sellPrice;
+    },
+    // 下单
+    handleRecive(index, row) {
+      this.$confirm(`确定下单操作?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$http({
+            url: this.$http.adornUrl("/ord/order/buy"),
+            method: "get",
+            params: this.$http.adornParams({
+              id: this.dealId,
+              rpCode: row.rpCode
+            })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+                duration: 1000
+              });
+            } else {
+              this.$message.error(data.msg);
+            }
+            this.drawer = false;
+          });
+        })
+        .catch(() => {
+          console.log("取消操作");
+        });
+    },
+    // 自采下单
+    handleReciveOther(index, row) {
+      this.$confirm(`确定下单操作?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.$http({
+          url: this.$http.adornUrl("/ord/order/buyother"),
+          method: "get",
+          params: this.$http.adornParams({
+            id: this.dealId,
+            otherOrderCode: this.reciveOtherData.orderCode,
+            price: this.reciveOtherData.price
+          })
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1000
+            });
+          } else {
+            this.$message.error(data.msg);
+          }
+          this.reciveOtherData.price = "";
+          this.drawer = false;
+        });
+      });
+    },
+
+    getExpandRowKeys(dataList) {
+      let expandRowKeys = [];
+      dataList.forEach(e => {
+        if (
+          e.note == "注意!直连订单,毛利小于0,取消直连,请人工处理。" ||
+          e.note == "注意!直连订单,金额大于1000元,取消直连,请人工处理。" ||
+          e.note == "注意!人工订单,毛利小于0。"
+        ) {
+          expandRowKeys.push(e.orderCode);
+        }
+      });
+      this.expandRowKeys = expandRowKeys;
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http({
+        url: this.$http.adornUrl("/ord/order/list"),
+        method: "post",
+        data: this.$http.adornData({
+          page: this.pageIndex,
+          limit: this.pageSize,
+          ordCode: this.dataForm.ordCode,
+          dateTime: this.dataForm.dateTime,
+          phone: this.dataForm.phone
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list;
+          this.totalPage = data.page.totalCount;
+          this.me = data.me;
+        } else {
+          this.dataList = [];
+          this.totalPage = 0;
+        }
+        this.dataListLoading = false;
+        this.$nextTick(() => {
+          this.getExpandRowKeys(this.dataList);
+        });
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val;
+      this.getDataList();
+    },
+    // 跟单
+    lockOrder(id) {
+      this.$http({
+        url: this.$http.adornUrl("/ord/order/lock"),
+        method: "get",
+        params: this.$http.adornParams({
+          id: id
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message({
+            message: "操作成功",
+            type: "success",
+            duration: 1000,
+            onClose: () => {
+              this.getDataList();
+            }
+          });
+        } else {
+          this.$message.error(data.msg);
+        }
+      });
+    },
+
+    // 处理订单
+    dealWithOrder(val) {
+      this.$http({
+        url: this.$http.adornUrl("/ord/order/deal"),
+        method: "get",
+        params: this.$http.adornParams({
+          dealOrderPeo: val.dealOrderPeo,
+          id: val.id,
+          buyStatus: val.buyStatus,
+          orderStatus: val.orderStatus
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.drawer = true;
+          this.dealWithInit(val.id);
+        } else {
+          this.$message.error(data.msg);
+        }
+      });
+    },
+
+    dealWithInit(id) {
+      this.dealId = id || 0;
+      this.$nextTick(() => {
+        if (this.dealId) {
+          this.$http({
+            url: this.$http.adornUrl("/ord/order/rateslist"),
+            method: "get",
+            params: this.$http.adornParams({
+              id: this.dealId
+            })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.rpData = data.list;
+            }
+          });
+        }
+      });
+    },
+    buySource(data) {
+      let status = data.buySource;
+      return status === 1
+        ? "携程"
+        : status === 2
+        ? "美团"
+        : status === 3
+        ? "人工线下采购"
+        : status === 4
+        ? "其他"
+        : "";
+    },
+    // 入住时间段
+    dateStr(data) {
+      return data.checkInDate + "~" + data.checkOutDate;
+    },
+    // 订单类型
+    orderType(data) {
+      let status = data.orderType;
+      return status === 0 ? "人工订单" : status === 1 ? "直连订单" : "其他";
+    },
+    // 订单状态判断
+    statusOrder(data) {
+      let status = data.orderStatus;
+      return status === 1
+        ? "未支付"
+        : status === 2
+        ? "已支付"
+        : status === 3
+        ? "已发货"
+        : status === 4
+        ? "已入住"
+        : status === -1
+        ? "申请退款"
+        : status === -2
+        ? "已退款"
+        : status === -3
+        ? "关单"
+        : status === -4
+        ? "已入住"
+        : status === -5
+        ? "申请取消订单"
+        : "其他";
+    },
+    // 采购状态判断
+    // 0未采购,1已受理(已提交)2已采购 -1 采购失败 -2 已退单
+    statusBuy(data) {
+      let status = data.buyStatus;
+      return status === 0
+        ? "未采购"
+        : status === 1
+        ? "已受理"
+        : status === 2
+        ? "采购中"
+        : status === 3
+        ? "已采购"
+        : status === -1
+        ? "采购失败"
+        : status === -2
+        ? "退款中"
+        : status === -3
+        ? "已退款"
+        : status === -4
+        ? "退款失败"
+        : status === -5
+        ? "订单取消中"
+        : status === -6
+        ? "已取消"
+        : status === -7
+        ? "取消失败"
+        : status === -8
+        ? "已入住"
+        : "其他";
+    }
+  }
+};
+</script>
+
+<style></style>

+ 8 - 8
src/views/common/login.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="login_page">
     <div class="login_top">
-      <img
+      <!-- <img
         src="~@/assets/img/top_logo.jpg"
         width="200px"
         height="57px"
         alt=""
-      />
-      <div class="nav_box">
+      /> -->
+      <!-- <div class="nav_box">
         <div class="nav" @click="handleJump(0)">首页</div>
         <div class="nav" @click="handleJump(1)">登记系统</div>
         <div class="nav">管理系统</div>
-      </div>
+      </div> -->
     </div>
     <div class="login_main">
       <div class="login_box">
         <div class="login_box_title">
-          趣旅宿酒店管理系统
+          宿四季酒店管理系统
         </div>
         <el-form
           :model="dataForm"
@@ -75,14 +75,14 @@
     </div>
     <div class="login_foot">
       <div class="left">
-        <div class="text1">趣旅宿</div>
+        <div class="text1">宿四季</div>
         <div class="text2">提供优质的旅宿运营服务</div>
       </div>
-      <div class="right">
+      <!-- <div class="right">
         <img src="~@/assets/img/QC.jpg" width="80px" alt="" />
         <div class="line"></div>
         <img src="~@/assets/img/logo20221029.png" width="200px" alt="" />
-      </div>
+      </div> -->
     </div>
   </div>
 </template>

+ 3 - 3
src/views/main-navbar.vue

@@ -2,8 +2,8 @@
   <nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
     <div class="site-navbar__header">
       <h1 class="site-navbar__brand" @click="$router.push({ name: 'home' })">
-        <a class="site-navbar__brand-lg" href="javascript:;">趣旅宿酒店管理系统</a>
-        <a class="site-navbar__brand-mini" href="javascript:;">趣旅宿</a>
+        <a class="site-navbar__brand-lg" href="javascript:;">宿四季酒店管理系统</a>
+        <a class="site-navbar__brand-mini" href="javascript:;">宿四季</a>
       </h1>
     </div>
     <div class="site-navbar__body clearfix">
@@ -103,4 +103,4 @@
 .site-navbar__brand{
 background-color: #ff6702;
 }
-</style>
+</style>

+ 2 - 0
src/views/modules/ord/ordorder.vue

@@ -91,6 +91,7 @@
                       color:
                         props.row.note ==
                           '注意!直连订单,毛利小于0,取消直连,请人工处理。' ||
+                        props.row.note == '注意!直连订单,金额大于1000元,取消直连,请人工处理。'||
                         props.row.note == '注意!人工订单,毛利小于0。'
                           ? '#FF0000'
                           : '#000'
@@ -322,6 +323,7 @@ export default {
       dataList.forEach(e => {
         if (
           e.note == "注意!直连订单,毛利小于0,取消直连,请人工处理。" ||
+          e.note == "注意!直连订单,金额大于1000元,取消直连,请人工处理。" ||
           e.note == "注意!人工订单,毛利小于0。"
         ) {
           expandRowKeys.push(e.orderCode);