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

设备领用审核代码提交

Browse Source
20231126-yw
郑明梁 2 years ago
parent d074ff5bea
commit 973d91fdfd
2 changed files with 155 additions and 72 deletions
Show Stats Download Patch File Download Diff File

7
src/views/inventory/DeviceReceiveOrderAudit.vue
Unescape Escape View File

@ -100,13 +100,6 @@
>详情
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>

220
src/views/inventory/DeviceReceiveOrderCompleted.vue
Unescape Escape View File

@ -1,72 +1,90 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
<el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号"
clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true"
@change="deptChange"
>
<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 class="query-form-item" label="领用仓库:">
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
>
<el-option
v-for="item in invList"
: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" label="领用货位:">
<el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
>
<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>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
</el-button-group>
</el-form-item>
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="登记记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入登记记录号" style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="登记部门:">
<el-select v-model="filterQuery.fromDeptCode" placeholder="请选择登记部门" clearable="true"
style="width: 90%"
@change="getDeptList"
>
<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-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="登记人:">
<el-input v-model="filterQuery.receiveUserName" placeholder="请输入登记人" style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="登记时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
style="width: 90%"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@current-change="handleChange"
border>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row @current-change="handleChange" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="设备领用记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
<el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>-->
<el-table-column label="领用日期" prop="createTime"></el-table-column>
<el-table-column label="领用人" prop="receiveUserName"></el-table-column>
<el-table-column label="创建人" prop="createUser"></el-table-column>
<el-table-column label="登记记录号" prop="orderId"></el-table-column>
<el-table-column label="登记部门" prop="fromDeptName"></el-table-column>
<el-table-column label="登记人" prop="receiveUserName"></el-table-column>
<el-table-column label="审核人" prop="auditUser"></el-table-column>
<!-- <el-table-column label="登记货位" prop="fromInvSpaceName"></el-table-column>-->
<el-table-column label="登记时间" prop="createTime"></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>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="detailOrder(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
@ -78,18 +96,16 @@
</el-card>
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;" border>
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label=DI/物资编码 prop="nameCode" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
</el-table>
@ -100,6 +116,24 @@
:page.sync="detailQuery.page"
@pagination="getDetailList"
></pagination>
<el-dialog
title = "设备登记-详情"
:visible.sync="deviceReceiveOrderAuditMoifyVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="deviceReceiveOrderAuditMoifyVisible"
>
<DeviceReceiveOrderAuditMoify
:receiveQuery="receiveQuery"
:closeDialog="closeDialog"
:formName="formName"
>
</DeviceReceiveOrderAuditMoify>
</el-dialog>
</el-card>
</div>
@ -113,6 +147,7 @@ import {
getDeviceReceiveOrderDetailList,
getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder";
import DeviceReceiveOrderAuditMoify from "@/views/inventory/DeviceReceiveOrderAuditMoify"
export default {
name: "DeviceReceiveOrderCompleted",
@ -143,12 +178,51 @@ export default {
page: 1,
limit: 20,
},
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
detailList: [],
actDateRange:[],
showSearch:true,
detailLoading: false,
receiveQuery:{},
formName:null,
deviceReceiveOrderAuditMoifyVisible: false,
detailTotal: 0
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
@ -163,6 +237,7 @@ export default {
limit: 20,
};
this.spaceList = [];
this.actDateRange = []
// this.getList();
this.getDeptList();
},
@ -174,6 +249,13 @@ export default {
this.loading = true;
this.detailList = [];
this.detailTotal = 0;
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
getDeviceReceiveOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
@ -251,9 +333,14 @@ export default {
});
},
closeDialog() {
this.formVisible = false;
this.deviceReceiveOrderAuditMoifyVisible = false;
this.getList();
},
detailOrder(row) {
this.formName = "detail"
this.receiveQuery = row
this.deviceReceiveOrderAuditMoifyVisible = true
},
},
mounted() {
document.body.ondrop = function (event) {
@ -261,6 +348,9 @@ export default {
event.stopPropagation();
};
},
components:{
DeviceReceiveOrderAuditMoify
},
created() {
this.getDeptList();
},

Write Preview
Loading…
Cancel
Save