1.修改设备领用相关页面,对接后端接口

feature-order-fix
x_z 3 years ago
parent 586e715e57
commit a7982a210b

@ -1,24 +1,24 @@
import axios from "../../utils/axios";
export function filterList(params) {
export function getCollectOrderList(params) {
return axios({
url: "",
url: "/device/collect/order/filterList",
method: "get",
params: params
});
}
export function addOrder(data) {
export function addCollectOrder(data) {
return axios({
url: "",
url: "/device/collect/order/addOrder",
method: "post",
data: data
});
}
export function updateOrder(data) {
export function updateCollectOrder(data) {
return axios({
url: "",
url: "/device/collect/order/update",
method: "post",
data: data
});
@ -26,26 +26,65 @@ export function updateOrder(data) {
export function submitAudit(data) {
return axios({
url: "",
url: "/device/collect/order/submitAudit",
method: "post",
data: data
});
}
export function updateStatus(data) {
export function updateCollectOrderStatus(data) {
return axios({
url: "",
url: "/device/collect/order/updateStatus",
method: "post",
data: data
});
}
export function deleteOrder(data) {
export function deleteCollectOrder(data) {
return axios({
url: "",
url: "/device/collect/order/delete",
method: "post",
data: data
});
}
export function getCollectOrderDetailList(params) {
return axios({
url: "/device/collect/order/detail/filterList",
method: "get",
params: params
});
}
export function checkCode(params) {
return axios({
url: "/device/collect/order/detail/checkCode",
method: "get",
params: params
});
}
export function addCollectOrderDetail(data) {
return axios({
url: "/device/collect/order/detail/addOrderDetail",
method: "post",
data: data
});
}
export function updateCollectOrderDetail(data) {
return axios({
url: "/device/collect/order/detail/updateOrderDetail",
method: "post",
data: data
})
}
export function deleteCollectOrderDetail(data) {
return axios({
url: "/device/collect/order/detail/deleteOrderDetail",
method: "post",
data: data
});
}

@ -1 +1,34 @@
import axios from "../../utils/axios";
export function filterList(params) {
return axios({
url: "/device/MA/order/filterList",
method: "get",
params: params
});
}
export function addDeviceMAOrder(data) {
return axios({
url: "/device/MA/order/addMAOrder",
method: "post",
data: data
});
}
export function updateDeviceMAOrder(data) {
return axios({
url: "/device/MA/order/updateMAOrder",
method: "post",
data: data
});
}
export function deleteDeviceMAOrder(data) {
return axios({
url: "/device/MA/order/deleteMAOrder",
method: "post",
data: data
});
}

@ -0,0 +1,563 @@
<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="saveDeviceCollectOrder()"
>保存
</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">
<el-col :span="3">
<div class="ao-text">
<span>领用部门</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="deptCode">
<el-select v-model="formData.deptCode" placeholder="领用部门"
:disabled="detailList.length >0 "
clearable>
<el-option
v-for="item in deptList"
: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-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="条码" width="180" prop="originCode" show-overflow-tooltip></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 label="序列号" width="200" prop="serialNo">
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.serialNo"></el-input>
</template>
</el-table-column>
<el-table-column label="领用仓库" prop="invWarehouseName"></el-table-column>
<el-table-column label="领用货位" prop="invSpaceName"></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"
v-if="scope.row.editSerialNo"
@click.stop="true"
@click.native="editOrderDetail(scope.$index, scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="updateOrderDetail(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-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">
<el-select v-model="filterQuery.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>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item" prop="invSpaceCode">
<el-select v-model="filterQuery.invSpaceCode" placeholder="领用货位信息"
:disabled="detailList.length >0 "
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-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<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="queryInvProducts"
>查询
</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>
<el-pagination
:page-size="filterQuery.limit"
:current-page="filterQuery.page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="productTotal"
></el-pagination>
</el-dialog>
</div>
</template>
<script>
import {filterSubAll} from "@/api/basic/invSubWarehouse";
import {getSpaceCodeList} from "@/api/inventory/invSpace";
import {
addCollectOrder,
updateCollectOrder,
updateCollectOrderDetail,
addCollectOrderDetail,
getCollectOrderDetailList,
deleteCollectOrderDetail,
checkCode
} from "@/api/inventory/deviceCollectOrder";
import {getMAInvProducts} from "@/api/inventory/InvProducts";
import {isBlank} from "@/utils/strUtil";
import {filterDepts} from "@/api/auth/authDept";
export default {
props: {
deviceCollectOrder: {
type: Object,
required: true,
},
closeDialog: {
type: Function,
required: true,
},
},
data() {
return {
filterQuery: {
nameCode: null,
cpmctymc: null,
batchNo: null,
invWarehouseCode: null,
invSpaceCode: null,
page: 1,
limit: 10
},
productList: [],
productTotal: 0,
warehouseList: [],
spaceList: [],
formData: {
orderId: null,
createTime: null,
deptCode: null,
status: 0,
code: null,
},
detailList: [],
loading: false,
scanText: "扫码录入:",
currentIndex: -1,
selectInvProductVisible: false,
multiProduct: [],
deptList: []
}
},
methods: {
getAllWarehouse() {
filterSubAll().then((res) => {
if (res.code === 20000) {
this.warehouseList = res.data || [];
}
});
},
warehouseChange() {
this.filterQuery.invSpaceCode = null;
this.spaceList = [];
let params = {invWarehouseCode: this.filterQuery.invWarehouseCode};
getSpaceCodeList(params).then((res) => {
this.spaceList = res.data || [];
});
},
selectInvProduct() {
this.getAllWarehouse();
//
this.saveOrder();
this.filterQuery = {
nameCode: null,
cpmctymc: null,
batchNo: null,
invWarehouseCode: null,
invSpaceCode: null,
page: 1,
limit: 10
};
this.productList = [];
this.productTotal = 0;
this.selectInvProductVisible = true;
},
saveDeviceCollectOrder() {
this.saveOrder();
this.closeDialog();
},
saveOrder(code) {
if (isBlank(this.formData.deptCode)) {
this.$message.warning("请选择领用部门!");
return;
}
if (!isBlank(this.formData.orderId)) {
//
updateCollectOrder(this.formData).then((res) => {
}).catch((error) => {
this.$message.error(error.message);
})
} else {
addCollectOrder(this.formData).then((res) => {
if (res.code === 20000) {
this.formData.id = res.data.id;
this.formData.orderId = res.data.orderId;
this.formData.createTime = res.data.createTime;
} else {
this.$message.error(res.message);
}
});
}
},
getInputFocus(event) {
event.currentTarget.select();
},
enterKey(event) {
this.addCode();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
addCode() {
if (isBlank(this.formData.deptCode)) {
this.$message.warning("请先选择养护仓库!");
return;
}
if (isBlank(this.formData.orderId)) {
this.saveOrder(this.formData.code);
return;
}
//
let checkParams = {
code: this.formData.code
}
checkCode(checkParams).then((res) => {
if (res.code === 20000) {
this.addDeviceCollectOrderDetail();
} else {
if (res.code === 3) {
this.$message.error(res.message);
} else if (res.code === 7) {
this.$confirm(res.message + ",是否继续添加?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.addDeviceCollectOrderDetail();
}).catch(() => {
});
}
}
}).catch((error) => {
});
},
addDeviceCollectOrderDetail() {
//
let params = {
orderIdFk: this.formData.orderId,
code: this.formData.code
}
addCollectOrderDetail(params).then((res) => {
if (res.code === 20000) {
this.$message.success("添加成功!");
this.getList();
} else {
this.$message.error(res.message);
}
});
},
deleteOrderDetail(index, row) {
this.$confirm('是否确认从此设备领用记录中删除此产品?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: row.id};
deleteCollectOrderDetail(params).then((res) => {
if (res.code === 20000) {
this.$message.success("删除成功");
this.getList();
}
})
}).catch(() => {
});
},
getList() {
let params = {orderIdFk: this.formData.orderId};
getCollectOrderDetailList(params).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
}
})
},
updateOrderDetail(row) {
updateCollectOrderDetail(row).then((res) => {
if (res.code === 20000) {
this.currentIndex = -1;
this.$message.success("更新成功!")
this.getList();
}
})
},
editOrderDetail(index, row) {
this.currentIndex = index;
},
onReset() {
this.filterQuery = {
nameCode: null,
cpmctymc: null,
batchNo: null,
invWarehouseCode: null,
invSpaceCode: null,
page: 1,
limit: 10
};
this.multiProduct = [];
this.queryInvProducts();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.queryInvProducts();
},
queryInvProducts() {
if (isBlank(this.filterQuery.invWarehouseCode)) {
this.$message.success("请选择领用仓库!");
return;
}
getMAInvProducts(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.error("请选择领用产品!");
return;
}
let invProductIds = [];
this.multiProduct.forEach(item => {
invProductIds.push(item.id);
});
let params = {
orderIdFk: this.formData.orderId,
invProductIds: invProductIds
};
addCollectOrderDetail(params).then((res) => {
if (res.code === 20000) {
this.selectInvProductVisible = false;
this.$message.success("添加成功!");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
})
},
getRowKeys(row) {
return row.id;
},
handleSelectionChange(selectedRows) {
this.multiProduct = [];
selectedRows.forEach(item => {
this.multiProduct.push(item);
});
},
getDepts() {
filterDepts().then((res) => {
this.deptList = res.data.list || [];
})
},
},
created() {
this.getDepts();
if (null !== this.deviceCollectOrder) {
this.formData.id = this.deviceCollectOrder.id;
this.formData.orderId = this.deviceCollectOrder.orderId;
this.formData.deptCode = this.deviceCollectOrder.deptCode;
this.formData.createTime = this.deviceCollectOrder.createTime;
this.formData.invWarehouseCode = this.deviceCollectOrder.invWarehouseCode;
this.getList();
}
},
};
</script>

@ -4,32 +4,18 @@
<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"
<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>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
<el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true"
size="mini">
<el-option
v-for="item in spaceCodeList"
v-for="item in deptList"
: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>
@ -44,22 +30,17 @@
>查询
</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 v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange">
<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="invWarehouseName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
<el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
<el-table-column label="设备领用记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
<el-table-column label="领用日期" prop="createTime" width="180"></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>
@ -70,15 +51,8 @@
<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)"
>提交审核
@click.native.stop="orderAudit(scope.row)"
>审核
</el-button
>
<el-button
@ -101,64 +75,82 @@
: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
:maOrder="maOrder"
:closeDialog="closeDialog"
></addInvMAOrder>
</el-dialog>
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="200"
label="产品通用名"
prop="productName"
></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="createTime"></el-table-column>
<el-table-column width="150" label="领用仓库" prop="invWarehouseName"></el-table-column>
<el-table-column width="150" label="领用货位" prop="invSpaceName"></el-table-column>
<el-table-column width="150" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column width="160" 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="200" label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>
<el-pagination
:page-size="detailQuery.limit"
:current-page="detailQuery.page"
@current-change="handleCurrentDetailChange"
layout="prev, pager, next"
:total="detailTotal"
></el-pagination>
</el-card>
</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";
import {
getCollectOrderList,
deleteCollectOrder,
updateCollectOrderStatus,
getCollectOrderDetailList
} from "@/api/inventory/deviceCollectOrder";
import addDeviceCollectOrder from "@/views/inventory/addDeviceCollectOrder.vue";
import {filterDepts} from "@/api/auth/authDept";
export default {
data() {
return {
filterQuery: {
invWarehouseCode: null,
invSpaceCode: null,
status: 0,
status: 1,
orderId: null,
deptCode: 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: "编辑养护记录"
deviceCollectOrder: null,
deptList: [],
detailLoading: false,
detailList: [],
detailQuery: {
orderIdFk: null,
page: 1,
limit: 20
},
maOrder: null
detailTotal: 0
};
},
components: {
addInvMAOrder
addDeviceCollectOrder
},
methods: {
onReset() {
@ -166,10 +158,9 @@ export default {
path: "",
});
this.filterQuery = {
invWarehouseCode: null,
invSpaceCode: null,
status: 0,
status: 1,
orderId: null,
deptCode: null,
page: 1,
limit: 20,
};
@ -188,7 +179,9 @@ export default {
},
getList() {
this.loading = true
getMAOrderList(this.filterQuery).then((res) => {
this.detailList = [];
this.detailTotal = 0;
getCollectOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
@ -203,58 +196,14 @@ export default {
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;
this.getList();
},
addMAOrder() {
this.maOrder = null;
this.formName = 'add';
this.formVisible = true;
},
editOrder(row) {
this.maOrder = row;
this.formName = 'edit';
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('此操作将永久删除该养护记录, 是否继续?', '提示', {
this.$confirm('此操作将永久删除设备领用记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: id};
deleteOrder(params).then((res) => {
deleteCollectOrder(params).then((res) => {
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getList();
@ -266,20 +215,80 @@ export default {
this.$message.error(error.message);
});
},
getDepts() {
filterDepts().then((res) => {
this.deptList = res.data.list || [];
})
},
orderAudit(row) {
this.$confirm('请选择审批意见', '提示', {
confirmButtonText: '通过',
cancelButtonText: '驳回',
type: 'warning',
center: true
}).then(() => {
let params = {
id: row.id,
status: 2
};
updateCollectOrderStatus(params).then((res) => {
if (res.code === 20000) {
this.$message("审核通过!");
this.getList();
}
})
}).catch((action) => {
if (action === "cancel") {
let params = {
id: row.id,
status: 0
};
updateCollectOrderStatus(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);
})
}
});
},
handleCurrentDetailChange(val) {
this.detailQuery.page = val;
this.getOrderDetailList();
},
getOrderDetailList() {
this.detailLoading = true;
getCollectOrderDetailList(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;
})
},
handleChange(row) {
this.detailList = {
orderIdFk: row.orderId,
page: 1,
limit: 20
};
this.getOrderDetailList();
}
},
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) => {
});
this.getDepts();
this.getList();
},
};
</script>

@ -8,15 +8,14 @@
clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择领用部门" clearable="true"
<el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true"
@change="invWarehouseChange" size="mini">
<el-option
v-for="item in subInvList"
v-for="item in deptList"
: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>
@ -42,11 +41,10 @@
<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="invWarehouseName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
<el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
<el-table-column label="设备领用记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
<el-table-column label="领用日期" prop="createTime" width="180"></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>
@ -96,10 +94,10 @@
:close-on-press-escape="false"
v-if="formVisible"
>
<addInvMAOrder
:maOrder="maOrder"
<addDeviceCollectOrder
:deviceCollectOrder="deviceCollectOrder"
:closeDialog="closeDialog"
></addInvMAOrder>
></addDeviceCollectOrder>
</el-dialog>
</div>
@ -108,19 +106,19 @@
<script>
import {isBlank} from "@/utils/strUtil";
import {userInfo} from "@/api/auth/login";
import {getMAOrderList, deleteOrder, submitAudit} from "@/api/inventory/invMAOrder";
import {getCollectOrderList, submitAudit, deleteCollectOrder} from "@/api/inventory/deviceCollectOrder";
import {filterSubAll} from "@/api/basic/invSubWarehouse";
import {getSpaceCodeList} from "@/api/inventory/invSpace";
import addInvMAOrder from "@/views/inventory/addInvMAOrder";
import addDeviceCollectOrder from "@/views/inventory/addDeviceCollectOrder.vue";
import {filterDepts} from "@/api/auth/authDept";
export default {
data() {
return {
filterQuery: {
invWarehouseCode: null,
invSpaceCode: null,
status: 0,
orderId: null,
deptCode: null,
page: 1,
limit: 20
},
@ -138,14 +136,15 @@ export default {
formVisible: false,
formName: null,
formMap: {
add: "新增养护记录",
edit: "编辑养护记录"
add: "新增设备领用记录",
edit: "编辑设备领用记录"
},
maOrder: null
deviceCollectOrder: null,
deptList: []
};
},
components: {
addInvMAOrder
addDeviceCollectOrder
},
methods: {
onReset() {
@ -153,10 +152,9 @@ export default {
path: "",
});
this.filterQuery = {
invWarehouseCode: null,
invSpaceCode: null,
status: 0,
orderId: null,
deptCode: null,
page: 1,
limit: 20,
};
@ -175,7 +173,7 @@ export default {
},
getList() {
this.loading = true
getMAOrderList(this.filterQuery).then((res) => {
getCollectOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
@ -212,12 +210,12 @@ export default {
this.getList();
},
addMAOrder() {
this.maOrder = null;
this.deviceCollectOrder = null;
this.formName = 'add';
this.formVisible = true;
},
editOrder(row) {
this.maOrder = row;
this.deviceCollectOrder = row;
this.formName = 'edit';
this.formVisible = true;
},
@ -235,13 +233,13 @@ export default {
});
},
deleteDialog(id) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
this.$confirm('此操作将永久删除设备领用记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: id};
deleteOrder(params).then((res) => {
deleteCollectOrder(params).then((res) => {
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getList();
@ -253,20 +251,15 @@ export default {
this.$message.error(error.message);
});
},
getDepts() {
filterDepts().then((res) => {
this.deptList = res.data.list || [];
})
},
},
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) => {
});
this.getDepts();
this.getList();
},
};
</script>

@ -298,7 +298,7 @@ export default {
};
updateStatus(params).then((res) => {
if (res.code === 20000) {
this.$message.success("审核通过!");
this.$message.success("已驳回!")
this.getList();
} else {
this.$message.error(res.message);

Loading…
Cancel
Save