UDI
/
udiwms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.调整设备领用审核及查询页面

Browse Source
feature-order-fix
x_z 3 years ago
parent a7982a210b
commit 8ca5929c1f
2 changed files with 93 additions and 156 deletions
Show Stats Download Patch File Download Diff File

1
src/views/inventory/deviceCollectOrderAudit.vue
Unescape Escape View File

@ -85,6 +85,7 @@
></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="serialNo"></el-table-column>
<el-table-column width="150" label="领用日期" prop="createTime"></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="invWarehouseName"></el-table-column>
<el-table-column width="150" label="领用货位" prop="invSpaceName"></el-table-column> <el-table-column width="150" label="领用货位" prop="invSpaceName"></el-table-column>

244
src/views/inventory/deviceCollectOrderCompleted.vue
Unescape Escape View File

@ -4,32 +4,18 @@
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <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> 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-select v-model="filterQuery.deptCode" 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"
size="mini"> size="mini">
<el-option <el-option
v-for="item in spaceCodeList" v-for="item in deptList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -44,52 +30,23 @@
>查询 >查询
</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%" @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="deptName" 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="auditUser" width="120"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template> </template>
</el-table-column> </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-table>
</el-card> </el-card>
@ -101,64 +58,81 @@
:total="total" :total="total"
></el-pagination> ></el-pagination>
<el-dialog <el-card>
:title="formMap[formName]" <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
:visible.sync="formVisible" <el-table-column label="序号" type="index" width="50"></el-table-column>
width="70%" <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
:close-on-click-modal="false" <el-table-column width="200"
:close-on-press-escape="false" label="产品通用名"
v-if="formVisible" prop="productName"
> ></el-table-column>
<addInvMAOrder <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
:maOrder="maOrder" <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
:closeDialog="closeDialog" <el-table-column width="150" label="序列号" prop="serialNo"></el-table-column>
></addInvMAOrder> <el-table-column width="150" label="领用日期" prop="createTime"></el-table-column>
</el-dialog> <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> </div>
</template> </template>
<script> <script>
import {isBlank} from "@/utils/strUtil"; import {
import {userInfo} from "@/api/auth/login"; getCollectOrderList,
import {getMAOrderList, deleteOrder, submitAudit} from "@/api/inventory/invMAOrder"; getCollectOrderDetailList
import {filterSubAll} from "@/api/basic/invSubWarehouse"; } from "@/api/inventory/deviceCollectOrder";
import {getSpaceCodeList} from "@/api/inventory/invSpace"; import addDeviceCollectOrder from "@/views/inventory/addDeviceCollectOrder.vue";
import addInvMAOrder from "@/views/inventory/addInvMAOrder"; import {filterDepts} from "@/api/auth/authDept";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
invWarehouseCode: null, status: 2,
invSpaceCode: null,
status: 0,
orderId: null, orderId: null,
deptCode: null,
page: 1, page: 1,
limit: 20 limit: 20
}, },
list: [], list: [],
total: 0, total: 0,
loading: false, loading: false,
idQuery: null,
subInvList: [],
spaceCodeList: [],
statusMap: { statusMap: {
0: "草稿", 0: "草稿",
1: "未审核", 1: "未审核",
2: "已完成" 2: "已完成"
}, },
formVisible: false, deviceCollectOrder: null,
formName: null, deptList: [],
formMap: { detailLoading: false,
add: "新增养护记录", detailList: [],
edit: "编辑养护记录" detailQuery: {
orderIdFk: null,
page: 1,
limit: 20
}, },
maOrder: null detailTotal: 0
}; };
}, },
components: { components: {
addInvMAOrder addDeviceCollectOrder
}, },
methods: { methods: {
onReset() { onReset() {
@ -166,10 +140,9 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
invWarehouseCode: null, status: 2,
invSpaceCode: null,
status: 0,
orderId: null, orderId: null,
deptCode: null,
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -188,7 +161,9 @@ export default {
}, },
getList() { getList() {
this.loading = true this.loading = true
getMAOrderList(this.filterQuery).then((res) => { this.detailList = [];
this.detailTotal = 0;
getCollectOrderList(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 +178,44 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
getAllWarehouse() { getDepts() {
filterSubAll().then((res) => { filterDepts().then((res) => {
this.subInvList = res.data || []; this.deptList = res.data.list || [];
});
},
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() { handleCurrentDetailChange(val) {
this.formVisible = false; this.detailQuery.page = val;
this.getList(); this.getOrderDetailList();
}, },
addMAOrder() { getOrderDetailList() {
this.maOrder = null; this.detailLoading = true;
this.formName = 'add'; getCollectOrderDetailList(this.detailQuery).then((res) => {
this.formVisible = true; this.detailLoading = false;
},
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) { 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) => {
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(() => {
this.detailLoading = false;
this.detailList = [];
this.detailTotal = 0;
}) })
}).catch((error) => {
this.$message.error(error.message);
});
}, },
handleChange(row) {
this.detailList = {
orderIdFk: row.orderId,
page: 1,
limit: 20
};
this.getOrderDetailList();
}
}, },
created() { created() {
this.getAllWarehouse(); this.getDepts();
//获取用户默认仓库信息
userInfo().then((res) => {
if (res.code === 20000) {
if (!isBlank(res.data.locInvCode)) {
this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
this.invWarehouseChange();
}
this.getList(); this.getList();
}
}).catch((error) => {
});
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save