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

出入库记录接口对接

This commit is contained in:
zzyuan 2025-07-09 09:48:21 +08:00
parent 27c0e331d5
commit c00e29c645
5 changed files with 109 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/foodManage/stockManage/warehouseIn/detail.vue
View File

@ -6,6 +6,11 @@
<template slot="label">入库单号</template>
{{baseInfo.intoCode}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">入库状态</template>
<span v-if="baseInfo.status==1">待入库</span>
<span v-if="baseInfo.status==2">已入库</span>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">所属区域</template>
{{ baseInfo.areaName }}

5
src/views/foodManage/stockManage/warehouseIn/edit.vue
View File

@ -384,7 +384,7 @@ export default {
let param = {
"pageSize": this.queryParams.pageSize,
"pageNum": this.queryParams.pageNum,
"areaId": this.queryParams.areaId,
"areaId": this.baseInfo.areaId,
"materialName": this.queryParams.materialName,
"materialCode": this.queryParams.materialCode,
"materialTypeIds": this.queryParams.materialTypeIds,
@ -407,6 +407,9 @@ export default {
if(this.batchChosenMaterial.length>0){
this.loading = true
this.materialList = this.batchChosenMaterial;
this.materialList.forEach(item=>{
this.$set(item,"unitPrice",item.unitPrice/100)
})
setTimeout(()=>{
this.loading = false
this.openDialog=false

44
src/views/foodManage/stockManage/warehouseOut/detail.vue
View File

@ -4,17 +4,14 @@
<el-descriptions style="margin-bottom: 20px;" title="基本信息" :column="4" size="medium" border>
<el-descriptions-item>
<template slot="label">出库单号</template>
{{baseInfo.outWareHouseCode}}
{{baseInfo.outCode}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">所属区域</template>
{{ baseInfo.areaName }}
<template slot="label">出库状态</template>
<span v-if="baseInfo.status==1">待出库</span>
<span v-if="baseInfo.status==2">已出库</span>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">货品仓库</template>
{{ baseInfo.warehouseName }}
</el-descriptions-item>
<el-descriptions-item>
<el-descriptions-item>
<template slot="label">出库类型</template>
<span v-if="baseInfo.outType==1">领取出库</span>
<span v-if="baseInfo.outType==2">报损出库</span>
@ -26,12 +23,23 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">出库时间</template>
{{ baseInfo.outWareHouseTime }}
{{ baseInfo.outDate }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">领料人</template>
{{ baseInfo.pickingMan }}
{{ baseInfo.fetchUserId }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">所属区域</template>
{{ baseInfo.areaName }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">货品仓库</template>
{{ baseInfo.warehouseName }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">备注</template>
{{ baseInfo.remark }}
@ -60,18 +68,20 @@
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-table-column label="金额(元)" align="center" prop="" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
<el-table-column label="入库时间" align="center" prop="" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="保质期" align="center" prop="" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.orderNum*scope.row.singlePrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column>
</el-table-column> -->
</el-table>
</div>
</div>

119
src/views/foodManage/stockManage/warehouseOut/edit.vue
View File

@ -2,8 +2,8 @@
<div style="padding: 10px;background: #E5EBF6;min-height: 830px;">
<div style="background: #FFF;padding: 10px;border-radius: 10px;margin-bottom: 20px;">
<el-form :model="baseInfo" ref="baseInfo" :rules="baseRules" size="medium" :inline="true" label-width="110px">
<el-form-item label="出库单号" prop="outWareHouseCode">
<el-input v-model="baseInfo.outWareHouseCode" placeholder="出库单号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
<el-form-item label="出库单号" prop="outCode">
<el-input v-model="baseInfo.outCode" placeholder="出库单号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
</el-form-item>
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="baseInfo.areaId"
@ -25,21 +25,21 @@
</el-select>
</el-form-item>
<el-form-item label="出库类型" prop="outType">
<el-select v-model="queryParams.outType" placeholder="请选择出库类型" style="width: 240px;">
<el-option label="领取出库" :value="1"></el-option>
<el-option label="报损出库" :value="2"></el-option>
<el-select v-model="baseInfo.outType" placeholder="请选择出库类型" style="width: 240px;">
<el-option label="领取出库" value="1"></el-option>
<el-option label="报损出库" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出库时间" prop="outWareHouseTime">
<el-form-item label="出库时间" prop="outDate">
<el-date-picker
v-model="baseInfo.outWareHouseTime"
v-model="baseInfo.outDate"
type="datetime" align="right"
format="yyyy-MM-dd HH:mm:ss" style="width: 240px;"
:picker-options="pickerOptions" @change="baseInfo.outWareHouseTime=formatDateTime(baseInfo.outWareHouseTime)">
:picker-options="pickerOptions" @change="baseInfo.outDate=formatDateTime(baseInfo.outDate)">
</el-date-picker>
</el-form-item>
<el-form-item label="领料人" prop="pickingMan">
<el-input v-model="baseInfo.pickingMan" placeholder="请输入领料人" maxlength="30" clearable style="width: 240px"/>
<el-form-item label="领料人" prop="fetchUserId">
<el-input v-model="baseInfo.fetchUserId" placeholder="请输入领料人" maxlength="30" clearable style="width: 240px"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="baseInfo.remark" placeholder="请输入备注" maxlength="30" clearable style="width: 240px"/>
@ -67,26 +67,15 @@
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.singlePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g,''))"/>
</template>
<el-table-column label="金额(元)" align="center" prop="" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true">
<el-table-column label="入库时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
<el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model.number="scope.row.orderNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.orderNum=v.replace(/[^\d]/g,''))"/>
<el-input v-model.number="scope.row.fetchNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.fetchNum=v.replace(/[^\d]/g,''))"/>
</template>
</el-table-column>
<el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.orderNum*scope.row.singlePrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入" maxlength="20" clearable/>
</template>
</el-table-column>
</el-table-column>
</el-table>
</div>
</div>
@ -140,11 +129,8 @@
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>
</template>
</el-table-column>
<el-table-column label="货品库存" align="center" prop="materialNum" :show-overflow-tooltip="true" />
</el-table>
<pagination
v-show="total>0"
@ -165,7 +151,7 @@
<script>
import { imgUpLoadTwo } from '@/api/system/upload'
import { systemAreaTreeApi } from "@/api/base/stall";
import { systemMaterialTreeApi,getMaterialListApi,drpWareHousePageApi } from "@/api/foodManage/stockManage";
import { systemMaterialTreeApi,getStockMaterialListApi,drpWareHousePageApi } from "@/api/foodManage/stockManage";
import { getWarehouseOutInfoApi,addWarehouseOutApi,editWarehouseOutApi } from "@/api/foodManage/stockManage";
//warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi
export default {
@ -195,14 +181,14 @@ export default {
supplierId: [
{ required: true, message: "供应商不能为空", trigger: "change" }
],
outWareHouseTime: [
outDate: [
{ required: true, message: "出库时间不能为空", trigger: "change" }
],
warehouseId: [
{ required: true, message: "货品仓库不能为空", trigger: "change" }
],
supplyAddress: [
{ required: true, message: "详细地址不能为空", trigger: "change" }
outType: [
{ required: true, message: "出库类型不能为空", trigger: "change" }
]
},
treeAreaOptions:[],
@ -253,10 +239,10 @@ export default {
//查询查询食堂下拉结构
getWarehouseOutInfoApi(param).then((response) => {
this.baseInfo = response.data;
this.materialList = this.baseInfo.orderGoodsDetailList;
this.materialList.forEach(item=>{
this.$set(item,"singlePrice",Number(item.singlePrice)/100)
})
this.materialList = this.baseInfo.imsOutInventoryDetailAddList;
// this.materialList.forEach(item=>{
// this.$set(item,"unitPrice",Number(item.unitPrice)/100)
// })
drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
this.wareHouseOptions = response.rows||[];
this.$set(this.baseInfo,'warehouseId',this.baseInfo.warehouseId)
@ -315,14 +301,14 @@ export default {
},
//添加货品
addMaterial(){
if(this.baseInfo.areaId!=undefined){
this.openDialog=true
if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
this.openDialog=true
this.resetQuery()
setTimeout(()=>{
this.$refs.multipleTable1.clearSelection()
},300)
}else{
this.$modal.msgError("请先选择区域");
this.$modal.msgError("请先选择区域，仓库");
}
},
@ -342,12 +328,13 @@ export default {
let param = {
"pageSize": this.queryParams.pageSize,
"pageNum": this.queryParams.pageNum,
"areaId": this.queryParams.areaId,
"areaId": this.baseInfo.areaId,
"warehouseId": this.baseInfo.warehouseId,
"materialName": this.queryParams.materialName,
"materialCode": this.queryParams.materialCode,
"materialTypeIds": this.queryParams.materialTypeIds,
}
getMaterialListApi(param).then(response => {
getStockMaterialListApi(param).then(response => {
this.tableListData = response.rows;
this.total = Number(response.total);
this.loading = false;
@ -356,8 +343,8 @@ export default {
handleSelectionChange2(selection) {
this.batchChosenMaterial = selection;
this.batchChosenMaterial.forEach(item=>{
this.$set(item,"orderNum",0)
this.$set(item,"singlePrice",item.unitPrice/100)
this.$set(item,"fetchNum",0)
// this.$set(item,"unitPrice",item.unitPrice/100)
})
},
confirmChosen(){
@ -375,23 +362,23 @@ export default {
this.$refs["baseInfo"].validate(valid => {
if (valid) {
let param = Object.assign({},this.baseInfo);
param.outWareHouseTime = this.formatDateTime(this.baseInfo.outWareHouseTime)
param.orderAmount=0
param.outDate = this.formatDateTime(this.baseInfo.outDate)
param.totalAmount=0
param.totalNum=0
param.status=1
param.orderGoodsDetailList = []
param.imsOutInventoryDetailAddList = []
this.noMaterial = false;
if(this.materialList.length>0){
this.materialList.forEach(item=>{
if(item.singlePrice==0 || item.orderNum==0){
if(item.fetchNum==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)
obj.singlePrice = Number(obj.singlePrice)*100
obj.totalPrice = (Number(obj.singlePrice)*Number(obj.orderNum))
param.orderAmount = param.orderAmount+obj.totalPrice;
param.totalNum = param.totalNum+Number(obj.orderNum)
param.orderGoodsDetailList.push(obj)
// obj.unitPrice = Number(obj.unitPrice)*100
// obj.totalPrice = (Number(obj.unitPrice)*Number(obj.fetchNum))
// param.totalAmount = param.totalAmount+obj.totalPrice;
// param.totalNum = param.totalNum+Number(obj.fetchNum)
param.imsOutInventoryDetailAddList.push(obj)
}
})
}
@ -435,28 +422,28 @@ export default {
this.$refs["baseInfo"].validate(valid => {
if (valid) {
let param = Object.assign({},this.baseInfo);
param.outWareHouseTime = this.formatDateTime(this.baseInfo.outWareHouseTime)
param.orderAmount=0
param.outDate = this.formatDateTime(this.baseInfo.outDate)
param.totalAmount=0
param.totalNum=0
param.status=2
param.orderGoodsDetailList = []
param.imsOutInventoryDetailAddList = []
this.noMaterial = false;
if(this.materialList.length>0){
this.materialList.forEach(item=>{
if(item.singlePrice==0 || item.orderNum==0){
if(item.fetchNum==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)
obj.singlePrice = Number(obj.singlePrice)*100
obj.totalPrice = (Number(obj.singlePrice)*Number(obj.orderNum))
param.orderAmount = param.orderAmount+obj.totalPrice;
param.totalNum = param.totalNum+Number(obj.orderNum)
param.orderGoodsDetailList.push(obj)
// obj.unitPrice = Number(obj.unitPrice)*100
// obj.totalPrice = (Number(obj.unitPrice)*Number(obj.fetchNum))
// param.totalAmount = param.totalAmount+obj.totalPrice;
// param.totalNum = param.totalNum+Number(obj.fetchNum)
param.imsOutInventoryDetailAddList.push(obj)
}
})
}
if(this.noMaterial){
this.$modal.msgError("请输入单价和数量！");
this.$modal.msgError("请输入数量！");
}else{
this.noMaterial = true;
if(this.materialList.length>0){

38
src/views/foodManage/stockManage/warehouseOut/index.vue
View File

@ -15,8 +15,8 @@
:picker-options="pickerOptions" >
</el-date-picker>
</el-form-item>
<el-form-item label="出库单号" prop="outWareHouseCode">
<el-input v-model="queryParams.outWareHouseCode" placeholder="请输入出库单号" maxlength="20" clearable style="width: 240px"/>
<el-form-item label="出库单号" prop="outCode">
<el-input v-model="queryParams.outCode" placeholder="请输入出库单号" maxlength="20" clearable style="width: 240px"/>
</el-form-item>
<el-form-item label="出库状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择出库状态" style="width: 240px;">
@ -79,29 +79,33 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="出库单号" align="center" prop="outWareHouseCode" :show-overflow-tooltip="true" />
<el-table-column label="出库单号" align="center" prop="outCode" :show-overflow-tooltip="true" />
<!-- <el-table-column label="采购订单标题" align="center" prop="orderTitle" :show-overflow-tooltip="true" /> -->
<el-table-column label="出库状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-if="scope.row.status==1">待提交</span>
<span v-if="scope.row.status==2">已提交</span>
<span v-if="scope.row.status==1">待出库</span>
<span v-if="scope.row.status==2">已出库</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="货品仓库" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="出库类型" align="center" prop="supplierConfirmStatus" :show-overflow-tooltip="true" width="100">
<el-table-column label="出库类型" align="center" prop="outType" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-if="scope.row.supplierConfirmStatus==1">待确认</span>
<span v-if="scope.row.supplierConfirmStatus==2">确认通过</span>
<span v-if="scope.row.supplierConfirmStatus==3">已拒绝</span>
<span v-if="scope.row.outType==1">领取出库</span>
<span v-if="scope.row.outType==2">报损出库</span>
<span v-if="scope.row.outType==3">退货出库</span>
<span v-if="scope.row.outType==4">调拨出库</span>
<span v-if="scope.row.outType==5">即入即出</span>
<span v-if="scope.row.outType==6">超市出库</span>
<span v-if="scope.row.outType==7">盘点出库</span>
</template>
</el-table-column>
<el-table-column label="质检报告" align="center" prop="status" :show-overflow-tooltip="true" width="100">
<!-- <el-table-column label="质检报告" align="center" prop="status" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-if="scope.row.status==1">待提交</span>
<span v-if="scope.row.status==2">已提交</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -109,7 +113,7 @@
</template>
</el-table-column>
<el-table-column label="总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="出库时间" align="center" prop="requestArrivalTime" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="出库时间" align="center" prop="outDate" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="关联单号" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="操作人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
@ -285,13 +289,11 @@ export default {
let param = {
"pageNum": this.queryParams.pageNum,
"pageSize": this.queryParams.pageSize,
"outWareHouseCode": this.queryParams.outWareHouseCode,
"outCode": this.queryParams.outCode,
"areaId": this.queryParams.areaId,
"canteenId": this.queryParams.canteenId,
"stallId": this.queryParams.stallId,
"status": this.queryParams.status,
"supplierConfirmStatus": this.queryParams.supplierConfirmStatus,
// "outType": this.queryParams.outType
"warehouseId": this.queryParams.warehouseId,
"status": this.queryParams.status,
"outType": this.queryParams.outType
}
if(this.dateRange&&this.dateRange.length>0){
param.startDateTime=this.formatDateTime(this.dateRange[0])