post改成get请求
This commit is contained in:
parent
7794157c7a
commit
f24a312af6
|
|
@ -52,15 +52,11 @@ export function getDishesByTypePageApi(data) {
|
|||
export function getCurrentRecipeListApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/cook_recipe/currentList',
|
||||
method: 'post',
|
||||
method: 'get',
|
||||
headers: {
|
||||
//"merchant-id":"378915229716713472",
|
||||
},
|
||||
data: data,
|
||||
params:{
|
||||
pageNum:data.pageNum,
|
||||
pageSize:data.pageSize
|
||||
}
|
||||
data,
|
||||
})
|
||||
}
|
||||
// 获取所有菜谱-分页
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ export function listNutrition(query) {
|
|||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
}
|
||||
// 新增
|
||||
export function addMenuNutrition(data) {
|
||||
return request({
|
||||
|
|
@ -69,15 +69,15 @@ export function delNutrition(data) {
|
|||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 查询详细数据
|
||||
export function getNutritionInfo(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/cook_nutrition/getInfo/'+data.nutritionId,
|
||||
method: 'get',
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 获取所有营养信息
|
||||
export function nutritionAllListApi(data) {
|
||||
return request({
|
||||
|
|
@ -85,5 +85,5 @@ export function nutritionAllListApi(data) {
|
|||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
|
||||
// 原料类别树
|
||||
export function systemMaterialTreeApi(data) {
|
||||
return request({
|
||||
|
|
@ -7,7 +7,7 @@ export function systemMaterialTreeApi(data) {
|
|||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 查询原料列表
|
||||
export function getMaterialListApi(data) {
|
||||
return request({
|
||||
|
|
@ -24,15 +24,12 @@ export function getMaterialListApi(data) {
|
|||
export function getStockMaterialListApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/api/v1/drpinventory/list',
|
||||
method: 'post',
|
||||
method: 'get',
|
||||
headers: {
|
||||
//"merchant-id":"378915229716713472",
|
||||
},
|
||||
data: data,
|
||||
params:{
|
||||
pageNum:data.pageNum,
|
||||
pageSize:data.pageSize
|
||||
}
|
||||
data,
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -95,7 +92,7 @@ export function addFetchMaterialApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 编辑领料单-提交
|
||||
export function editFetchMaterialApi(data) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -130,15 +130,11 @@ export function delPurchaseContractApi(data) {
|
|||
export function goodsInquiryPageApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/ims_inquiry/list',
|
||||
method: 'post',
|
||||
method: 'get',
|
||||
headers: {
|
||||
//"merchant-id":"378915229716713472",
|
||||
},
|
||||
data:data,
|
||||
params:{
|
||||
pageNum:data.pageNum,
|
||||
pageSize:data.pageSize
|
||||
}
|
||||
data,
|
||||
})
|
||||
}
|
||||
//获取采购询价分页详情
|
||||
|
|
@ -319,15 +315,11 @@ export function delProductionPlanApi(data) {
|
|||
export function purchasePlanPageApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/ims_purchase_plan/list',
|
||||
method: 'post',
|
||||
method: 'get',
|
||||
headers: {
|
||||
//"merchant-id":"378915229716713472",
|
||||
},
|
||||
data:data,
|
||||
params:{
|
||||
pageNum:data.pageNum,
|
||||
pageSize:data.pageSize
|
||||
}
|
||||
data
|
||||
})
|
||||
}
|
||||
//获取采购计划分页详情
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
|
||||
// 原料类别树
|
||||
export function systemMaterialTreeApi(data) {
|
||||
return request({
|
||||
|
|
@ -7,7 +7,7 @@ export function systemMaterialTreeApi(data) {
|
|||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 查询原料列表
|
||||
export function getMaterialListApi(data) {
|
||||
return request({
|
||||
|
|
@ -24,17 +24,13 @@ export function getMaterialListApi(data) {
|
|||
export function getStockMaterialListApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/api/v1/drpinventory/list',
|
||||
method: 'post',
|
||||
method: 'get',
|
||||
headers: {
|
||||
//"merchant-id":"378915229716713472",
|
||||
},
|
||||
data: data,
|
||||
params:{
|
||||
pageNum:data.pageNum,
|
||||
pageSize:data.pageSize
|
||||
}
|
||||
data,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 货品批次详情-入库批次列表
|
||||
export function getMaterialInStockBatchApi(data) {
|
||||
|
|
@ -111,7 +107,7 @@ export function addReturnMaterialApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 编辑退货单-提交
|
||||
export function editReturnMaterialApi(data) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ export function getWareHousePageApi(data) {
|
|||
},
|
||||
params:data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 仓库-下拉数据
|
||||
export function drpWareHousePageApi(data) {
|
||||
return request({
|
||||
|
|
@ -21,7 +21,7 @@ export function drpWareHousePageApi(data) {
|
|||
},
|
||||
params: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 仓库新增
|
||||
export function addWareHouseApi(data) {
|
||||
return request({
|
||||
|
|
@ -32,7 +32,7 @@ export function addWareHouseApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 仓库修改
|
||||
export function editWareHouseApi(data) {
|
||||
return request({
|
||||
|
|
@ -43,14 +43,14 @@ export function editWareHouseApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 仓库删除
|
||||
export function delWareHouseApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/ims_warehouse_info/del/'+data.warehouseId,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 原料类别树
|
||||
export function systemMaterialTreeApi(data) {
|
||||
|
|
@ -59,7 +59,7 @@ export function systemMaterialTreeApi(data) {
|
|||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 查询原料列表
|
||||
export function getMaterialListApi(data) {
|
||||
return request({
|
||||
|
|
@ -89,15 +89,12 @@ export function supplierPageApi(data) {
|
|||
export function getStockMaterialListApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/api/v1/drpinventory/list',
|
||||
method: 'post',
|
||||
method: 'get',
|
||||
headers: {
|
||||
//"merchant-id":"378915229716713472",
|
||||
},
|
||||
data: data,
|
||||
params:{
|
||||
pageNum:data.pageNum,
|
||||
pageSize:data.pageSize
|
||||
}
|
||||
data,
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -160,7 +157,7 @@ export function getWarehouseInInfoApi(data) {
|
|||
//"merchant-id":"378915229716713472",
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
// 新增入库管理
|
||||
export function addWarehouseInApi(data) {
|
||||
return request({
|
||||
|
|
@ -171,7 +168,7 @@ export function addWarehouseInApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 修改入库管理
|
||||
export function editWarehouseInApi(data) {
|
||||
return request({
|
||||
|
|
@ -220,7 +217,7 @@ export function getWarehouseOutInfoApi(data) {
|
|||
//"merchant-id":"378915229716713472",
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
// 新增出库管理
|
||||
export function addWarehouseOutApi(data) {
|
||||
return request({
|
||||
|
|
@ -231,7 +228,7 @@ export function addWarehouseOutApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 修改出库管理
|
||||
export function editWarehouseOutApi(data) {
|
||||
return request({
|
||||
|
|
@ -300,7 +297,7 @@ export function addCheckInventorySaveApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
// 新增库存盘点-提交
|
||||
export function addCheckInventoryCommitApi(data) {
|
||||
return request({
|
||||
|
|
@ -311,7 +308,7 @@ export function addCheckInventoryCommitApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
}
|
||||
//修改库存盘点-保存
|
||||
export function editCheckInventorySaveApi(data) {
|
||||
return request({
|
||||
|
|
@ -359,7 +356,7 @@ export function goodsTransferPageApi(data) {
|
|||
},
|
||||
params:data
|
||||
})
|
||||
}
|
||||
}
|
||||
//获取货品调拨详细信息
|
||||
export function getGoodsTransferInfoApi(data) {
|
||||
return request({
|
||||
|
|
@ -392,8 +389,8 @@ export function addGoodsTransferCommitApi(data) {
|
|||
},
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// 删除货品调拨
|
||||
export function delGoodsTransferApi(data) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -5,11 +5,7 @@ import request from '@/utils/request'
|
|||
export function getKitchenDeviceSensorRecordListApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/kitchen_device_sensor_record/list',
|
||||
method: 'post',
|
||||
data: data,
|
||||
params:{
|
||||
pageNum:data.pageNum,
|
||||
pageSize:data.pageSize
|
||||
}
|
||||
method: 'get',
|
||||
data
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -157,15 +157,11 @@ export function reportDeptIncomeListApi(data) {
|
|||
export function reportUserIncomeListApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/report/acc/user/income-outcome',
|
||||
method: 'post',
|
||||
method: 'get',
|
||||
headers: {
|
||||
//"merchant-id":"378915229716713472",
|
||||
},
|
||||
data: data,
|
||||
params:{
|
||||
pageNum:data.pageNum,
|
||||
pageSize:data.pageSize
|
||||
}
|
||||
data,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable maxlength="20"
|
||||
style="width: 300px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属区域" prop="areaId">
|
||||
<el-cascader v-model="queryParams.areaId"
|
||||
:options="treeOptions" :filterable="true" style="width: 300px;" :show-all-levels="false"
|
||||
:props="{
|
||||
:props="{
|
||||
emitPath: false,// 若设置 false,则只返回该节点的值,只返回最后选择的id
|
||||
checkStrictly: false,//来设置父子节点取消选中关联,从而达到选择任意一级选项的目的
|
||||
value:'id',label:'label'
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
:label="item.canteenName"
|
||||
:value="item.canteenId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属档口" prop="stallId">
|
||||
<el-select v-model="queryParams.stallId" placeholder="请选择所属档口" clearable style="width: 300px;">
|
||||
|
|
@ -36,14 +36,14 @@
|
|||
:label="item.stallName"
|
||||
:value="item.stallId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-select>
|
||||
</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>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
|
|
@ -60,15 +60,15 @@
|
|||
size="mini"
|
||||
@click="handleApp"
|
||||
>更新APP</el-button>
|
||||
</el-col>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
</el-row>
|
||||
<el-table v-loading="loading" :data="tableListData" height="800">
|
||||
<el-table-column label="设备编号" align="center" prop="deviceNumber" :show-overflow-tooltip="true" width="120" fixed="left"/>
|
||||
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="180" fixed="left"/>
|
||||
<el-table-column label="当前菜谱" align="center" prop="recipeName" :show-overflow-tooltip="true" width="180">
|
||||
<!-- <template slot-scope="scope">
|
||||
<span style="color: #4b80fd;cursor: pointer;" @click="openMenuDialog(scope.row)">{{scope.row.firstRecipeName}}</span>
|
||||
<!-- <template slot-scope="scope">
|
||||
<span style="color: #4b80fd;cursor: pointer;" @click="openMenuDialog(scope.row)">{{scope.row.firstRecipeName}}</span>
|
||||
</template> -->
|
||||
</el-table-column>
|
||||
<el-table-column label="通讯状态" align="center" prop="onlineState" :show-overflow-tooltip="true" width="100">
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
<!-- <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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设备状态" align="center" prop="deviceState" :show-overflow-tooltip="true" width="100">
|
||||
<template slot-scope="scope">
|
||||
|
|
@ -85,29 +85,29 @@
|
|||
<span v-if="scope.row.deviceState==2">异常</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true">
|
||||
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="设备版本号" align="center" prop="versionCode" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="设备版本号" align="center" prop="versionCode" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
|
||||
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handleUpdate(scope.row)"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
style="color: red;"
|
||||
@click="handleDelete(scope.row)"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
|
|
@ -115,18 +115,18 @@
|
|||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title+'设备'" :visible.sync="open" width="700px" append-to-body>
|
||||
<el-tabs v-model="activeName" @tab-click="handleTabClick">
|
||||
<!-- 基础设置 -->
|
||||
<el-tab-pane label="基础设置" name="baseSetting" style="height: 400px;">
|
||||
<el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
|
||||
<el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="所属区域" prop="areaId">
|
||||
<el-form-item label="所属区域" prop="areaId">
|
||||
<el-cascader v-model="baseForm.areaId"
|
||||
:options="treeOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
|
||||
:props="{
|
||||
:props="{
|
||||
emitPath: false,// 若设置 false,则只返回该节点的值,只返回最后选择的id
|
||||
checkStrictly: false,//来设置父子节点取消选中关联,从而达到选择任意一级选项的目的
|
||||
value:'id',label:'label'
|
||||
|
|
@ -144,18 +144,18 @@
|
|||
:label="item.canteenName"
|
||||
:value="item.canteenId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="所属档口" prop="stallId">
|
||||
<el-form-item label="所属档口" prop="stallId">
|
||||
<el-select v-model="baseForm.stallId" placeholder="请选择所属档口" style="width: 100%;" @change="chosenStall">
|
||||
<el-option v-for="item in stallOptions2"
|
||||
:key="item.stallId"
|
||||
:label="item.stallName"
|
||||
:value="item.stallId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
|
@ -166,8 +166,8 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="设备名称" prop="deviceName">
|
||||
<el-input v-model="baseForm.deviceName" placeholder="请输入设备名称" maxlength="30" clearable/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="设备Sn" prop="deviceSn">
|
||||
<el-input v-model="baseForm.deviceSn" placeholder="请输入设备Sn" maxlength="30" clearable/>
|
||||
|
|
@ -176,8 +176,8 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="设备Ip" prop="deviceIp">
|
||||
<el-input v-model="baseForm.deviceIp" placeholder="请输入设备Ip" maxlength="30" clearable/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="设备key" prop="deviceKey">
|
||||
<el-input v-model="baseForm.deviceKey" placeholder="请输入设备key" maxlength="30" clearable/>
|
||||
|
|
@ -186,8 +186,8 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="安装地址" prop="deviceAddr">
|
||||
<el-input v-model="baseForm.deviceAddr" placeholder="请输入安装地址" maxlength="30" clearable/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="设备Mac" prop="deviceMac">
|
||||
<el-input v-model="baseForm.deviceMac" placeholder="请输入设备key" maxlength="30" clearable/>
|
||||
|
|
@ -196,21 +196,21 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="网关" prop="deviceGateway">
|
||||
<el-input v-model="baseForm.deviceGateway" placeholder="请输入安装地址" maxlength="30" clearable/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="密码" prop="devicePwd">
|
||||
<el-input v-model="baseForm.devicePwd" placeholder="请输入密码" maxlength="30" clearable/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog title="查看 - 菜谱" :visible.sync="openMenu" width="800px" append-to-body>
|
||||
<el-form :model="dialogMenuParams" ref="dialogQueryForm" size="small" :inline="true" label-width="68px">
|
||||
|
|
@ -221,40 +221,40 @@
|
|||
<el-option label="下午茶" value="下午茶"></el-option>
|
||||
<el-option label="晚餐" value="晚餐"></el-option>
|
||||
<el-option label="夜宵" value="夜宵"></el-option>
|
||||
</el-select>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="applyDate">
|
||||
<el-date-picker
|
||||
<el-date-picker
|
||||
v-model="dialogMenuParams.applyDate"
|
||||
type="date" @change="queryMenuData"
|
||||
placeholder="选择日期"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="queryMenuData">搜索</el-button>
|
||||
value-format="yyyy-MM-dd"></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="queryMenuData">搜索</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table :data="menuSubData" height="500">
|
||||
<el-table-column label="序号" align="center" type="index" :show-overflow-tooltip="true" width="80"/>
|
||||
<el-table-column label="菜品名称" align="center" prop="dishesName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格" align="center" prop="" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<template slot-scope="scope">
|
||||
<span>标准</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="价格" align="center" prop="salePrice" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (scope.row.salePrice/100).toFixed(2) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="优惠价" align="center" prop="salePrice" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (scope.row.salePrice/100).toFixed(2) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="供应数量" align="center" prop="supplyNum" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="限购数量" align="center" prop="limitNum" :show-overflow-tooltip="true"/>
|
||||
</el-table-column>
|
||||
<el-table-column label="供应数量" align="center" prop="supplyNum" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="限购数量" align="center" prop="limitNum" :show-overflow-tooltip="true"/>
|
||||
</el-table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="openMenu=false">确 定</el-button>
|
||||
|
|
@ -287,12 +287,12 @@
|
|||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="APP类型" prop="type">
|
||||
<el-form-item label="APP类型" prop="type">
|
||||
<el-select v-model="appForm.type" placeholder="请选择" style="width: 100%;">
|
||||
<el-option label="食堂APP" :value="1"></el-option>
|
||||
<el-option label="超市APP" :value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-option label="超市APP" :value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
|
|
@ -301,14 +301,14 @@
|
|||
<el-input v-model="appForm.apkName" placeholder="请输入APP名称" maxlength="50" clearable/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="20">
|
||||
<el-form-item label="APP路径" prop="apkPath">
|
||||
<el-input v-model="appForm.apkPath" placeholder="请上传App" readonly clearable style="width: 100%;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4" style="display: flex;justify-content: center;align-items: center;">
|
||||
<el-col :span="4" style="display: flex;justify-content: center;align-items: center;">
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:limit="1"
|
||||
|
|
@ -318,19 +318,19 @@
|
|||
:show-file-list="false"
|
||||
:disabled="upload.isUploading"
|
||||
:on-progress="handleFileUploadProgress"
|
||||
:on-success="handleFileSuccess"
|
||||
:on-success="handleFileSuccess"
|
||||
>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="mini"
|
||||
type="primary"
|
||||
size="mini"
|
||||
>上传App
|
||||
</el-button>
|
||||
</el-upload>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
</el-form>
|
||||
</el-row>
|
||||
|
||||
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="confirmApp">确 定</el-button>
|
||||
<el-button @click="openApp=false">取 消</el-button>
|
||||
|
|
@ -342,12 +342,12 @@
|
|||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
<script>
|
||||
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall";
|
||||
import { getDeviceListPageApi,addDeviceApi, updateDeviceApi, deleteDeviceApi,getMenuRecipeDetailApi,uploadApkApi } from "@/api/device/index";
|
||||
import base64 from 'base-64';
|
||||
import { getToken } from '@/utils/auth'
|
||||
import { getToken } from '@/utils/auth'
|
||||
export default {
|
||||
name: "",
|
||||
dicts: ["dev_comm_status","dev_status"],
|
||||
|
|
@ -385,10 +385,10 @@
|
|||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord:"",//关键字
|
||||
areaId:null,//区域
|
||||
keyWord:"",//关键字
|
||||
areaId:null,//区域
|
||||
canteenId:null,//食堂
|
||||
stallId:null,//档口
|
||||
stallId:null,//档口
|
||||
},
|
||||
canteenOptions:[],//查询-食堂下拉选
|
||||
stallOptions:[],//查询-档口下拉选
|
||||
|
|
@ -410,9 +410,9 @@
|
|||
devicePwd:""
|
||||
},
|
||||
canteenOptions2:[],//弹窗-食堂下拉选
|
||||
stallOptions2:[],//弹窗-档口下拉选
|
||||
stallOptions2:[],//弹窗-档口下拉选
|
||||
// 表单校验
|
||||
baseFormRules: {
|
||||
baseFormRules: {
|
||||
deviceNumber: [
|
||||
{ required: true, message: "设备编号不能为空", trigger: "blur" }
|
||||
],
|
||||
|
|
@ -424,7 +424,7 @@
|
|||
],
|
||||
// deviceKey: [
|
||||
// { required: true, message: "设备Key不能为空", trigger: "blur" }
|
||||
// ],
|
||||
// ],
|
||||
areaId: [
|
||||
{ required: true, message: "所属区域不能为空", trigger: "blur" }
|
||||
],
|
||||
|
|
@ -457,7 +457,7 @@
|
|||
openLog:false,
|
||||
dialogQueryParams:{//异常查询条件
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 10,
|
||||
},
|
||||
logTableData:[],//异常弹窗
|
||||
// 总条数
|
||||
|
|
@ -478,18 +478,18 @@
|
|||
apkName:null,
|
||||
apkPath:null,
|
||||
updateContent:null,
|
||||
type:1,//1食堂APP 2超市APP
|
||||
type:1,//1食堂APP 2超市APP
|
||||
},
|
||||
//导入参数
|
||||
upload: {
|
||||
upload: {
|
||||
// 是否禁用上传
|
||||
isUploading: false,
|
||||
isUploading: false,
|
||||
// 设置上传的请求头部
|
||||
headers: { Authorization: 'Bearer ' + getToken() },
|
||||
// 上传的地址
|
||||
url: process.env.VUE_APP_BASE_API + '/file/upload',
|
||||
},
|
||||
appFormRules:{
|
||||
appFormRules:{
|
||||
version: [
|
||||
{ required: true, message: "版本号不能为空", trigger: "blur" }
|
||||
],
|
||||
|
|
@ -501,7 +501,7 @@
|
|||
],
|
||||
apkPath: [
|
||||
{ required: true, message: "APP路径不能为空", trigger: "blur" }
|
||||
],
|
||||
],
|
||||
updateContent: [
|
||||
{ required: true, message: "更新内容不能为空", trigger: "blur" }
|
||||
]
|
||||
|
|
@ -515,16 +515,17 @@
|
|||
getCanteenByAreaApi({
|
||||
"areaId":this.queryParams.areaId,"canteenType": 1
|
||||
}).then((response) => {
|
||||
const aa = 3;
|
||||
this.canteenOptions=response.rows||[]
|
||||
this.queryParams.canteenId=this.$route.query.canteenId
|
||||
getStallByCanteenApi({
|
||||
canteenId:this.queryParams.canteenId
|
||||
}).then((response) => {
|
||||
this.stallOptions=response.rows||[];
|
||||
if(this.$route.query.canteenId){
|
||||
if(this.$route.query.canteenId){
|
||||
this.queryParams.stallId=this.$route.query.stallId
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
this.getList()
|
||||
|
|
@ -534,18 +535,18 @@
|
|||
//区域树
|
||||
getTreeData() {
|
||||
systemAreaTreeApi({}).then((response) => {
|
||||
this.treeOptions = response.data;
|
||||
this.treeOptions = response.data;
|
||||
});
|
||||
},
|
||||
//查询-区域树
|
||||
handleTreeChange(e){
|
||||
handleTreeChange(e){
|
||||
let param= {
|
||||
"areaId":e,
|
||||
"canteenType": 1
|
||||
}
|
||||
getCanteenByAreaApi(param).then((response) => {
|
||||
this.canteenOptions=response.rows||[]
|
||||
this.queryParams.canteenId=null;
|
||||
this.queryParams.canteenId=null;
|
||||
this.queryParams.stallId=null;
|
||||
});
|
||||
},
|
||||
|
|
@ -566,20 +567,20 @@
|
|||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
},
|
||||
/** 查询列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
let param = {
|
||||
let param = {
|
||||
"pageNum":this.queryParams.pageNum,
|
||||
"pageSize":this.queryParams.pageSize,
|
||||
"areaId":this.queryParams.areaId,
|
||||
"canteenId":this.queryParams.canteenId,
|
||||
"stallId":this.queryParams.stallId,
|
||||
"searchValue":this.queryParams.keyWord,
|
||||
"stallId":this.queryParams.stallId,
|
||||
"searchValue":this.queryParams.keyWord,
|
||||
"deviceType":20
|
||||
}
|
||||
console.log("param",param)
|
||||
|
|
@ -622,7 +623,7 @@
|
|||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
this.reset();
|
||||
this.open = true;
|
||||
getCanteenByAreaApi({ areaId:row.areaId,canteenType: 1 }).then((response) => {
|
||||
this.canteenOptions2=response.rows||[]
|
||||
|
|
@ -635,20 +636,20 @@
|
|||
this.$set(this.baseForm,"canteenId",row.canteenId)
|
||||
this.$set(this.baseForm,"stallId",row.stallId)
|
||||
// this.$set(this,"metadata",row.deviceMetadata)
|
||||
this.title = "修改";
|
||||
this.title = "修改";
|
||||
},
|
||||
handleTabClick(tab, event) {
|
||||
console.log(tab, event);
|
||||
},
|
||||
//基础设置-选择区域
|
||||
handleTreeChange2(val){
|
||||
setTimeout(()=>{
|
||||
handleTreeChange2(val){
|
||||
setTimeout(()=>{
|
||||
// 选择区域后获取相应食堂
|
||||
getCanteenByAreaApi({areaId:val,canteenType: 1}).then((response) => {
|
||||
this.canteenOptions2=response.rows||[]
|
||||
this.stallOptions2=[]
|
||||
this.$set(this.baseForm,"canteenId",null)
|
||||
this.$set(this.baseForm,"stallId",null)
|
||||
this.$set(this.baseForm,"canteenId",null)
|
||||
this.$set(this.baseForm,"stallId",null)
|
||||
});
|
||||
},300)
|
||||
},
|
||||
|
|
@ -676,7 +677,7 @@
|
|||
submitForm: function() {
|
||||
console.log(this.baseForm)
|
||||
this.$refs["baseForm"].validate(valid => {
|
||||
if (valid) {
|
||||
if (valid) {
|
||||
this.baseForm.deviceType=20
|
||||
// this.baseForm.metadata=this.metadata
|
||||
if (this.baseForm.deviceId != undefined) {
|
||||
|
|
@ -704,7 +705,7 @@
|
|||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
},
|
||||
/** 今日菜谱按钮操作-打开弹窗 */
|
||||
openMenuDialog(row){
|
||||
this.openMenu=true
|
||||
|
|
@ -715,12 +716,12 @@
|
|||
this.queryMenuData()
|
||||
},
|
||||
//今日菜谱弹窗-分页查询接口
|
||||
queryMenuData() {
|
||||
queryMenuData() {
|
||||
console.log(this.dialogMenuParams.applyDate)
|
||||
let param = {
|
||||
"applyDate": this.dialogMenuParams.applyDate,
|
||||
"recipeId": this.recipeId
|
||||
}
|
||||
}
|
||||
getMenuRecipeDetailApi(param).then((response) => {
|
||||
console.log(response)
|
||||
this.menuData = response;
|
||||
|
|
@ -729,8 +730,8 @@
|
|||
this.menuData.forEach(item => {
|
||||
if(item.mealtimeName == this.dialogMenuParams.keyWord){
|
||||
this.menuSubData = this.menuSubData.concat(item.dishesList)
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
formatDate(date) {
|
||||
|
|
@ -747,7 +748,7 @@
|
|||
apkName:null,
|
||||
apkPath:null,
|
||||
updateContent:null,
|
||||
deviceType:20,//20食堂APP 2超市APP
|
||||
deviceType:20,//20食堂APP 2超市APP
|
||||
};
|
||||
this.resetForm("appForm");
|
||||
this.openApp = true;
|
||||
|
|
@ -757,7 +758,7 @@
|
|||
this.upload.isUploading = true
|
||||
},
|
||||
// 文件上传成功处理
|
||||
handleFileSuccess(response, file, fileList) {
|
||||
handleFileSuccess(response, file, fileList) {
|
||||
console.log(response)
|
||||
this.upload.isUploading = false
|
||||
this.$refs.upload.clearFiles()
|
||||
|
|
@ -770,14 +771,14 @@
|
|||
confirmApp(){
|
||||
console.log(this.appForm)
|
||||
this.$refs["appForm"].validate(valid => {
|
||||
if (valid) {
|
||||
if (valid) {
|
||||
uploadApkApi(this.appForm).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.openApp = false;
|
||||
this.openApp = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
|
||||
}
|
||||
};
|
||||
|
|
@ -803,4 +804,3 @@
|
|||
|
||||
|
||||
</style>
|
||||
|
||||
Loading…
Reference in New Issue