Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

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

@@ -0,0 +1,216 @@
+<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

@@ -9,8 +9,8 @@
       <div class="moreFilter"></div>
     </div>
     <div class="order-list-box">
-      <div v-for="(item,index) in list" :key="index">
-        <div class="print-area" :class="'item' + index">
+      <div style='position:relative;' v-for="(item,index) in list" :key="index">
+        <div>
           <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;">
@@ -30,37 +30,27 @@
               <span style="display:inline-block;width:20%;text-align:right">x 2</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>
-          </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;border-bottom:1px solid #cccccc">备注：请赶快制作</div>
+          <div style="padding:10px 20px;">下单人：xxxxx</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>
             </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>
+              <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">冷</span>
-              <span style="display:inline-block;width:20%;text-align:right">x 2</span>
+              <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>
           </div>
           <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注：请赶快制作</div>
@@ -95,7 +85,7 @@ export default {
         pagesize: 10, // 请求数据量
       },
       currentList: [],
-      list: [1, 2, 3, 4, 5]
+      list: [1]
     }
   },
   components: {
@@ -115,21 +105,43 @@ export default {
       'GetOrdersList',
     ]),
     submit (cl) {
-      this.printPdf(cl)
+      this.$confirm('确定完成此饮品?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((res) => {
+        // this.printPdf(cl)
+      }).catch((res) => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        })
+      })
     },
     printPdf (cl) {
       this.CreateOneFormPage(cl)
-      //        LODOP.PRINT();
-      LODOP.PREVIEW()
+      LODOP.PRINT()
+      // LODOP.PREVIEW()
     },
     CreateOneFormPage (cl) {
       LODOP = getLodop()
       LODOP.PRINT_INIT('订单')
-      LODOP.SET_PRINT_PAGESIZE(0, document.getElementsByClassName(cl)[0].offsetWidth * 10 / 4 + 100, document.getElementsByClassName(cl)[0].offsetHeight * 10 / 4 + 120, 'CreateCustomPage')
+      LODOP.SET_PRINT_PAGESIZE(3, 480, 40, '')
       LODOP.ADD_PRINT_HTM(0, 0, document.getElementsByClassName(cl)[0].offsetWidth, document.getElementsByClassName(cl)[0].offsetHeight, document.getElementsByClassName(cl)[0].innerHTML)
     },
     cancel () {
-
+      this.$confirm('确定取消此饮品?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((res) => {
+        // this.cancel()
+      }).catch((res) => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        })
+      })
     },
     initWebSocket (code) {
       const wsuri = `${baseUrl}/websocket/${code}`
@@ -142,23 +154,7 @@ export default {
       this.websock.onclose = this.websocketclose
     },
     websocketonmessage (e) {
-      const redata = JSON.parse(e.data)
-      if (redata.code === '1') {
-        this.$toast({
-          message: '核销成功',
-          position: 'center',
-          duration: 1000
-        })
-        setTimeout(() => {
-          this.$router.go(-1)
-        }, 1000)
-      } else {
-        // this.$toast({
-        //   message: redata.message,
-        //   position: 'center',
-        //   duration: 1000
-        // })
-      }
+      // const redata = JSON.parse(e.data)
     }
   }
 }

src/pages/system/newOrder/newOrderList/page.scss

@@ -14,6 +14,12 @@
     box-shadow: 0px 2px 10px 0px rgba(193, 204, 217, 0.5);
     padding-bottom: 10px;
   }
+  .print-area{
+    position: absolute;
+    z-index: -1;
+    top: 0;
+    left: 0;
+  }
   .btns{
     display: flex;
     justify-content: center;

src/pages/system/page.js

@@ -79,6 +79,7 @@ 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' // 卡列表