From 38d6f0c6e2ecffb9f8d030cc285ab74d1c46cdb2 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 21 Nov 2024 10:06:28 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=87=8D=E5=BA=86=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machinery/coding-nw/index.vue              | 18 +++++++++---------
 .../warehouseManage/machinery/coding/index.vue | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/warehouseManage/machinery/coding-nw/index.vue b/src/views/warehouseManage/machinery/coding-nw/index.vue
index 347a04c..dc32c7f 100644
--- a/src/views/warehouseManage/machinery/coding-nw/index.vue
+++ b/src/views/warehouseManage/machinery/coding-nw/index.vue
@@ -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
             })
         },
diff --git a/src/views/warehouseManage/machinery/coding/index.vue b/src/views/warehouseManage/machinery/coding/index.vue
index 2d89687..1a9aeb3 100644
--- a/src/views/warehouseManage/machinery/coding/index.vue
+++ b/src/views/warehouseManage/machinery/coding/index.vue
@@ -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
             })
         },

From 2141f4b34e001498d6001d20acddfcf66f8ebeba Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 21 Nov 2024 10:09:25 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=8D=E5=BA=86=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/store/tools.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/api/store/tools.js b/src/api/store/tools.js
index 87e8d7d..b291b68 100644
--- a/src/api/store/tools.js
+++ b/src/api/store/tools.js
@@ -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({

From 004c0ac57dc5b1ab64816d62ae060b48e4b5f0b7 Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Thu, 21 Nov 2024 17:26:43 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/entryandExit/Entry/index.vue    |  14 +-
 src/views/entryandExit/Entry/tableData.js |  12 ++
 src/views/entryandExit/Exit/index.vue     |  12 +-
 src/views/entryandExit/Exit/tableData.js  | 153 ++++++++++++---------
 src/views/equipment-manage/index.vue      |  30 ++--
 src/views/equipment-manage/tableData.js   | 150 ++++++++++++--------
 src/views/external/index.vue              |  12 +-
 src/views/external/tableData.js           | 150 ++++++++++++--------
 src/views/innovate/index.vue              |  10 +-
 src/views/innovate/tableData.js           | 150 ++++++++++++--------
 src/views/staff-manage/index.vue          |  10 +-
 src/views/staff-manage/tableData.js       | 160 ++++++++++++++--------
 12 files changed, 517 insertions(+), 346 deletions(-)

diff --git a/src/views/entryandExit/Entry/index.vue b/src/views/entryandExit/Entry/index.vue
index 851b31d..8b1a985 100644
--- a/src/views/entryandExit/Entry/index.vue
+++ b/src/views/entryandExit/Entry/index.vue
@@ -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"
             />
diff --git a/src/views/entryandExit/Entry/tableData.js b/src/views/entryandExit/Entry/tableData.js
index 01b7650..1310eb0 100644
--- a/src/views/entryandExit/Entry/tableData.js
+++ b/src/views/entryandExit/Entry/tableData.js
@@ -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: '牵引机、单轮滑车、叉车',
     },
 ]
diff --git a/src/views/entryandExit/Exit/index.vue b/src/views/entryandExit/Exit/index.vue
index d98ee4f..fb92457 100644
--- a/src/views/entryandExit/Exit/index.vue
+++ b/src/views/entryandExit/Exit/index.vue
@@ -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"
             />
diff --git a/src/views/entryandExit/Exit/tableData.js b/src/views/entryandExit/Exit/tableData.js
index 01b7650..3fd8207 100644
--- a/src/views/entryandExit/Exit/tableData.js
+++ b/src/views/entryandExit/Exit/tableData.js
@@ -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: '已出库',
+},]
diff --git a/src/views/equipment-manage/index.vue b/src/views/equipment-manage/index.vue
index 263c74e..8ad1873 100644
--- a/src/views/equipment-manage/index.vue
+++ b/src/views/equipment-manage/index.vue
@@ -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 }">
diff --git a/src/views/equipment-manage/tableData.js b/src/views/equipment-manage/tableData.js
index 01b7650..b008f06 100644
--- a/src/views/equipment-manage/tableData.js
+++ b/src/views/equipment-manage/tableData.js
@@ -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: '牵引车',
+  },
 ]
diff --git a/src/views/external/index.vue b/src/views/external/index.vue
index 3ce5f3a..c2c46d4 100644
--- a/src/views/external/index.vue
+++ b/src/views/external/index.vue
@@ -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"
             />
diff --git a/src/views/external/tableData.js b/src/views/external/tableData.js
index 01b7650..21b9a01 100644
--- a/src/views/external/tableData.js
+++ b/src/views/external/tableData.js
@@ -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: '牵引车',
+  },
 ]
diff --git a/src/views/innovate/index.vue b/src/views/innovate/index.vue
index cc5437e..edd6df0 100644
--- a/src/views/innovate/index.vue
+++ b/src/views/innovate/index.vue
@@ -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"
             />
diff --git a/src/views/innovate/tableData.js b/src/views/innovate/tableData.js
index 01b7650..890016d 100644
--- a/src/views/innovate/tableData.js
+++ b/src/views/innovate/tableData.js
@@ -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: '牵引车',
+  },
 ]
diff --git a/src/views/staff-manage/index.vue b/src/views/staff-manage/index.vue
index 551cdc5..40c0725 100644
--- a/src/views/staff-manage/index.vue
+++ b/src/views/staff-manage/index.vue
@@ -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"
             />
diff --git a/src/views/staff-manage/tableData.js b/src/views/staff-manage/tableData.js
index 01b7650..3549e01 100644
--- a/src/views/staff-manage/tableData.js
+++ b/src/views/staff-manage/tableData.js
@@ -1,62 +1,102 @@
 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: '合周高速',
+    upload_user: '张伟',
+    upload_time: '2024-10-9',
+    lot_name: '合肥到阜阳',
+    pre_num: '9',
+    out_num: '9',
+    out_status: '已出库',
+  },
+  {
+    name: 'BF20231207-001',
+    device: '合周高速',
+    upload_user: '张伟',
+    upload_time: '2024-10-9',
+    lot_name: '合肥到阜阳',
+    pre_num: '9',
+    out_num: '5',
+    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: '3',
+    out_status: '已出库',
+  },
+  {
+    name: 'BF20231207-001',
+    device: '合周高速',
+    upload_user: '张伟',
+    upload_time: '2024-10-9',
+    lot_name: '合肥到阜阳',
+    pre_num: '19',
+    out_num: '9',
+    out_status: '已出库',
+  },
+  {
+    name: 'BF20231207-001',
+    device: '合周高速',
+    upload_user: '张伟',
+    upload_time: '2024-10-9',
+    lot_name: '合肥到阜阳',
+    pre_num: '9',
+    out_num: '9',
+    out_status: '已出库',
+  },
+  {
+    name: 'BF20231207-001',
+    device: '合周高速',
+    upload_user: '张伟',
+    upload_time: '2024-10-9',
+    lot_name: '合肥到阜阳',
+    pre_num: '19',
+    out_num: '9',
+    out_status: '已出库',
+  },
+  {
+    name: 'BF20231207-001',
+    device: '合周高速',
+    upload_user: '张伟',
+    upload_time: '2024-10-9',
+    lot_name: '合肥到阜阳',
+    pre_num: '9',
+    out_num: '4',
+    out_status: '已出库',
+  },
+  {
+    name: 'BF20231207-001',
+    device: '合周高速',
+    upload_user: '张伟',
+    upload_time: '2024-10-9',
+    lot_name: '合肥到阜阳',
+    pre_num: '8',
+    out_num: '3',
+    out_status: '已出库',
+  },
+  {
+    name: 'BF20231207-001',
+    device: '合周高速',
+    upload_user: '张伟',
+    upload_time: '2024-10-9',
+    lot_name: '合肥到阜阳',
+    pre_num: '7',
+    out_num: '7',
+    out_status: '已出库',
+  },
 ]

From 6a78c159dcdaf8dee767d368e6ca6c01dd03fdbd Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Thu, 21 Nov 2024 18:23:56 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/staff-manage/index.vue    |  95 ++++++++++++++++--------
 src/views/staff-manage/tableData.js | 107 +++++++++++-----------------
 2 files changed, 109 insertions(+), 93 deletions(-)

diff --git a/src/views/staff-manage/index.vue b/src/views/staff-manage/index.vue
index 40c0725..aed3d63 100644
--- a/src/views/staff-manage/index.vue
+++ b/src/views/staff-manage/index.vue
@@ -59,65 +59,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="lot_name"
-                label="领料申请工程"
+                prop="idCode"
+                label="身份证号"
                 align="center"
             />
             <el-table-column
-                prop="pre_num"
-                label="申请数量"
+                prop="iphone"
+                label="手机号"
                 align="center"
             />
             <el-table-column
-                prop="upload_time"
-                label="申请时间"
+                prop="train"
+                label="培训是否合格"
                 align="center"
             />
             <el-table-column
-                prop="out_num"
-                label="已出库数量"
+                prop="check"
+                label="培训合格证明"
                 align="center"
             />
             <el-table-column
-                prop="out_status"
-                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 +133,33 @@
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
         />
+      <el-dialog
+        title="新增员工"
+        :visible.sync="logsDetailsDialogVisibleNew"
+        width="50%"
+      >
+        <el-form label-width="100px" size="small">
+          <el-form-item label="物品种类" required>
+            <el-select placeholder="请选择物品种类" style="width: 100%">
+            </el-select>
+          </el-form-item>
+          <el-form-item label="设备类型" required>
+            <el-select placeholder="请选择设备类型" style="width: 100%">
+            </el-select>
+          </el-form-item>
+          <el-form-item label="规格型号" required>
+            <el-input placeholder="请输入规格型号" />
+          </el-form-item>
+          <el-form-item label="所在仓库" required>
+            <el-input placeholder="请输入所在仓库" />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button> 确定 </el-button>
+            <el-button> 取消 </el-button>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
     </div>
 </template>
 
@@ -144,8 +177,14 @@ export default {
             },
             tableList,
             total: 10,
+          logsDetailsDialogVisibleNew:false
         }
     },
+  methods: {
+    onViewDetails() {
+      this.logsDetailsDialogVisibleNew = true
+    },
+  },
 }
 </script>
 
diff --git a/src/views/staff-manage/tableData.js b/src/views/staff-manage/tableData.js
index 3549e01..a62f95f 100644
--- a/src/views/staff-manage/tableData.js
+++ b/src/views/staff-manage/tableData.js
@@ -1,102 +1,79 @@
 export const tableList = [
   {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
+    user_type: '维修员',
+    idCode: '123456789556',
+    name: '张伟',
+    iphone: '1234565789',
+    train: '合格',
+    check: '查看',
     pre_num: '9',
     out_num: '9',
     out_status: '已出库',
   },
   {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
+    user_type: '维修员',
+    idCode: '123456789',
+    iphone: '1234565789',
+    name: '李阳',
+    train: '合格',
+    check: '查看',
     pre_num: '9',
     out_num: '5',
     out_status: '已出库',
   },
   {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
+    user_type: '维修员',
+    idCode: '123456789',
+    iphone: '1234565789',
+    name: '张三',
+    train: '合格',
+    check: '查看',
     pre_num: '6',
     out_num: '6',
     out_status: '已出库',
   },
   {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
+    user_type: '维修员',
+    idCode: '123456789',
+    iphone: '1234565789',
+    name: '王伟',
+    train: '合格',
+    check: '查看',
     pre_num: '9',
     out_num: '3',
     out_status: '已出库',
   },
   {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
+    user_type: '维修员',
+    idCode: '123456789',
+    iphone: '1234565789',
+    name: '张伟',
+    train: '合格',
+    check: '查看',
     pre_num: '19',
     out_num: '9',
     out_status: '已出库',
   },
   {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
+    user_type: '维修员',
+    idCode: '123456789',
+    iphone: '1234565789',
+    name: '李想',
+    train: '合格',
+    check: '查看',
     pre_num: '9',
     out_num: '9',
     out_status: '已出库',
   },
   {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
+    user_type: '机手',
+    idCode: '123456789',
+    iphone: '1234565789',
+    name: '赵铁柱',
+    train: '合格',
+    check: '查看',
     pre_num: '19',
     out_num: '9',
     out_status: '已出库',
   },
-  {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
-    pre_num: '9',
-    out_num: '4',
-    out_status: '已出库',
-  },
-  {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
-    pre_num: '8',
-    out_num: '3',
-    out_status: '已出库',
-  },
-  {
-    name: 'BF20231207-001',
-    device: '合周高速',
-    upload_user: '张伟',
-    upload_time: '2024-10-9',
-    lot_name: '合肥到阜阳',
-    pre_num: '7',
-    out_num: '7',
-    out_status: '已出库',
-  },
 ]

From 5b46e31fa7d9553435c925701965df327d323e60 Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Thu, 21 Nov 2024 18:44:13 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/staff-manage/index.vue | 134 +++++++++++++++++++++----------
 1 file changed, 93 insertions(+), 41 deletions(-)

diff --git a/src/views/staff-manage/index.vue b/src/views/staff-manage/index.vue
index aed3d63..8b6608e 100644
--- a/src/views/staff-manage/index.vue
+++ b/src/views/staff-manage/index.vue
@@ -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>
@@ -138,26 +132,84 @@
         :visible.sync="logsDetailsDialogVisibleNew"
         width="50%"
       >
-        <el-form label-width="100px" size="small">
-          <el-form-item label="物品种类" required>
-            <el-select placeholder="请选择物品种类" style="width: 100%">
-            </el-select>
-          </el-form-item>
-          <el-form-item label="设备类型" required>
-            <el-select placeholder="请选择设备类型" style="width: 100%">
-            </el-select>
-          </el-form-item>
-          <el-form-item label="规格型号" required>
-            <el-input placeholder="请输入规格型号" />
-          </el-form-item>
-          <el-form-item label="所在仓库" required>
-            <el-input placeholder="请输入所在仓库" />
-          </el-form-item>
+        <el-form label-width="120px" size="small">
 
-          <el-form-item>
-            <el-button> 确定 </el-button>
-            <el-button> 取消 </el-button>
-          </el-form-item>
+          <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>