1.调整设备养护功能页面

ww
x_z 3 years ago committed by wangwei
parent 2787b09dd1
commit 42c695316f

@ -88,3 +88,11 @@ export function deleteCollectOrderDetail(data) {
});
}
export function filterDetail(params) {
return axios({
url: "/device/MA/order/detail/filterMAOrderDetail",
method: "get",
params: params
});
}

@ -8,7 +8,7 @@ export function getDeviceMAOrderList(params) {
});
}
export function addDeviceMAOrder(data) {
export function addMAOrder(data) {
return axios({
url: "/device/MA/order/addMAOrder",
method: "post",
@ -63,3 +63,19 @@ export function deleteDeviceMAOrderDetail(data) {
data: data
});
}
export function deviceList(params) {
return axios({
url: "/device/collect/order/detail/deviceList",
method: "get",
params: params
});
}
export function addDeviceMAOrder(data) {
return axios({
url: "/device/MA/order/addDeviceMAOrder",
method: "post",
data: data
});
}

@ -124,6 +124,7 @@ import deviceCollectOrderAudit from "@/views/inventory/deviceCollectOrderAudit.v
import deviceCollectOrderCompleted from "@/views/inventory/deviceCollectOrderCompleted.vue";
import deviceMAOrderNew from "@/views/inventory/deviceMAOrderNew.vue";
import deviceMAOrderCompleted from "@/views/inventory/deviceMAOrderCompleted.vue";
import assetManage from "@/views/inventory/assetManage.vue";
//库存
import invProducts from "../views/inventory/InvProducts.vue";
@ -1563,8 +1564,8 @@ export const asyncRouterMap = [
},
children: [
{
path: "deviceMAOrderNew",
component: deviceMAOrderNew,
path: "assetManage",
component: assetManage,
name: "资产管理",
icon: "",
meta: {

@ -225,7 +225,7 @@
<script>
import {
updateDeviceMAOrderDetail,
addDeviceMAOrder,
addMAOrder,
updateDeviceMAOrder,
getDeviceMAOrderDetailList
} from "@/api/inventory/deviceMAOrder";
@ -296,7 +296,7 @@ export default {
},
saveOrder() {
if (isBlank(this.formData.orderId)) {
addDeviceMAOrder(this.formData).then((res) => {
addMAOrder(this.formData).then((res) => {
if (res.code === 20000) {
this.formData.id = res.data.id;
this.formData.orderId = res.data.orderId;

@ -0,0 +1,170 @@
<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.code"
clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input placeholder="DI" v-model="filterQuery.nameCode"
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-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="collOrderId" 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="addMAOrder(scope.row)"
>养护
</el-button
>
</template>
</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="formVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="formVisible"
>
<deviceMAOrderDialog
:deviceMAOrder="deviceMAOrder"
:closeDialog="closeDialog"
>
</deviceMAOrderDialog>
</el-dialog>
</div>
</template>
<script>
import {deviceList} from "@/api/inventory/deviceMAOrder";
import deviceMAOrderDialog from "@/views/inventory/deviceMAOrderDialog.vue";
export default {
data() {
return {
filterQuery: {
code: null,
nameCode: null,
page: 1,
limit: 20
},
list: [],
total: 0,
loading: false,
idQuery: null,
formVisible: false,
formName: null,
deviceMAOrder: {
code: null,
deptName: null,
createUser: null,
createTime: null
}
};
},
components: {
deviceMAOrderDialog
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
code: null,
nameCode: null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
getList() {
this.loading = true;
deviceList(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(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
closeDialog() {
this.formVisible = false;
this.getList();
},
addMAOrder(row) {
this.deviceMAOrder = {
code: row.code,
createUser: this.$store.getters.employName,
deptName: row.deptName,
deptCode: row.deptCode,
createTime: new Date().toLocaleString()
}
this.formVisible = true;
},
},
created() {
this.getList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -0,0 +1,171 @@
<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"
@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="code">
<el-input v-model="formData.code" 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="createTime">
<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: 20px;">
<el-col :span="3">
<div class="ao-text">
<span>部门</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="deptName">
<el-input v-model="formData.deptName" 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="createTime">
<el-input v-model="formData.createUser" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-table :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="maintenanceStatus">
<template slot-scope="scope">
<el-radio v-model="scope.row.maintenanceStatus"
:label="0">未养护
</el-radio>
<el-radio 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 v-model="scope.row.deviceStatus" :label="1">
正常
</el-radio>
<el-radio 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 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>
</el-form>
</div>
</template>
<script>
import {addDeviceMAOrder} from "@/api/inventory/deviceMAOrder";
import {filterDetail} from "@/api/inventory/deviceCollectOrder";
export default {
props: {
deviceMAOrder: {
type: Object,
required: true,
},
closeDialog: {
type: Function,
required: true,
},
},
data() {
return {
collectOrderList: [],
collectOrderTotal: 0,
formData: {
code: null,
createUser: null,
createTime: null,
deptName: null,
deptCode: null,
remark: null,
maintenanceStatus: null,
deviceStatus: null
},
detailList: []
}
},
methods: {
saveOrder() {
this.formData.remark = this.detailList[0].remark;
this.formData.maintenanceStatus = this.detailList[0].maintenanceStatus;
this.formData.deviceStatus = this.detailList[0].deviceStatus;
addDeviceMAOrder(this.formData).then((res) => {
if (res.code === 20000) {
this.closeDialog();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
},
getMAOrderDetailList(code) {
let params = {code: code};
filterDetail(params).then((res) => {
this.detailList.push(res.data);
})
}
},
created() {
this.formData = {
code: this.deviceMAOrder.code,
createUser: this.deviceMAOrder.createUser,
deptName: this.deviceMAOrder.deptName,
createTime: this.deviceMAOrder.createTime,
deptCode: this.deviceMAOrder.deptCode
};
this.getMAOrderDetailList(this.deviceMAOrder.code);
},
};
</script>
Loading…
Cancel
Save