DESKTOP-B78GIPM\admin 2 rokov pred
rodič
commit
df7d8b1381

+ 32 - 0
src/api/manage.js

@@ -174,6 +174,38 @@ export function downloadFile(url, fileName, parameter) {
   })
 }
 
+
+/**
+ * 下载文件
+ * @param url 文件路径
+ * @param fileName 文件名
+ * @param parameter
+ * @returns {*}
+ */
+export function downloadFileZIP(url, fileName, parameter) {
+  return downFile(url, parameter).then((data) => {
+    if (!data || data.size === 0) {
+      Vue.prototype['$message'].warning('文件下载失败')
+      return
+    }
+    if (typeof window.navigator.msSaveBlob !== 'undefined') {
+      window.navigator.msSaveBlob(new Blob([data],{ type: 'application/zip' }), fileName)
+    } else {
+      let url = window.URL.createObjectURL(new Blob([data],{ type: 'application/zip' }))
+      let link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', fileName)
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link) //下载完成移除元素
+      window.URL.revokeObjectURL(url) //释放掉blob对象
+    }
+  })
+}
+
+
+
 /**
  * 文件上传 用于富文本上传图片
  * @param url

+ 2 - 0
src/views/pos/posInfo.vue

@@ -33,6 +33,7 @@ import diandan from "./diandan.vue";
 import posType from "./posType.vue";
 import goodsOrder from "./goodsOrder.vue";
 import tablediandangallery from "./tablediandangallery.vue";
+import posThali from "./posThali.vue";
 
 export default {
   components: {
@@ -40,6 +41,7 @@ export default {
     posType,
     goodsOrder,
     tablediandangallery,
+    posThali,
   },
   data() {
     return { activeKey: "1" };

+ 385 - 0
src/views/pos/posThali.vue

@@ -0,0 +1,385 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <!-- <a-col :span="3">
+            <a-form-item label="">
+              <a-select
+                mode="multiple"
+                style="width: 180px"
+                placeholder="商家名称"
+                :maxTagCount="1"
+                :maxTagTextLength="50"
+                v-model="queryParam.hotelIds"
+              >
+                <a-select-option
+                  v-for="(item, index) in hotelList"
+                  :key="index"
+                  :value="item.id"
+                >
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-input placeholder="订单号" v-model="queryParam.code"></a-input>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="3">
+            <a-form-item label="">
+              <a-input
+                placeholder="店内单号"
+                v-model="queryParam.code"
+              ></a-input>
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-input
+                placeholder="餐台"
+                v-model="queryParam.tableNo"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="3">
+            <a-form-item label="">
+              <a-select
+                v-model="queryParam.commentType"
+                style="width: 100%"
+                placeholder="类型"
+              >
+                <a-select-option value="1">服务</a-select-option>
+                <a-select-option value="2">维修</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="6">
+            <a-form-item label="">
+              <a-range-picker
+                format="YYYY-MM-DD"
+                :placeholder="['开始日期', '结束日期']"
+                @change="onChange"
+                v-model="datetime"
+                :allowClear="true"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <span
+              style="float: left; overflow: hidden"
+              class="table-page-search-submitButtons"
+            >
+              <a-button type="primary" @click="searchQuery" icon="search"
+                >查询</a-button
+              >
+              <!-- <a-button
+                type="primary"
+                @click="searchReset"
+                icon="reload"
+                style="margin-left: 8px"
+                >重置</a-button
+              > -->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <a-tabs @change="tabsChange">
+        <a-tab-pane key="1" tab="待接单">
+        
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="已接单">
+        
+        </a-tab-pane>
+        <a-tab-pane key="3" tab="已完成">
+        
+        </a-tab-pane>
+        <a-tab-pane key="4" tab="已拒绝">
+        
+        </a-tab-pane>
+        <a-tab-pane key="5" tab="已取消">
+        
+        </a-tab-pane>
+        <a-tab-pane key="8" tab="全部订单">
+        
+        </a-tab-pane>
+    </a-tabs>
+    <!-- 查询区域-END -->
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{ x: true }"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange"
+      >
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text, record">
+          <span v-if="!text" style="font-size: 12px; font-style: italic"
+            >无图片</span
+          >
+          <img
+            v-else
+            :src="getImgView(text)"
+            :preview="record.id"
+            height="25px"
+            alt=""
+            style="max-width: 80px; font-size: 12px; font-style: italic"
+          />
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px; font-style: italic"
+            >无文件</span
+          >
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)"
+          >
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+            <a @click="okChange(record)" v-if="record.status==5"> 确认 </a>
+            <a-divider type="vertical" v-if="record.status==1 || record.status==5 || record.status==2" />
+          <a v-if="record.status==1 || record.status==5 || record.status==2" @click="cancelOrder(record)">取消订单</a>
+          <a-divider type="vertical" v-if="record.status==1 || record.status==5" />
+          <a @click="handleEdit(record)">查看</a>
+        </span>
+      </a-table>
+    </div>
+
+    <!-- <ces-order-message-modal
+      ref="modalForm"
+      @ok="modalFormOk"
+    ></ces-order-message-modal> -->
+  </a-card>
+</template>
+
+<script>
+import "@/assets/less/TableExpand.less";
+import { mixinDevice } from "@/utils/mixin";
+import { JeecgListMixin } from "@/mixins/JeecgListMixin";
+// import CesOrderMessageModal from "./modules/CesOrderMessageModal";
+import { httpAction, postAction, getAction } from "@/api/manage";
+export default {
+  name: "cesOrderRepairList",
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    // CesOrderMessageModal,
+  },
+  data() {
+    return {
+      description: "ces_order_message管理页面",
+      datetime: [],
+      queryParam:{
+        // status:1,
+        // keyword:' '
+      },
+      // 表头
+      columns: [
+        {
+          title: "订单号",
+          align: "center",
+          dataIndex: "code",
+        },
+        {
+          title: "区域",
+          align: "center",
+          dataIndex: "regionName",
+        },
+        {
+          title: "餐台/取餐号",
+          align: "center",
+          dataIndex: "tableNo",
+        },
+        {
+          title: "状态",
+          align: "center",
+          dataIndex: "statusName",
+        //   customRender: function (text) {
+        //     var msg = "--";
+        //     switch (text) {
+        //   case 1:
+        //     msg = '未付款'
+        //     break;
+        //   case 2:
+        //     msg = '已付款'
+        //     break;
+        //   case 3:
+        //     msg = '已取消'
+        //     break;
+        //   case 4:
+        //     msg = '已完成'
+        //     break;
+        //   case 5:
+        //     msg = '待入住'
+        //     break;
+        //   case 6:
+        //     msg = '已入住'
+        //     break;
+        //   case 7:
+        //     msg = '退款中'
+        //     break;
+        //   default: '--'
+        //     break;
+        // }
+        //     return msg;
+        //   },
+        },
+        {
+          title: "支付方式",
+          align: "center",
+          dataIndex: "paymentMethod",
+          customRender: function (text) {
+            return text == 1 ? "会员卡" : text==2? '积分' : "微信";
+          },
+        },
+        {
+          title: "付款状态",
+          align: "center",
+          dataIndex: "payStatus",
+          customRender: function (text) {
+            return text == 1 ? "已付款" : "未付款";
+          },
+        },
+        {
+          title: "金额",
+          align: "center",
+          dataIndex: "money",
+        },
+        {
+          title: "备注",
+          align: "center",
+          dataIndex: "remarks",
+        },
+        // {
+        //   title: "操作时间",
+        //   align: "center",
+        // //   dataIndex: "createTime",
+        // },
+        {
+          title: "操作人",
+          align: "center",
+          dataIndex: "operate",
+        },
+        {
+          title: "接单时间",
+          align: "center",
+          dataIndex: "createTime",
+        },
+        {
+          title: "操作",
+          dataIndex: "action",
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: { customRender: "action" },
+        },
+      ],
+      url: {
+        list: "/mall/mallPosTableOrderGoods/list",
+        delete: "/order/cesOrderRepair/delete",
+        deleteBatch: "/order/cesOrderRepair/deleteBatch",
+        exportXlsUrl: "/order/cesOrderRepair/exportXls",
+        importExcelUrl: "order/cesOrderRepair/importExcel",
+      },
+      dictOptions: {},
+      superFieldList: [],
+      hotelList: [],
+    };
+  },
+  created() {
+    // getAction("/business/busHotel/list", { pageNo: 1, pageSize: 100 }).then(
+    //   (res) => {
+    //     if (res.success) {
+    //       this.hotelList = res.result.records;
+    //     }
+    //   }
+    // );
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG["domianURL"]}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    tabsChange(e){
+        console.log('%chotelorderinfo.vue line:318 e', 'color: white; background-color: #26bfa5;', e);
+        this.queryParam.status = e*1
+        if (e == 8) {
+            this.queryParam.status = ''
+        }
+        this.searchQuery()
+    },
+    okChange(record){
+      console.log(record);
+      postAction('/mall/mallHotelOrder/confirm-move', {id:record.id}).then(res=>{
+        console.log(res);
+        if(res.success){
+          this.loadData(1);
+        }
+      })
+    },
+    cancelOrder(record){
+      console.log(record);
+      postAction('/mall/mallHotelOrder/confirm-cancel', {id:record.id}).then(res=>{
+        console.log(res);
+        if(res.success){
+          this.loadData(1);
+        }
+      })
+    },
+    searchReset() {
+      this.datetime = [];
+      this.queryParam = {};
+      this.loadData(1);
+    },
+    onChange(e, dateString) {
+      // console.log("Selected Time: ", e);
+      // console.log("Formatted Selected Time: ", dateString);
+      this.queryParam.startTime = dateString[0];
+      this.queryParam.endTime = dateString[1];
+    },
+    initDictConfig() {},
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({ type: "string", value: "tenantId", text: "关联租户" });
+      fieldList.push({ type: "string", value: "hotelId", text: "关联酒店" });
+      fieldList.push({ type: "int", value: "userId", text: "用户ID" });
+      fieldList.push({
+        type: "int",
+        value: "messageType",
+        text: "留言类型 1 投诉 2建议",
+      });
+      fieldList.push({ type: "string", value: "images", text: "图片逗号分隔" });
+      fieldList.push({ type: "string", value: "contentBody", text: "内容" });
+      fieldList.push({ type: "string", value: "userName", text: "姓名" });
+      fieldList.push({ type: "string", value: "userMobile", text: "手机号" });
+      fieldList.push({ type: "string", value: "roomNo", text: "房号" });
+      fieldList.push({ type: "date", value: "createDate", text: "创建时间" });
+      this.superFieldList = fieldList;
+    },
+  },
+};
+</script>
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

+ 20 - 25
src/views/settings/components/pos/posTable.vue

@@ -37,7 +37,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button :disabled="selectedRowKeys.length == 0" type="primary">下载二维码</a-button>
+      <a-button :disabled="selectedRowKeys.length == 0" @click="downloadQRcode" type="primary">下载二维码</a-button>
       <a-button @click="batchDel" :disabled="selectedRowKeys.length == 0" icon="stop" type="danger" >批量删除</a-button>
     </div>
 
@@ -136,7 +136,7 @@
 import { JeecgListMixin } from "@/mixins/JeecgListMixin";
 import PosTableModal from "./modules/PosTableModal";
 import { filterObj } from "@/utils/util";
-import { getAction } from "@/api/manage";
+import { getAction, downloadFileZIP } from "@/api/manage";
 export default {
   name: "memberList",
   mixins: [JeecgListMixin],
@@ -226,36 +226,31 @@ export default {
     };
   },
   created() {
-    // this.loadData()
   },
   methods: {
-    // searchQuery() {
-    //   this.loadData(1);
-    // },
-    // loadData(arg) {
-    //   //加载数据 若传入参数1则加载第一页的内容
-    //   if (arg === 1) {
-    //     this.ipagination.current = 1;
-    //   }
-    //   var params = this.getQueryParams(); //查询条件
-    //   getAction(this.url.list, params).then((res) => {
-    //     if (res.success) {
-    //       this.dataSource1 = res.result.records;
-    //       this.ipagination.total = res.result.total;
-    //     }
-    //   });
-    // },
-    // getQueryParams() {
-    //   var param = Object.assign({}, this.queryParam, this.isorter);
-    //   param.pageNo = this.ipagination.current;
-    //   param.pageSize = this.ipagination.pageSize;
-    //   return filterObj(param);
-    // },
     QRcode(record){
       console.log(record.qrCode);
       this.selectQRcode = record.qrCode;
       this.QRcodeVisible = true;
     },
+    downloadQRcode(){
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录!');
+        return;
+      } else {
+        var ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        var that = this;
+        console.log(ids);
+        downloadFileZIP('/pos/posTable/makeQRCode?ids=' + ids, '二维码', {}).then((res) => {
+          console.log(res);
+          that.onClearSelected();
+        });
+      }
+    },
+
     getAvatarView: function (avatar) {
       return getFileAccessHttpUrl(avatar);
     },