11

config/index.js

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

dist/static/js/manifest.3ad1d5771e9b13dbdad2.js

@@ -1,2 +0,0 @@
-!function(r){var n=window.webpackJsonp;window.webpackJsonp=function(e,u,c){for(var f,i,p,a=0,l=[];a<e.length;a++)i=e[a],o[i]&&l.push(o[i][0]),o[i]=0;for(f in u)Object.prototype.hasOwnProperty.call(u,f)&&(r[f]=u[f]);for(n&&n(e,u,c);l.length;)l.shift()();if(c)for(a=0;a<c.length;a++)p=t(t.s=c[a]);return p};var e={},o={2:0};function t(n){if(e[n])return e[n].exports;var o=e[n]={i:n,l:!1,exports:{}};return r[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=r,t.c=e,t.d=function(r,n,e){t.o(r,n)||Object.defineProperty(r,n,{configurable:!1,enumerable:!0,get:e})},t.n=function(r){var n=r&&r.__esModule?function(){return r.default}:function(){return r};return t.d(n,"a",n),n},t.o=function(r,n){return Object.prototype.hasOwnProperty.call(r,n)},t.p="./",t.oe=function(r){throw console.error(r),r}}([]);
-//# sourceMappingURL=manifest.3ad1d5771e9b13dbdad2.js.map

src/pages/system/cardAndCouponManager/vipManager/edit.vue

@@ -23,7 +23,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入VIP卡数量"
-                v-model="postData.CardNum"
+                v-model="postData.TotalCount"
                 clearable>
               </el-input>
             </div>
@@ -35,7 +35,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入价格"
-                v-model="postData.Price"
+                v-model="postData.CardAmount"
                 clearable>
               </el-input>
             </div>
@@ -57,8 +57,8 @@ export default {
   data () {
     return {
       postData: {
-        CardNum: '', // 卡数量
-        Price: '', // 价格
+        TotalCount: '', // 卡数量
+        CardAmount: '', // 价格
         CaseId: '', // 案场id
       }
     }

src/pages/system/cardAndCouponManager/vipManager/index.vue

@@ -53,7 +53,7 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="vips.list"
         stripe
         style="width: 100%">
         <el-table-column
@@ -101,7 +101,9 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { createNamespacedHelpers, mapState } from 'vuex'
+
+const { mapState: mapVipState, mapActions: mapVipActions } = createNamespacedHelpers('vip')
 
 export default {
   name: '',
@@ -116,16 +118,6 @@ export default {
         sellerName: '', // 销售姓名
         userName: '', // 用户名
       },
-      currentList: [{
-        CardNo: 'xxx',
-        Price: 'xxx',
-        Status: 'xxx',
-        SellerName: 'xxx',
-        CaseName: 'xxx',
-        UserName: 'xxx',
-        ActivationTime: 'xxx',
-        CreatTime: 'xxx',
-      }]
     }
   },
   mounted () {
@@ -134,6 +126,9 @@ export default {
     })
   },
   computed: {
+    ...mapVipState({
+      vips: x => x.vipList,
+    }),
     ...mapState({
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
@@ -148,14 +143,19 @@ export default {
     }
   },
   methods: {
+    ...mapVipActions([
+      'GetVipList',
+    ]),
     search () { // 搜索
       this.postData.page = 1
       this.currentList = []
       this.getList()
     },
     getList () { // 获取列表
+      this.GetVipList({...this.postData, caseid: this.CaseId})
     },
     handleCurrentChange (val) { // 跳转到分页
+      this.postData.page = val
       this.getList()
     },
     addVIP () {

src/pages/system/cmsManager/majorProjects/edit.vue

@@ -126,7 +126,7 @@
               </template>
             </el-table-column>
           </el-table>
-            <el-button type="primary" size="mini" @click="addCourse">新增</el-button>
+            <el-button type="primary" size="mini" @click="coursesShow">新增</el-button>
         </li>
         <li class="flex-h">
           <span>是否前台展示：</span>
@@ -203,6 +203,7 @@ export default {
       imgs: null,
       detailimgs: null,
       selCourseVisible: false,
+      selCourseList: [],
     }
   },
   components: {},
@@ -224,6 +225,7 @@ export default {
       },
       set (val) {
         this.UpdateInfo({...this.detail, CaseId: val})
+        this.getCourse()
       }
     },
     imgsArr: {
@@ -324,6 +326,9 @@ export default {
     getDetail () {
       this.GetCaseInfo({id: this.id})
     },
+    getCourse () {
+      this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100})
+    },
     toggleSelection (rows) {
       if (rows) {
         rows.forEach(row => {
@@ -344,15 +349,18 @@ export default {
       this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100, callback: this.coursesShow})
     },
     coursesShow () {
+      this.selCourseList = this.detail.Courses || []
       this.selCourseVisible = true
       setTimeout(() => {
-        this.toggleSelection(this.coursesList.filter(x => (this.detail.Courses || []).filter(y => y.CourseId === x.CourseId).length > 0))
+        this.toggleSelection(this.coursesList.filter(x => (this.selCourseList || []).filter(y => y.CourseId === x.CourseId).length > 0))
       }, 30)
     },
     handleSelectionChange (val) {
-      this.UpdateInfo({...this.detail, Courses: val})
+      this.selCourseList = val
+      // this.UpdateInfo({...this.detail, Courses: val})
     },
     addCourseOk () {
+      this.UpdateInfo({...this.detail, Courses: this.selCourseList})
       this.selCourseVisible = false
     },
     deleteItem (row) {
@@ -360,6 +368,7 @@ export default {
     }
   },
   mounted () {
+    this.getCourse()
     const { id } = this.$route.query
     this.id = id
     if (id && id !== '') {

src/pages/system/goodsManager/goodsTypeManager/add.vue

@@ -9,13 +9,27 @@
               <el-input
                 placeholder="请输入商品种类"
                 v-model="postData.TypeName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>种类英文：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入种类英文"
+                v-model="postData.EnglishName"
+                maxlength="10"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">
@@ -52,6 +66,7 @@ export default {
         CreatUser: '', // 创建者（传空值）
         CreatTime: '', // 创建时间（传空值）
         Status: '', // 状态（传空值）
+        EnglishName: '',
       },
       caseAreaList: [
         {

src/pages/system/goodsManager/goodsTypeManager/edit.vue

@@ -9,13 +9,27 @@
               <el-input
                 placeholder="请输入商品种类"
                 v-model="postData.TypeName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>种类英文：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入种类英文"
+                v-model="postData.EnglishName"
+                maxlength="10"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">
@@ -49,7 +63,8 @@ export default {
         TypeName: '',
         Status: '',
         OrgId: '',
-        CaseId: ''
+        CaseId: '',
+        EnglishName: '',
       },
     }
   },

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

@@ -0,0 +1,221 @@
+<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='addVisible = true'>新增</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="search">搜索</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="system-table-box">
+      <el-table :data="records.list" stripe style="width: 100%">
+        <el-table-column prop="CaseId" label="案场">
+          <template slot-scope="scope">
+            {{getCaseName(scope.row.CaseId)}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="Month" label="月份">
+        </el-table-column>
+        <el-table-column prop="Num" label="规定次数">
+        </el-table-column>
+        <el-table-column prop="ActrualNum" label="实际次数">
+        </el-table-column>
+        <el-table-column prop="OverNum" label="超出次数">
+        </el-table-column>
+        <el-table-column prop="LeftNum" label="剩余次数">
+        </el-table-column>
+        <el-table-column fixed='right' label="操作" width="300">
+          <template slot-scope="scope">
+            <el-button size="mini" type="warning" @click="handleReport(scope.row)">导出Excel</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @current-change="handleCurrentChange"
+        :current-page.sync="postData.page"
+        :page-size="postData.pagesize"
+        layout="prev, pager, next, jumper"
+        :total="records.pagenum">
+      </el-pagination>
+    </div>
+    <el-dialog
+      title="新增月记录"
+      :visible.sync="addVisible"
+      width="500px"
+      center>
+      <div>
+        <form class="mainForm">
+          <ul>
+            <li class="flex-h">
+              <span>对应案场：</span>
+              <div class="flex-item">
+                <div style="width:50%">
+                  <el-select v-model="detail.CaseId" placeholder="请选择">
+                    <el-option
+                      v-for="item in cases"
+                      :key="item.CaseId"
+                      :label="item.CaseName"
+                      :value="item.CaseId">
+                    </el-option>
+                  </el-select>
+                </div>
+              </div>
+            </li>
+            <li class="flex-h">
+              <span>月份：</span>
+              <div class="flex-item">
+                <div style="width:50%">
+                  <el-date-picker
+                    v-model="detail.Month"
+                    type="month"
+                    placeholder="选择月">
+                  </el-date-picker>
+                </div>
+              </div>
+            </li>
+            <li class="flex-h">
+              <span>规定次数：</span>
+              <div class="flex-item">
+                <div style="width:50%">
+                  <el-input v-model="detail.Num" placeholder="请输入规定次数"></el-input>
+                </div>
+              </div>
+            </li>
+          </ul>
+        </form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit">保 存</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers, mapState } from 'vuex'
+
+const { mapState: mapRecordState, mapActions: mapRecordActions } = createNamespacedHelpers('caserecord')
+const { mapState: mapOrdersState, mapActions: mapOrdersActions } = createNamespacedHelpers('goodsorder')
+
+export default {
+  name: '',
+  data () {
+    return {
+      addVisible: false,
+      excelData: [],
+      detail: {
+        CaseId: '',
+        Month: '',
+        Num: 0,
+      },
+      postData: {
+        caseid: '',
+        page: 1,
+        pagesize: 10,
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    ...mapRecordState({
+      records: x => x.recordList,
+    }),
+    ...mapOrdersState({
+      orders: x => x.recordOrders,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    },
+  },
+  methods: {
+    ...mapRecordActions([
+      'GetRecordList',
+      'AddRecord',
+    ]),
+    ...mapOrdersActions([
+      'GetOrdersByRecord',
+    ]),
+    getCaseName (caseid) {
+      return ((this.cases.filter(x => x.CaseId === caseid) || [])[0] || {}).CaseName
+    },
+    search () {
+      this.getList()
+    },
+    submit () {
+      if (this.detail.CaseId === '') {
+        this.$message({
+          type: 'error',
+          message: '请先选择对应案场！'
+        })
+        return
+      }
+      if (this.detail.Month === '') {
+        this.$message({
+          type: 'error',
+          message: '请先选择月份！'
+        })
+        return
+      }
+      if (this.detail.Num <= 0) {
+        this.$message({
+          type: 'error',
+          message: '请输入规定次数！'
+        })
+        return
+      }
+      this.AddRecord({...this.detail, callback: this.afterSave, Month: this.toolClass.dateFormat(this.detail.Month, 'yyyy-MM')})
+    },
+    afterSave () {
+      this.$message({
+        type: 'success',
+        message: '保存成功！'
+      })
+      this.addVisible = false
+      this.getList()
+    },
+    getList () {
+      this.GetRecordList({...this.postData, caseid: this.CaseId})
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.postData.page = val
+      this.getList()
+    },
+    handleReport (row) {
+      this.GetOrdersByRecord({id: row.RecordId, callback: this.ordersExport})
+    },
+  },
+  mounted () {
+    this.getList()
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

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

@@ -89,6 +89,8 @@ import vipList from './cardAndCouponManager/vipManager/index' // vip列表
 import editVip from './cardAndCouponManager/vipManager/edit' // 编辑vip
 import activateVip from './cardAndCouponManager/vipManager/activateVip' // 激活vip
 
+import caseRecord from './newOrder/caseRecord/index' // 月记录
+
 export default {
   router: [
     {
@@ -429,6 +431,11 @@ export default {
           name: 'newOrderList',
           component: newOrderList,
           children: []
+        }, { // 月记录
+          path: 'caseRecord',
+          name: 'caseRecord',
+          component: caseRecord,
+          children: []
         }]
       }, { // 数据统计
         path: 'dataStatistics',

src/store/card/vip.js

@@ -0,0 +1,41 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    vipList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.vipList = payload || []
+    },
+  },
+  actions: {
+    GetVipList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.cardManager.viplist.url, {
+          method: api.cardManager.viplist.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    AddVip ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.cardManager.vipadd.url, {
+          method: api.cardManager.vipadd.method,
+          data: {
+            ...payload,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    }
+  }
+}

src/store/case/record.js

@@ -0,0 +1,41 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    recordList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.recordList = payload || []
+    },
+  },
+  actions: {
+    GetRecordList ({ commit }, payload) {
+      ajax(api.caseManager.getRecordList.url, {
+        method: api.caseManager.getRecordList.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateList', res)
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+    AddRecord ({ commit }, payload) {
+      ajax(api.caseManager.addRecord.url, {
+        method: api.caseManager.addRecord.method,
+        data: {
+          ...payload,
+        }
+      }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+  }
+}

src/store/goods/order.js

@@ -5,11 +5,15 @@ export default {
   namespaced: true,
   state: {
     ordersList: [],
+    recordOrders: [],
   },
   mutations: {
     updateList (state, payload) {
       state.ordersList = payload || []
     },
+    updateRecordList (state, payload) {
+      state.recordOrders = payload || []
+    },
   },
   actions: {
     GetOrdersList ({ commit }, payload) {
@@ -22,5 +26,18 @@ export default {
         commit('updateList', res)
       })
     },
+    GetOrdersByRecord ({ commit }, { id, callback }) {
+      ajax(api.goodsOrder.getOrdersByRecord.url, {
+        method: api.goodsOrder.getOrdersByRecord.method,
+        urlData: {
+          id
+        }
+      }).then(res => {
+        commit('updateRecordList', res)
+        if (callback) {
+          callback()
+        }
+      })
+    }
   }
 }

src/store/index.js

@@ -24,6 +24,8 @@ export const modules = {
   verification: () => require('./verification/verification').default,
   goodsorder: () => require('./goods/order').default,
   cmscase: () => require('./cms/case').default,
+  caserecord: () => require('./case/record').default,
+  vip: () => require('./card/vip').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/api.js

@@ -1,4 +1,4 @@
-const baseUrl = '/api'
+const baseUrl = '/api-v2'
 const common = '/common/:org'
 const guest = '/guest/:org'
 
@@ -196,6 +196,14 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/usertype`
     },
+    getRecordList: {
+      method: 'get',
+      url: `${baseUrl}${common}/case/record`
+    },
+    addRecord: {
+      method: 'post',
+      url: `${baseUrl}${common}/case/record`
+    },
   },
   goodsManager: {
     getGoodsSpecList: { // 商品规格列表
@@ -530,6 +538,24 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/order/online/goods`
     },
+    getOrdersByRecord: {
+      method: 'get',
+      url: `${baseUrl}${common}/order/goods/record/:id`
+    },
+  },
+  cardManager: {
+    viplist: {
+      method: 'get',
+      url: `${baseUrl}${common}/vipcard`
+    },
+    vipadd: {
+      method: 'post',
+      url: `${baseUrl}${common}/vipcard`
+    },
+    vipcharge: {
+      method: 'put',
+      url: `${baseUrl}${common}/vipcard/:code`
+    },
   },
 }
 export default $api