1.提交盘点功能相关页面,修改盘点接口地址

prod
x_z 2 years ago
parent cf4ad83448
commit 22a296c6b9

@ -2,7 +2,7 @@ import axios from "../../utils/request";
export function getCountOrderList(params) {
return axios({
url: "/invCount/order/filter",
url: "/inv/count/order/filter",
method: "get",
params: params
});
@ -10,7 +10,7 @@ export function getCountOrderList(params) {
export function deleteCountOrder(data) {
return axios({
url: "/invCount/order/delete",
url: "/inv/count/order/delete",
method: "post",
data: data
});
@ -18,7 +18,7 @@ export function deleteCountOrder(data) {
export function getCountOrderDetailList(params) {
return axios({
url: "/invCount/order/detail/filter",
url: "/inv/count/order/detail/filter",
method: "get",
params: params
});
@ -26,7 +26,7 @@ export function getCountOrderDetailList(params) {
export function saveCountOrder(data) {
return axios({
url: "/invCount/order/saveCountOrder",
url: "/inv/count/order/saveCountOrder",
method: "post",
data: data
});
@ -34,7 +34,7 @@ export function saveCountOrder(data) {
export function submitAudit(params) {
return axios({
url: "/invCount/order/submitAudit",
url: "/inv/count/order/submitAudit",
method: "get",
params: params
});

@ -39,3 +39,11 @@ export function getInvMAProducts(params) {
params: params
});
}
export function getCountInvProductProduct(params) {
return axios({
url: "spms/inv/products/getCountInvProduct",
method: "get",
params: params
});
}

@ -158,7 +158,7 @@ export default {
statusMap: {
0: "草稿",
1: "未审核",
2: "已完成"
2: "已审核"
},
detailQuery: {
orderIdFk: null,

@ -138,7 +138,7 @@ export default {
statusMap: {
0: "草稿",
1: "未审核",
2: "已完成"
2: "已审核"
},
detailQuery: {
orderIdFk: null,

@ -151,7 +151,7 @@ export default {
statusMap: {
0: "草稿",
1: "未审核",
2: "已完成"
2: "已审核"
},
formName: null,
formMap: {

@ -0,0 +1,140 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="query" class="query-form" size="mini" :inline="true">
<el-form-item class="query-form-item" label="条码:">
<el-input v-model="query.code" placeholder="请扫描或输入条码" clearable="true"></el-input>
</el-form-item>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="codeArray" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="条码" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="扫码数量" prop="count"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="deleteCountCode(scope.row.id)"
>减一
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="getCodeList"
></pagination>
</el-card>
</div>
</template>
<script>
import {getCountCodesList, deleteCode} from "@/api/inventory/invCountCodes";
export default {
name: "InvCountCodes",
props: {
countQuery: {
type: Object,
required: true,
},
getCountOrderDetail: {
type: Function,
required: true
}
},
data() {
return {
query: {
code: null,
productId: null,
orderIdFk: null,
batchNo: null,
page: 1,
limit: 20
},
loading: true,
codeArray: [],
total: 0,
}
},
methods: {
onReset() {
this.query = {
code: null,
productId: null,
orderIdFk: null,
batchNo: null,
page: 1,
limit: 20
};
this.getCodeList();
},
onSubmit() {
this.query.page = 1;
this.getCodeList();
},
getCodeList() {
this.loading = true;
this.query.relId = this.codeQuery.relId;
this.query.orderIdFk = this.codeQuery.orderIdFk;
this.query.batchNo = this.codeQuery.batchNo;
getCountCodesList(this.query).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.codeArray = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.codeArray = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.codeArray = [];
this.total = 0;
})
},
deleteCountCode(row) {
this.$confirm('是否删除此条码?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
orderIdFk: row.orderIdFk,
relId: row.relId,
code: row.code
};
deleteCode(params).then((res) => {
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getCodeList();
this.getCountOrderDetail();
} else {
this.$message.error(res.data.message);
}
})
}).catch(() => {
});
},
},
created() {
this.getCodeList();
},
};
</script>

@ -0,0 +1,401 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
<el-form-item class="query-form-item" label="盘点单号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入盘点单号"
clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="领用仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@current-change="handleChange"
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderId" width="300"></el-table-column>
<el-table-column label="仓库" prop="invName" width="300"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="300"></el-table-column>
<el-table-column label="盘点类型" prop="countType" width="150">
<template slot-scope="scope">
<span>{{ countTypeMap[scope.row.countType] }}</span>
</template>
</el-table-column>
<el-table-column label="盘点人" prop="createUserName" width="200"></el-table-column>
<el-table-column label="盘点时间" prop="createTime"></el-table-column>
<el-table-column label="状态" prop="status" width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="auditCountOrder(scope.row)"
>审核
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="盘点数量" prop="countNum" width="150"></el-table-column>
<el-table-column label="账面数量" prop="invNum" width="150"></el-table-column>
<el-table-column label="盘盈数量" prop="profitNum" width="150"></el-table-column>
<el-table-column label="盘亏数量" prop="lossNum" width="150"></el-table-column>
<el-table-column label="盈亏状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag>
{{ countStatusMap[scope.row.status] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="showCode(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-dialog
title="码详情"
:visible.sync="codesVisible"
width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="codesVisible"
append-to-body
>
<invCountCodes
:codeQuery="codeQuery"
></invCountCodes>
</el-dialog>
</div>
</template>
<script>
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {
getCountOrderList,
deleteCountOrder,
updateCountOrderStatus, getCountOrderDetailList
} from "@/api/inventory/invCountOrder";
import invCountCodes from "@/views/inventory/InvCountCodes.vue";
export default {
name: "InvCountOrderAudit",
data() {
return {
filterQuery: {
orderId: null,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
status: 1,
page: 1,
limit: 20,
},
list: [],
total: 0,
invList: [],
spaceList: [],
loading: false,
formVisible: false,
statusMap: {
0: "草稿",
1: "未审核",
2: "已审核"
},
countOrder: {},
countType: null,
countTypeMap: {
0: "整库盘点",
1: "货位盘点",
2: "部分盘点"
},
countStatusMap: {
0: '亏损',
1: '盈利',
2: "平衡"
},
detailQuery: {
orderIdFk: null,
page: 1,
limit: 20
},
detailList: [],
detailTotal: 0,
detailLoading: false,
codeQuery: {
orderIdFk: null,
relId: null,
batchNo: null,
edit: false
},
codesVisible: false
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
orderId: null,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
status: 1,
page: 1,
limit: 20,
};
this.spaceList = [];
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getCountOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
})
},
invChange() {
this.spaceList = [];
this.filterQuery.fromInvSpaceCode = null;
this.getSpaceList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
this.getList();
})
},
addCountOrder(type) {
this.formVisible = true;
this.formName = 'add_' + type;
this.countOrder = {};
this.countType = type;
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该盘点单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteCountOrder(params).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.loading = false;
});
});
},
auditCountOrder(row) {
let params = {
id: row.id,
status: null
};
this.$confirm('请选择审核意见', '提示', {
confirmButtonText: '通过',
cancelButtonText: '驳回',
type: 'warning',
center: true,
closeOnPressEscape: false,// ESC
closeOnClickModal: false,//
distinguishCancelAndClose: true,//
}).then(() => {
params.status = 2; //
updateCountOrderStatus(params).then((res) => {
if (res.code === 20000) {
this.$message.success("审核通过");
this.getList();
this.onRestDetail();
} else {
this.$message.error(res.message);
}
}).catch(() => {
});
}).catch((action) => {
if (action === 'cancel') {
//
params.status = 0; //
updateCountOrderStatus(params).then((res) => {
if (res.code === 20000) {
this.$message.success("审核通过");
this.$message.success("已驳回");
this.getList();
this.onRestDetail();
} else {
this.$message.error(res.message);
}
}).catch(() => {
});
} else {
//
return;
}
});
},
onRestDetail() {
this.detailQuery = {
orderIdFk: null,
page: 1,
limit: 20
};
this.detailList = [];
this.detailTotal = 0;
},
handleChange(row) {
this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1;
this.getCountOrderDetailList()
},
getCountOrderDetailList() {
this.detailLoading = true;
getCountOrderDetailList(this.detailQuery).then((res) => {
this.detailLoading = false;
if (res.code === 20000) {
this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailLoading = false;
this.detailList = [];
this.detailTotal = 0;
});
},
showCode(row) {
this.codeQuery = {
orderIdFk: row.orderIdFk,
relId: row.relId,
batchNo: row.batchNo,
edit: false
};
this.codesVisible = true;
},
},
components: {
invCountCodes
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -0,0 +1,315 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
<el-form-item class="query-form-item" label="盘点单号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入盘点单号"
clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="领用仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@current-change="handleChange"
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderId" width="300"></el-table-column>
<el-table-column label="仓库" prop="invName" width="300"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="300"></el-table-column>
<el-table-column label="盘点类型" prop="countType" width="150">
<template slot-scope="scope">
<span>{{ countTypeMap[scope.row.countType] }}</span>
</template>
</el-table-column>
<el-table-column label="盘点人" prop="createUserName" width="200"></el-table-column>
<el-table-column label="盘点时间" prop="createTime"></el-table-column>
<el-table-column label="状态" prop="status" width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="盘点数量" prop="countNum" width="150"></el-table-column>
<el-table-column label="账面数量" prop="invNum" width="150"></el-table-column>
<el-table-column label="盘盈数量" prop="profitNum" width="150"></el-table-column>
<el-table-column label="盘亏数量" prop="lossNum" width="150"></el-table-column>
<el-table-column label="盈亏状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag>
{{ countStatusMap[scope.row.status] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="showCode(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-dialog
title="码详情"
:visible.sync="codesVisible"
width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="codesVisible"
append-to-body
>
<invCountCodes
:codeQuery="codeQuery"
></invCountCodes>
</el-dialog>
</div>
</template>
<script>
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {
getCountOrderList,
getCountOrderDetailList
} from "@/api/inventory/invCountOrder";
import invCountCodes from "@/views/inventory/InvCountCodes.vue";
export default {
name: "InvCountOrderCompleted",
data() {
return {
filterQuery: {
orderId: null,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
status: 2,
page: 1,
limit: 20,
},
list: [],
total: 0,
invList: [],
spaceList: [],
loading: false,
formVisible: false,
statusMap: {
0: "草稿",
1: "未审核",
2: "已审核"
},
countOrder: {},
countType: null,
countTypeMap: {
0: "整库盘点",
1: "货位盘点",
2: "部分盘点"
},
countStatusMap: {
0: '亏损',
1: '盈利',
2: "平衡"
},
detailQuery: {
orderIdFk: null,
page: 1,
limit: 20
},
detailList: [],
detailTotal: 0,
detailLoading: false,
codeQuery: {
orderIdFk: null,
relId: null,
batchNo: null,
edit: false
},
codesVisible: false
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
orderId: null,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
status: 2,
page: 1,
limit: 20,
};
this.spaceList = [];
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getCountOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
})
},
invChange() {
this.spaceList = [];
this.filterQuery.fromInvSpaceCode = null;
this.getSpaceList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
this.getList();
})
},
addCountOrder(type) {
this.formVisible = true;
this.formName = 'add_' + type;
this.countOrder = {};
this.countType = type;
},
onRestDetail() {
this.detailQuery = {
orderIdFk: null,
page: 1,
limit: 20
};
this.detailList = [];
this.detailTotal = 0;
},
handleChange(row) {
this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1;
this.getCountOrderDetailList()
},
getCountOrderDetailList() {
this.detailLoading = true;
getCountOrderDetailList(this.detailQuery).then((res) => {
this.detailLoading = false;
if (res.code === 20000) {
this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailLoading = false;
this.detailList = [];
this.detailTotal = 0;
});
},
showCode(row) {
this.codeQuery = {
orderIdFk: row.orderIdFk,
relId: row.relId,
batchNo: row.batchNo,
edit: false
};
this.codesVisible = true;
},
},
components: {
invCountCodes
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -0,0 +1,595 @@
<template>
<div>
<el-card style="margin: 5px;margin-top: -20px">
<el-form :model="formData" ref="dataForm" label-width="100px" style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button
v-if="countType != 2"
type="primary"
:disabled="this.codeArray.length > 0"
@click.native="startCount()"
>开始盘点
</el-button>
<el-button
v-if="countType != 2"
type="primary"
:disabled="this.codeArray.length > 0"
@click.native="startCount()"
>录入产品
</el-button>
<el-button
type="primary"
@click.native="saveOrder()"
>保存
</el-button>
</el-button-group>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="盘点单号:">
<el-input v-model="formData.orderId"
auto-complete="off"
:disabled="true"
style="width: 90%"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="盘点日期:">
<el-input v-model="formData.createTime"
auto-complete="off"
:disabled="true"
style="width: 90%"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="盘点仓库:">
<el-select v-model="formData.invCode" placeholder="盘点仓库信息"
:disabled="codeArray.length >0 "
@change="invChange"
style="width: 90%"
clearable>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="盘点货位:">
<el-select v-model="formData.invSpaceCode" placeholder="盘点货位信息"
:disabled="codeArray.length >0 "
@change="invSpaceChange"
style="width: 90%;"
clearable>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码录入:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="formData.code"
></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button
type="primary"
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
>添加
</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;margin-top: 20px;"
highlight-current-row
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column width="150" label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column width="150" label="库存数量" prop="invNum"></el-table-column>
<el-table-column width="150" label="盘点数量" prop="countNum"></el-table-column>
<el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column label="失效日期(yyMMdd)" prop="expireDate" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="showCodes(scope.$index, scope.row)"
>码详情
</el-button>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="deleteOrderDetail(scope.$index, scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<el-dialog
title="库存产品录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectInvProductVisible"
:append-to-body='true'
>
<el-form :inline="true" :model="filterQuery" size="mini">
<el-row>
<el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="queryInvProductsList"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="combine"></el-button>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table v-loading="loading" :data="productList" style="width: 100%"
highlight-current-row="false"
:row-key="getRowKeys"
@selection-change="handleSelectionChange"
ref="multipleTable">
<el-table-column
type="selection"
:reserve-selection="true"
width="55">
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column>
<el-table-column label="结余数量" prop="reCount"></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="queryInvProducts"
></pagination>
</el-dialog>
<el-dialog
title="码详情"
:visible.sync="codesVisible"
width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="codesVisible"
append-to-body
>
<invCountCodes
:codeQuery="codeQuery"
:getCountOrderDetail="getList"
></invCountCodes>
</el-dialog>
</div>
</template>
<script>
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {
saveCountOrder,
getCountOrderDetailList,
deleteCountOrderDetail,
addCountOrderDetail
} from "@/api/inventory/invCountOrder";
import {addCode} from "@/api/inventory/invCountCodes";
import {getCountInvProductProduct} from "@/api/inventory/invPorduct";
import {isBlank} from "@/utils/strUtil";
import {getInvListByUser} from "@/api/system/invWarehouse";
import invCountCodes from "@/views/inventory/InvCountCodes.vue";
export default {
props: {
countOrder: {
type: Object,
required: true,
},
closeDialog: {
type: Function,
required: true,
},
countType: {
type: Number,
required: true
},
getCountOrderList: {
type: Function,
required: true
}
},
data() {
return {
formData: {
code: null,
orderId: null,
createTime: null,
deptCode: null,
invCode: null,
invSpaceCode: null,
countType: this.countType
},
codeArray: [],
total: 0,
loading: false,
index: null,
selectInvProductVisible: false,
invList: [],
spaceList: [],
filterQuery: {
invCode: null,
invSpaceCode: null,
nameCode: null,
cpmctymc: null,
batchNo: null,
page: 1,
limit: 10
},
productList: [],
scanText: "扫码录入:",
codesList: [],
detailQuery: {
orderIdFk: null
},
detailTotal: 0,
countProductList: [],
codesNum: 0,
codeQuery: {
relId: null,
orderIdFk: null,
batchNo: null,
edit: true
},
codesVisible: false,
disableSpace: false,
multiProduct: []
}
},
methods: {
getInvList() {
getInvListByUser().then((res) => {
if (res.code === 20000) {
this.invList = res.data || [];
if (!isBlank(this.countOrder.invSpaceCode)) {
this.formData.invCode = this.countOrder.invCode;
this.invList.forEach((item) => {
if (item.code === this.formData.invCode) {
this.formData.deptCode = item.parentId;
}
})
this.invChange();
}
}
});
},
invChange() {
// ID
this.invList.forEach((item) => {
if (item.code === this.formData.invCode) {
this.formData.deptCode = item.parentId;
}
});
this.formData.invSpaceCode = null;
this.spaceList = [];
let params = {invWarehouseCode: this.formData.invCode};
getInvSpaceList(params).then((res) => {
if (!isBlank(this.countOrder.invSpaceCode)) {
this.formData.invSpaceCode = this.countOrder.invSpaceCode;
}
this.spaceList = res.data.list || [];
});
},
invSpaceChange() {
this.$forceUpdate();
},
saveOrder(type) {
let orderData = {
orderId: this.formData.orderId,
createTime: this.formData.billDate,
deptCode: this.formData.deptCode,
invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode,
countType: this.countType
};
saveCountOrder(orderData).then((res) => {
if (res.code === 20000) {
this.formData.orderId = res.data.orderId;
this.formData.createTime = res.data.createTime;
this.$message.success("保存成功");
if (type != null) {
//
this.countProductList.forEach(product => {
let detailData = {
orderIdFk: this.formData.orderId,
relId: product.relIdFk,
nameCode: product.nameCode,
batchNo: product.batchNo,
produceDate: product.productionDate,
expireDate: product.expireDate
};
addCountOrderDetail(detailData).then((result) => {
if (result.code === 20000) {
this.getList();
this.getCountOrderList();
}
});
})
} else {
this.closeDialog();
}
} else {
this.$message.error(res.message);
}
});
},
getInputFocus(event) {
event.currentTarget.select();
},
enterKey(event) {
if (this.codeArray.length === 0) {
this.$message.error("请先录入盘点产品!");
return;
}
this.addCode();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
addCode() {
if (this.countType != 1) {
if (isBlank(this.formData.invCode)) {
this.$message.error("请先选择盘点仓库信息")
return;
}
} else if (this.countType === 1) {
if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) {
this.$message.error("请先选择盘点仓库和货位信息");
return;
}
}
if (this.codeArray.length < 1) {
this.$message.error("未选择盘点产品!")
return;
}
this.formData.code.trim();
let params = {
orderIdFk: this.formData.orderId,
code: this.formData.code
};
addCode(params).then((res) => {
if (res.code === 20000) {
this.getList()
} else {
this.$message.error(res.message);
}
})
},
deleteOrderDetail(index, row) {
this.$confirm('此操作将删除单据详情,是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: row.id};
deleteCountOrderDetail(params).then((res) => {
if (res.code === 20000) {
this.$message.success("删除成功");
this.getList();
}
})
}).catch(() => {
});
},
getList() {
let params = {orderIdFk: this.formData.orderId};
getCountOrderDetailList(params).then((res) => {
if (res.code === 20000) {
this.codeArray = res.data.list || [];
}
});
},
onReset() {
this.filterQuery = {
invCode: null,
invSpaceCode: null,
nameCode: null,
cpmctymc: null,
batchNo: null,
page: 1,
limit: 10
};
this.countProductList = [];
this.queryInvProducts();
},
queryInvProductsList() {
this.filterQuery.page = 1;
this.queryInvProducts();
},
queryInvProducts() {
this.filterQuery.invCode = this.formData.invCode;
this.filterQuery.invSpaceCode = this.formData.invSpaceCode;
getCountInvProductProduct(this.filterQuery).then((res) => {
if (res.code === 20000) {
this.productList = res.data.list || [];
this.productTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
this.productList = [];
this.productTotal = 0;
}
}).catch((error) => {
this.$message.error(error.message);
this.productList = [];
this.productTotal = 0;
});
},
combine() {
if (this.multiProduct.length === 0) {
this.$message.warning("请选择产品");
return;
}
this.multiProduct.forEach(product => {
this.countProductList.push(product);
})
if (this.codeArray.length === 0) {
//
this.saveOrder(1);
}
this.selectInvProductVisible = false;
},
getRowKeys(row) {
return row.id;
},
handleSelectionChange(selectedRows) {
this.multiProduct = [];
selectedRows.forEach(item => {
this.multiProduct.push(item);
});
},
startCount() {
this.countProductList = [];
if (this.countType === 0) {
if (isBlank(this.formData.invCode)) {
this.$message.warning("请先选择盘点仓库");
return;
}
//
let params = {
invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode
};
getCountInvProductProduct(params).then((res) => {
if (res.data.total !== 0) {
let invProductList = res.data.list;
for (let product of invProductList) {
this.countProductList.push(product);
}
this.saveOrder(1);
}
});
} else if (this.countType === 1) {
if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) {
this.$message.warning("请先选择盘点仓库和货位");
return;
}
let params = {
invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode
};
getCountInvProductProduct(params).then((res) => {
if (res.data.total !== 0) {
let invProductList = res.data.list;
for (let product of invProductList) {
this.countProductList.push(product);
}
this.saveOrder(1);
}
});
} else if (this.countType === 2) {
if (isBlank(this.formData.invStorageCode) || isBlank(this.formData.invWarehouseCode)) {
this.$message.warning("请先选盘点仓库");
return;
}
this.multiProduct = [];
this.selectInvProductVisible = true;
this.queryInvProducts();
}
},
showCodes(index, row) {
this.codesVisible = true;
this.codeQuery = {
orderIdFk: row.orderIdFk,
relId: row.relId,
batchNo: row.batchNo,
edit: true
}
},
},
components: {
invCountCodes
},
created() {
this.getInvList();
this.formData = this.countOrder;
if (!isBlank(this.formData.orderId)) {
//
let params = {orderIdFk: this.countOrder.orderId};
getCountOrderDetailList(params).then((res) => {
if (res.code === 20000) {
this.codeArray = res.data.list || [];
this.total = res.data.total || 0;
}
})
}
},
};
</script>

@ -0,0 +1,333 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
<el-form-item class="query-form-item" label="盘点单号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入盘点单号"
clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="领用仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addCountOrder(0)"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addCountOrder(1)"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addCountOrder(2)"></el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderId" width="300"></el-table-column>
<el-table-column label="仓库" prop="invName" width="300"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="300"></el-table-column>
<el-table-column label="盘点类型" prop="countType" width="150">
<template slot-scope="scope">
<span>{{ countTypeMap[scope.row.countType] }}</span>
</template>
</el-table-column>
<el-table-column label="盘点人" prop="createUserName" width="200"></el-table-column>
<el-table-column label="盘点时间" prop="createTime"></el-table-column>
<el-table-column label="状态" prop="status" width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="printOrder(scope.row)"
>打印
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="editOrder(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="submitAudit(scope.row)"
>提交审核
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-dialog
:title="formMap[formName]"
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="formVisible"
>
<invCountOrderModify
:closeDialog="closeDialog"
:countOrder="countOrder"
:getCountOrderList="getList"
:countType="countType"
></invCountOrderModify>
</el-dialog>
</div>
</template>
<script>
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {
getCountOrderList,
deleteCountOrder,
submitAudit,
verifyTemplateFile,
printOrder
} from "@/api/inventory/invCountOrder";
import invCountOrderModify from "@/views/inventory/InvCountOrderModify.vue";
export default {
name: "InvCountOrderNew",
data() {
return {
filterQuery: {
orderId: null,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
status: 0,
page: 1,
limit: 20,
},
list: [],
total: 0,
invList: [],
spaceList: [],
loading: false,
formVisible: false,
statusMap: {
0: "草稿",
1: "未审核",
2: "已审核"
},
formName: null,
formMap: {
add_0: "新增整库盘点单",
add_1: "新增货位盘点单",
add_2: "新增部分盘点单",
edit_0: "编辑整库盘点单",
edit_1: "编辑货位盘点单",
edit_2: "编辑部分盘点单"
},
countOrder: {},
countType: null,
countTypeMap: {
0: "整库盘点",
1: "货位盘点",
2: "部分盘点"
}
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
orderId: null,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
status: 0,
page: 1,
limit: 20,
};
this.spaceList = [];
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getCountOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
})
},
invChange() {
this.spaceList = [];
this.filterQuery.fromInvSpaceCode = null;
this.getSpaceList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
this.getList();
})
},
addCountOrder(type) {
this.formVisible = true;
this.formName = 'add_' + type;
this.countOrder = {};
this.countType = type;
},
printOrder(row) {
let query = {moduleId: 6};
this.loading = true;
verifyTemplateFile(query).then((res) => {
if (res.code === 20000) {
let printParams = {
templateId: res.data,
orderId: row.orderId
};
printOrder(printParams).then((response) => {
//pdfurl
const binaryData = [];
binaryData.push(response);
//blob
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//pdf
})
} else {
this.loading = false;
this.$message.error(res.message);
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
})
},
editOrder(row) {
this.formVisible = true;
this.formName = "edit_" + row.countType;
this.deviceReceiveOrder = row;
},
submitAudit(row) {
let params = {id: row.id};
submitAudit(params).then((res) => {
if (res.code === 20000) {
this.$message.success("提交成功!");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该盘点单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteCountOrder(params).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.loading = false;
});
});
},
closeDialog() {
this.formVisible = false;
this.getList();
},
},
components: {
invCountOrderModify
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -160,7 +160,7 @@ export default {
statusMap: {
0: "草稿",
1: "未审核",
2: "已完成"
2: "已审核"
},
detailQuery: {
orderIdFk: null,

@ -143,7 +143,7 @@ export default {
statusMap: {
0: "草稿",
1: "未审核",
2: "已完成"
2: "已审核"
},
detailList: [],
detailLoading: false,

@ -133,7 +133,7 @@ export default {
statusMap: {
0: "草稿",
1: "未审核",
2: "已完成"
2: "已审核"
},
formName: null,
formMap: {

Loading…
Cancel
Save