ytj

config/index.js

@@ -12,8 +12,9 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        target: 'http://192.168.0.62:8080', //wf
-        // target: 'http://192.168.0.11:8088', //zys
+        // target: 'http://192.168.0.62:8080', //wf
+        target: 'http://192.168.0.11', //ys
+        // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {
         //   '^/api': 'api'

config/prod.env.js

@@ -1,4 +1,5 @@
 'use strict'
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  TEST_ENV: '"' + process.env.TEST_ENV + '"'
 }

package.json

@@ -11,7 +11,8 @@
     "e2e": "node test/e2e/runner.js",
     "test": "npm run unit && npm run e2e",
     "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs",
-    "build": "node build/build.js"
+    "build": "cross-env TEST_ENV=production node build/build.js",
+    "buildtest": "cross-env TEST_ENV=test node build/build.js"
   },
   "dependencies": {
     "@antv/g2": "^3.2.7",

src/pages/system/newOrder/monthOrder/index.vue

@@ -1,216 +0,0 @@
-<template>
-  <div class="subPage">
-    <div class="system-table-search">
-      <div class="flex-h">
-        <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click='addMajorProjects'>新增</el-button>
-        </div>
-        <ul>
-          <li>
-            <span>选择案场：</span>
-            <el-select v-model="tableSearch.caseId" placeholder="请选择">
-              <el-option
-              value=""
-              >
-              </el-option>
-              <el-option
-                v-for="item in caseList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
-              </el-option>
-            </el-select>
-          </li>
-        </ul>
-        <el-button
-          size="mini"
-          type="primary" @click="search">搜索</el-button>
-      </div>
-      <div class="moreFilter"></div>
-    </div>
-    <div class="system-table-box">
-      <el-table
-        :data="tableData"
-        stripe
-        style="width: 100%">
-        <el-table-column
-          prop="Name"
-          label="案场">
-        </el-table-column>
-        <el-table-column
-          prop="Title"
-          label="月份">
-        </el-table-column>
-        <el-table-column
-          prop="CaseName"
-          label="规定次数">
-        </el-table-column>
-        <el-table-column
-          prop="CreateDate"
-          label="实际次数">
-        </el-table-column>
-        <el-table-column
-          prop="CreateDate"
-          label="超出次数">
-        </el-table-column>
-        <el-table-column
-          prop="CreateDate"
-          label="剩余次数">
-        </el-table-column>
-        <el-table-column label="操作" width="450">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              @click="deleteItem(scope.$index, scope.row)">导出Excel</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <el-pagination
-      @current-change="handleCurrentChange"
-      :current-page.sync="postData.currentPage"
-      :page-size="postData.pageSize"
-      layout="prev, pager, next, jumper"
-      :total="postData.total">
-    </el-pagination>
-  </div>
-</template>
-
-<script>
-import { mapState, mapActions } from 'vuex'
-
-export default {
-  name: '',
-  data () {
-    return {
-      postData: {
-        currentPage: 1, // 当前页码
-        pageSize: 10,
-        total: 0,
-      },
-      tableSearch: { // 表格搜索条件
-        key: '', // 搜索关键字
-        caseId: '', // 案场id
-      },
-      tableData: []
-    }
-  },
-  computed: {
-    ...mapState({
-      OrgId: x => x.app.user.OrgId,
-      caseList: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
-    })
-  },
-  components: {
-    // tableSearch,
-  },
-  created () {
-    this.updateSystemInfo().then(() => {
-      // this.tableSearch.caseId = this.defaultCaseId
-      this.getList()
-    })
-  },
-  methods: {
-    ...mapActions(['updateSystemInfo']),
-    handleCurrentChange (val) {
-      this.postData.currentPage = val
-      this.getList()
-    },
-    showItem (index, row) { // 前台显示
-      this.editIsAllCourse(row)
-    },
-    editItem (index, row) { // 编辑
-      console.log(index, row)
-      this.$router.push({ name: 'editIndexCase', query: { id: row.CmsCaseId } })
-    },
-    // copyItemUrl (index, row) { // 复制专题链接
-    //   console.log(index, row)
-    //   window.clipboardData.setData('Text', row.Title)
-    // },
-    deleteItem (index, row) { // 删除
-      console.log(index, row)
-      this.$confirm('确认删除此项目专题?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.deleteInfo(row.CmsCaseId)
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    searchList (key) { // 搜索列表
-      this.tableSearch.key = key
-      this.getList()
-    },
-    addMajorProjects () {
-      this.$router.push({ name: 'addIndexCase' })
-    },
-    getList () {
-      this.tableData = []
-      this.$ajax(this.$api.cms.case.url, {
-        method: this.$api.cms.case.method,
-        queryData: {
-          page: this.postData.currentPage,
-          pagesize: this.postData.pageSize,
-          caseid: this.tableSearch.caseId,
-          name: this.tableSearch.key
-        }
-      }).then(res => {
-        for (let i = 0; i < res.list.length; i++) {
-          res.list[i].CreateDate = this.toolClass.dateFormat(res.list[i].CreateDate)
-        }
-        this.tableData = res.list
-        this.postData.total = res.pagenum
-        this.postData.currentPage = res.page
-      }).catch(msg => {
-
-      })
-    },
-    deleteInfo (id) {
-      this.$ajax(this.$api.cms.deleteCase.url, {
-        method: this.$api.cms.deleteCase.method,
-        urlData: {
-          id: id
-        }
-      }).then(res => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
-        })
-        this.getList()
-      }).catch(msg => {
-
-      })
-    },
-    editIsAllCourse (data) {
-      console.log(data)
-      let api = data.Status === 1 ? this.$api.cms.caseHide : this.$api.cms.caseShow
-      this.$ajax(api.url, {
-        method: api.method,
-        urlData: {
-          id: data.CmsCaseId
-        }
-      }).then(res => {
-        this.$message({
-          message: '编辑成功',
-          type: 'success',
-          duration: 1000
-        })
-        this.getList()
-      }).catch(msg => {
-
-      })
-    },
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-</style>

src/pages/system/newOrder/newOrderList/index.vue

@@ -5,6 +5,22 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="danger">营业</el-button>
         </div>
+        <ul>
+          <li>
+            <!-- <span>选择案场：</span> -->
+            <el-select v-model="CaseId" placeholder="请选择">
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId">
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="GetOrdersList({ caseid: CaseId })">搜索</el-button>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -14,47 +30,39 @@
           <div style="padding:25px 20px 5px;border-bottom:2px solid #cccccc;">
             <i class="iconfont icon-yinchenglogo" style="font-size:70px;color:red;position: relative;bottom: 20px;margin-right:10px;"></i>
             <div style="display:inline-block;">
-              <span style="display:block;font-size:20px;font-weight:700;">A区域1号桌</span>
-              <span style="display:block;margin-top:10px">下单时间：21:30:39</span>
-              <span style="display:block;margin-top:10px">已等待：<span style="color:red;font-weight:700;">30:29</span></span>
+              <span style="display:block;font-size:20px;font-weight:700;">{{item.AreaName}}</span>
+              <span style="display:block;margin-top:10px">下单时间：{{toolClass.dateFormat(item.CreateDate)}}</span>
+              <span style="display:block;margin-top:10px">已等待：<span style="color:red;font-weight:700;">{{leftTimes[item.OrdersId]}}</span></span>
             </div>
           </div>
-          <div style="padding:10px 20px 5px;border-bottom:1px solid #cccccc;">
-            <div>卡布奇诺</div>
-            <div style="margin-top:8px;">
-              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc">热</span>
-              <span style="display:inline-block;width:20%;text-align:right">x 1</span>
-            </div>
-            <div style="margin-top:8px;">
-              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc">冷</span>
-              <span style="display:inline-block;width:20%;text-align:right">x 2</span>
+          <div style="padding:10px 20px 5px;border-bottom:1px solid #cccccc;" v-for='(item1,index1) in item.Goods' :key='index1'>
+            <div style="display:flex;justify-content: space-between;align-items: center;"><span>{{item1.GoodsName}}</span><span style="display:inline-block;width:20%;text-align:right" v-if='!item1.SpecName'>x {{item1.Number}}</span></div>
+            <div style="margin-top:8px;" v-if='item1.SpecName'>
+              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc">{{item1.SpecName}}</span>
+              <span style="display:inline-block;width:20%;text-align:right">x {{item1.Number}}</span>
             </div>
           </div>
-          <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注：请赶快制作</div>
-          <div style="padding:10px 20px;">下单人：xxxxx</div>
+          <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注：{{item.Remark}}</div>
+          <div style="padding:10px 20px;">下单人：{{item.UserName}}</div>
         </div>
         <div class="print-area" :class="'item' + index" style="width:180px;">
           <div style="padding:25px 20px 5px;border-bottom:2px solid #cccccc;">
             <div style="display:inline-block;">
               <img class="topIcon" style="display:block;width:60%;margin:0 0 20px 10px;" src="http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/111101940020.png" alt="">
-              <span style="display:block;font-size:20px;font-weight:700;"> <img width='25px' height="25px" src="http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/111101940020.png" alt=""> A区域1号桌</span>
-              <span style="display:block;margin-top:10px;font-size:12px;">下单时间：21:30:39</span>
-              <span style="display:block;margin-top:10px;font-size:12px;">已等待：<span style="color:red;font-weight:700;">30:29</span></span>
+              <span style="display:block;font-size:20px;font-weight:700;"> <img width='25px' height="25px" src="http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/111101940020.png" alt=""> {{item.AreaName}}</span>
+              <span style="display:block;margin-top:10px;font-size:12px;">下单时间：{{toolClass.dateFormat(item.CreateDate)}}</span>
+              <span style="display:block;margin-top:10px;font-size:12px;">已等待：<span style="color:red;font-weight:700;">{{leftTimes[item.OrdersId]}}</span></span>
             </div>
           </div>
-          <div style="padding:10px 20px 5px;border-bottom:1px solid #cccccc;">
-            <div>卡布奇诺</div>
-            <div style="margin-top:8px;">
-              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc;font-size:12px;">热</span>
-              <span style="display:inline-block;width:20%;text-align:right;font-size:12px;">x 1</span>
-            </div>
-            <div style="margin-top:8px;">
-              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc;font-size:12px;">冷</span>
-              <span style="display:inline-block;width:20%;text-align:right;font-size:12px;">x 2</span>
+          <div style="padding:10px 20px 5px;border-bottom:1px solid #cccccc;" v-for='(item1,index1) in item.Goods' :key='index1'>
+            <div style="display:flex;justify-content: space-between;align-items: center;"><span>{{item1.GoodsName}}</span><span style="display:inline-block;width:20%;text-align:right" v-if='!item1.SpecName'>x {{item1.Number}}</span></div>
+            <div style="margin-top:8px;" v-if='item1.SpecName'>
+              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc;font-size:12px;">{{item1.SpecName}}</span>
+              <span style="display:inline-block;width:20%;text-align:right;font-size:12px;">x {{item1.Number}}</span>
             </div>
           </div>
-          <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注：请赶快制作</div>
-          <div style="padding:10px 20px;">下单人：xxxxx</div>
+          <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注：{{item.Remark}}</div>
+          <div style="padding:10px 20px;">下单人：{{item.UserName}}</div>
         </div>
         <div class="btns">
           <span @click="cancel">取消</span>
@@ -66,13 +74,14 @@
 </template>
 
 <script>
-import { createNamespacedHelpers, mapState } from 'vuex'
+import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
 
 import { getLodop } from '@/util/LodopFuncs'
 
+import { formatTimeBySeconds } from '@/util/util'
+
 const { mapState: mapOrderState, mapActions: mapOrderActions } = createNamespacedHelpers('goodsorder')
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'ws://192.168.0.148:8078/admin' : 'ws://cdkj.ycjcjy.com/admin' // 'ws://cdkj.ycjcjy.com/admin'
 var LODOP
 export default {
   name: '',
@@ -85,32 +94,66 @@ export default {
         pagesize: 10, // 请求数据量
       },
       currentList: [],
-      list: [1]
+      leftTimes: {},
     }
   },
-  components: {
+  computed: {
     ...mapOrderState({
-      orders: x => x.ordersList
+      list: x => (x.ordersList || {}).list || [],
     }),
     ...mapState({
       cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
-    })
+      defaultCaseId: x => x.app.cases.default,
+      userInfo: x => x.app.user
+    }),
+    CaseId: {
+      get () {
+        return this.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.caseid = val
+      }
+    }
   },
-  mounted () {
-    this.GetOrdersList()
+  created () {
+    this.updateSystemInfo().then(() => {
+      this.initWebSocket()
+      this.GetOrdersList({ caseid: this.CaseId }).then(() => {
+        setInterval(() => {
+          const now = (new Date()).valueOf()
+          this.leftTimes = this.list.reduce((acc, it) => {
+            const showDT = now - ((new Date(it.CreateDate)).valueOf())
+
+            return { ...acc, [`${it.OrdersId}`]: formatTimeBySeconds(showDT) }
+          }, {})
+        }, 1000)
+      })
+    })
   },
   methods: {
+    timeOut (c) {
+      let cTime = new Date(c).valueOf()
+      let time = new Date().valueOf()
+      let s = parseInt((time - cTime) / 1000)
+      let m = parseInt(s / 60)
+      s = s - m * 60
+      m = m < 10 ? '0' + m : m
+      s = s < 10 ? '0' + s : s
+      return `${m} : ${s}`
+    },
     ...mapOrderActions([
       'GetOrdersList',
     ]),
+    ...mapActions([
+      'updateSystemInfo'
+    ]),
     submit (cl) {
       this.$confirm('确定完成此饮品?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then((res) => {
-        // this.printPdf(cl)
+        this.printPdf(cl)
       }).catch((res) => {
         this.$message({
           type: 'info',
@@ -143,18 +186,25 @@ export default {
         })
       })
     },
-    initWebSocket (code) {
-      const wsuri = `${baseUrl}/websocket/${code}`
+    initWebSocket () {
+      console.log(this.user)
+      let caseid = this.defaultCaseId
+      let id = this.userInfo.UserId
+      // const wsuri = `${window.location.origin.replace('http', 'ws')}/api/common/MQ/websocket/${caseid}/${id}`
+      const wsuri = `ws://192.168.0.11/api/guest/MQ/websocket/${caseid}/${id}`
       try {
         this.websock = new WebSocket(wsuri)
       } catch (e) {
         console.log(e)
       }
+      this.websock.onopen = console.log
       this.websock.onmessage = this.websocketonmessage
-      this.websock.onclose = this.websocketclose
+      this.websock.onclose = console.log
     },
     websocketonmessage (e) {
+      console.log(e)
       // const redata = JSON.parse(e.data)
+      this.list = JSON.parse(e.data).data.refreshOnlineGoodsOrders
     }
   }
 }

src/pages/system/page.js

@@ -79,7 +79,6 @@ import frontEndUserList from './dataStatistics/frontEndUserList/index' // 课程
 
 import newOrder from './newOrder/index' // 商品订单系统
 import newOrderList from './newOrder/newOrderList/index' // 新订单列表
-import monthOrder from './newOrder/monthOrder/index' // 月订单列表
 
 import cardAndCouponManager from './cardAndCouponManager/index' // 卡券管理
 import cardList from './cardAndCouponManager/cardManager/index' // 卡列表

src/util/util.js

@@ -27,4 +27,12 @@ const toolClass = {
 
 }
 
+export function formatTimeBySeconds (ms) {
+  const hs = ms / 3600000 | 0
+  const min = (ms - (hs * 3600000)) / 60000 | 0
+  const sec = (ms - (hs * 3600000) - (min * 60000)) / 1000 | 0
+
+  return hs > 0 ? `${hs}:${min}:${sec}` : `${min}:${sec}`
+}
+
 export default toolClass