库存接口对接
This commit is contained in:
parent
7fc62e30ca
commit
44aecc4733
|
|
@ -64,7 +64,7 @@
|
||||||
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
|
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="货品编码" align="center" prop="" :show-overflow-tooltip="true" />
|
<el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true"/>
|
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
|
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="120"/>
|
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="120"/>
|
||||||
|
|
@ -73,7 +73,11 @@
|
||||||
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
|
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
|
||||||
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/>
|
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/>
|
||||||
<el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true" width="120"/>
|
<el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true" width="120"/>
|
||||||
<el-table-column label="库存金额" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
|
<el-table-column label="库存金额" align="center" prop="totalPrice" :show-overflow-tooltip="true" width="120">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ (scope.row.totalPrice/100).toFixed(2) }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
|
<el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.inventoryStatus==1">正常</span>
|
<span v-if="scope.row.inventoryStatus==1">正常</span>
|
||||||
|
|
@ -81,7 +85,7 @@
|
||||||
<span v-if="scope.row.inventoryStatus==3">超额</span>
|
<span v-if="scope.row.inventoryStatus==3">超额</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="总库存数" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
|
<el-table-column label="总库存数" align="center" prop="totalNum" :show-overflow-tooltip="true" width="120"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div style="width: 100%;height: 400px;overflow-y: auto;">
|
<div style="width: 100%;height: 400px;overflow-y: auto;">
|
||||||
<el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
|
<!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
|
||||||
<el-table-column label="序号" align="center" width="80" type="index" />
|
<el-table-column label="序号" align="center" width="80" type="index" />
|
||||||
<!-- <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 label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
|
<el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
|
||||||
|
|
@ -68,7 +68,7 @@
|
||||||
<el-table-column label="入库数量" align="center" prop="purNum" :show-overflow-tooltip="true"></el-table-column>
|
<el-table-column label="入库数量" align="center" prop="purNum" :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">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.purNum*scope.row.unitPrice }}</span>
|
<span>{{ scope.row.purNum*scope.row.unitPrice/100 }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -172,12 +172,12 @@ export default {
|
||||||
getContractInfo(){
|
getContractInfo(){
|
||||||
console.log(this.pageJson)
|
console.log(this.pageJson)
|
||||||
let param = {
|
let param = {
|
||||||
orderGoodsId:this.pageJson.orderGoodsId
|
outId:this.pageJson.outId
|
||||||
}
|
}
|
||||||
//查询查询食堂下拉结构
|
//查询查询食堂下拉结构
|
||||||
getWarehouseOutInfoApi(param).then((response) => {
|
getWarehouseOutInfoApi(param).then((response) => {
|
||||||
this.baseInfo = response.data;
|
this.baseInfo = response.data;
|
||||||
this.materialLis = this.baseInfo.orderGoodsDetailList;
|
this.materialLis = this.baseInfo.imsOutInventoryDetailVOList;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 多选框选中数据
|
// 多选框选中数据
|
||||||
|
|
|
||||||
|
|
@ -234,12 +234,12 @@ export default {
|
||||||
getContractInfo(){
|
getContractInfo(){
|
||||||
console.log(this.pageJson)
|
console.log(this.pageJson)
|
||||||
let param = {
|
let param = {
|
||||||
orderGoodsId:this.pageJson.orderGoodsId
|
outId:this.pageJson.outId
|
||||||
}
|
}
|
||||||
//查询查询食堂下拉结构
|
//查询查询食堂下拉结构
|
||||||
getWarehouseOutInfoApi(param).then((response) => {
|
getWarehouseOutInfoApi(param).then((response) => {
|
||||||
this.baseInfo = response.data;
|
this.baseInfo = response.data;
|
||||||
this.materialList = this.baseInfo.imsOutInventoryDetailAddList;
|
this.materialList = this.baseInfo.imsOutInventoryDetailVOList;
|
||||||
// this.materialList.forEach(item=>{
|
// this.materialList.forEach(item=>{
|
||||||
// this.$set(item,"unitPrice",Number(item.unitPrice)/100)
|
// this.$set(item,"unitPrice",Number(item.unitPrice)/100)
|
||||||
// })
|
// })
|
||||||
|
|
@ -344,7 +344,6 @@ export default {
|
||||||
this.batchChosenMaterial = selection;
|
this.batchChosenMaterial = selection;
|
||||||
this.batchChosenMaterial.forEach(item=>{
|
this.batchChosenMaterial.forEach(item=>{
|
||||||
this.$set(item,"fetchNum",0)
|
this.$set(item,"fetchNum",0)
|
||||||
// this.$set(item,"unitPrice",item.unitPrice/100)
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
confirmChosen(){
|
confirmChosen(){
|
||||||
|
|
@ -374,10 +373,7 @@ export default {
|
||||||
this.noMaterial = true
|
this.noMaterial = true
|
||||||
}else{
|
}else{
|
||||||
let obj = Object.assign({}, item)
|
let obj = Object.assign({}, item)
|
||||||
// obj.unitPrice = Number(obj.unitPrice)*100
|
param.totalNum = param.totalNum+Number(obj.fetchNum)
|
||||||
// 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)
|
param.imsOutInventoryDetailAddList.push(obj)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -394,7 +390,7 @@ export default {
|
||||||
this.$modal.msgError("请添加货品!");
|
this.$modal.msgError("请添加货品!");
|
||||||
}else{
|
}else{
|
||||||
this.loadingBtn=true;
|
this.loadingBtn=true;
|
||||||
if (this.baseInfo.orderGoodsId != undefined) {
|
if (this.baseInfo.outId != undefined) {
|
||||||
editWarehouseOutApi(param).then((response) => {
|
editWarehouseOutApi(param).then((response) => {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.loadingBtn=false
|
this.loadingBtn=false
|
||||||
|
|
@ -434,10 +430,7 @@ export default {
|
||||||
this.noMaterial = true
|
this.noMaterial = true
|
||||||
}else{
|
}else{
|
||||||
let obj = Object.assign({}, item)
|
let obj = Object.assign({}, item)
|
||||||
// obj.unitPrice = Number(obj.unitPrice)*100
|
param.totalNum = param.totalNum+Number(obj.fetchNum)
|
||||||
// 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)
|
param.imsOutInventoryDetailAddList.push(obj)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -454,7 +447,7 @@ export default {
|
||||||
this.$modal.msgError("请添加货品!");
|
this.$modal.msgError("请添加货品!");
|
||||||
}else{
|
}else{
|
||||||
this.loadingBtn=true;
|
this.loadingBtn=true;
|
||||||
if (this.baseInfo.orderGoodsId != undefined) {
|
if (this.baseInfo.outId != undefined) {
|
||||||
editWarehouseOutApi(param).then((response) => {
|
editWarehouseOutApi(param).then((response) => {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.loadingBtn=false
|
this.loadingBtn=false
|
||||||
|
|
|
||||||
|
|
@ -107,9 +107,9 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column> -->
|
</el-table-column> -->
|
||||||
|
|
||||||
<el-table-column label="总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
|
<el-table-column label="总金额(元)" align="center" prop="totalAmount" :show-overflow-tooltip="true" width="120">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
|
<span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/>
|
<el-table-column label="总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue