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

1.修改设备巡检计划页面

Browse Source
prod
x_z 2 years ago
parent 60beeb8244
commit 782c43b058
6 changed files with 139 additions and 110 deletions
Show Stats Download Patch File Download Diff File

41
src/api/inventory/deviceInspectPlan.js
Unescape Escape View File

@ -0,0 +1,41 @@
import axios from "@/utils/request";
export function getDeviceInspectPlanList(params) {
return axios({
url: "/udiwms/inv/device/inspect/plan/filter",
method: "get",
prams: params
});
}
export function saveDeviceInspectPlan(data, formName) {
return axios({
url: formName === "add" ? "/udiwms/inv/device/inspect/plan/addInspectPlan" : "/udiwms/inv/device/inspect/plan/updateInspectPlan",
method: "post",
data: data
});
}
export function submitAudit(data){
return axios({
url: "/udiwms/inv/device/inspect/plan/submitAudit",
method: "post",
data: data
});
}
export function updateStatus(data) {
return axios({
url: "/udiwms/inv/device/inspect/plan/updateStatus",
method: "post",
data: data
});
}
export function deleteInspectPlan(data){
return axios({
url: "/udiwms/inv/device/inspect/plan/deleteInspectPlan",
method: "post",
data: data
});
}

3
src/views/inventory/DeptDeviceDetail.vue
Unescape Escape View File

@ -206,11 +206,10 @@
<script>
import {getInvListByUser} from "@/api/system/invWarehouse";
import {isBlank} from "@/utils/strUtil";
import {getDeptListByUser} from "@/api/auth/authDept";
import {getDeptDeviceList, deleteDeptDevice} from "@/api/inventory/deptDevice";
import deptDeviceModifyDialog from "@/views/inventory/deptDeviceModifyDialog.vue";
import inspectSetModifyDialog from "@/views/inventory/inspectSetModifyDialog.vue";
import inspectSetModifyDialog from "@/views/inventory/InspectSetModifyDialog.vue";
export default {
name: "DeptDeviceDetail",

0
src/views/inventory/InspectionPlanAudit.vue → src/views/inventory/DeviceInspectPlanAudit.vue
Unescape Escape View File

12
src/views/inventory/InspectionPlanCompleted.vue → src/views/inventory/DeviceInspectPlanCompleted.vue
Unescape Escape View File

@ -31,18 +31,6 @@
</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>

193
src/views/inventory/InspectionPlan.vue → src/views/inventory/DeviceInspectPlanNew.vue
Unescape Escape View File

@ -1,67 +1,81 @@
<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.deptCode" 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 type="primary" icon="el-icon-plus" @click="addReceiveOrder">新增领用记录</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-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true"
@change="deptChange"
style="width: 90%"
>
<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-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
style="width: 90%"
>
<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-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="计划单号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入计划单号" style="width: 90%"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="资产编码:">
<el-input v-model="filterQuery.code" placeholder="请输入资产编码" style="width: 90%"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<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 type="primary" icon="el-icon-plus" @click="addInspectPlan">新增单据</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
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="deptName"></el-table-column>
<el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="设备名称" prop="deviceName"></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="createTime"></el-table-column>
<el-table-column label="创建人" prop="createUserName"></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>
@ -72,7 +86,7 @@
<el-button
type="text"
size="small"
@click.native.stop="editOrder(scope.row)"
@click.native.stop="editInspectPlan(scope.row)"
>编辑
</el-button
>
@ -110,10 +124,6 @@
width="85%"
v-if="formVisible"
>
<deviceReceiveOrderModify
:deviceReceiveOrder="deviceReceiveOrder"
:closeDialog="closeDialog"
></deviceReceiveOrderModify>
</el-dialog>
</div>
@ -122,22 +132,20 @@
<script>
import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue";
import {submitAudit, deleteDeviceReceiveOrder, getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder";
import {filterList} from "@/api/inventory/InspectionPlan";
import {getDeviceInspectPlanList, submitAudit, deleteInspectPlan} from "@/api/inventory/deviceInspectPlan";
export default {
name: "DeviceReceiveOrderNew",
name: "DeviceInspectPlanNew",
data() {
return {
filterQuery: {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
fromInvCode: null,
fromInvSpaceCode: null,
status: 0,
invCode: null,
code: null,
status: 1,
page: 1,
limit: 20,
},
@ -145,10 +153,8 @@ export default {
total: 0,
deptList: [],
invList: [],
spaceList: [],
loading: false,
formVisible: false,
codeTableLoading: false,
statusMap: {
0: "草稿",
1: "未审核",
@ -156,13 +162,17 @@ export default {
},
formName: null,
formMap: {
add: "新增设备领用记录",
edit: "编辑设备领用记录"
add: "新增设备巡检计划",
edit: "编辑设备巡检计划"
},
deviceReceiveOrder: {},
deviceInspectPlan: {},
showSearch: true
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
@ -170,9 +180,9 @@ export default {
this.filterQuery = {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
fromInvCode: null,
fromInvSpaceCode: null,
status: 0,
invCode: null,
code: null,
status: 1,
page: 1,
limit: 20,
};
@ -185,7 +195,7 @@ export default {
},
getList() {
this.loading = true;
filterList(this.filterQuery).then((res) => {
getDeviceInspectPlanList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
@ -204,9 +214,7 @@ export default {
},
deptChange() {
this.invList = [];
this.spaceList = [];
this.filterQuery.fromInvCode = null;
this.filterQuery.fromInvSpaceCode = null;
this.filterQuery.invCode = null;
this.getInvList();
},
getDeptList() {
@ -231,22 +239,10 @@ export default {
.catch(() => {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.deptCode, status: 1};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
this.getList();
})
},
addReceiveOrder() {
this.formVisible = true;
this.formName = 'add';
this.deviceReceiveOrder = {};
},
editOrder(row) {
editInspectPlan(row) {
this.formVisible = true;
this.formName = 'edit';
this.deviceReceiveOrder = row;
this.deviceInspectPlan = row;
},
submitAudit(row) {
let params = {id: row.id};
@ -262,14 +258,14 @@ export default {
});
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
this.$confirm('此操作将永久删除该巡检计划, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteDeviceReceiveOrder(params).then((res) => {
deleteInspectPlan(params).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.$message.success("删除成功！");
@ -286,6 +282,11 @@ export default {
this.formVisible = false;
this.getList();
},
addInspectPlan() {
this.formVisible = true;
this.formName = 'add';
this.deviceInspectPlan = {};
},
},
components: {
deviceReceiveOrderModify

0
src/views/inventory/inspectSetModifyDialog.vue → src/views/inventory/InspectSetModifyDialog.vue
Unescape Escape View File

Write Preview
Loading…
Cancel
Save