设备上下架开发
This commit is contained in:
parent
4c10944e92
commit
f9fa2c5c71
|
|
@ -8,14 +8,14 @@ export function getDevList(data) {
|
||||||
data: data,
|
data: data,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
//装备详细信息
|
//装备详细信息
|
||||||
export function getDevDetail(maId) {
|
export function getDevDetail(maId) {
|
||||||
return request({
|
return request({
|
||||||
url: '/material-mall/dev/getInfo/' + maId,
|
url: '/material-mall/dev/getInfo/' + maId,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
//装备新增
|
//装备新增
|
||||||
export function addDevice(data) {
|
export function addDevice(data) {
|
||||||
|
|
@ -41,7 +41,7 @@ export function getEquipmentType(query) {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: query
|
params: query
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
//装备删除
|
//装备删除
|
||||||
export function removeDevice(data) {
|
export function removeDevice(data) {
|
||||||
|
|
@ -52,6 +52,15 @@ export function removeDevice(data) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//上下架（批量）
|
||||||
|
export function updateUpDown(data) {
|
||||||
|
return request({
|
||||||
|
url: '/material-mall/dev/updateUpDown',
|
||||||
|
method: 'post',
|
||||||
|
data: data,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,286 +1,324 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-form-item prop="deviceName">
|
<el-form-item prop="deviceName">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.deviceName"
|
v-model="queryParams.deviceName"
|
||||||
placeholder="请输入装备名称"
|
placeholder="请输入装备名称"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="code">
|
<el-form-item prop="code">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.code"
|
v-model="queryParams.code"
|
||||||
placeholder="请输入装备编码"
|
placeholder="请输入装备编码"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="maStatus">
|
<el-form-item prop="maStatus">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="queryParams.maStatus"
|
v-model="queryParams.maStatus"
|
||||||
placeholder="请选择装备状态"
|
placeholder="请选择装备状态"
|
||||||
clearable
|
clearable
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in dict.type.ma_machine_status"
|
v-for="dict in dict.type.ma_machine_status"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
:label="dict.label"
|
:label="dict.label"
|
||||||
:value="dict.value"
|
:value="dict.value"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="status">
|
<el-form-item prop="status">
|
||||||
<el-select v-model="queryParams.status" placeholder="请选择装备分类" clearable>
|
<el-select v-model="queryParams.status" placeholder="请选择装备分类" clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in statusList"
|
v-for="item in statusList"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="status">
|
<el-form-item prop="status">
|
||||||
<el-select v-model="queryParams.status" placeholder="请选择装备型号" clearable>
|
<el-select v-model="queryParams.status" placeholder="请选择装备型号" clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in statusList"
|
v-for="item in statusList"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="dateRange">
|
<el-form-item prop="dateRange">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="dateRange"
|
v-model="dateRange"
|
||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始日期"
|
start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期">
|
end-placeholder="结束日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
type="success" plain
|
type="success" plain
|
||||||
size="mini" @click="equipmentAdd"
|
size="mini" @click="equipmentAdd"
|
||||||
>装备新建</el-button>
|
>装备新建
|
||||||
</el-col>
|
</el-button>
|
||||||
<el-col :span="1.5">
|
</el-col>
|
||||||
<el-button
|
<el-col :span="1.5">
|
||||||
type="warning" plain
|
<el-button
|
||||||
icon="el-icon-download"
|
type="warning" plain
|
||||||
size="mini"
|
icon="el-icon-download"
|
||||||
>批量上架</el-button>
|
size="mini"
|
||||||
</el-col>
|
@click="handleUpdateUpDown(null,2)"
|
||||||
<el-col :span="1.5">
|
>批量上架</el-button>
|
||||||
<el-button
|
</el-col>
|
||||||
type="warning" plain
|
<el-col :span="1.5">
|
||||||
icon="el-icon-download"
|
<el-button
|
||||||
size="mini"
|
type="warning" plain
|
||||||
>批量下架</el-button>
|
icon="el-icon-download"
|
||||||
</el-col>
|
size="mini"
|
||||||
</el-row>
|
@click="handleUpdateUpDown(null,3)"
|
||||||
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="maId" @selection-change="handleSelectionChange" border>
|
>批量下架
|
||||||
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
|
</el-button>
|
||||||
<el-table-column label="序号" align="center" width="80" type="index">
|
</el-col>
|
||||||
<template slot-scope="scope">
|
</el-row>
|
||||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="maId"
|
||||||
</template>
|
@selection-change="handleSelectionChange" border>
|
||||||
</el-table-column>
|
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
|
||||||
<el-table-column label="装备名称" align="center" prop="deviceName" width="150" :show-overflow-tooltip="true"/>
|
<el-table-column label="序号" align="center" width="80" type="index">
|
||||||
<el-table-column label="装备编码" align="center" prop="code" width="150" :show-overflow-tooltip="true"/>
|
<template slot-scope="scope">
|
||||||
<el-table-column label="装备类目" align="center" prop="groupName" width="150" :show-overflow-tooltip="true"/>
|
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||||
<el-table-column label="装备型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
</template>
|
||||||
<el-table-column label="装备状态" align="center" prop="maStatus" :show-overflow-tooltip="true">
|
</el-table-column>
|
||||||
<template slot-scope="scope">
|
<el-table-column label="装备名称" align="center" prop="deviceName" width="150" :show-overflow-tooltip="true"/>
|
||||||
<dict-tag :options="dict.type.ma_machine_status" :value="scope.row.maStatus"/>
|
<el-table-column label="装备编码" align="center" prop="code" width="150" :show-overflow-tooltip="true"/>
|
||||||
</template>
|
<el-table-column label="装备类目" align="center" prop="groupName" width="150" :show-overflow-tooltip="true"/>
|
||||||
</el-table-column>
|
<el-table-column label="装备型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="更新时间" align="center" prop="updateTime" width="150" :show-overflow-tooltip="true"/>
|
<el-table-column label="装备状态" align="center" prop="maStatus" :show-overflow-tooltip="true">
|
||||||
<el-table-column label="操作" align="center" width="250">
|
<template slot-scope="scope">
|
||||||
<template slot-scope="scope">
|
<dict-tag :options="dict.type.ma_machine_status" :value="scope.row.maStatus"/>
|
||||||
<!-- <el-button
|
</template>
|
||||||
size="mini"
|
</el-table-column>
|
||||||
@click="handleView(scope.row)">
|
<el-table-column label="更新时间" align="center" prop="updateTime" width="150" :show-overflow-tooltip="true"/>
|
||||||
查看
|
<el-table-column label="操作" align="center" width="250">
|
||||||
</el-button> -->
|
<template slot-scope="scope">
|
||||||
<el-button
|
<!-- <el-button
|
||||||
size="mini" type="primary"
|
size="mini"
|
||||||
@click="handleUpdate(scope.row)">
|
@click="handleView(scope.row)">
|
||||||
编辑
|
查看
|
||||||
</el-button>
|
</el-button> -->
|
||||||
<el-button
|
<el-button
|
||||||
size="mini" type="warning" >
|
size="mini" type="primary"
|
||||||
下架
|
@click="handleUpdate(scope.row)">
|
||||||
</el-button>
|
编辑
|
||||||
<el-button size="mini" type="danger" @click="delDev(scope.row)">
|
</el-button>
|
||||||
删除
|
<el-button
|
||||||
</el-button>
|
size="mini" type="warning">
|
||||||
</template>
|
<span
|
||||||
</el-table-column>
|
v-if="scope.row.maStatus == 2"
|
||||||
</el-table>
|
@click="handleUpdateUpDown(scope.row,3)">
|
||||||
|
下架
|
||||||
<pagination
|
</span>
|
||||||
v-show="total>0"
|
<span
|
||||||
:total="total"
|
v-if="scope.row.maStatus == 3"
|
||||||
:page.sync="queryParams.pageNum"
|
@click="handleUpdateUpDown(scope.row,2)">
|
||||||
:limit.sync="queryParams.pageSize"
|
上架
|
||||||
@pagination="getList"
|
</span>
|
||||||
/>
|
</el-button>
|
||||||
</div>
|
<el-button size="mini" type="danger" @click="delDev(scope.row)">
|
||||||
</template>
|
删除
|
||||||
|
</el-button>
|
||||||
<script>
|
</template>
|
||||||
import { getDevList,removeDevice } from "@/api/lessor/equipment";
|
</el-table-column>
|
||||||
export default {
|
</el-table>
|
||||||
name: "",
|
|
||||||
dicts: ['ma_machine_status'],
|
<pagination
|
||||||
data() {
|
v-show="total>0"
|
||||||
return {
|
:total="total"
|
||||||
// 遮罩层
|
:page.sync="queryParams.pageNum"
|
||||||
loading: false,
|
:limit.sync="queryParams.pageSize"
|
||||||
// 非单个禁用
|
@pagination="getList"
|
||||||
single: true,
|
/>
|
||||||
// 非多个禁用
|
</div>
|
||||||
multiple: true,
|
</template>
|
||||||
// 显示搜索条件
|
|
||||||
showSearch: true,
|
<script>
|
||||||
statusList:[{id:'1',name:'状态1'},{id:'2',name:'状态2'},{id:'3',name:'状态3'}],
|
import {getDevList, removeDevice,updateUpDown} from "@/api/lessor/equipment";
|
||||||
ids:[],
|
|
||||||
// 总条数
|
export default {
|
||||||
total: 0,
|
name: "",
|
||||||
//表格数据
|
dicts: ['ma_machine_status'],
|
||||||
tableList: [],
|
data() {
|
||||||
// 弹出层标题
|
return {
|
||||||
title: "",
|
// 遮罩层
|
||||||
// 是否显示弹出层
|
loading: false,
|
||||||
open: false,
|
// 非单个禁用
|
||||||
// 查询参数
|
single: true,
|
||||||
dateRange:[],
|
// 非多个禁用
|
||||||
queryParams: {
|
multiple: true,
|
||||||
pageNum: 1,
|
// 显示搜索条件
|
||||||
pageSize: 10,
|
showSearch: true,
|
||||||
deviceName:undefined,
|
statusList: [{id: '1', name: '状态1'}, {id: '2', name: '状态2'}, {id: '3', name: '状态3'}],
|
||||||
code:undefined,
|
ids: [],
|
||||||
keyWord:undefined,
|
// 总条数
|
||||||
status:undefined,
|
total: 0,
|
||||||
},
|
//表格数据
|
||||||
};
|
tableList: [],
|
||||||
|
maIds: [],
|
||||||
|
// 弹出层标题
|
||||||
|
title: "",
|
||||||
|
// 是否显示弹出层
|
||||||
|
open: false,
|
||||||
|
// 查询参数
|
||||||
|
dateRange: [],
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
deviceName: undefined,
|
||||||
|
code: undefined,
|
||||||
|
keyWord: undefined,
|
||||||
|
status: undefined,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
/** 查询列表 */
|
||||||
|
getList() {
|
||||||
|
this.loading = true;
|
||||||
|
if (this.dateRange.length > 0) {
|
||||||
|
this.queryParams.startTime = this.dateRange[0]
|
||||||
|
this.queryParams.endTime = this.dateRange[1]
|
||||||
|
} else {
|
||||||
|
this.queryParams.startTime = undefined
|
||||||
|
this.queryParams.endTime = undefined
|
||||||
|
}
|
||||||
|
getDevList(this.queryParams).then(response => {
|
||||||
|
this.tableList = response.rows;
|
||||||
|
this.total = response.total;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
},
|
},
|
||||||
created() {
|
/** 重置按钮操作 */
|
||||||
|
resetQuery() {
|
||||||
|
this.resetForm("queryForm");
|
||||||
|
this.dateRange = []
|
||||||
|
this.queryParams.keyWord = null;
|
||||||
|
this.handleQuery();
|
||||||
|
},
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
handleQuery() {
|
||||||
|
this.queryParams.pageNum = 1;
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
methods: {
|
// 多选框选中数据
|
||||||
/** 查询列表 */
|
handleSelectionChange(selection) {
|
||||||
getList() {
|
this.ids = selection.map(item => item.maId)
|
||||||
this.loading = true;
|
this.single = selection.length != 1
|
||||||
if(this.dateRange.length>0){
|
this.multiple = !selection.length
|
||||||
this.queryParams.startTime=this.dateRange[0]
|
},
|
||||||
this.queryParams.endTime=this.dateRange[1]
|
//新增
|
||||||
}else{
|
equipmentAdd() {
|
||||||
this.queryParams.startTime=undefined
|
let query = {}
|
||||||
this.queryParams.endTime=undefined
|
this.$tab.closeOpenPage({
|
||||||
}
|
path: '/lessor/equipmentDetail',
|
||||||
getDevList(this.queryParams).then(response => {
|
query,
|
||||||
this.tableList = response.rows;
|
})
|
||||||
this.total = response.total;
|
},
|
||||||
this.loading = false;
|
//编辑
|
||||||
});
|
handleUpdate(row) {
|
||||||
|
console.log(row)
|
||||||
|
let query = {maId: row.maId, isView: "false"}
|
||||||
|
this.$tab.closeOpenPage({
|
||||||
|
path: '/lessor/equipmentDetail',
|
||||||
|
query,
|
||||||
|
})
|
||||||
|
},
|
||||||
|
// 上下架（批量）
|
||||||
|
handleUpdateUpDown(row,maStatus) {
|
||||||
|
this.$modal.confirm('是否确认？').then(() => {
|
||||||
|
let maIds = []
|
||||||
|
if (!row){
|
||||||
|
maIds = this.ids
|
||||||
|
} else {
|
||||||
|
maIds.push(row.maId)
|
||||||
|
}
|
||||||
|
if (maIds.length == 0){
|
||||||
|
this.$modal.msgError('请选择要操作的数据')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return updateUpDown({maIds,maStatus})
|
||||||
|
}).then(() => {
|
||||||
|
this.handleQuery()
|
||||||
|
}).catch(() => {
|
||||||
|
})
|
||||||
},
|
},
|
||||||
/** 重置按钮操作 */
|
//查看
|
||||||
resetQuery() {
|
handleView(row) {
|
||||||
this.resetForm("queryForm");
|
console.log(row)
|
||||||
this.dateRange=[]
|
// let query = { Id:row.id,taskId: row.taskId,isView:"true" }
|
||||||
this.queryParams.keyWord=null;
|
// this.$tab.closeOpenPage({
|
||||||
this.handleQuery();
|
// path: '/purchase/goodsAcceptDetail',
|
||||||
},
|
// query,
|
||||||
/** 搜索按钮操作 */
|
// })
|
||||||
handleQuery() {
|
},
|
||||||
this.queryParams.pageNum = 1;
|
handleExport() {
|
||||||
this.getList();
|
// this.download('/material/ma_machine/export', {
|
||||||
},
|
// ...this.queryParams
|
||||||
// 多选框选中数据
|
// }, `仓库管理_${new Date().getTime()}.xlsx`)
|
||||||
handleSelectionChange(selection) {
|
},
|
||||||
this.ids = selection.map(item => item.maId)
|
delDev(row) {
|
||||||
this.single = selection.length != 1
|
this.$modal.confirm('是否确认删除所选择的装备？').then(() => {
|
||||||
this.multiple = !selection.length
|
return removeDevice([row.maId])
|
||||||
},
|
}).then(() => {
|
||||||
//新增
|
this.handleQuery()
|
||||||
equipmentAdd(){
|
this.$message.success('删除成功!')
|
||||||
let query = {}
|
}).catch(() => {
|
||||||
this.$tab.closeOpenPage({
|
})
|
||||||
path: '/lessor/equipmentDetail',
|
|
||||||
query,
|
|
||||||
})
|
|
||||||
},
|
|
||||||
//编辑
|
|
||||||
handleUpdate(row){
|
|
||||||
console.log(row)
|
|
||||||
let query = { maId:row.maId,isView:"false" }
|
|
||||||
this.$tab.closeOpenPage({
|
|
||||||
path: '/lessor/equipmentDetail',
|
|
||||||
query,
|
|
||||||
})
|
|
||||||
},
|
|
||||||
//查看
|
|
||||||
handleView(row){
|
|
||||||
console.log(row)
|
|
||||||
// let query = { Id:row.id,taskId: row.taskId,isView:"true" }
|
|
||||||
// this.$tab.closeOpenPage({
|
|
||||||
// path: '/purchase/goodsAcceptDetail',
|
|
||||||
// query,
|
|
||||||
// })
|
|
||||||
},
|
|
||||||
handleExport() {
|
|
||||||
// this.download('/material/ma_machine/export', {
|
|
||||||
// ...this.queryParams
|
|
||||||
// }, `仓库管理_${new Date().getTime()}.xlsx`)
|
|
||||||
},
|
|
||||||
delDev(row){
|
|
||||||
this.$modal.confirm('是否确认删除所选择的装备？').then(() => {
|
|
||||||
return removeDevice([row.maId])
|
|
||||||
}).then(() => {
|
|
||||||
this.handleQuery()
|
|
||||||
this.$message.success('删除成功!')
|
|
||||||
}).catch(() => {
|
|
||||||
})
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
</script>
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.uploadImg {
|
|
||||||
padding-top: 20px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
}
|
||||||
.deviceCode {
|
};
|
||||||
margin-top: 10px;
|
</script>
|
||||||
padding-bottom: 20px;
|
<style lang="scss" scoped>
|
||||||
font-size: 18px;
|
.uploadImg {
|
||||||
|
padding-top: 20px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.deviceCode {
|
||||||
|
margin-top: 10px;
|
||||||
|
padding-bottom: 20px;
|
||||||
|
font-size: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::v-deep.el-table .fixed-width .el-button--mini {
|
||||||
|
width: 60px !important;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
//隐藏图片上传框的css
|
||||||
|
::v-deep.disabled {
|
||||||
|
.el-upload--picture-card {
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
::v-deep.el-table .fixed-width .el-button--mini {
|
}
|
||||||
width: 60px !important;
|
</style>
|
||||||
margin-bottom: 10px;
|
|
||||||
}
|
|
||||||
//隐藏图片上传框的css
|
|
||||||
::v-deep.disabled {
|
|
||||||
.el-upload--picture-card {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue