1.完成设备养护功能

feature-order-fix
x_z 3 years ago
parent 7cd0458866
commit f6dd117b8d

@ -32,7 +32,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="billDate"> <el-form-item prop="createTime">
<el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input> <el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -46,7 +46,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="billDate"> <el-form-item prop="collOrderId">
<el-input v-model="formData.collOrderId" auto-complete="off" :disabled="true"></el-input> <el-input v-model="formData.collOrderId" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -64,7 +64,6 @@
></el-table-column> ></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column> <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column> <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column width="150" label="养护数量" prop="count"></el-table-column>
<el-table-column width="150" label="养护状态" prop="maintenanceStatus"> <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus" <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus"
@ -133,10 +132,19 @@
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="领用记录号" clearable></el-input> <el-input v-model="filterQuery.orderId" placeholder="领用记录号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.deptCode" placeholder="领用部门" clearable></el-input> <el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true"
size="mini">
<el-option
v-for="item in deptList"
: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-form-item> <el-form-item>
<el-button-group> <el-button-group>
@ -145,7 +153,6 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="search" @click="combine"></el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -153,8 +160,7 @@
<el-table v-loading="collOrderLoading" :data="collectOrderList" style="width: 100%" <el-table v-loading="collOrderLoading" :data="collectOrderList" style="width: 100%"
highlight-current-row="false" highlight-current-row="false"
@current-change="combine" @current-change="combine">
ref="multipleTable">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="领用记录号" prop="orderId"></el-table-column> <el-table-column label="领用记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="deptName"></el-table-column> <el-table-column label="领用部门" prop="deptName"></el-table-column>
@ -196,21 +202,12 @@
@current-change="combine" @current-change="combine"
ref="multipleTable"> ref="multipleTable">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="领用记录号" prop="orderId"></el-table-column> <el-table-column label="产品名称" prop="productName"></el-table-column>
<el-table-column label="领用部门" prop="deptName"></el-table-column> <el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="领用人" prop="createUser"></el-table-column> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<template slot-scope="scope"> <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-button <el-table-column label="条码" prop="code" show-overflow-tooltip></el-table-column>
type="text"
size="small"
@click.stop="true"
@click.native="showCollectOrderDetail(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
@ -234,6 +231,7 @@ import {
} from "@/api/inventory/deviceMAOrder"; } from "@/api/inventory/deviceMAOrder";
import {getCollectOrderList, getCollectOrderDetailList} from "@/api/inventory/deviceCollectOrder"; import {getCollectOrderList, getCollectOrderDetailList} from "@/api/inventory/deviceCollectOrder";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {filterDepts} from "@/api/auth/authDept";
export default { export default {
props: { props: {
@ -258,17 +256,16 @@ export default {
collectOrderList: [], collectOrderList: [],
collectOrderTotal: 0, collectOrderTotal: 0,
formData: { formData: {
id: null,
orderId: null, orderId: null,
collOrderId: null, collOrderId: null,
createTime: null, createTime: null,
status: 0, status: 0,
code: null,
}, },
detailList: [], detailList: [],
loading: false, loading: false,
currentIndex: -1, currentIndex: -1,
selectCollectOrderVisible: false, selectCollectOrderVisible: false,
multiProduct: [],
collOrderDetailVisible: false, collOrderDetailVisible: false,
collOrderDetailList: [], collOrderDetailList: [],
collOrderDetailLoading: false, collOrderDetailLoading: false,
@ -278,7 +275,8 @@ export default {
page: 1, page: 1,
limit: 10 limit: 10
}, },
collOrderDetailTotal: 0 collOrderDetailTotal: 0,
deptList: []
} }
}, },
methods: { methods: {
@ -288,13 +286,20 @@ export default {
this.selectCollectOrderVisible = true; this.selectCollectOrderVisible = true;
}, },
saveMAOrder() { saveMAOrder() {
this.saveOrder(); if (!isBlank(this.formData.orderId)) {
this.closeDialog(); this.saveOrder();
this.closeDialog();
} else {
this.$message.error("请选择养护设备!");
}
}, },
saveOrder() { saveOrder() {
if (isBlank(this.formData.orderId)) { if (isBlank(this.formData.orderId)) {
addDeviceMAOrder(this.formData).then((res) => { addDeviceMAOrder(this.formData).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.formData.id = res.data.id;
this.formData.orderId = res.data.orderId;
this.formData.createTime = res.data.createTime; this.formData.createTime = res.data.createTime;
this.getList(); this.getList();
} else { } else {
@ -359,14 +364,7 @@ export default {
}); });
}, },
combine(row) { combine(row) {
if (this.multiProduct.length === 0) { this.selectCollectOrderVisible = false;
this.$message.error("请选择养护产品!");
return;
}
let invProductIds = [];
this.multiProduct.forEach(item => {
invProductIds.push(item.id);
});
this.formData.collOrderId = row.orderId; this.formData.collOrderId = row.orderId;
this.saveOrder(); this.saveOrder();
}, },
@ -375,6 +373,7 @@ export default {
this.getCollOrderDetailList(); this.getCollOrderDetailList();
}, },
showCollectOrderDetail(row) { showCollectOrderDetail(row) {
this.collOrderDetailVisible = true;
this.collOrderDetailList = []; this.collOrderDetailList = [];
this.collOrderDetailTotal = 0; this.collOrderDetailTotal = 0;
this.collDetailQuery.orderId = row.orderId; this.collDetailQuery.orderId = row.orderId;
@ -384,6 +383,7 @@ export default {
getCollOrderDetailList() { getCollOrderDetailList() {
this.collOrderDetailLoading = true; this.collOrderDetailLoading = true;
getCollectOrderDetailList(this.collDetailQuery).then((res) => { getCollectOrderDetailList(this.collDetailQuery).then((res) => {
this.collOrderDetailLoading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.collOrderDetailList = res.data.list || []; this.collOrderDetailList = res.data.list || [];
this.collOrderDetailTotal = res.data.total || 0; this.collOrderDetailTotal = res.data.total || 0;
@ -392,16 +392,24 @@ export default {
this.collOrderDetailTotal = 0; this.collOrderDetailTotal = 0;
} }
}).catch(() => { }).catch(() => {
this.collOrderDetailLoading = false;
this.collOrderDetailList = []; this.collOrderDetailList = [];
this.collOrderDetailTotal = 0; this.collOrderDetailTotal = 0;
}); });
} },
getDepts() {
filterDepts().then((res) => {
this.deptList = res.data.list || [];
})
},
}, },
created() { created() {
this.getDepts();
if (null !== this.deviceMAOrder) { if (null !== this.deviceMAOrder) {
this.formData.id = this.deviceMAOrder.id;
this.formData.orderId = this.deviceMAOrder.orderId; this.formData.orderId = this.deviceMAOrder.orderId;
this.formData.collOrderId = this.deviceMAOrder.collOrderId;
this.formData.createTime = this.deviceMAOrder.createTime; this.formData.createTime = this.deviceMAOrder.createTime;
this.formData.invWarehouseCode = this.deviceMAOrder.invWarehouseCode;
this.getList(); this.getList();
} }
}, },

@ -9,7 +9,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true" <el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true"
@change="invWarehouseChange" size="mini"> size="mini">
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.name" :key="item.name"
@ -188,23 +188,6 @@ export default {
this.total = 0; 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() { closeDialog() {
this.formVisible = false; this.formVisible = false;
this.getList(); this.getList();

@ -8,30 +8,8 @@
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true" <el-input placeholder="请输入领用记录号" v-model="filterQuery.collOrderId"
@change="invWarehouseChange" size="mini"> clearable="true"></el-input>
<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"
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>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
@ -44,132 +22,117 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="search" @click="addMAOrder"
>新增养护记录
</el-button
>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%"
highlight-current-row="true"
@current-change="handleChange"
>
<el-table-column label="序号" type="index" fixed></el-table-column> <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="invWarehouseName" width="180"></el-table-column> <el-table-column label="领用记录号" prop="collOrderId" 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="createTime" width="180"></el-table-column>
<el-table-column label="养护人" prop="createUser" 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"> </el-table>
<el-pagination
:page-size="filterQuery.limit"
:current-page="filterQuery.page"
@current-change="handleCurrentChange" kan1
layout="prev, pager, next"
:total="total"
></el-pagination>
</el-card>
<el-card>
<el-table v-loading="loading" :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"></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
<el-table-column width="150" label="养护状态" prop="maintenanceStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
:label="0">未养护
</el-radio>
<el-radio disabled="true" v-model="scope.row.maintenanceStatus"
:label="1">已养护
</el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="180" fixed="right"> <el-table-column width="150" label="设备状态" prop="deviceStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-radio v-model="scope.row.deviceStatus" :label="1" disabled="true">
type="text" 正常
size="small" </el-radio>
@click.native.stop="editOrder(scope.row)" <el-radio v-model="scope.row.deviceStatus" :label="0" disabled="true">
>编辑 异常
</el-button </el-radio>
>
<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> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" label="养护备注" prop="remark" 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"></el-table-column>
<el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column>
<el-table-column width="180" label="生产厂家" prop="ylqxzcrbarmc"></el-table-column>
</el-table> </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 <el-pagination
:title="formMap[formName]" :page-size="detailQuery.limit"
:visible.sync="formVisible" :current-page="detailQuery.page"
width="70%" @current-change="handleCurrentDetailChange"
:close-on-click-modal="false" layout="prev, pager, next"
:close-on-press-escape="false" :total="detailTotal"
v-if="formVisible" ></el-pagination>
> </el-card>
<addInvMAOrder
:maOrder="maOrder"
:closeDialog="closeDialog"
></addInvMAOrder>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {isBlank} from "@/utils/strUtil"; import {getDeviceMAOrderList, getDeviceMAOrderDetailList} from "@/api/inventory/deviceMAOrder";
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 { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
invWarehouseCode: null, status: 1,
invSpaceCode: null,
status: 0,
orderId: null, orderId: null,
collOrderId: null,
page: 1, page: 1,
limit: 20 limit: 20
}, },
list: [], list: [],
total: 0, total: 0,
loading: false, loading: false,
idQuery: null, detailList: [],
subInvList: [], detailQuery: {
spaceCodeList: [], orderIdFk: null,
statusMap: { page: 1,
0: "草稿", limit: 10
1: "未审核",
2: "已完成"
},
formVisible: false,
formName: null,
formMap: {
add: "新增养护记录",
edit: "编辑养护记录"
}, },
maOrder: null detailTotal: 0,
}; };
}, },
components: {
addInvMAOrder
},
methods: { methods: {
onReset() { onReset() {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
invWarehouseCode: null, status: 1,
invSpaceCode: null,
status: 0,
orderId: null, orderId: null,
collOrderId: null,
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -188,7 +151,9 @@ export default {
}, },
getList() { getList() {
this.loading = true this.loading = true
getMAOrderList(this.filterQuery).then((res) => { this.detailList = [];
this.detailTotal = 0;
getDeviceMAOrderList(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data.list || []; this.list = res.data.list || [];
@ -203,83 +168,35 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
getAllWarehouse() { handleChange(row) {
filterSubAll().then((res) => { this.detailQuery.orderIdFk = row.orderId;
this.subInvList = res.data || []; this.detailQuery.page = 1;
}); this.getDeviceCollOrderDetailList();
},
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) { handleCurrentDetailChange(val) {
this.maOrder = row; this.detailQuery.page = val;
this.formName = 'edit'; this.getDeviceCollOrderDetailList();
this.formVisible = true;
}, },
submitAudit(row) { getDeviceCollOrderDetailList() {
let params = {id: row.id}; this.loading = true;
submitAudit(params).then((res) => { getDeviceMAOrderDetailList(this.detailQuery).then((res) => {
this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功!"); this.detailList = res.data.list || [];
this.getList(); this.detailTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.detailList = [];
this.detailTotal = 0;
} }
}).catch((error) => { }).catch((error) => {
this.$message.error(error.message); this.loading = false;
}); this.detailList = [];
}, this.detailTotal = 0;
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() { created() {
this.getAllWarehouse(); this.getList();
//
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> </script>

@ -7,6 +7,10 @@
<el-input placeholder="请输入养护记录号" v-model="filterQuery.orderId" <el-input placeholder="请输入养护记录号" v-model="filterQuery.orderId"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item">
<el-input placeholder="请输入领用记录号" v-model="filterQuery.collOrderId"
clearable="true"></el-input>
</el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button <el-button
@ -30,7 +34,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" fixed></el-table-column> <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="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="createTime" width="180"></el-table-column>
<el-table-column label="养护人" prop="createUser" width="120"></el-table-column> <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
<el-table-column label="操作" width="180" fixed="right"> <el-table-column label="操作" width="180" fixed="right">
@ -64,7 +68,7 @@
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
:current-page="filterQuery.page" :current-page="filterQuery.page"
@current-change="handleCurrentChange" kan1 @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
></el-pagination> ></el-pagination>
@ -96,6 +100,7 @@ export default {
filterQuery: { filterQuery: {
status: 0, status: 0,
orderId: null, orderId: null,
collOrderId: null,
page: 1, page: 1,
limit: 20 limit: 20
}, },
@ -199,11 +204,13 @@ export default {
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch((error) => {
this.$message.error(error.message);
}) })
} }
}, },
created() { created() {
this.getList();
}, },
}; };
</script> </script>

Loading…
Cancel
Save