Merge branch 'main' of http://192.168.30.2:3000/bonus/nw-cqdevicemgt-ui
This commit is contained in:
commit
ff490e7441
|
|
@ -15,6 +15,14 @@ export function getListByMaType(query) {
|
|||
params: query,
|
||||
})
|
||||
}
|
||||
//获取机具类型列表
|
||||
export function getListByMaTypePid(query) {
|
||||
return request({
|
||||
url: '/material/base/type/getListByMaTypePid',
|
||||
method: 'get',
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
//获取机具类型树2
|
||||
export function equipmentTypeTree(query) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<!-- 省级资料培训库 -->
|
||||
<!-- 入库异常 -->
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
|
|
@ -86,20 +86,20 @@
|
|||
<el-table border :data="tableList">
|
||||
<el-table-column label="序号" type="index" align="center" />
|
||||
<el-table-column prop="name" label="采购单号" align="center" />
|
||||
<el-table-column prop="device" label="采购日期" align="center" />
|
||||
<el-table-column prop="upload_time" label="采购日期" align="center" />
|
||||
<el-table-column
|
||||
prop="upload_user"
|
||||
prop="upload_time"
|
||||
label="到货日期"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="machine"
|
||||
label="采购机具设备"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column prop="upload_time" label="采购员" align="center" />
|
||||
<el-table-column prop="upload_user" label="采购员" align="center" />
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="upload_user"
|
||||
label="发布人员"
|
||||
align="center"
|
||||
/>
|
||||
|
|
@ -109,7 +109,7 @@
|
|||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="remark"
|
||||
label="不通过原因"
|
||||
align="center"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -4,59 +4,71 @@ export const tableList = [
|
|||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
remark: '数量不对',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
remark: '数量不对',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
machine: '牵引机、单轮滑车、叉车',
|
||||
},
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<!-- 省级资料培训库 -->
|
||||
<!-- 出库异常 -->
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
<el-form-item prop="deviceType">
|
||||
<el-select
|
||||
v-model="queryParams.deviceType"
|
||||
placeholder="请选择工单位名称"
|
||||
placeholder="请选择单位名称"
|
||||
clearable
|
||||
filterable
|
||||
>
|
||||
|
|
@ -90,12 +90,12 @@
|
|||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_user"
|
||||
prop="lot_name"
|
||||
label="领料申请工程"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="pre_num"
|
||||
label="申请数量"
|
||||
align="center"
|
||||
/>
|
||||
|
|
@ -105,12 +105,12 @@
|
|||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="out_num"
|
||||
label="已出库数量"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="out_status"
|
||||
label="出库状态"
|
||||
align="center"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -1,62 +1,91 @@
|
|||
export const tableList = [
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
]
|
||||
export const tableList = [{
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '5',
|
||||
out_num: '5',
|
||||
out_status: '已出库',
|
||||
},{
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '5',
|
||||
out_num: '5',
|
||||
out_status: '已出库',
|
||||
}, {
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '5',
|
||||
out_num: '5',
|
||||
out_status: '已出库',
|
||||
}, {
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '5',
|
||||
out_num: '5',
|
||||
out_status: '已出库',
|
||||
}, {
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '5',
|
||||
out_num: '5',
|
||||
out_status: '已出库',
|
||||
}, {
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '5',
|
||||
out_num: '5',
|
||||
out_status: '已出库',
|
||||
}, {
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '5',
|
||||
out_num: '5',
|
||||
out_status: '已出库',
|
||||
}, {
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '8',
|
||||
out_num: '8',
|
||||
out_status: '已出库',
|
||||
}, {
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '6',
|
||||
out_num: '6',
|
||||
out_status: '已出库',
|
||||
}, {
|
||||
name: 'BF20231207-001',
|
||||
device: '合周高速',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
lot_name: '合肥到阜阳',
|
||||
pre_num: '9',
|
||||
out_num: '9',
|
||||
out_status: '已出库',
|
||||
},]
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
:inline="true"
|
||||
label-width="80px"
|
||||
>
|
||||
<el-form-item prop="unitId">
|
||||
<el-input
|
||||
v-model="queryParams.keyWords"
|
||||
placeholder="请输入领料单号"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item prop="unitId">
|
||||
<el-input
|
||||
v-model="queryParams.keyWords"
|
||||
placeholder="请输入领料单号"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>-->
|
||||
|
||||
<el-form-item prop="deviceType">
|
||||
<el-select
|
||||
v-model="queryParams.deviceType"
|
||||
placeholder="请选择工单位名称"
|
||||
placeholder="设备名称"
|
||||
clearable
|
||||
filterable
|
||||
>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<el-form-item prop="deviceType">
|
||||
<el-select
|
||||
v-model="queryParams.deviceType"
|
||||
placeholder="请选择工程名称"
|
||||
placeholder="设备型号"
|
||||
clearable
|
||||
filterable
|
||||
>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<el-form-item prop="deviceType">
|
||||
<el-select
|
||||
v-model="queryParams.deviceType"
|
||||
placeholder="请选择出库状态"
|
||||
placeholder="规格型号"
|
||||
clearable
|
||||
filterable
|
||||
>
|
||||
|
|
@ -63,19 +63,19 @@
|
|||
|
||||
<el-table border :data="tableList">
|
||||
<el-table-column label="序号" type="index" align="center" />
|
||||
<el-table-column prop="name" label="设备名称" align="center" />
|
||||
<el-table-column prop="device" label="设备类型" align="center" />
|
||||
<el-table-column prop="type_name" label="设备名称" align="center" />
|
||||
<el-table-column prop="type_name1" label="设备类型" align="center" />
|
||||
<el-table-column
|
||||
prop="upload_user"
|
||||
prop="type_name2"
|
||||
label="规格型号"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="device"
|
||||
label="所在仓库"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column prop="upload_time" label="合格证" align="center" />
|
||||
<el-table-column prop="hege" label="合格证" align="center" />
|
||||
|
||||
<el-table-column label="操作" align="center">
|
||||
<template slot-scope="{ row }">
|
||||
|
|
|
|||
|
|
@ -1,62 +1,92 @@
|
|||
export const tableList = [
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '002号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '002号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '002号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '002号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '002号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '002号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '001号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '001号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '001号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '001号库',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
]
|
||||
|
|
|
|||
|
|
@ -54,15 +54,15 @@
|
|||
|
||||
<el-table border :data="tableList">
|
||||
<el-table-column label="序号" type="index" align="center" />
|
||||
<el-table-column prop="name" label="设备名称" align="center" />
|
||||
<el-table-column prop="device" label="设备类型" align="center" />
|
||||
<el-table-column prop="type_name" label="设备名称" align="center" />
|
||||
<el-table-column prop="type_name1" label="设备类型" align="center" />
|
||||
<el-table-column
|
||||
prop="upload_user"
|
||||
prop="type_name2"
|
||||
label="规格型号"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="name"
|
||||
label="所属公司"
|
||||
align="center"
|
||||
/>
|
||||
|
|
@ -76,9 +76,9 @@
|
|||
label="租赁结束时间"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column prop="upload_time" label="租赁人" align="center" />
|
||||
<el-table-column prop="upload_user" label="租赁人" align="center" />
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="device"
|
||||
label="所属部门"
|
||||
align="center"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -1,62 +1,92 @@
|
|||
export const tableList = [
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '三鹿机具管理公司',
|
||||
device: '物资部',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
]
|
||||
|
|
|
|||
|
|
@ -67,20 +67,20 @@
|
|||
|
||||
<el-table border :data="tableList">
|
||||
<el-table-column label="序号" type="index" align="center" />
|
||||
<el-table-column prop="name" label="物品种类" align="center" />
|
||||
<el-table-column prop="device" label="设备类型" align="center" />
|
||||
<el-table-column prop="type_name" label="物品种类" align="center" />
|
||||
<el-table-column prop="type_name1" label="设备类型" align="center" />
|
||||
<el-table-column
|
||||
prop="upload_user"
|
||||
prop="type_name2"
|
||||
label="规格型号"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="name"
|
||||
label="所在仓库"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
prop="upload_user"
|
||||
label="使用次数"
|
||||
align="center"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -1,62 +1,92 @@
|
|||
export const tableList = [
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: '001号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '2',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '抱杆',
|
||||
type_name2: '人字抱杆',
|
||||
},
|
||||
{
|
||||
name: '001号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '3',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '抱杆',
|
||||
type_name2: '人字抱杆',
|
||||
},
|
||||
{
|
||||
name: '001号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '1',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '抱杆',
|
||||
type_name2: '人字抱杆',
|
||||
},
|
||||
{
|
||||
name: '001号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '5',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '抱杆',
|
||||
type_name2: '人字抱杆',
|
||||
},
|
||||
{
|
||||
name: '002号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '6',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '002号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '2',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '002号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '3',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '002号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '4',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '002号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '4',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
{
|
||||
name: '002号库',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '4',
|
||||
upload_time: '2024-10-9',
|
||||
type_name: '线路施工类',
|
||||
type_name1: '放线及滑车',
|
||||
type_name2: '牵引车',
|
||||
},
|
||||
]
|
||||
|
|
|
|||
|
|
@ -11,37 +11,31 @@
|
|||
<el-form-item prop="unitId">
|
||||
<el-input
|
||||
v-model="queryParams.keyWords"
|
||||
placeholder="请输入领料单号"
|
||||
placeholder="员工姓名"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="deviceType">
|
||||
<el-select
|
||||
v-model="queryParams.deviceType"
|
||||
placeholder="请选择工单位名称"
|
||||
clearable
|
||||
filterable
|
||||
>
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="queryParams.keyWords"
|
||||
placeholder="员工工种"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item prop="deviceType">
|
||||
<el-select
|
||||
v-model="queryParams.deviceType"
|
||||
placeholder="请选择工程名称"
|
||||
clearable
|
||||
filterable
|
||||
>
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="queryParams.keyWords"
|
||||
placeholder="身份证号"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item prop="deviceType">
|
||||
<el-select
|
||||
v-model="queryParams.deviceType"
|
||||
placeholder="请选择出库状态"
|
||||
clearable
|
||||
filterable
|
||||
>
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="queryParams.keyWords"
|
||||
placeholder="手机号"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
|
|
@ -59,65 +53,71 @@
|
|||
>重置</el-button
|
||||
>
|
||||
|
||||
<el-button
|
||||
<!-- <el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
size="mini"
|
||||
@click="handleQuery"
|
||||
>下载模板</el-button
|
||||
>
|
||||
>-->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
>导出数据</el-button
|
||||
>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="onViewDetails"
|
||||
>新增员工</el-button
|
||||
>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table border :data="tableList">
|
||||
<el-table-column label="序号" type="index" align="center" />
|
||||
<el-table-column prop="name" label="领料单号" align="center" />
|
||||
<el-table-column prop="name" label="员工姓名" align="center" />
|
||||
<el-table-column
|
||||
prop="device"
|
||||
label="领料申请单位"
|
||||
prop="user_type"
|
||||
label="员工工种"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_user"
|
||||
label="领料申请工程"
|
||||
prop="idCode"
|
||||
label="身份证号"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
label="申请数量"
|
||||
prop="iphone"
|
||||
label="手机号"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
label="申请时间"
|
||||
prop="train"
|
||||
label="培训是否合格"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
label="已出库数量"
|
||||
prop="check"
|
||||
label="培训合格证明"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="upload_time"
|
||||
label="出库状态"
|
||||
prop="train"
|
||||
label="考试是否合格"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="check"
|
||||
label="考试合格证明"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column label="操作" align="center">
|
||||
<template slot-scope="{ row }">
|
||||
<el-button type="text"> 查看 </el-button>
|
||||
<el-button type="text"> 出库 </el-button>
|
||||
<el-button type="text"> 编辑 </el-button>
|
||||
<el-button type="text"> 删除 </el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -127,6 +127,91 @@
|
|||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
/>
|
||||
<el-dialog
|
||||
title="新增员工"
|
||||
:visible.sync="logsDetailsDialogVisibleNew"
|
||||
width="50%"
|
||||
>
|
||||
<el-form label-width="120px" size="small">
|
||||
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="员工姓名" required>
|
||||
<el-input placeholder="请输入员工姓名" />
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="员工工种" required>
|
||||
<el-input placeholder="请输入员工工种" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="身份证号" required>
|
||||
<el-input placeholder="请输入身份证号" />
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="手机号" required>
|
||||
<el-input placeholder="请输入手机号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="培训是否合格" required>
|
||||
<el-checkbox label="合格">合格</el-checkbox>
|
||||
<el-checkbox label="不合格">不合格</el-checkbox>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="培训合格证明" required>
|
||||
<el-upload
|
||||
class="upload-demo"
|
||||
action="https://jsonplaceholder.typicode.com/posts/"
|
||||
multiple
|
||||
:limit="3"
|
||||
>
|
||||
<el-button size="small" type="primary">点击上传</el-button>
|
||||
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="考试是否合格" required>
|
||||
<el-checkbox label="合格">合格</el-checkbox>
|
||||
<el-checkbox label="不合格">不合格</el-checkbox>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="考试合格证明" required>
|
||||
<el-upload
|
||||
class="upload-demo"
|
||||
action="https://jsonplaceholder.typicode.com/posts/"
|
||||
multiple
|
||||
:limit="3"
|
||||
>
|
||||
<el-button size="small" type="primary">点击上传</el-button>
|
||||
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
|
||||
<el-row style="text-align: right">
|
||||
<el-button> 确定 </el-button>
|
||||
<el-button> 取消 </el-button>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -144,8 +229,14 @@ export default {
|
|||
},
|
||||
tableList,
|
||||
total: 10,
|
||||
logsDetailsDialogVisibleNew:false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onViewDetails() {
|
||||
this.logsDetailsDialogVisibleNew = true
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,62 +1,79 @@
|
|||
export const tableList = [
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
name: 'BF20231207-001',
|
||||
device: '挖掘机培训',
|
||||
upload_user: '张伟',
|
||||
upload_time: '2024-10-9',
|
||||
},
|
||||
{
|
||||
user_type: '维修员',
|
||||
idCode: '123456789556',
|
||||
name: '张伟',
|
||||
iphone: '1234565789',
|
||||
train: '合格',
|
||||
check: '查看',
|
||||
pre_num: '9',
|
||||
out_num: '9',
|
||||
out_status: '已出库',
|
||||
},
|
||||
{
|
||||
user_type: '维修员',
|
||||
idCode: '123456789',
|
||||
iphone: '1234565789',
|
||||
name: '李阳',
|
||||
train: '合格',
|
||||
check: '查看',
|
||||
pre_num: '9',
|
||||
out_num: '5',
|
||||
out_status: '已出库',
|
||||
},
|
||||
{
|
||||
user_type: '维修员',
|
||||
idCode: '123456789',
|
||||
iphone: '1234565789',
|
||||
name: '张三',
|
||||
train: '合格',
|
||||
check: '查看',
|
||||
pre_num: '6',
|
||||
out_num: '6',
|
||||
out_status: '已出库',
|
||||
},
|
||||
{
|
||||
user_type: '维修员',
|
||||
idCode: '123456789',
|
||||
iphone: '1234565789',
|
||||
name: '王伟',
|
||||
train: '合格',
|
||||
check: '查看',
|
||||
pre_num: '9',
|
||||
out_num: '3',
|
||||
out_status: '已出库',
|
||||
},
|
||||
{
|
||||
user_type: '维修员',
|
||||
idCode: '123456789',
|
||||
iphone: '1234565789',
|
||||
name: '张伟',
|
||||
train: '合格',
|
||||
check: '查看',
|
||||
pre_num: '19',
|
||||
out_num: '9',
|
||||
out_status: '已出库',
|
||||
},
|
||||
{
|
||||
user_type: '维修员',
|
||||
idCode: '123456789',
|
||||
iphone: '1234565789',
|
||||
name: '李想',
|
||||
train: '合格',
|
||||
check: '查看',
|
||||
pre_num: '9',
|
||||
out_num: '9',
|
||||
out_status: '已出库',
|
||||
},
|
||||
{
|
||||
user_type: '机手',
|
||||
idCode: '123456789',
|
||||
iphone: '1234565789',
|
||||
name: '赵铁柱',
|
||||
train: '合格',
|
||||
check: '查看',
|
||||
pre_num: '19',
|
||||
out_num: '9',
|
||||
out_status: '已出库',
|
||||
},
|
||||
]
|
||||
|
|
|
|||
|
|
@ -574,13 +574,13 @@
|
|||
|
||||
<script>
|
||||
import {
|
||||
addMachine,
|
||||
delMachine,
|
||||
getMachine,
|
||||
listMachine,
|
||||
updateMachine,
|
||||
supplierInfoList,
|
||||
getListByMaType,
|
||||
addMachine,
|
||||
delMachine,
|
||||
getMachine,
|
||||
listMachine,
|
||||
updateMachine,
|
||||
supplierInfoList,
|
||||
getListByMaType, getListByMaTypePid,
|
||||
} from '@/api/store/tools'
|
||||
import { pushNotificationsApi } from '@/api/dataPush' // 推送至租赁平台
|
||||
import { getProLists } from '@/api/base/base'
|
||||
|
|
@ -714,14 +714,14 @@ export default {
|
|||
//选择物品种类
|
||||
selectItem(id) {
|
||||
console.log(id)
|
||||
getListByMaType({ typeId: id, level: '3' }).then((response) => {
|
||||
getListByMaTypePid({ typeId: id }).then((response) => {
|
||||
this.typeList = response.data.rows
|
||||
})
|
||||
},
|
||||
//选择设备类型
|
||||
selectDevice(id) {
|
||||
console.log(id)
|
||||
getListByMaType({ typeId: id, level: '0' }).then((response) => {
|
||||
getListByMaTypePid({ typeId: id }).then((response) => {
|
||||
this.modelList = response.data.rows
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -515,13 +515,13 @@
|
|||
|
||||
<script>
|
||||
import {
|
||||
addMachine,
|
||||
delMachine,
|
||||
getMachine,
|
||||
listMachine,
|
||||
updateMachine,
|
||||
supplierInfoList,
|
||||
getListByMaType,
|
||||
addMachine,
|
||||
delMachine,
|
||||
getMachine,
|
||||
listMachine,
|
||||
updateMachine,
|
||||
supplierInfoList,
|
||||
getListByMaType, getListByMaTypePid,
|
||||
} from '@/api/store/tools'
|
||||
import { getProLists } from '@/api/base/base'
|
||||
import { imgUpLoad } from '@/api/system/upload'
|
||||
|
|
@ -637,14 +637,14 @@ export default {
|
|||
//选择物品种类
|
||||
selectItem(id) {
|
||||
console.log(id)
|
||||
getListByMaType({ typeId: id, level: '3' }).then((response) => {
|
||||
getListByMaTypePid({ typeId: id }).then((response) => {
|
||||
this.typeList = response.data.rows
|
||||
})
|
||||
},
|
||||
//选择设备类型
|
||||
selectDevice(id) {
|
||||
console.log(id)
|
||||
getListByMaType({ typeId: id, level: '0' }).then((response) => {
|
||||
getListByMaTypePid({ typeId: id }).then((response) => {
|
||||
this.modelList = response.data.rows
|
||||
})
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue