bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商超设备列表，商超订单列表

This commit is contained in:
zzyuan 2025-05-09 16:09:50 +08:00
parent 7ca851d726
commit 01f619fab1
5 changed files with 146 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/api/superStore/device.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 通过区域Id查询超市
export function getSupermarketByAreaApi(data) {
return request({
url: '/smart-canteen/api/v1/basics-supermarket/page-supermarket',
url: '/smart-canteen/supermarket_info/getSupermarketList',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -15,12 +15,12 @@ export function getSupermarketByAreaApi(data) {
// 分页查询设备信息
export function getDeviceListPageApi(data) {
return request({
url: '/smart-canteen/api/v2/device/page',
method: 'post',
url: '/smart-canteen/supermarket_device/list',
method: 'get',
headers: {
"merchant-id":"378915229716713472",
},
data: data
},
params:data
})
}
@ -28,7 +28,7 @@ export function getDeviceListPageApi(data) {
// 新增设备
export function addDeviceApi(data) {
return request({
url: '/smart-canteen/api/v2/device/insert',
url: '/smart-canteen/supermarket_device/add',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -40,7 +40,7 @@ export function addDeviceApi(data) {
// 修改设备信息
export function updateDeviceApi(data) {
return request({
url: '/smart-canteen/api/v2/device/update',
url: '/smart-canteen/supermarket_device/update',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -51,22 +51,11 @@ export function updateDeviceApi(data) {
// 删除设备信息
// export function deleteDeviceApi(data) {
// return request({
// url: '/smart-canteen/api/v2/device/delete',
// method: 'post',
// headers: {
// "merchant-id":"378915229716713472",
// },
// data: data
// })
// }
export function deleteDeviceApi(deviceId){
export function deleteDeviceApi(deviceId){
const formData = new FormData()
formData.append('deviceId', deviceId)
return request({
url: '/smart-canteen/api/v2/device/delete',
url: '/smart-canteen/doubleScreenMachine/delete',
method: 'post',
data: formData,
headers: {
@ -76,33 +65,6 @@ export function deleteDeviceApi(deviceId){
})
}
//{"page":{"current":1,"size":20,"total":0},"object":{"deviceSn":"124"}}
// 分页查询设备异常信息
export function getDeviceStateLogApi(data) {
return request({
url: '/smart-canteen/api/v2/device/statelog/page',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
data: data
})
}
// 获取指定日期菜谱计划菜品详情
export function getMenuRecipeDetailApi(data) {
return request({
url: '/smart-canteen/menu_recipe/getDetailByDate',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
data: data
})
}

8
src/api/superStore/superOrder.js
View File

@ -108,12 +108,16 @@ export function orderNuclearModeListApi(data) {
// 订单列表-分页
export function orderPageListApi(data) {
return request({
url: '/smart-canteen/api/v2/web/order/page/detail',
url: '/smart-canteen/supermarket_info/order/list',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
data: data
data: data,
params:{
pageNum:data.pageNum,
pageSize:data.pageSize
}
})
}
// 订单详情

86
src/views/superstore/doubleScreen/index.vue
View File

@ -7,8 +7,8 @@
:options="treeOptions" :props="treeProps" collapse-tags clearable
@change="handleTreeChange"></el-cascader>
</el-form-item>
<el-form-item label="所属超市" prop="canteenIdList">
<el-select v-model="queryParams.canteenIdList" clearable multiple collapse-tags placeholder="请选择所属超市" style="width: 240px">
<el-form-item label="所属超市" prop="canteenId">
<el-select v-model="queryParams.canteenId" clearable collapse-tags placeholder="请选择所属超市" style="width: 240px">
<el-option v-for="item in supermarketOptions"
:key="item.supermarketId"
:label="item.supermarketName"
@ -16,9 +16,9 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="deviceSearchInfo">
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.deviceSearchInfo"
v-model="queryParams.keyWord"
placeholder="请输入关键字"
clearable
style="width: 300px"
@ -46,20 +46,30 @@
</el-row>
<el-table v-loading="loading" :data="tableListData" height="800">
<el-table-column label="序号" align="center" width="80" type="index" fixed="left">
<template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="设备编号" align="center" prop="deviceNum" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="设备Sn码" align="center" prop="deviceSn" :show-overflow-tooltip="true"/>
<el-table-column label="设备Mac码" align="center" prop="deviceMac" :show-overflow-tooltip="true"/>
<el-table-column label="设备Ip" align="center" prop="deviceIp" :show-overflow-tooltip="true"/>
<el-table-column label="所属超市" align="center" prop="firstCanteenName" :show-overflow-tooltip="true"/>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
<el-table-column label="所属超市" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
<el-table-column label="通讯状态" align="center" prop="onlineState" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.dev_comm_status" :value="scope.row.onlineState"/>
<!-- <dict-tag :options="dict.type.dev_comm_status" :value="scope.row.onlineState"/> -->
<span v-if="scope.row.onlineState==1">在线</span>
<span v-if="scope.row.onlineState==2">离线</span>
</template>
</el-table-column>
<el-table-column label="设备状态" align="center" prop="deviceState" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/>
<!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
<span v-if="scope.row.deviceState==1">正常</span>
<span v-if="scope.row.deviceState==2">异常</span>
</template>
</el-table-column>
<el-table-column label="设备版本号" align="center" prop="versionCode" :show-overflow-tooltip="true"/>
@ -240,7 +250,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
deviceSearchInfo:"",//关键字
keyWord:"",//关键字
areaId:null,//区域
canteenId:null,//食堂
},
@ -291,16 +301,13 @@
});
},
//查询-区域树
handleTreeChange(e){
console.log(this.queryParams.areaIdList)
handleTreeChange(e){
let param= {
areaIdList:this.queryParams.areaIdList,
current:1,
size:-1
areaId:this.queryParams.areaId
}
getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions=response.records||[]
this.queryParams.canteenIdList = []
this.supermarketOptions=response.rows||[]
this.queryParams.canteenId = null
});
},
/** 搜索按钮操作 */
@ -317,20 +324,15 @@
getList() {
this.loading = true;
let param = {
"page":{"current":this.queryParams.pageNum,"size":this.queryParams.pageSize},
"object":{
"areaIdList":this.queryParams.areaIdList,
"canteenIdList":this.queryParams.canteenIdList,
"mealLineIdList":[],
"deviceSearchInfo":this.queryParams.deviceSearchInfo,
"deviceType":53
}
}
let str = base64.encode(JSON.stringify(param))
// console.log(str)
getDeviceListPageApi({"content":str}).then(response => {
this.tableListData = response.records;
"pageNum":this.queryParams.pageNum,
"pageSize":this.queryParams.pageSize,
"areaId":this.queryParams.areaId,
"canteenId":this.queryParams.canteenId,
"keyWord":this.queryParams.keyWord,
"deviceType":53
}
getDeviceListPageApi(param).then(response => {
this.tableListData = response.rows;
this.total = Number(response.total);
this.loading = false;
});
@ -355,16 +357,14 @@
handleUpdate(row) {
this.reset();
let param= {
areaIdList:[row.bindList[0].areaId],
current:1,
size:-1
areaId:row.areaId
}
getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions2=response.records||[]
this.supermarketOptions2=response.rows||[]
});
this.baseForm = Object.assign({}, row)
this.$set(this.baseForm,"areaId",row.bindList[0].areaId)
this.$set(this.baseForm,"canteenId",row.bindList[0].canteenId)
this.$set(this.baseForm,"areaId",row.areaId)
this.$set(this.baseForm,"canteenId",row.canteenId)
this.title = "修改";
this.open = true;
},
@ -372,16 +372,14 @@
handleView(row) {
this.reset();
let param= {
areaIdList:[row.bindList[0].areaId],
current:1,
size:-1
areaId:row.areaId
}
getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions2=response.records||[]
this.supermarketOptions2=response.rows||[]
});
this.baseForm = Object.assign({}, row)
this.$set(this.baseForm,"areaId",row.bindList[0].areaId)
this.$set(this.baseForm,"canteenId",row.bindList[0].canteenId)
this.$set(this.baseForm,"areaId",row.areaId)
this.$set(this.baseForm,"canteenId",row.canteenId)
this.title = "查看";
this.open = true;
},
@ -392,12 +390,10 @@
handleTreeChange2(val){
setTimeout(()=>{
let param= {
areaIdList:[val],
current:1,
size:-1
areaId:val
}
getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions2=response.records||[]
this.supermarketOptions2=response.rows||[]
this.$set(this.baseForm,"canteenId",null)
});
},800)

246
src/views/superstore/superOrder/index.vue
View File

@ -14,8 +14,8 @@
:picker-options="pickerOptions" >
</el-date-picker>
</el-form-item>
<el-form-item label="所属区域" prop="areaIdList">
<el-cascader v-model="queryParams.areaIdList"
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="queryParams.areaId"
:options="treeAreaOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
:props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
@ -24,8 +24,8 @@
}" clearable collapse-tags @change="handleAreaChange">
</el-cascader>
</el-form-item>
<el-form-item label="所属超市" prop="canteenIdList">
<el-select v-model="queryParams.canteenIdList" multiple clearable collapse-tags placeholder="请选择所属超市" style="width: 220px" @change="handleCanteenChange">
<el-form-item label="所属超市" prop="canteenId">
<el-select v-model="queryParams.canteenId" clearable collapse-tags placeholder="请选择所属超市" style="width: 220px" @change="handleCanteenChange">
<el-option v-for="item in supermarketOptions"
:key="item.supermarketId"
:label="item.supermarketName"
@ -33,8 +33,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属组织" prop="orgIdList">
<el-cascader v-model="queryParams.orgIdList"
<el-form-item label="所属组织" prop="deptIdList">
<el-cascader v-model="queryParams.deptIdList"
:options="deptOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
:props="{
multiple: true,
@ -52,37 +52,27 @@
</el-form-item>
<el-form-item label="商品名称">
<el-input v-model="queryParams.goodsSearchInfo" placeholder="请输入商品名称" maxlength="20" clearable style="width: 220px"/>
</el-form-item>
</el-form-item>
<el-form-item label="订单状态">
<el-select v-model="queryParams.orderStateMixList" multiple collapse-tags style="width: 220px" clearable>
<el-option v-for="item in orderStateOptions"
:key="item.key"
:label="item.value"
:value="item.key"
></el-option>
<el-select v-model="queryParams.orderStateList" clearable multiple collapse-tags style="width: 220px">
<el-option
v-for="dict in dict.type.sm_order_status"
:key="dict.value"
:label="dict.label"
:value="Number(dict.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="支付方式">
<el-select v-model="queryParams.payTypeList" multiple collapse-tags style="width: 220px" clearable>
<el-option v-for="item in orderPayOptions"
:key="item.key"
:label="item.value"
:value="item.key"
></el-option>
<el-select v-model="queryParams.payStateList" clearable multiple collapse-tags style="width: 220px">
<el-option
v-for="dict in dict.type.sm_order_pay_type"
:key="dict.value"
:label="dict.label"
:value="Number(dict.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="配送方式">
<el-select v-model="queryParams.deliveryTypeList" multiple collapse-tags style="width: 220px" clearable>
<el-option v-for="item in deliveryTypeOptions"
:key="item.key"
:label="item.value"
:value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="流水号">
<el-input v-model="queryParams.mealCode" placeholder="请输入流水号" maxlength="20" clearable style="width: 220px"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -90,7 +80,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="danger"
size="mini" :disabled="multiple"
@ -110,7 +100,7 @@
size="mini" :disabled="multiple"
@click="handleSyncPayState"
>同步订单状态</el-button>
</el-col>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -122,18 +112,16 @@
</template>
</el-table-column>
<el-table-column label="订单日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="流水号" align="center" prop="mealCode" :show-overflow-tooltip="true" width="80"/>
<!-- <el-table-column label="流水号" align="center" prop="mealCode" :show-overflow-tooltip="true" width="80"/> -->
<el-table-column label="商品明细" align="center" prop="orderDetailList" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-for="item in scope.row.orderDetailList" :key="item.detailId">{{ item.goodsDishesName }}*{{ item.goodsGetNum }};</span>
</template>
</el-table-column>
<el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<div v-for="item in orderTypeOptions" :key="item.key" v-if="item.key==scope.row.orderType">
{{ item.value }}
</div>
</template>
<el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sm_order_type" :value="scope.row.orderType"/>
</template>
</el-table-column>
<el-table-column label="订单金额" align="center" prop="payableAmount" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope">
@ -150,26 +138,22 @@
<span>{{ (scope.row.realAmount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="80"/>
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="订单号" align="center" prop="orderId" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="配送方式" align="center" prop="deliveryType" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-for="item in deliveryTypeOptions" :key="item.key" v-if="item.key==scope.row.deliveryType">
{{ item.value }}
</span>
</template>
</el-table-column>
<el-table-column label="订单状态" align="center" prop="orderStateMix" :show-overflow-tooltip="true" width="100">
<el-table-column label="支付方式" align="center" prop="payType" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-for="item in orderStateOptions" :key="item.key" v-if="item.key==scope.row.orderStateMix">
{{ item.value }}
</span>
</template>
<dict-tag :options="dict.type.sm_order_pay_type" :value="scope.row.payType"/>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="80"/> -->
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="订单号" align="center" prop="orderId" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="订单状态" align="center" prop="orderState" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sm_order_status" :value="scope.row.orderState"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
@ -178,7 +162,7 @@
type="text"
@click="handleView(scope.row)"
>详情</el-button>
<el-button
<!-- <el-button
size="mini"
type="text" v-if="scope.row.orderStateMix==1||scope.row.orderStateMix==11"
@click="handleRefundPart(scope.row)"
@ -192,7 +176,7 @@
size="mini"
type="text" v-if="scope.row.orderStateMix==1"
@click="writeOffOrder(scope.row)"
>核销</el-button>
>核销</el-button> -->
</template>
</el-table-column>
@ -225,21 +209,21 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 用户姓名</template>
{{ orderInfoData.custName }}
{{ orderInfoData.nickName }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 用户编号</template>
{{ orderInfoData.custNum }}
{{ orderInfoData.userId }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 用户手机号</template>
{{ orderInfoData.mobile }}
{{ orderInfoData.phoneNumber }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 所属组织</template>
{{ orderInfoData.orgFullName }}
{{ orderInfoData.deptFullName }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 订单日期</template>
@ -260,9 +244,9 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 配送方式</template>
<div v-for="item in deliveryTypeOptions" :key="item.key" v-if="item.key==orderInfoData.deliveryType">
<!-- <div v-for="item in deliveryTypeOptions" :key="item.key" v-if="item.key==orderInfoData.deliveryType">
{{ item.value }}
</div>
</div> -->
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 支付方式</template>
@ -280,9 +264,9 @@
<el-descriptions-item>
<template slot="label"> 订单状态</template>
<div v-for="item in orderStateOptions" :key="item.key" v-if="item.key==orderInfoData.orderStateMix">
<!-- <div v-for="item in orderStateOptions" :key="item.key" v-if="item.key==orderInfoData.orderStateMix">
{{ item.value }}
</div>
</div> -->
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 流水号</template>
@ -387,10 +371,10 @@
<el-dialog :title="handleType+'提醒'" :visible.sync="openRemind" width="40%" append-to-body>
<div class="remind-question">请问是否对以下可{{handleType}}订单进行{{handleType}}操作？</div>
<div class="remind-title">可{{handleType}}订单 {{ableList.length}} 笔</div>
<div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}，用户编号:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
<div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
<div class="remind-title">不可{{handleType}}订单 {{unableList.length}} 笔</div>
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>
@ -403,12 +387,11 @@
<script>
import { deptTreeSelect } from '@/api/system/user'
import { systemAreaTreeApi } from "@/api/base/stall";
import { getSupermarketByAreaApi,orderStateListApi,orderPayAllTypeApi,deliveryTypeListApi,orderTypeListApi} from "@/api/superStore/superOrder";
import { systemAreaTreeApi,getCanteenByAreaApi } from "@/api/base/stall";
import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/superStore/superOrder";
export default {
name: "",
dicts: ['sys_user_type'],
dicts: ['sys_user_type','sm_order_type','sm_order_status','sm_order_pay_type'],
data() {
return {
// 遮罩层
@ -459,12 +442,7 @@
supermarketOptions:[],//查询-超市下拉选
canteenOptions:[],//查询-食堂下拉选
stallOptions:[],//查询-档口下拉选
deptOptions:[],//组织树
//下拉选数据
orderStateOptions:[],
orderPayOptions:[],
deliveryTypeOptions:[],
orderTypeOptions:[],
deptOptions:[],//组织树
//组织树
treeOrgOptions:[],
// 查询参数
@ -472,21 +450,11 @@
pageNum: 1,
pageSize: 10,
custSearchInfo: undefined,
orderId: undefined,
tradeNo: undefined,
macOrderId: undefined,
deviceSearchInfo: undefined,
orderTypeList:[4,14],
areaIdList:[],
canteenIdList:[],
stallIdList:[],
orderStateMixList:[],
payTypeList:[],
nuClearMode: undefined,
psnType: undefined,
ifCoupon: undefined,
goodsSearchInfo: undefined,
mealCode: undefined,
orderId: undefined,
orderType:4,
areaId:null,
canteenId:null,
goodsSearchInfo: undefined
},
//订单详情
orderInfoData: {},
@ -515,11 +483,7 @@
},
created() {
this.getAreaTreeData();
this.getDeptTree();
this.orderStateList();
this.orderPayAllType();
this.deliveryTypeList();
this.orderTypeList();
this.getDeptTree();
this.getList()
},
methods: {
@ -529,20 +493,17 @@
this.treeAreaOptions = response.data;
});
},
handleAreaChange(e){
console.log(this.queryParams.areaIdList)
handleAreaChange(e){
let param= {
areaIdList:this.queryParams.areaIdList,
current:1,
size:-1
areaId:this.queryParams.areaId,
canteenType:2
}
getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions=response.records||[]
this.queryParams.canteenIdList = []
getCanteenByAreaApi(param).then((response) => {
this.supermarketOptions=response.rows||[]
this.queryParams.canteenId = null
});
},
handleCanteenChange(e){
console.log(this.queryParams.canteenIdList)
handleCanteenChange(e){
},
/** 查询部门下拉树结构 */
getDeptTree() {
@ -559,31 +520,7 @@
return node
})
.filter((node) => node.status !== '1')
},
//订单状态
orderStateList(){
orderStateListApi({}).then(response => {
this.orderStateOptions = response.data
});
},
//支付方式
orderPayAllType(){
orderPayAllTypeApi().then(response => {
this.orderPayOptions = response.data
});
},
//配送方式
deliveryTypeList(){
deliveryTypeListApi().then(response => {
this.deliveryTypeOptions = response
});
},
//订单类型
orderTypeList(){
orderTypeListApi({}).then((response) => {
this.orderTypeOptions = response.data; ;
});
},
},
/** 搜索按钮操作 */
handleQuery() {
@ -597,21 +534,11 @@
pageNum: 1,
pageSize: 10,
custSearchInfo: undefined,
orderId: undefined,
tradeNo: undefined,
macOrderId: undefined,
deviceSearchInfo: undefined,
orderTypeList:[4,14],
areaIdList:[],
canteenIdList:[],
stallIdList:[],
orderStateMixList:[],
payTypeList:[],
nuClearMode: undefined,
psnType: undefined,
ifCoupon: undefined,
goodsSearchInfo: undefined,
mealCode: undefined,
orderId: undefined,
orderType:4,
areaId:null,
canteenId:null,
goodsSearchInfo: undefined
}
this.resetForm("queryForm");
this.handleQuery();
@ -621,25 +548,24 @@
this.loading = true;
let param = {
...this.queryParams,
"current": this.queryParams.pageNum,
"size": this.queryParams.pageSize,
"startDate":this.formatDate(this.dateRange[0]),
"endDate":this.formatDate(this.dateRange[1])
}
orderPageListApi(param).then(response => {
this.tableListData = response.data.records;
this.total = Number(response.data.total);
this.tableListData = response.rows;
this.total = Number(response.total);
this.loading = false;
});
},
/** 修改按钮操作 */
handleView(row) {
let param = {
orderId:row.orderId
}
orderDetailInfoApi(param).then(response => {
this.orderInfoData = response.data
});
// let param = {
// orderId:row.orderId
// }
// orderDetailInfoApi(param).then(response => {
// this.orderInfoData = response.data
// });
this.orderInfoData = Object.assign({}, row)
this.open = true;
},
/** 部分退款按钮操作 */

8
vue.config.js
View File

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '博诺思管理系统' // 网页标题
const name = process.env.VUE_APP_TITLE || '国网安徽经研院绿智食堂' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
@ -35,9 +35,9 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.2.80:48380`,//旭
// target: `http://192.168.0.244:48380`,//测试
target: `http://192.168.0.44:48380`,//测试
// target: `http://192.168.2.75:48380`,//旭
target: `http://192.168.0.244:48380`,//测试
// target: `http://192.168.0.44:48380`,//测试
// target: `http://192.168.0.176:48380`,//
changeOrigin: true,
pathRewrite: {