1.添加库存养护相关页面和api文件

2.完善新增库存养护记录页面
feature-order-fix
x_z 3 years ago
parent d103fde86d
commit eb850d80af

@ -0,0 +1,89 @@
import axios from "../../utils/axios";
export function getMAOrderList(params) {
return axios({
url: "/inv/MA/order/filterList",
method: "get",
params: params
});
}
export function addOrder(data) {
return axios({
url: "/inv/MA/order/addOrder",
method: "post",
data: data
});
}
export function updateOrder(data) {
return axios({
url: "/inv/MA/order/update",
method: "post",
data: data
});
}
export function submitAudit(data) {
return axios({
url: "/inv/MA/order/submitAudit",
method: "post",
data: data
});
}
export function updateStatus(data) {
return axios({
url: "/inv/MA/order/updateStatus",
method: "post",
data: data
});
}
export function deleteOrder(data) {
return axios({
url: "/inv/MA/order/delete",
method: "post",
data: data
});
}
export function getMAOrderDetailList(params) {
return axios({
url: "/inv/MA/order/detail/filterList",
method: "get",
params: params
});
}
export function addOrderDetail(data) {
return axios({
url: "/inv/MA/order/detail/addOrderDetail",
method: "post",
data: data
});
}
export function batchAddDetail(data) {
return axios({
url: "/inv/MA/order/detail/batchAddDetail",
method: "post",
data: data
});
}
export function deleteDetail(data) {
return axios({
url: "/inv/MA/order/detail/delete",
method: "post",
data: data
});
}
export function updateDetail(data) {
return axios({
url: "/inv/MA/order/detail/update",
method: "post",
data: data
});
}

@ -112,6 +112,11 @@ import invCountSetting from "@/views/inventory/invCountSetting";
//货物摆放
import invGoodsPlacement from "@/views/inventory/InvGoodsPlacement";
//库存养护记录
import invMAOrderNew from "@/views/inventory/invMAOrderNew";
import invMAOrderAudit from "@/views/inventory/invMAOrderAudit";
import invMAOrderCompleted from "@/views/inventory/invMAOrderCompleted";
//库存
import invProducts from "../views/inventory/InvProducts.vue";
@ -1456,7 +1461,7 @@ export const asyncRouterMap = [
children: [
{
path: "maintenanceOrderNew",
component: invGoodsPlacement,
component: invMAOrderNew,
name: "新增养护记录",
icon: "",
meta: {
@ -1465,7 +1470,7 @@ export const asyncRouterMap = [
},
{
path: "maintenanceOrderAudit",
component: invGoodsPlacement,
component: invMAOrderAudit,
name: "审核养护记录",
icon: "",
meta: {
@ -1476,7 +1481,7 @@ export const asyncRouterMap = [
},
{
path: "maintenanceOrderCompleted",
component: invGoodsPlacement,
component: invMAOrderCompleted,
name: "养护记录查询",
icon: "",
meta: {

@ -0,0 +1,300 @@
<template>
<div>
<el-form :model="formData" ref="dataForm">
<el-button-group style="display: flex;margin: -50px 0 10px 80%; height: 35px">
<el-button
type="primary"
:disabled="this.detailList.length > 0"
@click.native="selectInvProduct()"
>录入产品
</el-button>
<el-button
type="primary"
@click.native="saveOrder()"
>保存
</el-button>
</el-button-group>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="3">
<div class="ao-text">
<span>养护记录号</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="orderId">
<el-input v-model="formData.orderId" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>养护日期</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="billDate">
<el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 0px">
<el-col :span="3">
<div class="ao-text">
<span>养护仓库</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="盘点分库信息"
:disabled="detailList.length>0"
@change="warehouseChange"
clearable>
<el-option
v-for="item in warehouseList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>养护货位</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item class="query-form-item" prop="invSpaceCode">
<el-select v-model="formData.invSpaceCode" placeholder="盘点货位信息"
clearable>
<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-col>
</el-row>
<el-row :gutter="20" style="margin-top: 12px">
<el-col :span="2">
<div class="ao-text">
<el-link
target="_blank">{{ scanText }}
</el-link>
</div>
</el-col>
<el-col :span="16">
<el-form-item prop="code">
<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-group style="display: flex">
<el-button
type="primary"
size="small"
@click.native.stop="addCode()"
style="height: 31px; margin-left: 20px"
>添加
</el-button
>
</el-button-group>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="11" style="margin-left: 40px">
</el-col>
<el-col :span="3">
<div class="text item" style="margin-left: 30px"> 养护产品数量{{ detailList.length }}
</div>
</el-col>
</el-row>
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 10px;"
max-height="300" height="300" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" type="index" width="150"></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="invNum"
show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="盘点数量" prop="countNum"
show-overflow-tooltip></el-table-column>
<el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate">
</el-table-column>
<el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate" show-overflow-tooltip>
</el-table-column>
<el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip>
</el-table-column>
<el-table-column width="150" label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<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>
</div>
</template>
<script>
import {filterSubAll} from "@/api/basic/invSubWarehouse";
import {getSpaceCodeList} from "@/api/inventory/invSpace";
import {
addOrder,
addOrderDetail,
batchAddDetail,
updateDetail,
updateOrder,
deleteDetail,
getMAOrderDetailList
} from "@/api/inventory/invMAOrder";
import {isBlank} from "@/utils/strUtil";
export default {
name: "",
props: {
maOrder: {
type: Object,
required: true,
},
closeDialog: {
type: Function,
required: true,
},
},
data() {
return {
warehouseList: [],
spaceList: [],
formData: {
orderId: null,
createTime: null,
invWarehouseCode: null,
invSpaceCode: null,
code: null,
},
detailList: [],
loading: false,
scanText: "扫码录入:",
}
},
methods: {
getAllWarehouse() {
filterSubAll().then((res) => {
if (res.code === 20000) {
this.warehouseList = res.data || [];
}
});
},
warehouseChange() {
this.formData.invSpaceCode = null;
this.spaceList = [];
let params = {invWarehouseCode: this.formData.invWarehouseCode};
getSpaceCodeList(params).then((res) => {
this.spaceList = res.data || [];
});
},
selectInvProduct() {
if (isBlank(this.formData.orderId)) {
this.saveOrder();
}
},
saveOrder() {
if (isBlank(this.formData.invWarehouseCode)) {
this.$message.warning("请选择养护仓库!");
return;
}
if (this.detailList.length === 0) {
this.$message.warning("请录入养护产品信息!");
return;
}
addOrder(this.formData).then((res) => {
if (res.code === 200000) {
this.formData.orderId = res.data;
this.$message.success("保存成功!");
}
});
},
getInputFocus(event) {
event.currentTarget.select();
},
enterKey(event) {
this.addCode();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
addCode() {
if (isBlank(this.formData.invWarehouseCode)) {
this.$message.warning("请先选择养护仓库!");
return;
}
if (isBlank(this.formData.orderId)) {
this.saveOrder();
}
},
deleteOrderDetail(index, row) {
},
getList() {
let params = {orderIdFk: this.formData.orderId};
getMAOrderDetailList(params).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
}
})
},
},
created() {
this.getAllWarehouse();
if (!isBlank(this.maOrder.orderId)) {
this.formData.orderId = this.maOrder.orderId;
this.formData.createTime = this.maOrder.createTime;
this.getList();
}
},
};
</script>

@ -0,0 +1,553 @@
<template>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange" size="mini">
<el-option
v-for="item in storageList"
: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">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="invWarehouseChange" size="mini">
<el-option
v-for="item in subInvList"
: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">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
size="mini">
<el-option
v-for="item in spaceCodeList"
: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>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="goodsPlacement"
>摆放
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
<el-table-column label="分库" prop="invWarehouseName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></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="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
</el-table>
</el-card>
<el-pagination
:page-size="filterQuery.limit"
:current-page="filterQuery.page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
></el-pagination>
<el-dialog
title="货物摆放"
:visible.sync="placeDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="placeDialogVisible"
>
<el-form :model="formData" :rules="formRules" ref="dataForm">
<el-button-group style="display: flex;margin: -50px 0 10px 80%; height: 35px">
<el-button
type="primary"
@click.native="saveData()"
>提交
</el-button
>
</el-button-group>
<el-row :gutter="20" style="margin-top: 0px">
<el-col :span="3">
<div class="ao-text">
<span>当前仓库</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.invStorageCode" placeholder="当前仓库信息"
@change="locInChange"
:disabled="codeArray.length>0"
clearable>
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>当前分库</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="codeArray.length>0"
@change="subStorageChange"
clearable>
<el-option
v-for="item in formSubInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3">
<div class="ao-text">
<span>当前货位</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item class="query-form-item" prop="invSpaceCode"
>
<el-select v-model="formData.invSpaceCode" placeholder="当前货位信息"
:disabled="codeArray.length>0"
clearable>
<el-option
v-for="item in formSpaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 12px">
<el-col :span="2">
<div class="ao-text">
<el-link
target="_blank">{{ scanText }}
</el-link>
</div>
</el-col>
<el-col :span="16">
<el-form-item prop="code">
<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="small"
@click.native.stop="addCode()"
style="height: 31px; margin-left: 20px"
>添加
</el-button
>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="14" style="margin-left: 40px">
</el-col>
<el-col :span="3">
<div class="text item" style="margin-left: 30px"> 条码数量{{ codeArray.length }}
</div>
</el-col>
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;margin-top: 20px;"
max-height="300" height="300" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column width="300" label="条码" prop="code" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="deleteCodeArray(scope.$index, scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
</el-form>
</el-dialog>
</div>
</template>
<script>
import draggable from "vuedraggable";
import {filterUplLocInv} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {getSpaceCodeList} from "@/api/inventory/invSpace";
import {getPlacementDetailList, bindInvSpace, checkCodeSpace} from "@/api/inventory/InvProducts";
import {isBlank} from "@/utils/strUtil";
import {userInfo} from "@/api/auth/login";
import {getMAOrderList} from "@/api/inventory/invMAOrder";
export default {
data() {
return {
filterQuery: {
invWarehouseCode: null,
page: 1,
limit: 20,
invStorageCode: null,
invSpaceCode: null,
},
detailQuery: {
code: null,
productIdFk: null,
page: 1,
limit: 20,
},
list: [],
total: 0,
loading: false,
index: null,
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
deleteLoading: false,
idQuery: null,
showSup: false,
fromOptions: [],
storageOptions: [],
storageList: [],
subInvList: [],
spaceCodeList: [],
formSubInvList: [],
formSpaceList: [],
placeDialogVisible: false,
formData: {
invStorageCode: null,
invWarehouseCode: null,
invSpaceCode: null,
code: null,
codeArray: []
},
formRules: [],
codeArray: [],
scanText: "扫码录入:",
originCode: null,
};
},
components: {
draggable,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invStorageCode: null,
invWarehouseCode: null,
invSpaceCode: null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
closeDialog() {
this.getList();
},
getList() {
this.loading = true
getPlacementDetailList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.invWarehouseCode = null;
this.filterQuery.invSpaceCode = null;
this.subInvList = [];
this.spaceCodeList = [];
let query = {
pcode: this.filterQuery.invStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
invWarehouseChange() {
this.filterQuery.invSpaceCode = null;
this.spaceCodeList = [];
let params = {
invStorageCode: this.filterQuery.invStorageCode,
invWarehouseCode: this.filterQuery.invWarehouseCode,
status: true
};
getSpaceCodeList(params).then((res) => {
this.spaceCodeList = res.data || [];
})
},
goodsPlacement() {
this.placeDialogVisible = true;
this.formData = {
code: null,
invStorageCode: null,
invWarehouseCode: null,
invSpaceCode: null
};
this.codeArray = [];
},
saveData() {
if (isBlank(this.formData.invStorageCode) || isBlank(this.formData.invWarehouseCode)
|| isBlank(this.formData.invSpaceCode)) {
this.$message.warning("请选择仓库和货位信息");
return;
}
if (this.codeArray.length === 0) {
this.$message.warning("请扫描需要摆放的货物");
return;
}
this.formData.codeArray = [];
this.codeArray.forEach(item => {
this.formData.codeArray.push(item.code);
})
bindInvSpace(this.formData).then((res) => {
if (res.code === 20000) {
this.$message.success("绑定成功");
this.placeDialogVisible = false;
this.getList();
} else {
this.$message.error("绑定失败");
}
})
},
deleteCodeArray(index, row) {
for (let i = 0; i < this.codeArray.length; i++) {
if (this.codeArray[i] === row) {
this.codeArray.splice(i, 1);
return;
}
}
},
getInputFocus(event) {
event.currentTarget.select();
},
enterKey(event) {
this.checkSuccess = true;
let tQuery = {
code: this.formData.code.trim(),
invStorageCode: this.formData.invStorageCode,
invWarehouseCode: this.formData.invWarehouseCode,
invSpaceCode: this.formData.invSpaceCode
}
this.addCode(event);
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
addCode(event) {
this.originCode = "";
if (event != null) {
event.target.select();
}
this.actionEnable = true;
this.$refs.inputRef.select();
if (isBlank(this.formData.invStorageCode)) {
this.$message.error('当前仓库不能为空');
return;
}
if (isBlank(this.formData.invWarehouseCode)) {
this.$message.error('当前分库不能为空');
return;
}
if (isBlank(this.formData.invSpaceCode)) {
this.$message.error('当前货位不能为空');
return;
}
this.formData.code = this.formData.code.trim();
if (this.$isBlank(this.formData.code)) return;
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
this.checkCode(tQuery);
this.$refs.inputRef.select();
},
locInChange() {
this.formData.invWarehouseCode = null;
this.formData.invSpaceCode = null;
this.formSubInvList = [];
this.formSpaceList = [];
let params = {pcode: this.formData.invStorageCode};
filterSubByInv(params).then((res) => {
this.formSubInvList = res.data || [];
})
},
subStorageChange() {
this.formData.invSpaceCode = null;
this.formSpaceList = [];
let params = {
invStorageCode: this.formData.invStorageCode,
invWarehouseCode: this.formData.invWarehouseCode,
status: true
};
getSpaceCodeList(params).then((res) => {
this.formSpaceList = res.data || [];
})
},
checkCode(tQuery) {
//
let flag = false;
this.codeArray.forEach(item => {
if (item.code === this.formData.code) {
this.$message.error("重复条码!");
flag = true;
return;
}
})
if (flag) {
return;
}
//
checkCodeSpace(tQuery).then((res) => {
if (res.code === 20000) {
this.codeArray.push({code: this.formData.code});
} else if (res.code === 8) {
this.loading = false;
this.$message.error(res.message);
} else if (res.code === 7) {
this.$confirm(res.data, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.codeArray.push(this.formData.code);
}).catch(() => {
this.loading = false;
this.$message({
type: 'info',
message: '已取消'
});
});
}
});
},
},
created() {
this.getStorage();
//
userInfo().then((res) => {
if (res.code === 20000) {
if (!isBlank(res.data.locInvCode)) {
this.filterQuery.invStorageCode = res.data.locInvCode;
this.invChange();
this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
this.invWarehouseChange();
}
this.getList();
}
}).catch((error) => {
});
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -0,0 +1,540 @@
<template>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invWarehouseChange" size="mini">
<el-option
v-for="item in subInvList"
: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">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
size="mini">
<el-option
v-for="item in spaceCodeList"
: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>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="goodsPlacement"
>摆放
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
<el-table-column label="分库" prop="invWarehouseName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></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="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
</el-table>
</el-card>
<el-pagination
:page-size="filterQuery.limit"
:current-page="filterQuery.page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
></el-pagination>
<el-dialog
title="货物摆放"
:visible.sync="placeDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="placeDialogVisible"
>
<el-form :model="formData" :rules="formRules" ref="dataForm">
<el-button-group style="display: flex;margin: -50px 0 10px 80%; height: 35px">
<el-button
type="primary"
@click.native="saveData()"
>提交
</el-button
>
</el-button-group>
<el-row :gutter="20" style="margin-top: 0px">
<el-col :span="3">
<div class="ao-text">
<span>当前仓库</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.invStorageCode" placeholder="当前仓库信息"
@change="locInChange"
:disabled="codeArray.length>0"
clearable>
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>当前分库</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="codeArray.length>0"
@change="subStorageChange"
clearable>
<el-option
v-for="item in formSubInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3">
<div class="ao-text">
<span>当前货位</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item class="query-form-item" prop="invSpaceCode"
>
<el-select v-model="formData.invSpaceCode" placeholder="当前货位信息"
:disabled="codeArray.length>0"
clearable>
<el-option
v-for="item in formSpaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 12px">
<el-col :span="2">
<div class="ao-text">
<el-link
target="_blank">{{ scanText }}
</el-link>
</div>
</el-col>
<el-col :span="16">
<el-form-item prop="code">
<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="small"
@click.native.stop="addCode()"
style="height: 31px; margin-left: 20px"
>添加
</el-button
>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="14" style="margin-left: 40px">
</el-col>
<el-col :span="3">
<div class="text item" style="margin-left: 30px"> 条码数量{{ codeArray.length }}
</div>
</el-col>
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;margin-top: 20px;"
max-height="300" height="300" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column width="300" label="条码" prop="code" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="deleteCodeArray(scope.$index, scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
</el-form>
</el-dialog>
</div>
</template>
<script>
import draggable from "vuedraggable";
import {filterUplLocInv} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {getSpaceCodeList} from "@/api/inventory/invSpace";
import {getPlacementDetailList, bindInvSpace, checkCodeSpace} from "@/api/inventory/InvProducts";
import {isBlank} from "@/utils/strUtil";
import {userInfo} from "@/api/auth/login";
import {getMAOrderList} from "@/api/inventory/invMAOrder";
export default {
data() {
return {
filterQuery: {
invWarehouseCode: null,
page: 1,
limit: 20,
invStorageCode: null,
invSpaceCode: null,
},
detailQuery: {
code: null,
productIdFk: null,
page: 1,
limit: 20,
},
list: [],
total: 0,
loading: false,
index: null,
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
deleteLoading: false,
idQuery: null,
showSup: false,
fromOptions: [],
storageOptions: [],
storageList: [],
subInvList: [],
spaceCodeList: [],
formSubInvList: [],
formSpaceList: [],
placeDialogVisible: false,
formData: {
invStorageCode: null,
invWarehouseCode: null,
invSpaceCode: null,
code: null,
codeArray: []
},
formRules: [],
codeArray: [],
scanText: "扫码录入:",
originCode: null,
};
},
components: {
draggable,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invStorageCode: null,
invWarehouseCode: null,
invSpaceCode: null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
closeDialog() {
this.getList();
},
getList() {
this.loading = true
getPlacementDetailList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.invWarehouseCode = null;
this.filterQuery.invSpaceCode = null;
this.subInvList = [];
this.spaceCodeList = [];
let query = {
pcode: this.filterQuery.invStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
invWarehouseChange() {
this.filterQuery.invSpaceCode = null;
this.spaceCodeList = [];
let params = {
invStorageCode: this.filterQuery.invStorageCode,
invWarehouseCode: this.filterQuery.invWarehouseCode,
status: true
};
getSpaceCodeList(params).then((res) => {
this.spaceCodeList = res.data || [];
})
},
goodsPlacement() {
this.placeDialogVisible = true;
this.formData = {
code: null,
invStorageCode: null,
invWarehouseCode: null,
invSpaceCode: null
};
this.codeArray = [];
},
saveData() {
if (isBlank(this.formData.invStorageCode) || isBlank(this.formData.invWarehouseCode)
|| isBlank(this.formData.invSpaceCode)) {
this.$message.warning("请选择仓库和货位信息");
return;
}
if (this.codeArray.length === 0) {
this.$message.warning("请扫描需要摆放的货物");
return;
}
this.formData.codeArray = [];
this.codeArray.forEach(item => {
this.formData.codeArray.push(item.code);
})
bindInvSpace(this.formData).then((res) => {
if (res.code === 20000) {
this.$message.success("绑定成功");
this.placeDialogVisible = false;
this.getList();
} else {
this.$message.error("绑定失败");
}
})
},
deleteCodeArray(index, row) {
for (let i = 0; i < this.codeArray.length; i++) {
if (this.codeArray[i] === row) {
this.codeArray.splice(i, 1);
return;
}
}
},
getInputFocus(event) {
event.currentTarget.select();
},
enterKey(event) {
this.checkSuccess = true;
let tQuery = {
code: this.formData.code.trim(),
invStorageCode: this.formData.invStorageCode,
invWarehouseCode: this.formData.invWarehouseCode,
invSpaceCode: this.formData.invSpaceCode
}
this.addCode(event);
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
addCode(event) {
this.originCode = "";
if (event != null) {
event.target.select();
}
this.actionEnable = true;
this.$refs.inputRef.select();
if (isBlank(this.formData.invStorageCode)) {
this.$message.error('当前仓库不能为空');
return;
}
if (isBlank(this.formData.invWarehouseCode)) {
this.$message.error('当前分库不能为空');
return;
}
if (isBlank(this.formData.invSpaceCode)) {
this.$message.error('当前货位不能为空');
return;
}
this.formData.code = this.formData.code.trim();
if (this.$isBlank(this.formData.code)) return;
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
this.checkCode(tQuery);
this.$refs.inputRef.select();
},
locInChange() {
this.formData.invWarehouseCode = null;
this.formData.invSpaceCode = null;
this.formSubInvList = [];
this.formSpaceList = [];
let params = {pcode: this.formData.invStorageCode};
filterSubByInv(params).then((res) => {
this.formSubInvList = res.data || [];
})
},
subStorageChange() {
this.formData.invSpaceCode = null;
this.formSpaceList = [];
let params = {
invStorageCode: this.formData.invStorageCode,
invWarehouseCode: this.formData.invWarehouseCode,
status: true
};
getSpaceCodeList(params).then((res) => {
this.formSpaceList = res.data || [];
})
},
checkCode(tQuery) {
//
let flag = false;
this.codeArray.forEach(item => {
if (item.code === this.formData.code) {
this.$message.error("重复条码!");
flag = true;
return;
}
})
if (flag) {
return;
}
//
checkCodeSpace(tQuery).then((res) => {
if (res.code === 20000) {
this.codeArray.push({code: this.formData.code});
} else if (res.code === 8) {
this.loading = false;
this.$message.error(res.message);
} else if (res.code === 7) {
this.$confirm(res.data, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.codeArray.push(this.formData.code);
}).catch(() => {
this.loading = false;
this.$message({
type: 'info',
message: '已取消'
});
});
}
});
},
},
created() {
this.getStorage();
//
userInfo().then((res) => {
if (res.code === 20000) {
if (!isBlank(res.data.locInvCode)) {
this.filterQuery.invStorageCode = res.data.locInvCode;
this.invChange();
this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
this.invWarehouseChange();
}
this.getList();
}
}).catch((error) => {
});
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -0,0 +1,283 @@
<template>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-input placeholder="请输入养护记录号" v-model="filterQuery.orderId"
clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invWarehouseChange" size="mini">
<el-option
v-for="item in subInvList"
: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">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
size="mini">
<el-option
v-for="item in spaceCodeList"
: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>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="addMAOrder"
>新增养护记录
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="120"></el-table-column>
<el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="180" fixed="right">
<template slot-scope="scope">
<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>
</el-card>
<el-pagination
:page-size="filterQuery.limit"
:current-page="filterQuery.page"
@current-change="handleCurrentChange" kan1
layout="prev, pager, next"
:total="total"
></el-pagination>
<el-dialog
:title="formMap[formName]"
:visible.sync="formVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="formVisible"
>
<addInvMAOrder
:orderId="currentOrderId"
:closeDialog="closeDialog"
></addInvMAOrder>
</el-dialog>
</div>
</template>
<script>
import {isBlank} from "@/utils/strUtil";
import {userInfo} from "@/api/auth/login";
import {getMAOrderList, deleteOrder, submitAudit} from "@/api/inventory/invMAOrder";
import {filterSubAll} from "@/api/basic/invSubWarehouse";
import {getSpaceCodeList} from "@/api/inventory/invSpace";
import addInvMAOrder from "@/views/inventory/addInvMAOrder";
export default {
data() {
return {
filterQuery: {
invWarehouseCode: null,
invSpaceCode: null,
status: 0,
orderId: null,
page: 1,
limit: 20
},
list: [],
total: 0,
loading: false,
idQuery: null,
subInvList: [],
spaceCodeList: [],
statusMap: {
0: "草稿",
1: "未审核",
2: "已完成"
},
formVisible: false,
formName: null,
formMap: {
add: "新增养护记录",
edit: "编辑养护记录"
},
currentOrderId: null
};
},
components: {
addInvMAOrder
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invWarehouseCode: null,
invSpaceCode: null,
status: 0,
orderId: null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
getList() {
this.loading = true
getMAOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
getAllWarehouse() {
filterSubAll().then((res) => {
this.subInvList = res.data || [];
});
},
invWarehouseChange() {
this.filterQuery.invSpaceCode = null;
this.spaceCodeList = [];
let params = {
invStorageCode: this.filterQuery.invStorageCode,
invWarehouseCode: this.filterQuery.invWarehouseCode,
status: true
};
getSpaceCodeList(params).then((res) => {
this.spaceCodeList = res.data || [];
})
},
closeDialog() {
this.formVisible = false;
},
addMAOrder() {
this.currentOrderId = null;
this.formVisible = true;
},
editOrder(row) {
this.currentOrderId = row.orderId;
this.formVisible = true;
},
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(id) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: id};
deleteOrder(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);
});
},
},
created() {
this.getAllWarehouse();
//
userInfo().then((res) => {
if (res.code === 20000) {
if (!isBlank(res.data.locInvCode)) {
this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
this.invWarehouseChange();
}
this.getList();
}
}).catch((error) => {
});
},
};
</script>
<style type="text/scss" lang="scss">
</style>
Loading…
Cancel
Save