1.修改设备养护记录页面及接口文件

feature-order-fix
x_z 3 years ago
parent 8ca5929c1f
commit 2986d1b47f

@ -1,6 +1,6 @@
import axios from "../../utils/axios";
export function filterList(params) {
export function getDeviceMAOrderList(params) {
return axios({
url: "/device/MA/order/filterList",
method: "get",
@ -32,3 +32,34 @@ export function deleteDeviceMAOrder(data) {
});
}
export function getDeviceMAOrderDetailList(params) {
return axios({
url: "/device/MA/order/detail/filterList",
method: "get",
params: params
});
}
export function addDeviceMAOrderDetail(data) {
return axios({
url: "/device/MA/order/detail/addOrderDetail",
method: "post",
data: data
});
}
export function updateDeviceMAOrderDetail(data) {
return axios({
url: "/device/MA/order/detail/updateOrderDetail",
method: "post",
data: data
});
}
export function deleteDeviceMAOrderDetail(data) {
return axios({
url: "/device/MA/order/detail/deleteOrderDetail",
method: "post",
data: data
});
}

@ -122,7 +122,8 @@ import invMAOrderCompleted from "@/views/inventory/invMAOrderCompleted";
import deviceCollectOrderNew from "@/views/inventory/deviceCollectOrderNew.vue";
import deviceCollectOrderAudit from "@/views/inventory/deviceCollectOrderAudit.vue";
import deviceCollectOrderCompleted from "@/views/inventory/deviceCollectOrderCompleted.vue";
import deviceMAOrder from "@/views/inventory/deviceMAOrder.vue";
import deviceMAOrderNew from "@/views/inventory/deviceMAOrderNew.vue";
import deviceMAOrderCompleted from "@/views/inventory/deviceMAOrderCompleted.vue";
//库存
import invProducts from "../views/inventory/InvProducts.vue";
@ -1553,13 +1554,33 @@ export const asyncRouterMap = [
]
},
{
path: "deviceMAOrder",
component: deviceMAOrder,
name: "设备养护记录",
path: "/deviceMA",
component: Empty,
name: "设备养护",
icon: "",
meta: {
authRule: ["deviceManage/deviceMAOrder"]
}
},
children: [
{
path: "deviceMAOrderNew",
component: deviceMAOrderNew,
name: "新增设备养护",
icon: "",
meta: {
authRule: ["deviceMA/orderNew"]
}
},
{
path: "deviceMAOrderCompleted",
component: deviceMAOrderCompleted,
name: "设备养护查询",
icon: "",
meta: {
authRule: ["deviceMA/orderCompleted"]
}
}
]
}
]
}

@ -0,0 +1,323 @@
<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="selectCollectOrderList()"
>选择设备领用单
</el-button>
<el-button
type="primary"
@click.native="saveMAOrder()"
>保存
</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="billDate">
<el-input v-model="formData.collOrderId" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</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="code" 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 width="150" label="养护数量" prop="count"></el-table-column>
<el-table-column width="150" label="养护状态" prop="maintenanceStatus">
<template slot-scope="scope">
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus"
:label="0">未养护
</el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus"
:label="1">已养护
</el-radio>
</template>
</el-table-column>
<el-table-column width="150" label="设备状态" prop="deviceStatus">
<template slot-scope="scope">
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="1">
正常
</el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="0">
异常
</el-radio>
</template>
</el-table-column>
<el-table-column width="200" label="养护备注" prop="remark">
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.remark"></el-input>
</template>
</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="editOrderDetail(scope.$index, scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="updateOrderDetail(scope.row)"
>保存
</el-button
>
</template>
</el-table-column>
</el-table>
</el-form>
<el-dialog
title="选择领用设备"
:visible.sync="selectCollectOrderVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectCollectOrderVisible"
:append-to-body='true'
>
<el-form :inline="true" :model="filterQuery" size="mini">
<el-row>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="领用记录号" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.deptCode" 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="getDeviceCollectOrderList"
>查询
</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="collectOrderList" 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="collectOrderTotal"
></el-pagination>
</el-dialog>
</div>
</template>
<script>
import {updateDeviceMAOrderDetail, addDeviceMAOrder, updateDeviceMAOrder, getDeviceMAOrderDetailList} from "@/api/inventory/deviceMAOrder";
import {getCollectOrderList, getCollectOrderDetailList} from "@/api/inventory/deviceCollectOrder";
import {isBlank} from "@/utils/strUtil";
export default {
props: {
deviceMAOrder: {
type: Object,
required: true,
},
closeDialog: {
type: Function,
required: true,
},
},
data() {
return {
filterQuery: {
orderId: null,
deptCode: null,
page: 1,
limit: 10
},
collectOrderList: [],
collectOrderTotal: 0,
formData: {
orderId: null,
collOrderId: null,
createTime: null,
status: 0,
code: null,
},
detailList: [],
loading: false,
currentIndex: -1,
selectCollectOrderVisible: false,
multiProduct: []
}
},
methods: {
selectCollectOrderList() {
//
this.onReset();
this.selectCollectOrderVisible = true;
},
saveMAOrder() {
this.saveOrder();
this.closeDialog();
},
saveOrder() {
if (isBlank(this.formData.orderId)) {
addDeviceMAOrder(this.formData).then((res) => {
if (res.code === 20000) {
this.formData.createTime = res.data.createTime;
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
})
}
},
getList() {
let params = {orderIdFk: this.formData.orderId};
getDeviceMAOrderDetailList(params).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
}
})
},
updateOrderDetail(row) {
updateDeviceMAOrderDetail(row).then((res) => {
if (res.code === 20000) {
this.$message.success("保存成功!")
this.getList();
}
})
},
editOrderDetail(index, row) {
this.currentIndex = index;
},
onReset() {
this.filterQuery = {
orderId: null,
deptCode: null,
page: 1,
limit: 10
};
this.multiProduct = [];
this.getDeviceCollectOrderList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getDeviceCollectOrderList();
},
getDeviceCollectOrderList() {
getCollectOrderList(this.filterQuery).then((res) => {
this.collectOrderList = res.data.list || [];
this.collectOrderTotal = res.data.total || 0;
}).catch(() => {
this.collectOrderList = [];
this.collectOrderTotal = 0;
});
},
combine() {
if (this.multiProduct.length === 0) {
this.$message.error("请选择养护产品!");
return;
}
let invProductIds = [];
this.multiProduct.forEach(item => {
invProductIds.push(item.id);
});
this.formData.collOrderId = '';
this.saveOrder();
},
getRowKeys(row) {
return row.id;
},
handleSelectionChange(selectedRows) {
this.multiProduct = [];
selectedRows.forEach(item => {
this.multiProduct.push(item);
});
},
},
created() {
if (null !== this.deviceMAOrder) {
this.formData.orderId = this.deviceMAOrder.orderId;
this.formData.createTime = this.deviceMAOrder.createTime;
this.formData.invWarehouseCode = this.deviceMAOrder.invWarehouseCode;
this.getList();
}
},
};
</script>

@ -0,0 +1,212 @@
<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>
<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="orderId" 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="操作" 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="updateOrder(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"
>
<addDeviceMAOrder
:deviceMAOrder="deviceMAOrder"
:closeDialog="closeDialog"
></addDeviceMAOrder>
</el-dialog>
</div>
</template>
<script>
import {getDeviceMAOrderList, updateDeviceMAOrder, deleteDeviceMAOrder} from "@/api/inventory/deviceMAOrder";
import addDeviceMAOrder from "@/views/inventory/addDeviceMAOrder.vue";
export default {
data() {
return {
filterQuery: {
status: 0,
orderId: null,
page: 1,
limit: 20
},
list: [],
total: 0,
loading: false,
idQuery: null,
formVisible: false,
formName: null,
formMap: {
add: "新增设备养护记录",
edit: "编辑设备养护记录"
},
deviceMAOrder: null
};
},
components: {
addDeviceMAOrder
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
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
getDeviceMAOrderList(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;
});
},
closeDialog() {
this.formVisible = false;
this.getList();
},
addMAOrder() {
this.deviceMAOrder = null;
this.formName = 'add';
this.formVisible = true;
},
editOrder(row) {
this.deviceMAOrder = row;
this.formName = 'edit';
this.formVisible = true;
},
deleteDialog(id) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: id};
deleteDeviceMAOrder(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);
});
},
updateOrder(row) {
//
let data = JSON.parse(JSON.stringify(row))
data.status = 1;
updateDeviceMAOrder(data).then((res) => {
if (res.code === 20000) {
this.getList();
} else {
this.$message.error(res.message);
}
})
}
},
created() {
},
};
</script>
<style type="text/scss" lang="scss">
</style>
Loading…
Cancel
Save