From 4ddaf1aee1f088a15d5a06a2426a66b443a53138 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 12 Nov 2024 18:27:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?lsun=20=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lease/outbound.js                     |  335 ++++
 src/api/lease/picking.js                      |  335 ++++
 src/api/lease/protocol.js                     |  377 +---
 .../lease/apply/component/outbound.vue        | 1181 ++++++++++++
 .../lease/apply/component/picking.vue         | 1181 ++++++++++++
 src/views/material/lease/protocol/index.vue   | 1581 +++++++++--------
 6 files changed, 3938 insertions(+), 1052 deletions(-)
 create mode 100644 src/api/lease/outbound.js
 create mode 100644 src/api/lease/picking.js
 create mode 100644 src/views/material/lease/apply/component/outbound.vue
 create mode 100644 src/views/material/lease/apply/component/picking.vue

diff --git a/src/api/lease/outbound.js b/src/api/lease/outbound.js
new file mode 100644
index 00000000..7a0be060
--- /dev/null
+++ b/src/api/lease/outbound.js
@@ -0,0 +1,335 @@
+import request from '@/utils/request'
+
+// 往来单位-下拉
+export function getUnitList(query) {
+    return request({
+        url: '/material/agreementInfo/getUnitList',
+        method: 'get',
+        params: query,
+    })
+}
+
+// 工程名称-下拉
+export function getProjectList(query) {
+    return request({
+        url: '/material/agreementInfo/getProjectList',
+        method: 'get',
+        params: query,
+    })
+}
+
+// 协议管理-列表
+export function getAgreementList(query) {
+    return request({
+        url: '/material/agreementInfo/getAgreementInfoAll',
+        method: 'get',
+        params: query,
+    })
+}
+// 协议管理-详情
+export function getAgreementInfoId(query) {
+    return request({
+        url: '/material/agreementInfo/getAgreementInfoId',
+        method: 'get',
+        params: query,
+    })
+}
+
+//协议管理--新增
+export function addAgreement(data) {
+    return request({
+        url: '/material/agreementInfo/add',
+        method: 'post',
+        data: data,
+    })
+}
+
+// 协议管理--修改
+export function updateAgreement(data) {
+    return request({
+        url: '/material/agreementInfo/update',
+        method: 'post',
+        data: data,
+    })
+}
+// //协议管理--删除
+export function removeAgreement(data) {
+    return request({
+        url: '/material/agreementInfo/remove',
+        method: 'post',
+        data: data,
+    })
+}
+
+// 机具领料-申请列表
+export function getLeaseManageListAll(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseManageListAll',
+        method: 'get',
+        params: query,
+    })
+}
+// 机具领料-申请列表
+export function getLeaseManageListAllCq(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseManageListAllCq',
+        method: 'get',
+        params: query,
+    })
+}
+// 机具领料-管理列表
+export function getLeaseAuditListAll(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseAuditListAll',
+        method: 'get',
+        params: query,
+    })
+}
+
+// 获取 来往单位 列表
+export function getUnitData(params = {}) {
+    return request({
+        url: '/material/select/getUnitCbx',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 获取 工程 列表
+export function getProData(params = {}) {
+    return request({
+        url: '/material/select/getSectionEngineeringCbx',
+        method: 'post',
+        data: params,
+    })
+}
+
+//  获取 设备树
+export function getDeviceTypeTree(params = {}) {
+    return request({
+        url: '/material/select/getDeviceTypeTree',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 根据单位id和工程id  获取 协议id
+export function getAgreementInfoById(params = {}) {
+    return request({
+        url: '/material/select/getAgreementInfoById',
+        method: 'post',
+        data: params,
+    })
+}
+
+//提交 领料申请
+export function submitLeaseApply(params = {}) {
+    return request({
+        url: '/material/base/tm_task/submitLeaseApply',
+        method: 'post',
+        data: params,
+    })
+}
+
+//编辑 领料申请
+export function editLeaseApply(params = {}) {
+    return request({
+        url: '/material/base/tm_task/edit',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 参数 领料任务
+export function deleteTask(taskId) {
+    return request({
+        url: `/material/base/tm_task/${taskId}`,
+        method: 'delete',
+    })
+}
+
+// 根据 领料任务id  获取详情数据
+export function getLeaseListAll(params = {}) {
+    return request({
+        url: '/material/base/tm_task/getLeaseListAll',
+        method: 'get',
+        params: params,
+    })
+}
+
+export function getLeaseOutOrder(params = {}) {
+  return request({
+    url: '/material/base/leaseOutDetails/getLeaseOutOrder',
+    method: 'get',
+    params: params,
+  })
+}
+// 根据 领料任务id  获取详情数据
+export function getLeaseListAllCq(params = {}) {
+    return request({
+        url: '/material/base/tm_task/getLeaseListAllCq',
+        method: 'get',
+        params: params,
+    })
+}
+
+// 领料审核  同意
+export function auditLeaseByCompany(params = {}) {
+    return request({
+        url: '/material/base/tm_task/auditLeaseByCompany',
+        method: 'post',
+        data: params,
+    })
+}
+// 领料审核  同意
+export function auditLeaseByCompanyCq(params = {}) {
+    return request({
+        url: '/material/base/tm_task/auditLeaseByCompanyCq',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 领料审核  拒绝
+export function rejectLeaseByCompany(params = {}) {
+    return request({
+        url: '/material/base/tm_task/rejectLeaseByCompany',
+        method: 'post',
+        data: params,
+    })
+}
+// 领料审核  拒绝
+export function rejectLeaseByCompanyCq(params = {}) {
+    return request({
+        url: '/material/base/tm_task/rejectLeaseByCompanyCq',
+        method: 'post',
+        data: params,
+    })
+}
+
+//  获取 物品类型
+export function getUseTypeTreee(params = {}) {
+    return request({
+        url: '/material/backApply/getUseTypeTree',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 机具领料申请-详情
+export function getLeaseApplyListAll(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseApplyListAll',
+        method: 'get',
+        params: query,
+    })
+}
+
+export function getLeaseApplyAuditListAll(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseApplyAuditListAll',
+        method: 'get',
+        params: query,
+    })
+}
+
+//领料出库 列表
+export function getLeaseAuditList(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseAuditList',
+        method: 'get',
+        params: query,
+    })
+}
+
+//领料出库 详情
+export function getLeaseAuditListDetail(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseAuditListDetail',
+        method: 'get',
+        params: query,
+    })
+}
+
+//领料出库 编码出库获取编码
+export function getDetailsByTypeId(query) {
+    return request({
+        url: '/material/base/leaseOutDetails/getDetailsByTypeId',
+        method: 'get',
+        params: query,
+    })
+}
+
+// 领料出库  编码出库 保存
+export function submitOut(params) {
+    return request({
+        url: '/material/base/leaseOutDetails/submitOutRfid',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 领料出库  数量出库 保存
+export function submitNumOut(params) {
+    return request({
+        url: '/material/base/leaseOutDetails/submitOutRfid',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 领料确认
+export function updateLeaseTaskStatusConfirmByCq(params) {
+    return request({
+        url: '/material/base/tm_task/updateLeaseTaskStatusConfirmByCq',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 当前在用量
+export function getUseNumByTypeId(params) {
+    return request({
+        url: '/material/backApply/getUseNumByTypeId',
+        method: 'get',
+        params,
+    })
+}
+
+// 批量审核
+export function auditAll(params) {
+    return request({
+        url: '/material/backApply/auditAll',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 获取费用承担方
+export function getCostBearingApi() {
+    return request({
+        url: '/material/base/dic/pid',
+        method: 'get',
+    })
+}
+// 推送智慧工程
+export function pushSmartEngineeringApi(data) {
+    return request({
+        url: '/material/base/tm_task/pushToIntelligentProject',
+        method: 'post',
+        data,
+    })
+}
+// 推送智慧工程
+export function getLeaseOutDetailRecordApi(data) {
+    return request({
+        url: '/material/base/tm_task/getLeaseOutDetailRecord',
+        method: 'get',
+        params: data,
+    })
+}
+
+/* 获取抱杆成套下拉数据 */
+export const getHoldingPoleSelListApi = () => {
+    return request.get('/material/maWhole/selectWholeList')
+}
diff --git a/src/api/lease/picking.js b/src/api/lease/picking.js
new file mode 100644
index 00000000..7a0be060
--- /dev/null
+++ b/src/api/lease/picking.js
@@ -0,0 +1,335 @@
+import request from '@/utils/request'
+
+// 往来单位-下拉
+export function getUnitList(query) {
+    return request({
+        url: '/material/agreementInfo/getUnitList',
+        method: 'get',
+        params: query,
+    })
+}
+
+// 工程名称-下拉
+export function getProjectList(query) {
+    return request({
+        url: '/material/agreementInfo/getProjectList',
+        method: 'get',
+        params: query,
+    })
+}
+
+// 协议管理-列表
+export function getAgreementList(query) {
+    return request({
+        url: '/material/agreementInfo/getAgreementInfoAll',
+        method: 'get',
+        params: query,
+    })
+}
+// 协议管理-详情
+export function getAgreementInfoId(query) {
+    return request({
+        url: '/material/agreementInfo/getAgreementInfoId',
+        method: 'get',
+        params: query,
+    })
+}
+
+//协议管理--新增
+export function addAgreement(data) {
+    return request({
+        url: '/material/agreementInfo/add',
+        method: 'post',
+        data: data,
+    })
+}
+
+// 协议管理--修改
+export function updateAgreement(data) {
+    return request({
+        url: '/material/agreementInfo/update',
+        method: 'post',
+        data: data,
+    })
+}
+// //协议管理--删除
+export function removeAgreement(data) {
+    return request({
+        url: '/material/agreementInfo/remove',
+        method: 'post',
+        data: data,
+    })
+}
+
+// 机具领料-申请列表
+export function getLeaseManageListAll(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseManageListAll',
+        method: 'get',
+        params: query,
+    })
+}
+// 机具领料-申请列表
+export function getLeaseManageListAllCq(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseManageListAllCq',
+        method: 'get',
+        params: query,
+    })
+}
+// 机具领料-管理列表
+export function getLeaseAuditListAll(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseAuditListAll',
+        method: 'get',
+        params: query,
+    })
+}
+
+// 获取 来往单位 列表
+export function getUnitData(params = {}) {
+    return request({
+        url: '/material/select/getUnitCbx',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 获取 工程 列表
+export function getProData(params = {}) {
+    return request({
+        url: '/material/select/getSectionEngineeringCbx',
+        method: 'post',
+        data: params,
+    })
+}
+
+//  获取 设备树
+export function getDeviceTypeTree(params = {}) {
+    return request({
+        url: '/material/select/getDeviceTypeTree',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 根据单位id和工程id  获取 协议id
+export function getAgreementInfoById(params = {}) {
+    return request({
+        url: '/material/select/getAgreementInfoById',
+        method: 'post',
+        data: params,
+    })
+}
+
+//提交 领料申请
+export function submitLeaseApply(params = {}) {
+    return request({
+        url: '/material/base/tm_task/submitLeaseApply',
+        method: 'post',
+        data: params,
+    })
+}
+
+//编辑 领料申请
+export function editLeaseApply(params = {}) {
+    return request({
+        url: '/material/base/tm_task/edit',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 参数 领料任务
+export function deleteTask(taskId) {
+    return request({
+        url: `/material/base/tm_task/${taskId}`,
+        method: 'delete',
+    })
+}
+
+// 根据 领料任务id  获取详情数据
+export function getLeaseListAll(params = {}) {
+    return request({
+        url: '/material/base/tm_task/getLeaseListAll',
+        method: 'get',
+        params: params,
+    })
+}
+
+export function getLeaseOutOrder(params = {}) {
+  return request({
+    url: '/material/base/leaseOutDetails/getLeaseOutOrder',
+    method: 'get',
+    params: params,
+  })
+}
+// 根据 领料任务id  获取详情数据
+export function getLeaseListAllCq(params = {}) {
+    return request({
+        url: '/material/base/tm_task/getLeaseListAllCq',
+        method: 'get',
+        params: params,
+    })
+}
+
+// 领料审核  同意
+export function auditLeaseByCompany(params = {}) {
+    return request({
+        url: '/material/base/tm_task/auditLeaseByCompany',
+        method: 'post',
+        data: params,
+    })
+}
+// 领料审核  同意
+export function auditLeaseByCompanyCq(params = {}) {
+    return request({
+        url: '/material/base/tm_task/auditLeaseByCompanyCq',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 领料审核  拒绝
+export function rejectLeaseByCompany(params = {}) {
+    return request({
+        url: '/material/base/tm_task/rejectLeaseByCompany',
+        method: 'post',
+        data: params,
+    })
+}
+// 领料审核  拒绝
+export function rejectLeaseByCompanyCq(params = {}) {
+    return request({
+        url: '/material/base/tm_task/rejectLeaseByCompanyCq',
+        method: 'post',
+        data: params,
+    })
+}
+
+//  获取 物品类型
+export function getUseTypeTreee(params = {}) {
+    return request({
+        url: '/material/backApply/getUseTypeTree',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 机具领料申请-详情
+export function getLeaseApplyListAll(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseApplyListAll',
+        method: 'get',
+        params: query,
+    })
+}
+
+export function getLeaseApplyAuditListAll(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseApplyAuditListAll',
+        method: 'get',
+        params: query,
+    })
+}
+
+//领料出库 列表
+export function getLeaseAuditList(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseAuditList',
+        method: 'get',
+        params: query,
+    })
+}
+
+//领料出库 详情
+export function getLeaseAuditListDetail(query) {
+    return request({
+        url: '/material/base/tm_task/getLeaseAuditListDetail',
+        method: 'get',
+        params: query,
+    })
+}
+
+//领料出库 编码出库获取编码
+export function getDetailsByTypeId(query) {
+    return request({
+        url: '/material/base/leaseOutDetails/getDetailsByTypeId',
+        method: 'get',
+        params: query,
+    })
+}
+
+// 领料出库  编码出库 保存
+export function submitOut(params) {
+    return request({
+        url: '/material/base/leaseOutDetails/submitOutRfid',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 领料出库  数量出库 保存
+export function submitNumOut(params) {
+    return request({
+        url: '/material/base/leaseOutDetails/submitOutRfid',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 领料确认
+export function updateLeaseTaskStatusConfirmByCq(params) {
+    return request({
+        url: '/material/base/tm_task/updateLeaseTaskStatusConfirmByCq',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 当前在用量
+export function getUseNumByTypeId(params) {
+    return request({
+        url: '/material/backApply/getUseNumByTypeId',
+        method: 'get',
+        params,
+    })
+}
+
+// 批量审核
+export function auditAll(params) {
+    return request({
+        url: '/material/backApply/auditAll',
+        method: 'post',
+        data: params,
+    })
+}
+
+// 获取费用承担方
+export function getCostBearingApi() {
+    return request({
+        url: '/material/base/dic/pid',
+        method: 'get',
+    })
+}
+// 推送智慧工程
+export function pushSmartEngineeringApi(data) {
+    return request({
+        url: '/material/base/tm_task/pushToIntelligentProject',
+        method: 'post',
+        data,
+    })
+}
+// 推送智慧工程
+export function getLeaseOutDetailRecordApi(data) {
+    return request({
+        url: '/material/base/tm_task/getLeaseOutDetailRecord',
+        method: 'get',
+        params: data,
+    })
+}
+
+/* 获取抱杆成套下拉数据 */
+export const getHoldingPoleSelListApi = () => {
+    return request.get('/material/maWhole/selectWholeList')
+}
diff --git a/src/api/lease/protocol.js b/src/api/lease/protocol.js
index 0df83e80..a252380f 100644
--- a/src/api/lease/protocol.js
+++ b/src/api/lease/protocol.js
@@ -2,31 +2,58 @@ import request from '@/utils/request'
 
 // 往来单位-下拉
 export function getUnitList(query) {
-    return request({
-        url: '/material/select/getUnitList',
-        method: 'post',
-        data: {
+  return request({
+    url: '/material/select/getUnitList',
+    method: 'post',
+    data: {
 
-        },
-    })
+    },
+  })
 }
 
 // 工程名称-下拉
 export function getProjectList(query) {
-    return request({
-        url: '/material/select/getProjectList',
-        method: 'post',
-        data: {},
-    })
+  return request({
+    url: '/material/select/getProjectList',
+    method: 'post',
+    data: {},
+  })
 }
 
-// 协议管理-列表
-export function getAgreementList(query) {
-    return request({
-        url: '/material/bm_agreement_info/list',
-        method: 'get',
-        params: query,
-    })
+//协议管理-列表
+export function getListAgreement(query) {
+  return request({
+    url: '/material/bm_agreement_info/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+// 协议管理-详情
+export function getAgreementDetail(id) {
+  return request({
+    url: '/material/bm_agreement_info/'+id,
+    method: 'get',
+  })
+}
+
+
+//协议管理--删除
+export function delAgreement(id) {
+  return request({
+    url: '/material/bm_agreement_info/'+id,
+    method: 'delete',
+  })
+}
+
+// 协议管理--修改
+export function editAgreement(data) {
+  return request({
+    url: '/material/bm_agreement_info',
+    method: 'put',
+    data: data,
+  })
 }
 
 //协议管理--新增
@@ -38,316 +65,10 @@ export function addAgreement(data) {
   })
 }
 
-// 协议管理--修改
-export function updateAgreement(data) {
+//协议管理--删除
+export function deleteFile(objectKey) {
   return request({
-    url: '/material/bm_agreement_info',
-    method: 'put',
-    data: data,
+    url: '/material/bm_agreement_info/'+id,
+    method: 'delete',
   })
 }
-
-
-// 协议管理-详情
-export function getAgreementInfoId(id) {
-    return request({
-        url: '/material/bm_agreement_info/'+id,
-        method: 'get',
-        params: query,
-    })
-}
-
-// //协议管理--删除
-export function removeAgreement(id) {
-    return request({
-        url: '/material/bm_agreement_info/'+id,
-        method: 'delete',
-        data: data,
-    })
-}
-
-//资源图片上传
-export function imgUpLoad(param){
-  const formData = new FormData()
-  formData.append('file', param.file)
-  formData.append('fileType', param.type)
-  return request({
-    url: '/material/bm_file_info',
-    method: 'post',
-    data: formData,
-    header:'multipart/form-data'
-  })
-}
-
-// 机具领料-申请列表
-export function getLeaseManageListAll(query) {
-    return request({
-        url: '/material/base/tm_task/getLeaseManageListAll',
-        method: 'get',
-        params: query,
-    })
-}
-// 机具领料-申请列表
-export function getLeaseManageListAllCq(query) {
-    return request({
-        url: '/material/base/tm_task/getLeaseManageListAllCq',
-        method: 'get',
-        params: query,
-    })
-}
-// 机具领料-管理列表
-export function getLeaseAuditListAll(query) {
-    return request({
-        url: '/material/base/tm_task/getLeaseAuditListAll',
-        method: 'get',
-        params: query,
-    })
-}
-
-// 获取 来往单位 列表
-export function getUnitData(params = {}) {
-    return request({
-        url: '/material/select/getUnitCbx',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 获取 工程 列表
-export function getProData(params = {}) {
-    return request({
-        url: '/material/select/getSectionEngineeringCbx',
-        method: 'post',
-        data: params,
-    })
-}
-
-//  获取 设备树
-export function getDeviceTypeTree(params = {}) {
-    return request({
-        url: '/material/select/getDeviceTypeTree',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 根据单位id和工程id  获取 协议id
-export function getAgreementInfoById(params = {}) {
-    return request({
-        url: '/material/select/getAgreementInfoById',
-        method: 'post',
-        data: params,
-    })
-}
-
-//提交 领料申请
-export function submitLeaseApply(params = {}) {
-    return request({
-        url: '/material/base/tm_task/submitLeaseApply',
-        method: 'post',
-        data: params,
-    })
-}
-
-//编辑 领料申请
-export function editLeaseApply(params = {}) {
-    return request({
-        url: '/material/base/tm_task/edit',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 参数 领料任务
-export function deleteTask(taskId) {
-    return request({
-        url: `/material/base/tm_task/${taskId}`,
-        method: 'delete',
-    })
-}
-
-// 根据 领料任务id  获取详情数据
-export function getLeaseListAll(params = {}) {
-    return request({
-        url: '/material/base/tm_task/getLeaseListAll',
-        method: 'get',
-        params: params,
-    })
-}
-
-export function getLeaseOutOrder(params = {}) {
-  return request({
-    url: '/material/base/leaseOutDetails/getLeaseOutOrder',
-    method: 'get',
-    params: params,
-  })
-}
-// 根据 领料任务id  获取详情数据
-export function getLeaseListAllCq(params = {}) {
-    return request({
-        url: '/material/base/tm_task/getLeaseListAllCq',
-        method: 'get',
-        params: params,
-    })
-}
-
-// 领料审核  同意
-export function auditLeaseByCompany(params = {}) {
-    return request({
-        url: '/material/base/tm_task/auditLeaseByCompany',
-        method: 'post',
-        data: params,
-    })
-}
-// 领料审核  同意
-export function auditLeaseByCompanyCq(params = {}) {
-    return request({
-        url: '/material/base/tm_task/auditLeaseByCompanyCq',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 领料审核  拒绝
-export function rejectLeaseByCompany(params = {}) {
-    return request({
-        url: '/material/base/tm_task/rejectLeaseByCompany',
-        method: 'post',
-        data: params,
-    })
-}
-// 领料审核  拒绝
-export function rejectLeaseByCompanyCq(params = {}) {
-    return request({
-        url: '/material/base/tm_task/rejectLeaseByCompanyCq',
-        method: 'post',
-        data: params,
-    })
-}
-
-//  获取 物品类型
-export function getUseTypeTreee(params = {}) {
-    return request({
-        url: '/material/backApply/getUseTypeTree',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 机具领料申请-详情
-export function getLeaseApplyListAll(query) {
-    return request({
-        url: '/material/base/tm_task/getLeaseApplyListAll',
-        method: 'get',
-        params: query,
-    })
-}
-
-export function getLeaseApplyAuditListAll(query) {
-    return request({
-        url: '/material/base/tm_task/getLeaseApplyAuditListAll',
-        method: 'get',
-        params: query,
-    })
-}
-
-//领料出库 列表
-export function getLeaseAuditList(query) {
-    return request({
-        url: '/material/base/tm_task/getLeaseAuditList',
-        method: 'get',
-        params: query,
-    })
-}
-
-//领料出库 详情
-export function getLeaseAuditListDetail(query) {
-    return request({
-        url: '/material/base/tm_task/getLeaseAuditListDetail',
-        method: 'get',
-        params: query,
-    })
-}
-
-//领料出库 编码出库获取编码
-export function getDetailsByTypeId(query) {
-    return request({
-        url: '/material/base/leaseOutDetails/getDetailsByTypeId',
-        method: 'get',
-        params: query,
-    })
-}
-
-// 领料出库  编码出库 保存
-export function submitOut(params) {
-    return request({
-        url: '/material/base/leaseOutDetails/submitOutRfid',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 领料出库  数量出库 保存
-export function submitNumOut(params) {
-    return request({
-        url: '/material/base/leaseOutDetails/submitOutRfid',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 领料确认
-export function updateLeaseTaskStatusConfirmByCq(params) {
-    return request({
-        url: '/material/base/tm_task/updateLeaseTaskStatusConfirmByCq',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 当前在用量
-export function getUseNumByTypeId(params) {
-    return request({
-        url: '/material/backApply/getUseNumByTypeId',
-        method: 'get',
-        params,
-    })
-}
-
-// 批量审核
-export function auditAll(params) {
-    return request({
-        url: '/material/backApply/auditAll',
-        method: 'post',
-        data: params,
-    })
-}
-
-// 获取费用承担方
-export function getCostBearingApi() {
-    return request({
-        url: '/material/base/dic/pid',
-        method: 'get',
-    })
-}
-// 推送智慧工程
-export function pushSmartEngineeringApi(data) {
-    return request({
-        url: '/material/base/tm_task/pushToIntelligentProject',
-        method: 'post',
-        data,
-    })
-}
-// 推送智慧工程
-export function getLeaseOutDetailRecordApi(data) {
-    return request({
-        url: '/material/base/tm_task/getLeaseOutDetailRecord',
-        method: 'get',
-        params: data,
-    })
-}
-
-/* 获取抱杆成套下拉数据 */
-export const getHoldingPoleSelListApi = () => {
-    return request.get('/material/maWhole/selectWholeList')
-}
diff --git a/src/views/material/lease/apply/component/outbound.vue b/src/views/material/lease/apply/component/outbound.vue
new file mode 100644
index 00000000..cbb96a4b
--- /dev/null
+++ b/src/views/material/lease/apply/component/outbound.vue
@@ -0,0 +1,1181 @@
+<template>
+    <!-- 领料出库 -->
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <el-form-item label="领料单号" prop="code">
+                <el-input
+                    v-model="queryParams.code"
+                    placeholder="请输入领料单号"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="单位名称" prop="unitId">
+                <el-select
+                    v-model="queryParams.unitId"
+                    placeholder="请选择单位名称"
+                    clearable
+                >
+                    <el-option
+                        v-for="item in unitList"
+                        filterable
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="工程名称" prop="proId">
+                <el-select
+                    v-model="queryParams.proId"
+                    filterable
+                    clearable
+                    placeholder="请选择工程名称"
+                >
+                    <el-option
+                        v-for="item in proList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="出库状态" prop="taskStatus">
+                <el-select
+                    v-model="queryParams.taskStatus"
+                    placeholder="请选择出库状态"
+                    clearable
+                >
+                    <el-option
+                        v-for="item in statusList"
+                        filterable
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item>
+                <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-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"
+                    @click="handleExport"
+                    v-hasPermi="['picking:outbound:export']"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="leaseList" border>
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+                :index="
+                    indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                "
+            />
+            <el-table-column
+                label="领料单号"
+                align="center"
+                prop="code"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料申请单位"
+                align="center"
+                prop="unitName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料申请工程"
+                align="center"
+                prop="proName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="申请数量"
+                align="center"
+                prop="preCountNum"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="申请时间"
+                align="center"
+                prop="createTimes"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="已出库数量"
+                align="center"
+                prop="alNum"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="出库状态"
+                align="center"
+                prop="taskName"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        @click="handleView(scope.row)"
+                        v-hasPermi="['picking:outbound:view']"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        v-if="scope.row.taskStatus != 35"
+                        @click="handleOut(scope.row)"
+                        v-hasPermi="['picking:outbound:out']"
+                    >
+                        出库
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
+
+        <!-- 出库弹窗 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openLeaseDevices"
+            width="80%"
+            append-to-body
+        >
+            <el-form
+                :model="dialogQuery"
+                ref="dialogQuery"
+                size="small"
+                :inline="true"
+                label-width="100px"
+            >
+                <el-form-item label="设备负责人" prop="userName">
+                    <el-input v-model="dialogQuery.userName" maxlength="20" />
+                </el-form-item>
+                <el-form-item label="机具类型" prop="typeId">
+                    <treeselect
+                        v-model="dialogQuery.typeId"
+                        default-expand-all
+                        :options="equipmentTypeList"
+                        placeholder="请选择规格型号"
+                        :disable-branch-nodes="true"
+                        style="width: 240px"
+                        noChildrenText="没有数据了"
+                        noOptionsText="没有数据"
+                        noResultsText="没有搜索结果"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="el-icon-search"
+                        size="mini"
+                        @click="handleDialogQuery"
+                        >查询</el-button
+                    >
+                    <el-button
+                        icon="el-icon-refresh"
+                        size="mini"
+                        @click="resetDialogQuery"
+                        >重置</el-button
+                    >
+                </el-form-item>
+            </el-form>
+
+            <el-table v-loading="loading" :data="dialogList">
+                <el-table-column
+                    align="center"
+                    label="序号"
+                    type="index"
+                    :index="
+                        indexContinuation(
+                            queryParams.pageNum,
+                            queryParams.pageSize,
+                        )
+                    "
+                />
+                <el-table-column
+                    label="机具名称"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeModelName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="待出库数量"
+                    align="center"
+                    prop="outNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="已出库数量"
+                    align="center"
+                    prop="alNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="设备负责人"
+                    align="center"
+                    prop="userName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column label="操作" align="center" v-if="isView">
+                    <template slot-scope="{ row }" v-if="row.alNum > 0">
+                        <el-button type="text" @click="onPreviewRecord(row)"
+                            >出库记录</el-button
+                        >
+                      <el-button type="text" @click="openLld(row)"
+                      >出库单</el-button
+                      >
+                    </template>
+                </el-table-column>
+
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    v-if="!isView"
+                >
+                    <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            @click="codeOut(scope.row)"
+                            v-if="
+                                scope.row.manageType == 0 &&
+                                scope.row.status != 2
+                            "
+                        >
+                            编码出库
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            v-if="
+                                scope.row.manageType == 1 &&
+                                scope.row.status != 2
+                            "
+                            @click="numOut(scope.row)"
+                        >
+                            数量出库
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination
+                v-show="dialogTotal > 0"
+                :total="dialogTotal"
+                :page.sync="dialogQuery.pageNum"
+                :limit.sync="dialogQuery.pageSize"
+                @pagination="getDialogList"
+            />
+
+            <el-dialog
+                title="出库记录"
+                :visible.sync="outRecordVisible"
+                width="70%"
+                append-to-body
+            >
+                <el-form inline>
+                    <!-- 搜索表单 -->
+                    <el-form-item label="时间">
+                        <el-date-picker
+                            clearable
+                            type="daterange"
+                            v-model="outTime"
+                            style="width: 240px"
+                            range-separator="至"
+                            value-format="yyyy-MM-dd"
+                            end-placeholder="结束日期"
+                            start-placeholder="开始日期"
+                            placeholder="请选择出库日期"
+                            @change="onOutTimeChange"
+                        />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button
+                            size="small"
+                            type="primary"
+                            @click="onHandleQuery"
+                            >查询</el-button
+                        >
+                        <el-button
+                            size="small"
+                            type="primary"
+                            @click="onHandleReset"
+                            >重置</el-button
+                        >
+                        <el-button
+                            size="small"
+                            type="primary"
+                            @click="onHandleExport"
+                            >导出</el-button
+                        >
+                    </el-form-item>
+                </el-form>
+
+                <!-- 出库记录列表 -->
+                <el-table border :data="leaseOutDetailsList">
+                    <el-table-column
+                        align="center"
+                        label="序号"
+                        show-overflow-tooltip
+                        type="index"
+                    />
+                    <el-table-column
+                        align="center"
+                        label="机具名称"
+                        prop="typeName"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        align="center"
+                        label="规格型号"
+                        prop="typeModelName"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        align="center"
+                        label="出库时间"
+                        prop="createTime"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        align="center"
+                        label="本次出库数量"
+                        prop="outNum"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        align="center"
+                        label="出库人"
+                        prop="userName"
+                        show-overflow-tooltip
+                    />
+                </el-table>
+            </el-dialog>
+        </el-dialog>
+
+        <!-- 编码出库 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openCode"
+            width="1200px"
+            append-to-body
+        >
+            <el-form
+                :model="codeOutForm"
+                ref="codeOutForm"
+                size="small"
+                :inline="true"
+                label-width="100px"
+            >
+                <span style="margin-right: 50px">待出库数量：{{ outNum }}</span>
+                <br> <br>
+                <el-form-item label="请输入车牌号" prop="carCode">
+                    <el-input v-model="codeOutForm.carCode" maxlength="20" />
+                </el-form-item>
+                <span style="margin-right: 50px; color: red"
+                >部分设备出库时，需进行装车,需记录车牌号码</span
+                >
+                <br>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="codeOutForm.remark" maxlength="50" />
+                </el-form-item>
+
+            </el-form>
+
+            <el-form
+                :model="outQuery"
+                ref="outQuery"
+                size="small"
+                :inline="true"
+                label-width="100px"
+            >
+                <el-form-item label="设备编码" prop="maCode">
+                    <el-input v-model="outQuery.maCode" maxlength="20" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="el-icon-search"
+                        size="mini"
+                        @click="handleOutQuery"
+                        >查询</el-button
+                    >
+                    <el-button
+                        icon="el-icon-refresh"
+                        size="mini"
+                        @click="resetOutQuery"
+                        >重置</el-button
+                    >
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="saveCodeOut"
+                        >出库</el-button
+                    >
+                </el-col>
+            </el-row>
+            <el-table
+                v-loading="loading"
+                :data="outCodeList"
+                height="500"
+                @selection-change="handleSelectionChange"
+            >
+                <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center"
+                    :selectable="selectable"
+                />
+                <el-table-column
+                    label="序号"
+                    align="center"
+                    width="80"
+                    type="index"
+                    :index="
+                        indexContinuation(outQuery.pageNum, outQuery.pageSize)
+                    "
+                >
+                    <!-- <template slot-scope="scope">
+                        <span>{{
+                            (outQuery.pageNum - 1) * 10 + scope.$index + 1
+                        }}</span>
+                    </template> -->
+                </el-table-column>
+                <el-table-column
+                    label="类型名称"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeModelName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="设备编码"
+                    align="center"
+                    prop="maCode"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="设备状态"
+                    align="center"
+                    prop="maStatus"
+                    :show-overflow-tooltip="true"
+                />
+            </el-table>
+
+            <pagination
+                v-show="outTotal > 0"
+                :total="outTotal"
+                :page.sync="outQuery.pageNum"
+                :limit.sync="outQuery.pageSize"
+                @pagination="getCodeList"
+            />
+        </el-dialog>
+
+        <!-- 数量出库 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openNum"
+            width="1200px"
+            append-to-body
+        >
+            <el-form
+                :model="numOutForm"
+                ref="numOutForm"
+                size="small"
+                :inline="true"
+                label-width="100px"
+            >
+                <!-- <span style="margin-right: 50px;">
+            待出库数量：{{outNum}}
+        </span>-->
+                <el-form-item label="请输入车牌号" prop="carCode">
+                    <el-input v-model="numOutForm.carCode" maxlength="20" />
+                </el-form-item>
+                <span style="margin-right: 50px; color: red"
+                >部分设备出库时，需进行装车,需记录车牌号码</span
+                >
+                <br>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="numOutForm.remark" maxlength="50" />
+                </el-form-item>
+
+            </el-form>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="saveNumOut"
+                        >出库</el-button
+                    >
+                </el-col>
+            </el-row>
+            <el-table v-loading="loading" :data="outNumList" height="500">
+                <el-table-column label="序号" align="center" type="index" />
+                <el-table-column
+                    label="设备类型"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeModelName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="库存数量"
+                    align="center"
+                    prop="num"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="待出库数量"
+                    align="center"
+                    prop="outNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="已出库数量"
+                    align="center"
+                    prop="alNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column label="出库数量" align="center">
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model.number="scope.row.inputNum"
+                            placeholder="请输入出库数量"
+                            type="number"
+                            @input="checkNum(scope.row)"
+                            clearable
+                            style="width: 100%"
+                        />
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+
+      <!-- 领料单弹窗 -->
+      <el-dialog :visible.sync="open" width="800px" append-to-body>
+        <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+          <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+            <div
+              class="title"
+              style="
+                            text-align: center;
+                            font-weight: 600;
+                            font-size: 16px;
+                        "
+            >
+              出库单
+            </div>
+            <div
+              class="info"
+              style="margin-top: 10px; display: flex; flex-wrap: wrap"
+            >
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>领料单位：</span>{{ leaseOutData.unitName }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>工程名称：</span>{{ leaseOutData.proName }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>时间：</span>{{ leaseOutData.updateTime }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>编号：</span>{{ leaseOutData.code }}
+              </div>
+            </div>
+            <el-table
+              :data="leaseOutDetailRecord"
+              class="table"
+              border
+              style="margin-top: 20px; padding: 1px"
+            >
+              <!--          <el-table-column type="selection" width="55" align="center" />-->
+              <el-table-column
+                label="序号"
+                align="center"
+                type="index"
+              />
+              <el-table-column
+                label="类型名称"
+                align="center"
+                prop="typeName"
+              />
+              <el-table-column
+                label="规格型号"
+                align="center"
+                prop="typeModelName"
+              />
+              <el-table-column
+                label="计量单位"
+                align="center"
+                prop="unitName"
+              />
+              <el-table-column
+                label="出库数量"
+                align="center"
+                prop="outNum"
+              />
+              <el-table-column
+                label="设备编码"
+                align="center"
+                prop="maCode"
+              />
+              <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+              />
+              <el-table-column
+                label="出库方式"
+                align="center"
+                prop="manageTypeName"
+              />
+            </el-table>
+
+            <div
+              class="fillIn"
+              style="
+                            margin-top: 30px;
+                            display: flex;
+                            justify-content: space-between;
+                        "
+            >
+              <div class="item" style="width: 25%">
+                <span>审核：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>领料：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>仓库：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>操作人：</span>
+              </div>
+            </div>
+          </vue-easy-print>
+        </div>
+        <div slot="footer" class="dialog-footer" style="text-align: center">
+          <el-button type="primary" @click="print">打 印</el-button>
+          <el-button @click="open = false">关 闭</el-button>
+        </div>
+      </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+  getUnitData,
+  getProData,
+  getLeaseAuditList,
+  getLeaseAuditListDetail,
+  getDetailsByTypeId,
+  submitOut,
+  submitNumOut,
+  getLeaseOutDetailRecordApi, getLeaseListAll, getLeaseOutOrder,
+} from '@/api/lease/outbound.js'
+// import { getTypeList } from '@/api/store/warehousing'
+// import { equipmentTypeTree } from '@/api/store/tools'
+// import Treeselect from '@riophae/vue-treeselect'
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+// import vueEasyPrint from 'vue-easy-print'
+export default {
+    name: 'receiveOut',
+    components: { Treeselect,vueEasyPrint },
+    data() {
+        return {
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            maCodeList: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+          // 是否显示弹出层
+            open: false,
+            // 表格数据
+            leaseList: [],
+            // 弹出层标题
+            title: '设备出库',
+            // 单位数据
+            unitList: [],
+            proList: [], //工程集合
+            statusList: [
+                { id: '33', name: '待出库' },
+                { id: '34', name: '出库进行中' },
+                { id: '35', name: '完成' },
+            ], //工程集合
+            //搜索下拉数据
+            typeList: [],
+            equipmentTypeList: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                flag: 1,
+                code: undefined,
+                unitId: undefined,
+                proId: undefined,
+                taskStatus: undefined,
+            },
+            // 表单参数 出库
+            form: {},
+            //弹窗
+            openLeaseDevices: false,
+            isView: false,
+            dialogQuery: {
+                pageNum: 1,
+                pageSize: 10,
+                director: undefined,
+                typeId: undefined,
+            },
+            dialogList: [],
+            dialogTotal: 0,
+            outObj: {},
+            openCode: false, //编码弹窗开关
+            openNum: false, //数量弹窗开关
+            outNum: 0, //待出库数量
+            codeOutForm: {
+                //编码表单-车牌号
+                carCode: undefined,
+                remark: undefined,
+            },
+            numOutForm: {
+                //数量表单-车牌号
+                carCode: '',
+                remark: '',
+            },
+            outQuery: {
+                //编码出库-搜索条件
+                pageNum: 1,
+                pageSize: 10,
+                maCode: undefined,
+            },
+            outTotal: 0, //编码弹窗分页-总数
+            outCodeList: [], //编码弹窗表格数据
+            outNumList: [], //数量弹窗表格数据
+            leaseType: '', // 领用类型 0 为工程租赁 1 为长期领用
+
+            outRecordVisible: false,
+            leaseOutDetailParams: {
+                id: '',
+                typeId: '',
+                startTime: '',
+                endTime: '',
+            },
+            leaseOutDetailsList: [],
+            outTime: [],
+          // 领料任务详情数据
+            leaseOutDetailRecord: [],
+            leaseOutData: {},
+        }
+    },
+    created() {
+        this.getTypeList()
+        this.getUnitList()
+        this.getProList()
+        this.equipmentType()
+
+        this.getList()
+    },
+    methods: {
+        //获取单位
+        getUnitList() {
+            getUnitData().then((response) => {
+                this.unitList = response.data
+            })
+        },
+        //获取单位
+        getProList() {
+            getProData().then((response) => {
+                this.proList = response.data
+            })
+        },
+        getTypeList() {
+            getTypeList({ level: '3' }).then((response) => {
+                this.typeList = response.data
+            })
+        },
+        //规格型号
+        equipmentType() {
+            equipmentTypeTree().then((response) => {
+                this.equipmentTypeList = response.data
+                this.equipmentTypeList.forEach((item, index) => {
+                    if (item.children && item.children.length > 0) {
+                        item.children.forEach((item2, index2) => {
+                            if (item2.children && item2.children.length > 0) {
+                                item2.children.forEach((item3) => {
+                                    if (
+                                        item3.children &&
+                                        item3.children.length > 0
+                                    ) {
+                                        item3.children.forEach((item4) => {
+                                            item4.machineTypeName =
+                                                item3.typeName
+                                            item4.specificationType =
+                                                item4.typeName
+                                            // this.$set(item4, 'purchasePrice', 0);
+                                            // this.$set(item4, 'purchaseNum', 1);
+                                        })
+                                    }
+                                })
+                            }
+                        })
+                    }
+                })
+            })
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true
+            getLeaseAuditList(this.queryParams).then((response) => {
+                this.leaseList = response.data.rows
+                this.total = response.data.total
+                this.loading = false
+            })
+        },
+        //查看按钮
+        handleView(row) {
+            this.openLeaseDevices = true
+            this.isView = true
+            this.dialogQuery.id = row.id
+            this.leaseOutDetailParams.id = row.id
+            this.resetDialogQuery()
+            // this.getDialogList();
+        },
+        /** 查询列表 */
+        getDialogList() {
+            // console.log(this.dialogQuery)
+            getLeaseAuditListDetail(this.dialogQuery).then((response) => {
+                this.dialogList = response.data.rows
+                this.dialogTotal = response.data.total
+            })
+        },
+        handleDialogQuery() {
+            this.dialogQuery.pageNum = 1
+            this.getDialogList()
+        },
+        resetDialogQuery() {
+            this.resetForm('dialogQuery')
+            this.handleDialogQuery()
+        },
+        /** 出库按钮操作 */
+        handleOut(row) {
+            this.openLeaseDevices = true
+            this.isView = false
+            this.dialogQuery.id = row.id
+            this.leaseType = row.leaseType
+            this.resetDialogQuery()
+            // this.getDialogList()
+        },
+
+        //编码出库
+        codeOut(row) {
+            // this.title = '编码出库'
+            this.openCode = true
+            this.resetForm('codeOutForm')
+            this.resetForm('outQuery')
+            this.outNum = row.outNum
+            this.outQuery.typeId = row.typeId
+            this.outObj = row
+            this.handleOutQuery()
+        },
+        //数量出库
+        numOut(row) {
+            console.log(row, '数量出库当前行数据--')
+            // this.title = '数量出库'
+            this.openNum = true
+            this.resetForm('codeOutForm')
+            this.resetForm('numOutForm')
+            // console.log(row)
+            let obj = {}
+            this.$set(obj, 'taskId', row.taskId)
+            this.$set(obj, 'id', row.id)
+            this.$set(obj, 'manageType', 1)
+            this.$set(obj, 'parentId', row.parentId)
+            this.$set(obj, 'typeName', row.typeName)
+            this.$set(obj, 'typeModelName', row.typeModelName)
+            this.$set(obj, 'typeId', row.typeId)
+            this.$set(obj, 'alNum', row.alNum) //已出库数量
+            this.$set(obj, 'outNum', row.outNum) //待出库数量
+            this.$set(obj, 'inputNum', 1) //出库数量
+            this.$set(obj, 'num', row.num) //库存
+            this.outNumList = [obj]
+        },
+        handleOutQuery() {
+            this.outQuery.pageNum = 1
+            this.getCodeList()
+        },
+        resetOutQuery() {
+            this.resetForm('outQuery')
+            this.handleOutQuery()
+        },
+        getCodeList() {
+            getDetailsByTypeId(this.outQuery).then((response) => {
+                this.outCodeList = response.data.rows
+                if (response.data.total) {
+                    this.outTotal = response.data.total
+                }
+            })
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.maCodeList = selection.map((item) => item.maId)
+        },
+        selectable(row) {
+            console.log(row)
+            if (row.maStatus == '在库') {
+                return true
+            } else {
+                return false
+            }
+        },
+        //编码出库保存
+        saveCodeOut() {
+            if (this.maCodeList.length <= this.outObj.outNum) {
+                let params = this.maCodeList.map((item) => {
+                    let obj = {
+                        id: this.outObj.id,
+                        maId: item,
+                        manageType: 0,
+                        carCode: this.codeOutForm.carCode,
+                        remark: this.codeOutForm.remark,
+                        typeId: this.outObj.typeId,
+                        parentId: this.outObj.parentId,
+                        outNum: 1,
+                        taskId: this.outObj.taskId,
+                        leaseType: this.leaseType,
+                    }
+                    return obj
+                })
+
+                // console.log(params, '编码出库时参数')
+                // console.log(params)
+                submitOut(params).then((response) => {
+                    this.$modal.msgSuccess('出库成功')
+                    this.openCode = false
+                    this.handleDialogQuery()
+                    this.handleQuery()
+                })
+            } else {
+                this.$modal.msgError('所选机具编码已超出出库数量！')
+            }
+        },
+        //数量出库保存
+        saveNumOut() {
+            this.outNumList[0].carCode = this.numOutForm.carCode
+            this.outNumList[0].remark = this.numOutForm.remark
+            this.outNumList[0].leaseType = this.leaseType
+            let param = this.outNumList
+            // console.log(param, '数量出库时参数')
+            submitNumOut(param).then((response) => {
+                this.$modal.msgSuccess('出库成功')
+                this.openNum = false
+                this.handleDialogQuery()
+                this.handleQuery()
+            })
+        },
+
+        //输入出库数量
+        checkNum(row) {
+            let maxNum = row.outNum
+            if (row.inputNum <= 1) {
+                row.inputNum = 1
+            }
+            if (row.inputNum > row.outNum && row.num >= maxNum) {
+                row.inputNum = maxNum
+            }
+            if (row.inputNum > row.outNum && row.num < maxNum) {
+                row.inputNum = row.num
+            }
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            this.downloadJson(
+                'material/base/tm_task/export',
+                JSON.stringify(this.queryParams),
+                `领料出库_${new Date().getTime()}.xlsx`,
+            )
+        },
+
+        /* 查看出库记录 */
+        onPreviewRecord(row) {
+            this.leaseOutDetailParams.typeId = row.typeId
+            this.onHandleQuery().then(() => {
+                this.outRecordVisible = true
+            })
+        },
+      /* 打开出库单 */
+      async openLld(row) {
+        this.open = true
+
+        const res = await getLeaseOutOrder({ parentId: row.parentId,typeId: row.typeId})
+
+        this.leaseOutDetailRecord = res.data.leaseOutDetailRecord
+        this.leaseOutData = res.data
+
+        console.log('this.leaseApplyData ============', this.leaseApplyData)
+      },
+      // 领料单 打印
+      print() {
+        this.$refs.remarksPrintRef.print()
+      },
+
+        async onHandleQuery() {
+            const res = await getLeaseOutDetailRecordApi(
+                this.leaseOutDetailParams,
+            )
+            this.leaseOutDetailsList = res.data
+        },
+        onHandleReset() {
+            this.outTime = []
+            this.leaseOutDetailParams.startTime = ''
+            this.leaseOutDetailParams.endTime = ''
+            this.onHandleQuery()
+        },
+        onHandleExport() {
+            this.download(
+                'material/base/tm_task/exportLeaseOutDetailRecord',
+                {
+                    ...this.leaseOutDetailParams,
+                },
+                `机具出库列表.xlsx`,
+            )
+        },
+        onOutTimeChange(val) {
+            if (val.length > 0) {
+                const [_1, _2] = val
+                this.leaseOutDetailParams.startTime = _1
+                this.leaseOutDetailParams.endTime = _2
+            } else {
+                this.leaseOutDetailParams.startTime = ''
+                this.leaseOutDetailParams.endTime = ''
+            }
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+    width: 60px !important;
+    margin-bottom: 10px;
+}
+.clickText {
+    color: #02a7f0;
+    cursor: pointer;
+}
+</style>
diff --git a/src/views/material/lease/apply/component/picking.vue b/src/views/material/lease/apply/component/picking.vue
new file mode 100644
index 00000000..cbb96a4b
--- /dev/null
+++ b/src/views/material/lease/apply/component/picking.vue
@@ -0,0 +1,1181 @@
+<template>
+    <!-- 领料出库 -->
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <el-form-item label="领料单号" prop="code">
+                <el-input
+                    v-model="queryParams.code"
+                    placeholder="请输入领料单号"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="单位名称" prop="unitId">
+                <el-select
+                    v-model="queryParams.unitId"
+                    placeholder="请选择单位名称"
+                    clearable
+                >
+                    <el-option
+                        v-for="item in unitList"
+                        filterable
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="工程名称" prop="proId">
+                <el-select
+                    v-model="queryParams.proId"
+                    filterable
+                    clearable
+                    placeholder="请选择工程名称"
+                >
+                    <el-option
+                        v-for="item in proList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="出库状态" prop="taskStatus">
+                <el-select
+                    v-model="queryParams.taskStatus"
+                    placeholder="请选择出库状态"
+                    clearable
+                >
+                    <el-option
+                        v-for="item in statusList"
+                        filterable
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item>
+                <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-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"
+                    @click="handleExport"
+                    v-hasPermi="['picking:outbound:export']"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="leaseList" border>
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+                :index="
+                    indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                "
+            />
+            <el-table-column
+                label="领料单号"
+                align="center"
+                prop="code"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料申请单位"
+                align="center"
+                prop="unitName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料申请工程"
+                align="center"
+                prop="proName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="申请数量"
+                align="center"
+                prop="preCountNum"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="申请时间"
+                align="center"
+                prop="createTimes"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="已出库数量"
+                align="center"
+                prop="alNum"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="出库状态"
+                align="center"
+                prop="taskName"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        @click="handleView(scope.row)"
+                        v-hasPermi="['picking:outbound:view']"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        v-if="scope.row.taskStatus != 35"
+                        @click="handleOut(scope.row)"
+                        v-hasPermi="['picking:outbound:out']"
+                    >
+                        出库
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
+
+        <!-- 出库弹窗 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openLeaseDevices"
+            width="80%"
+            append-to-body
+        >
+            <el-form
+                :model="dialogQuery"
+                ref="dialogQuery"
+                size="small"
+                :inline="true"
+                label-width="100px"
+            >
+                <el-form-item label="设备负责人" prop="userName">
+                    <el-input v-model="dialogQuery.userName" maxlength="20" />
+                </el-form-item>
+                <el-form-item label="机具类型" prop="typeId">
+                    <treeselect
+                        v-model="dialogQuery.typeId"
+                        default-expand-all
+                        :options="equipmentTypeList"
+                        placeholder="请选择规格型号"
+                        :disable-branch-nodes="true"
+                        style="width: 240px"
+                        noChildrenText="没有数据了"
+                        noOptionsText="没有数据"
+                        noResultsText="没有搜索结果"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="el-icon-search"
+                        size="mini"
+                        @click="handleDialogQuery"
+                        >查询</el-button
+                    >
+                    <el-button
+                        icon="el-icon-refresh"
+                        size="mini"
+                        @click="resetDialogQuery"
+                        >重置</el-button
+                    >
+                </el-form-item>
+            </el-form>
+
+            <el-table v-loading="loading" :data="dialogList">
+                <el-table-column
+                    align="center"
+                    label="序号"
+                    type="index"
+                    :index="
+                        indexContinuation(
+                            queryParams.pageNum,
+                            queryParams.pageSize,
+                        )
+                    "
+                />
+                <el-table-column
+                    label="机具名称"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeModelName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="待出库数量"
+                    align="center"
+                    prop="outNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="已出库数量"
+                    align="center"
+                    prop="alNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="设备负责人"
+                    align="center"
+                    prop="userName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column label="操作" align="center" v-if="isView">
+                    <template slot-scope="{ row }" v-if="row.alNum > 0">
+                        <el-button type="text" @click="onPreviewRecord(row)"
+                            >出库记录</el-button
+                        >
+                      <el-button type="text" @click="openLld(row)"
+                      >出库单</el-button
+                      >
+                    </template>
+                </el-table-column>
+
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    v-if="!isView"
+                >
+                    <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            @click="codeOut(scope.row)"
+                            v-if="
+                                scope.row.manageType == 0 &&
+                                scope.row.status != 2
+                            "
+                        >
+                            编码出库
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            v-if="
+                                scope.row.manageType == 1 &&
+                                scope.row.status != 2
+                            "
+                            @click="numOut(scope.row)"
+                        >
+                            数量出库
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination
+                v-show="dialogTotal > 0"
+                :total="dialogTotal"
+                :page.sync="dialogQuery.pageNum"
+                :limit.sync="dialogQuery.pageSize"
+                @pagination="getDialogList"
+            />
+
+            <el-dialog
+                title="出库记录"
+                :visible.sync="outRecordVisible"
+                width="70%"
+                append-to-body
+            >
+                <el-form inline>
+                    <!-- 搜索表单 -->
+                    <el-form-item label="时间">
+                        <el-date-picker
+                            clearable
+                            type="daterange"
+                            v-model="outTime"
+                            style="width: 240px"
+                            range-separator="至"
+                            value-format="yyyy-MM-dd"
+                            end-placeholder="结束日期"
+                            start-placeholder="开始日期"
+                            placeholder="请选择出库日期"
+                            @change="onOutTimeChange"
+                        />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button
+                            size="small"
+                            type="primary"
+                            @click="onHandleQuery"
+                            >查询</el-button
+                        >
+                        <el-button
+                            size="small"
+                            type="primary"
+                            @click="onHandleReset"
+                            >重置</el-button
+                        >
+                        <el-button
+                            size="small"
+                            type="primary"
+                            @click="onHandleExport"
+                            >导出</el-button
+                        >
+                    </el-form-item>
+                </el-form>
+
+                <!-- 出库记录列表 -->
+                <el-table border :data="leaseOutDetailsList">
+                    <el-table-column
+                        align="center"
+                        label="序号"
+                        show-overflow-tooltip
+                        type="index"
+                    />
+                    <el-table-column
+                        align="center"
+                        label="机具名称"
+                        prop="typeName"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        align="center"
+                        label="规格型号"
+                        prop="typeModelName"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        align="center"
+                        label="出库时间"
+                        prop="createTime"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        align="center"
+                        label="本次出库数量"
+                        prop="outNum"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        align="center"
+                        label="出库人"
+                        prop="userName"
+                        show-overflow-tooltip
+                    />
+                </el-table>
+            </el-dialog>
+        </el-dialog>
+
+        <!-- 编码出库 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openCode"
+            width="1200px"
+            append-to-body
+        >
+            <el-form
+                :model="codeOutForm"
+                ref="codeOutForm"
+                size="small"
+                :inline="true"
+                label-width="100px"
+            >
+                <span style="margin-right: 50px">待出库数量：{{ outNum }}</span>
+                <br> <br>
+                <el-form-item label="请输入车牌号" prop="carCode">
+                    <el-input v-model="codeOutForm.carCode" maxlength="20" />
+                </el-form-item>
+                <span style="margin-right: 50px; color: red"
+                >部分设备出库时，需进行装车,需记录车牌号码</span
+                >
+                <br>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="codeOutForm.remark" maxlength="50" />
+                </el-form-item>
+
+            </el-form>
+
+            <el-form
+                :model="outQuery"
+                ref="outQuery"
+                size="small"
+                :inline="true"
+                label-width="100px"
+            >
+                <el-form-item label="设备编码" prop="maCode">
+                    <el-input v-model="outQuery.maCode" maxlength="20" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="el-icon-search"
+                        size="mini"
+                        @click="handleOutQuery"
+                        >查询</el-button
+                    >
+                    <el-button
+                        icon="el-icon-refresh"
+                        size="mini"
+                        @click="resetOutQuery"
+                        >重置</el-button
+                    >
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="saveCodeOut"
+                        >出库</el-button
+                    >
+                </el-col>
+            </el-row>
+            <el-table
+                v-loading="loading"
+                :data="outCodeList"
+                height="500"
+                @selection-change="handleSelectionChange"
+            >
+                <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center"
+                    :selectable="selectable"
+                />
+                <el-table-column
+                    label="序号"
+                    align="center"
+                    width="80"
+                    type="index"
+                    :index="
+                        indexContinuation(outQuery.pageNum, outQuery.pageSize)
+                    "
+                >
+                    <!-- <template slot-scope="scope">
+                        <span>{{
+                            (outQuery.pageNum - 1) * 10 + scope.$index + 1
+                        }}</span>
+                    </template> -->
+                </el-table-column>
+                <el-table-column
+                    label="类型名称"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeModelName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="设备编码"
+                    align="center"
+                    prop="maCode"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="设备状态"
+                    align="center"
+                    prop="maStatus"
+                    :show-overflow-tooltip="true"
+                />
+            </el-table>
+
+            <pagination
+                v-show="outTotal > 0"
+                :total="outTotal"
+                :page.sync="outQuery.pageNum"
+                :limit.sync="outQuery.pageSize"
+                @pagination="getCodeList"
+            />
+        </el-dialog>
+
+        <!-- 数量出库 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openNum"
+            width="1200px"
+            append-to-body
+        >
+            <el-form
+                :model="numOutForm"
+                ref="numOutForm"
+                size="small"
+                :inline="true"
+                label-width="100px"
+            >
+                <!-- <span style="margin-right: 50px;">
+            待出库数量：{{outNum}}
+        </span>-->
+                <el-form-item label="请输入车牌号" prop="carCode">
+                    <el-input v-model="numOutForm.carCode" maxlength="20" />
+                </el-form-item>
+                <span style="margin-right: 50px; color: red"
+                >部分设备出库时，需进行装车,需记录车牌号码</span
+                >
+                <br>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="numOutForm.remark" maxlength="50" />
+                </el-form-item>
+
+            </el-form>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="saveNumOut"
+                        >出库</el-button
+                    >
+                </el-col>
+            </el-row>
+            <el-table v-loading="loading" :data="outNumList" height="500">
+                <el-table-column label="序号" align="center" type="index" />
+                <el-table-column
+                    label="设备类型"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeModelName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="库存数量"
+                    align="center"
+                    prop="num"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="待出库数量"
+                    align="center"
+                    prop="outNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="已出库数量"
+                    align="center"
+                    prop="alNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column label="出库数量" align="center">
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model.number="scope.row.inputNum"
+                            placeholder="请输入出库数量"
+                            type="number"
+                            @input="checkNum(scope.row)"
+                            clearable
+                            style="width: 100%"
+                        />
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+
+      <!-- 领料单弹窗 -->
+      <el-dialog :visible.sync="open" width="800px" append-to-body>
+        <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+          <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+            <div
+              class="title"
+              style="
+                            text-align: center;
+                            font-weight: 600;
+                            font-size: 16px;
+                        "
+            >
+              出库单
+            </div>
+            <div
+              class="info"
+              style="margin-top: 10px; display: flex; flex-wrap: wrap"
+            >
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>领料单位：</span>{{ leaseOutData.unitName }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>工程名称：</span>{{ leaseOutData.proName }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>时间：</span>{{ leaseOutData.updateTime }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>编号：</span>{{ leaseOutData.code }}
+              </div>
+            </div>
+            <el-table
+              :data="leaseOutDetailRecord"
+              class="table"
+              border
+              style="margin-top: 20px; padding: 1px"
+            >
+              <!--          <el-table-column type="selection" width="55" align="center" />-->
+              <el-table-column
+                label="序号"
+                align="center"
+                type="index"
+              />
+              <el-table-column
+                label="类型名称"
+                align="center"
+                prop="typeName"
+              />
+              <el-table-column
+                label="规格型号"
+                align="center"
+                prop="typeModelName"
+              />
+              <el-table-column
+                label="计量单位"
+                align="center"
+                prop="unitName"
+              />
+              <el-table-column
+                label="出库数量"
+                align="center"
+                prop="outNum"
+              />
+              <el-table-column
+                label="设备编码"
+                align="center"
+                prop="maCode"
+              />
+              <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+              />
+              <el-table-column
+                label="出库方式"
+                align="center"
+                prop="manageTypeName"
+              />
+            </el-table>
+
+            <div
+              class="fillIn"
+              style="
+                            margin-top: 30px;
+                            display: flex;
+                            justify-content: space-between;
+                        "
+            >
+              <div class="item" style="width: 25%">
+                <span>审核：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>领料：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>仓库：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>操作人：</span>
+              </div>
+            </div>
+          </vue-easy-print>
+        </div>
+        <div slot="footer" class="dialog-footer" style="text-align: center">
+          <el-button type="primary" @click="print">打 印</el-button>
+          <el-button @click="open = false">关 闭</el-button>
+        </div>
+      </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+  getUnitData,
+  getProData,
+  getLeaseAuditList,
+  getLeaseAuditListDetail,
+  getDetailsByTypeId,
+  submitOut,
+  submitNumOut,
+  getLeaseOutDetailRecordApi, getLeaseListAll, getLeaseOutOrder,
+} from '@/api/lease/outbound.js'
+// import { getTypeList } from '@/api/store/warehousing'
+// import { equipmentTypeTree } from '@/api/store/tools'
+// import Treeselect from '@riophae/vue-treeselect'
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+// import vueEasyPrint from 'vue-easy-print'
+export default {
+    name: 'receiveOut',
+    components: { Treeselect,vueEasyPrint },
+    data() {
+        return {
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            maCodeList: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+          // 是否显示弹出层
+            open: false,
+            // 表格数据
+            leaseList: [],
+            // 弹出层标题
+            title: '设备出库',
+            // 单位数据
+            unitList: [],
+            proList: [], //工程集合
+            statusList: [
+                { id: '33', name: '待出库' },
+                { id: '34', name: '出库进行中' },
+                { id: '35', name: '完成' },
+            ], //工程集合
+            //搜索下拉数据
+            typeList: [],
+            equipmentTypeList: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                flag: 1,
+                code: undefined,
+                unitId: undefined,
+                proId: undefined,
+                taskStatus: undefined,
+            },
+            // 表单参数 出库
+            form: {},
+            //弹窗
+            openLeaseDevices: false,
+            isView: false,
+            dialogQuery: {
+                pageNum: 1,
+                pageSize: 10,
+                director: undefined,
+                typeId: undefined,
+            },
+            dialogList: [],
+            dialogTotal: 0,
+            outObj: {},
+            openCode: false, //编码弹窗开关
+            openNum: false, //数量弹窗开关
+            outNum: 0, //待出库数量
+            codeOutForm: {
+                //编码表单-车牌号
+                carCode: undefined,
+                remark: undefined,
+            },
+            numOutForm: {
+                //数量表单-车牌号
+                carCode: '',
+                remark: '',
+            },
+            outQuery: {
+                //编码出库-搜索条件
+                pageNum: 1,
+                pageSize: 10,
+                maCode: undefined,
+            },
+            outTotal: 0, //编码弹窗分页-总数
+            outCodeList: [], //编码弹窗表格数据
+            outNumList: [], //数量弹窗表格数据
+            leaseType: '', // 领用类型 0 为工程租赁 1 为长期领用
+
+            outRecordVisible: false,
+            leaseOutDetailParams: {
+                id: '',
+                typeId: '',
+                startTime: '',
+                endTime: '',
+            },
+            leaseOutDetailsList: [],
+            outTime: [],
+          // 领料任务详情数据
+            leaseOutDetailRecord: [],
+            leaseOutData: {},
+        }
+    },
+    created() {
+        this.getTypeList()
+        this.getUnitList()
+        this.getProList()
+        this.equipmentType()
+
+        this.getList()
+    },
+    methods: {
+        //获取单位
+        getUnitList() {
+            getUnitData().then((response) => {
+                this.unitList = response.data
+            })
+        },
+        //获取单位
+        getProList() {
+            getProData().then((response) => {
+                this.proList = response.data
+            })
+        },
+        getTypeList() {
+            getTypeList({ level: '3' }).then((response) => {
+                this.typeList = response.data
+            })
+        },
+        //规格型号
+        equipmentType() {
+            equipmentTypeTree().then((response) => {
+                this.equipmentTypeList = response.data
+                this.equipmentTypeList.forEach((item, index) => {
+                    if (item.children && item.children.length > 0) {
+                        item.children.forEach((item2, index2) => {
+                            if (item2.children && item2.children.length > 0) {
+                                item2.children.forEach((item3) => {
+                                    if (
+                                        item3.children &&
+                                        item3.children.length > 0
+                                    ) {
+                                        item3.children.forEach((item4) => {
+                                            item4.machineTypeName =
+                                                item3.typeName
+                                            item4.specificationType =
+                                                item4.typeName
+                                            // this.$set(item4, 'purchasePrice', 0);
+                                            // this.$set(item4, 'purchaseNum', 1);
+                                        })
+                                    }
+                                })
+                            }
+                        })
+                    }
+                })
+            })
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true
+            getLeaseAuditList(this.queryParams).then((response) => {
+                this.leaseList = response.data.rows
+                this.total = response.data.total
+                this.loading = false
+            })
+        },
+        //查看按钮
+        handleView(row) {
+            this.openLeaseDevices = true
+            this.isView = true
+            this.dialogQuery.id = row.id
+            this.leaseOutDetailParams.id = row.id
+            this.resetDialogQuery()
+            // this.getDialogList();
+        },
+        /** 查询列表 */
+        getDialogList() {
+            // console.log(this.dialogQuery)
+            getLeaseAuditListDetail(this.dialogQuery).then((response) => {
+                this.dialogList = response.data.rows
+                this.dialogTotal = response.data.total
+            })
+        },
+        handleDialogQuery() {
+            this.dialogQuery.pageNum = 1
+            this.getDialogList()
+        },
+        resetDialogQuery() {
+            this.resetForm('dialogQuery')
+            this.handleDialogQuery()
+        },
+        /** 出库按钮操作 */
+        handleOut(row) {
+            this.openLeaseDevices = true
+            this.isView = false
+            this.dialogQuery.id = row.id
+            this.leaseType = row.leaseType
+            this.resetDialogQuery()
+            // this.getDialogList()
+        },
+
+        //编码出库
+        codeOut(row) {
+            // this.title = '编码出库'
+            this.openCode = true
+            this.resetForm('codeOutForm')
+            this.resetForm('outQuery')
+            this.outNum = row.outNum
+            this.outQuery.typeId = row.typeId
+            this.outObj = row
+            this.handleOutQuery()
+        },
+        //数量出库
+        numOut(row) {
+            console.log(row, '数量出库当前行数据--')
+            // this.title = '数量出库'
+            this.openNum = true
+            this.resetForm('codeOutForm')
+            this.resetForm('numOutForm')
+            // console.log(row)
+            let obj = {}
+            this.$set(obj, 'taskId', row.taskId)
+            this.$set(obj, 'id', row.id)
+            this.$set(obj, 'manageType', 1)
+            this.$set(obj, 'parentId', row.parentId)
+            this.$set(obj, 'typeName', row.typeName)
+            this.$set(obj, 'typeModelName', row.typeModelName)
+            this.$set(obj, 'typeId', row.typeId)
+            this.$set(obj, 'alNum', row.alNum) //已出库数量
+            this.$set(obj, 'outNum', row.outNum) //待出库数量
+            this.$set(obj, 'inputNum', 1) //出库数量
+            this.$set(obj, 'num', row.num) //库存
+            this.outNumList = [obj]
+        },
+        handleOutQuery() {
+            this.outQuery.pageNum = 1
+            this.getCodeList()
+        },
+        resetOutQuery() {
+            this.resetForm('outQuery')
+            this.handleOutQuery()
+        },
+        getCodeList() {
+            getDetailsByTypeId(this.outQuery).then((response) => {
+                this.outCodeList = response.data.rows
+                if (response.data.total) {
+                    this.outTotal = response.data.total
+                }
+            })
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.maCodeList = selection.map((item) => item.maId)
+        },
+        selectable(row) {
+            console.log(row)
+            if (row.maStatus == '在库') {
+                return true
+            } else {
+                return false
+            }
+        },
+        //编码出库保存
+        saveCodeOut() {
+            if (this.maCodeList.length <= this.outObj.outNum) {
+                let params = this.maCodeList.map((item) => {
+                    let obj = {
+                        id: this.outObj.id,
+                        maId: item,
+                        manageType: 0,
+                        carCode: this.codeOutForm.carCode,
+                        remark: this.codeOutForm.remark,
+                        typeId: this.outObj.typeId,
+                        parentId: this.outObj.parentId,
+                        outNum: 1,
+                        taskId: this.outObj.taskId,
+                        leaseType: this.leaseType,
+                    }
+                    return obj
+                })
+
+                // console.log(params, '编码出库时参数')
+                // console.log(params)
+                submitOut(params).then((response) => {
+                    this.$modal.msgSuccess('出库成功')
+                    this.openCode = false
+                    this.handleDialogQuery()
+                    this.handleQuery()
+                })
+            } else {
+                this.$modal.msgError('所选机具编码已超出出库数量！')
+            }
+        },
+        //数量出库保存
+        saveNumOut() {
+            this.outNumList[0].carCode = this.numOutForm.carCode
+            this.outNumList[0].remark = this.numOutForm.remark
+            this.outNumList[0].leaseType = this.leaseType
+            let param = this.outNumList
+            // console.log(param, '数量出库时参数')
+            submitNumOut(param).then((response) => {
+                this.$modal.msgSuccess('出库成功')
+                this.openNum = false
+                this.handleDialogQuery()
+                this.handleQuery()
+            })
+        },
+
+        //输入出库数量
+        checkNum(row) {
+            let maxNum = row.outNum
+            if (row.inputNum <= 1) {
+                row.inputNum = 1
+            }
+            if (row.inputNum > row.outNum && row.num >= maxNum) {
+                row.inputNum = maxNum
+            }
+            if (row.inputNum > row.outNum && row.num < maxNum) {
+                row.inputNum = row.num
+            }
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            this.downloadJson(
+                'material/base/tm_task/export',
+                JSON.stringify(this.queryParams),
+                `领料出库_${new Date().getTime()}.xlsx`,
+            )
+        },
+
+        /* 查看出库记录 */
+        onPreviewRecord(row) {
+            this.leaseOutDetailParams.typeId = row.typeId
+            this.onHandleQuery().then(() => {
+                this.outRecordVisible = true
+            })
+        },
+      /* 打开出库单 */
+      async openLld(row) {
+        this.open = true
+
+        const res = await getLeaseOutOrder({ parentId: row.parentId,typeId: row.typeId})
+
+        this.leaseOutDetailRecord = res.data.leaseOutDetailRecord
+        this.leaseOutData = res.data
+
+        console.log('this.leaseApplyData ============', this.leaseApplyData)
+      },
+      // 领料单 打印
+      print() {
+        this.$refs.remarksPrintRef.print()
+      },
+
+        async onHandleQuery() {
+            const res = await getLeaseOutDetailRecordApi(
+                this.leaseOutDetailParams,
+            )
+            this.leaseOutDetailsList = res.data
+        },
+        onHandleReset() {
+            this.outTime = []
+            this.leaseOutDetailParams.startTime = ''
+            this.leaseOutDetailParams.endTime = ''
+            this.onHandleQuery()
+        },
+        onHandleExport() {
+            this.download(
+                'material/base/tm_task/exportLeaseOutDetailRecord',
+                {
+                    ...this.leaseOutDetailParams,
+                },
+                `机具出库列表.xlsx`,
+            )
+        },
+        onOutTimeChange(val) {
+            if (val.length > 0) {
+                const [_1, _2] = val
+                this.leaseOutDetailParams.startTime = _1
+                this.leaseOutDetailParams.endTime = _2
+            } else {
+                this.leaseOutDetailParams.startTime = ''
+                this.leaseOutDetailParams.endTime = ''
+            }
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+    width: 60px !important;
+    margin-bottom: 10px;
+}
+.clickText {
+    color: #02a7f0;
+    cursor: pointer;
+}
+</style>
diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index 659e4fc6..87f7867e 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -1,757 +1,890 @@
 <template>
-    <!-- 协议管理 -->
-    <div class="app-container" id="agreement">
-        <el-row>
-            <el-form
-                :model="queryParams"
-                ref="queryForm"
-                size="small"
-                :inline="true"
-                v-show="showSearch"
-                label-width="80px"
-            >
-                <el-form-item label="关键字" prop="keyWord">
-                    <el-input
-                        v-model="queryParams.keyWord"
-                        placeholder="请输入关键字"
-                        clearable
-                        maxlength="50"
-                        style="width: 240px"
-                        @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <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-form-item>
-            </el-form>
-        </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="handleAdd"
-                    >新建</el-button
-                >
-            </el-col>
-
-            <el-col :span="1.5">
-                <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    >导出</el-button
-                >
-            </el-col>
-            <right-toolbar
-                :showSearch.sync="showSearch"
-                @queryTable="getList"
-            ></right-toolbar>
-        </el-row>
-
-        <el-table
-            v-loading="loading"
-            :data="agreementList"
-            @selection-change="handleSelectionChange"
-            border
-        >
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column
-                align="center"
-                label="序号"
-                type="index"
-
-            />
-            <el-table-column
-                label="协议编号"
-                align="center"
-                prop="agreementCode"
-                :show-overflow-tooltip="true"
-            />
-            <!-- <el-table-column
-                label="合同编号"
-                align="center"
-                prop="contractCode"
-                :show-overflow-tooltip="true"
-            /> -->
-            <!-- <el-table-column
-                label="协议类型"
-                align="center"
-                prop="protocol"
-                :show-overflow-tooltip="true"
-            >
-                <template slot-scope="scope">
-                    <span v-if="scope.row.protocol == 1">内部单位</span>
-                    <span v-if="scope.row.protocol == 2">外部单位</span>
-                </template>
-            </el-table-column> -->
-            <!-- <el-table-column
-                label="附件图片"
-                align="center"
-                prop="fileName"
-                :show-overflow-tooltip="true"
-            >
-                <template slot-scope="scope">
-                    <div
-                        v-for="(item, index) in scope.row.imgUrlList"
-                        :key="index"
-                        @click="openImg(item)"
-                        style="color: #02a7f0; cursor: pointer"
-                        >{{ scope.row.imgNameList[index] }}</div
-                    >
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="签订日期"
-                align="center"
-                prop="signTime"
-                :show-overflow-tooltip="true"
-            /> -->
-            <el-table-column
-                label="租赁单位"
-                align="center"
-                prop="unitName"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="租赁工程"
-                align="center"
-                prop="proName"
-                :show-overflow-tooltip="true"
-            />
-            <!-- <el-table-column
-                label="开始日期"
-                align="center"
-                prop="planStartTime"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="租赁期限(天)"
-                align="center"
-                prop="leaseDay"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="授权人"
-                align="center"
-                prop="authPerson"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="联系电话 "
-                align="center"
-                prop="phone"
-                :show-overflow-tooltip="true"
-            /> -->
-            <el-table-column
-                label="备注"
-                align="center"
-                prop="remark"
-                width="160"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column label="操作" align="center" width="120">
-                <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
-                        v-hasPermi="['picking:protocol:edit']"
-                        >编辑</el-button
-                    >
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleDelete(scope.row)"
-                        v-hasPermi="['picking:protocol:del']"
-                        >删除</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item  prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键词"
+          clearable
+          @keyup.enter.native="handleQuery"
+          maxlength="20"
         />
+      </el-form-item>
 
-        <!-- 新增编辑弹窗 -->
-        <el-dialog
-            :title="title"
-            :visible.sync="open"
-            width="1200px"
-            append-to-body
-            :close-on-click-modal="false"
+      <el-form-item>
+        <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-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button
         >
-            <el-form
-                ref="form"
-                :model="form"
-                :rules="rules"
-                label-width="120px"
-            >
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="租赁单位" prop="unitId">
-                            <el-select
-                                v-model="form.unitId"
-                                filterable
-                                placeholder="请选择租赁单位"
-                                style="width: 100%"
-                            >
-                                <el-option
-                                    v-for="item in unitList"
-                                    :key="item.unitId"
-                                    :label="item.unitName"
-                                    :value="item.unitId"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-
-                  <el-col :span="12">
-                    <el-form-item label="授权人" prop="authPerson">
-                      <el-input
-                        maxlength="50"
-                        v-model="form.authPerson"
-                        placeholder="请输入授权人"
-                      />
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12">
-                    <el-form-item label="租赁工程" prop="proId">
-                      <el-select
-                        v-model="form.proId"
-                        filterable
-                        placeholder="请选择租赁工程"
-                        style="width: 100%"
-                      >
-                        <el-option
-                          v-for="item in projectList"
-                          :key="item.proId"
-                          :label="item.proName"
-                          :value="item.proId"
-                        ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
 
-                  <el-col :span="12">
-                    <el-form-item label="联系电话" prop="phone">
-                      <el-input
-                        v-model="form.phone"
-                        placeholder="请输入联系电话"
-                        maxlength="11"
-                        onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
-                      />
-                    </el-form-item>
-                  </el-col>
-                </el-row>
+    <el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="teamId">
+      <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="协议签订时间" align="center" prop="signTime" sortable/>
+      <el-table-column label="协议编号" align="center" prop="agreementCode" sortable/>
+      <el-table-column label="合同编号" align="center" prop="contractCode" sortable/>
+      <el-table-column label="租赁单位" align="center" prop="unitName" sortable/>
+      <el-table-column label="租赁工程" align="center" prop="projectName" sortable/>
+      <el-table-column label="开始日期" align="center" prop="planStartTime" sortable/>
+      <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" sortable/>
+      <el-table-column label="授权人" align="center" prop="authPerson" sortable/>
+      <el-table-column label="授权人电话" align="center" prop="phone" sortable/>
+      <el-table-column label="租赁单位类型" align="center">
+        <template v-if="houseList.protocol ==1">
+          <dict-tag>内部单位</dict-tag>
+        </template>
+        <template v-if="houseList.protocol ==2">
+          <dict-tag>外部单位</dict-tag>
+        </template>
+      </el-table-column>
 
-                <el-row>
-                  <el-col :span="12">
-                    <el-form-item label="合同编号" prop="contractCode">
-                      <el-input
-                        maxlength="50"
-                        v-model="form.contractCode"
-                        placeholder="请输入合同编号"
-                      />
-                    </el-form-item>
-                  </el-col>
 
-                  <el-col :span="12">
-                    <el-form-item label="租赁期限(天)" prop="leaseDay">
-                      <el-input-number
-                        v-model="form.leaseDay"
-                        placeholder="请输入租赁期限(天)"
-                        controls-position="right"
-                        :min="0"
-                        :max="9999"
-                        style="width: 100%"
-                      />
-                    </el-form-item>
-                  </el-col>
-                </el-row>
 
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item label="开始日期" prop="planStartTime">
-                    <el-date-picker
-                      style="width: 100%"
-                      v-model="form.planStartTime"
-                      value-format="yyyy-MM-dd"
-                      type="date"
-                      placeholder="请选择开始日期"
-                    ></el-date-picker>
-                  </el-form-item>
-                </el-col>
+      <el-table-column label="附件图片" align="center" width="180">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-zoom-in"
+            @click="handleUpdate(scope.row)"
+          >
+            查看
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" sortable/>
+      <el-table-column label="操作" align="center" width="180">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-zoom-in"
+            @click="handleUpdate(scope.row)"
+          >
+            查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-                <el-col :span="12">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input
-                      v-model="form.remark"
-                      type="textarea"
-                      placeholder="请输入备注"
-                      maxlength="100"
-                    />
-                  </el-form-item>
-                </el-col>
-              </el-row>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="合同照片" prop="fileName">
-                    <el-upload
-                      :http-request="(obj) => imgUpLoad(obj, 'fileUrl')"
-                      action="#"
-                      :limit="3"
-                      :file-list="fileList"
-                      :show-file-list="true"
-                      list-type="picture-card"
-                      accept=".png, .jpg, .jpeg"
-                      :on-success="handleAvatarSuccess"
-                      :class="{ disabled: uploadDisabled }"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove"
-                    >
-                      <i
-                        class="el-icon-plus avatar-uploader-icon"
-                      ></i>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer" style="text-align: center">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
+    <!-- 新增或修改弹窗 -->
+    <el-dialog :title="title" :visible.sync="showHouse" width="1000px"   append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="租赁单位" prop="unitId">
+              <el-select
+                v-model="form.unitId"
+                filterable
+                placeholder="请选择租赁单位"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in unitList"
+                  :key="item.unitId"
+                  :label="item.unitName"
+                  :value="item.unitId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="授权人" prop="authPerson">
+              <el-input
+                maxlength="50"
+                v-model="form.authPerson"
+                placeholder="请输入授权人"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="租赁工程" prop="proId">
+              <el-select
+                v-model="form.proId"
+                filterable
+                placeholder="请选择租赁工程"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in projectList"
+                  :key="item.proId"
+                  :label="item.proName"
+                  :value="item.proId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入联系电话"
+                maxlength="11"
+                onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同编号" prop="contractCode">
+              <el-input
+                maxlength="50"
+                v-model="form.contractCode"
+                placeholder="请输入合同编号"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="租赁期限(天)" prop="leaseDay">
+              <el-input-number
+                v-model="form.leaseDay"
+                placeholder="请输入租赁期限(天)"
+                controls-position="right"
+                :min="0"
+                :max="9999"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="开始日期" prop="planStartTime">
+              <el-date-picker
+                style="width: 100%"
+                v-model="form.planStartTime"
+                value-format="yyyy-MM-dd"
+                type="date"
+                placeholder="请选择开始日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入备注"
+                maxlength="100"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="营业执照">
+          <el-upload
+            class = "upload-demo"
+            action="#"
+            :file-list="businessLicenseListTemp"
+            :show-file-list="true"
+            :auto-upload="false"
+            :key="uploadKey"
+            list-type="picture-card"
+            accept=".png, .jpg, .jpeg, .pdf"
+            :on-change="handleChangeBusinessList"
+            :class="{ disabled: uploadDisabled }"
+            :on-preview="picturePreview"
+            :on-remove="handleRemoveElectricianImgList"
+          >
+
+            <!-- 文件格式下载，图片格式预览 -->
+            <div slot="file" slot-scope="{file}">
+              <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
+              <div v-else class="picture-card-container" >
+                <img class="picture-card" :src="urlTemp" alt="">
+                <p class="file-name">{{ file.name }}</p>
+              </div>
+              <span class="el-upload-list__item-actions">
+                <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                <i class="el-icon-download" />
+                </span>
+                <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                <i class="el-icon-zoom-in" />
+                </span>
+                <span class="el-upload-list__item-delete" @click="handleRemoveElectricianImgList(file)">
+                <i class="el-icon-delete" />
+                </span>
+              </span>
             </div>
-        </el-dialog>
 
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" height="650px" :src="dialogImageUrl" alt />
-        </el-dialog>
-    </div>
+            <i class="el-icon-plus avatar-uploader-icon" ></i>
+          </el-upload>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible" width="600px" height="600px" >
+      <img width="100%" height="500px" :src="dialogImageUrl"  />
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {
-    getAgreementList,
-    getAgreementInfoId,
-    addAgreement,
-    updateAgreement,
-    removeAgreement,
-    getUnitList,
-    getProjectList,
-    imgUpLoad
-} from '@/api/lease/protocol'
-// import { imgUpLoad, fileUpLoad } from '@/api/system/upload'
-
+import { getListAgreement,getAgreementDetail,editAgreement,addAgreement,delAgreement,deleteFile, getUnitList, getProjectList, } from "@/api/lease/protocol";
+import { imgUpLoadThree, fileUpLoad } from '@/api/system/upload'
+import { downloadFile,downloadFileData } from '@/utils/download'
+import { getToken } from '@/utils/auth'
+import {Base64} from 'js-base64'
+import { forEach } from 'jszip';
 export default {
-    name: 'Agreement',
-    dicts: ['sys_normal_disable'],
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 租赁单位数据
-            unitList: [],
-            // 工程数据
-            projectList: [],
-            // 表格数据
-            agreementList: [],
+  name: "supplier",
+  data() {
+    return {
+      uploadKey: Date.now(),
+      // 遮罩层
+      loading: false,
 
-            protocolList: [
-                { protocolId: 1, protocolName: '内部单位' },
-                // { protocolId: 2, protocolName: '外部单位' },
-            ],
-            // 弹出层标题
-            title: '',
-            // 是否显示弹出层
-            open: false,
-            // 日期范围
-            dateRange: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                keyWord: undefined,
-                agreementCode: '',
-              proId: '',
-                unitId: '',
-            },
-            // 表单参数
-            form: {},
-            //图片上传
-            uploadHeader: process.env.VUE_APP_BASE_API,
-            imageUrl: '',
-            imageName: '',
-            fileList: [],
-            checkUrlList: [],
-            checkUrlNameList: [],
-            dialogImageUrl: '',
-            dialogVisible: false,
-            //上传地址
-            // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-            // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
-            uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
-            // 表单校验
-            rules: {
-                /*contractCode: [
-                    {
-                        required: true,
-                        message: '合同编号不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-                signTime: [
-                    {
-                        required: true,
-                        message: '签订日期不能为空',
-                        trigger: 'blur',
-                    },
-                ],*/
-                unitId: [
-                    {
-                        required: true,
-                        message: '租赁单位不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-              proId: [
-                    {
-                        required: true,
-                        message: '租赁工程不能为空',
-                        trigger: 'blur',
-                    },
-                ],
+      loadingTwo: false,
 
-              authPerson: [
-                {
-                  required: true,
-                  message: '授权人不能为空',
-                  trigger: 'blur',
-                },
-              ],
 
-              phone: [
-                {
-                  required: true,
-                  message: '联系电话不能为空',
-                  trigger: 'blur',
-                },
-              ],
-            },
-            peopleOpen: false,
-            noticeOpen: false,
-            nform: {
-                notice: '',
-            },
-            nrules: {
-                notice: [
-                    {
-                        required: true,
-                        message: '通知内容不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-            },
-            deptName: undefined,
+      // 是否显示项目部Id
+      showName: false,
+
+      // 是否显示施工预警信息
+      showWarn: false,
+
+
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+
+
+      // 显示搜索条件
+      showSearch: true,
+      showHouse: false,
+
+      // 总条数
+      total: 0,
+      totalTwo : 0,
+      // 租赁单位数据
+      unitList: [],
+      // 工程数据
+      projectList: [],
+      // 施工记录表格数据
+      houseList: [],
+      maxLength:100,//已选列表上限，防止数据过多请求报错
+      keeperDataRange:[],
+      // 班组人员表格数据
+      teamList: [],
+      teamTempList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        keyWord:undefined
+      },
+      // 查询参数
+      queryTeam: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        sex: undefined,
+        teamId: undefined,
+      },
+
+      fileList:[],
+      businessLicenseFileList:[],
+      businessLicenseListTemp:[],
+      delBusinessFileIdList:[],
+      modelIdTemp:undefined,
+      base64Data:undefined,
+      //图片查看弹窗
+      dialogImageUrl: '',
+      dialogVisible: false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        unitId: [
+          {
+            required: true,
+            message: '租赁单位不能为空',
+            trigger: 'blur',
+          },
+        ],
+        proId: [
+          {
+            required: true,
+            message: '租赁工程不能为空',
+            trigger: 'blur',
+          },
+        ],
+
+        authPerson: [
+          {
+            required: true,
+            message: '授权人不能为空',
+            trigger: 'blur',
+          },
+        ],
+        phone: [
+          {
+            required:false,
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的联系电话",
+            trigger: "blur"
+          }
+        ],
+      },
+
+      //上传
+      upload: {
+        // 设置上传的请求头部
+        headers: { Authorization: 'Bearer ' + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/file/upload'
+      },
+    };
+  },
+  computed: {
+
+    //图片上传1张后，隐藏上传框
+    uploadDisabled() {
+      return this.businessLicenseListTemp.length > 2
+    },
+  },
+  created() {
+    this.getList();
+    this.getUnitList();
+    this.getProjectList();
+  },
+  methods: {
+
+
+    //提交时循环fileList 获取raw文件
+    async getFileData() {
+      const fileTwo = []
+      this.businessLicenseListTemp.forEach(item => {
+        if (item?.hasOwnProperty('raw')) {
+          fileTwo.push(item.raw)
         }
+      })
+      return { fileTwo }
     },
-    computed: {
-        //图片上传1张后，隐藏上传框
-        uploadDisabled() {
-            return this.checkUrlList.length > 2
-          console.log(this.checkUrlList.length > 2);
-        },
-    },
-    created() {
-        this.getList()
-        this.getUnitList()
-        this.getProjectList()
-    },
-    methods: {
-        //获取单位类型 ,getUnitList, getProjectList
-        getUnitList() {
-            getUnitList({}).then((response) => {
-                this.unitList = response.data
-            })
-        },
-        getProjectList() {
-            getProjectList({}).then((response) => {
-                this.projectList = response.data
-            })
-        },
 
-        /** 查询字典类型列表 */
-        getList() {
-            this.loading = true
-            getAgreementList(this.queryParams).then((response) => {
-                this.agreementList = response.rows
-                this.agreementList.forEach((item) => {
-                    if (item.fileUrl) {
-                        item.imgUrlList = item.fileUrl.split(',')
-                        item.imgNameList = item.fileName.split(',')
-                    }
-                })
-                this.total = response.total
-                this.loading = false
-            })
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false
-            this.reset()
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                agreementId: undefined,
-                dictName: undefined,
-                dictType: undefined,
-                fileUrl: undefined,
-                fileName: undefined,
-                remark: undefined,
+    // 图片上传
+    async  imgUpLoadTwoAll(param) {
+      param.type = 'ma'
+      imgUpLoadThree(param)
+        .then((res) => {
+          if (res.code == 200) {
+            let obj =  {'name':res.data.name,'url':res.data.url}
+            console.log('obj',obj)
+            this.businessLicenseFileList.push(obj);
+          } else {
+            // this.$msgError(res.msg)
+            this.$modal.msgError(res.msg)
+          }
+        })
+        .catch((error) => {
+          // this.$msgError(error)
+          this.$modal.msgError(error)
+        })
+    },
+
+    //上传组件-图片查看
+    picturePreview(file) {
+
+      this.dialogImageUrl = file.url;
+      const parts = file.name.split('.');
+      const extension = parts.pop();
+      if(extension === 'pdf'){
+        const windowName = file.name;
+        window.open(file.url,windowName)
+      }else{
+        this.dialogVisible = true
+      }
+
+    },
+
+    handleRemoveElectricianImgList(file, fileList) {
+      let sum = 0
+      this.businessLicenseListTemp.forEach((item, index) => {
+        if (item.uid == file.uid) {
+          sum = index
+        }
+      })
+      this.businessLicenseListTemp.splice(sum, 1)
+      if(file.status=='success'){
+        this.delBusinessFileIdList.push(file.url);
+      }
+      console.log('delBusinessFileIdList',this.delBusinessFileIdList)
+    },
+
+    isImage(file){
+      this.urlTemp = require('@/assets/file.png');
+      if(this.updataIf(file)){
+        return false
+      }else{
+        return true
+      }
+    },
+    // 判断文件类型,图片预览，文件下载
+    updataIf(e) {
+      if (e.fileName) {
+        const parts = e.fileName.split('.');
+        const extension = parts.pop();
+        if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+          return false
+        } else {
+          return true
+        }
+      } else {
+        const parts = e.name.split('.');
+        const extension = parts.pop();
+        if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+          return false
+        } else {
+          return true
+        }
+      }
+    },
+
+    handleDownload(file) {
+      console.log(file)
+      if(file.status === 'ready'){
+        downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+      }else if(file.status === 'success'){
+
+        downloadFileData(  { fileName: file.name, fileUrl: file.url } )
+        // downloadFileData({ fileName: file.name,fileUrl:file.url })
+      }
+    },
+
+    handleChangeBusinessList(file, fileList) {
+      const fileListTemp = fileList.filter(item => {
+        return item.uid != file.uid
+      });
+      const parts = file.name.split('.');
+      const extension = parts.pop();
+      if(fileList.length > 3){
+        this.$message.warning('最多上传3张营业执照')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      }else if(!(extension === 'pdf' || extension === 'png' || extension === 'jpg' || extension === 'jpeg')){
+        this.$message.warning('文件格式不正确')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      }else if(file.size > 1024 * 1024 * 10){
+        this.$message.warning('文件大小不能超过10Mb')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      }else if(file.name.length > 40){
+        this.$message.warning('文件名长度不能超过40个字符')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      }else if(fileListTemp.some(item =>item.name === file.name)){
+        this.$message.warning('文件名重复')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      }
+      fileList.forEach(file=>{
+        if(extension === 'pdf'){
+          this.urlTemp = require('../../../../assets/file.png');
+
+        }
+      });
+      this.businessLicenseListTemp = fileList;
+    },
+
+    async getList() {
+      this.loading = true;
+      getListAgreement(this.queryParams).then(response => {
+        this.houseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    //获取单位类型 ,getUnitList, getProjectList
+    async getUnitList() {
+      getUnitList({}).then((response) => {
+        this.unitList = response.data
+      })
+    },
+
+    async getProjectList() {
+      getProjectList({}).then((response) => {
+        this.projectList = response.data
+      })
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.uploadKey = Date.now();
+      this.delBusinessFileIdList=[];
+      this.businessLicenseListTemp=[];
+      this.businessLicenseFileList=[];
+      this.showHouse = true
+      this.title = '新增'
+    },
+
+    handleUpdate(row){
+      this.reset()
+      this.uploadKey = Date.now();
+      this.delBusinessFileIdList=[];
+      this.businessLicenseListTemp=[];
+      this.businessLicenseFileList=[];
+      const supplierId = row.supplierId;
+      this.modelIdTemp = row.supplierId;
+      getAgreementDetail(supplierId).then((response) => {
+        this.form = response.data;
+        if(response.data.bmFileInfos!=null){
+          this.businessLicenseListTemp = response.data.bmFileInfos;
+          this.businessLicenseListTemp.forEach(item=>{
+            if(item.name.includes('/')){
+              const fileNameWithTimestamp = item.name.split('/').pop();
+              const parts = fileNameWithTimestamp.split('_');
+              const fileType = item.name.split('.').pop();
+              const mainFileName = parts.slice(0, parts.length - 1).join('_');
+              item.name = mainFileName + '.' +fileType;
             }
-            this.fileList = []
-            this.resetForm('form')
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            // this.dateRange = []
-            this.resetForm('queryForm')
-            this.queryParams.pageNum = 1
-            this.queryParams.pageSize = 10
-            this.getList()
-            // this.handleQuery()
-        },
-        handleNotice() {
-            this.noticeOpen = true
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.reset()
-            this.fileList = []
-            this.checkUrlList = []
-            this.checkUrlNameList = []
-            this.open = true
-            this.title = '新建协议'
-        },
-        // 图片上传
-        imgUpLoad(param, name, index) {
-
-
-            // console.log(param,'image')
-            // param.type = 'ma'
-            param.taskType ='10'
-            imgUpLoad(param)
-                .then((res) => {
-                    if (res.code == 200) {
-                        this.checkUrlList.push(res.data.fileUrl)
-                        this.checkUrlNameList.push(res.data.fileName)
-                    } else {
-                        // this.$msgError(res.msg)
-                        this.$modal.msgError(res.msg)
-                    }
-                })
-                .catch((error) => {
-                    // this.$msgError(error)
-                    this.$modal.msgError(error)
-                })
-        },
-        handleAvatarSuccess(res, file) {
-            console.log('success')
-        },
-        handleExceed(files, fileList) {
-            this.$message.warning('最多只可以上传3张图片')
-        },
-        handleRemove(file, fileList) {
-            let sum = 0
-            this.checkUrlNameList.forEach((item, index) => {
-                if (item == file.name) {
-                    sum = index
-                }
-            })
-            this.checkUrlNameList.splice(sum, 1)
-            this.checkUrlList.splice(sum, 1)
-        },
-        //图片点击查看
-        handlePictureCardPreview(file) {
-            console.log(file)
-            this.dialogImageUrl = file.url
-            this.dialogVisible = true
-        },
-        //图片查看
-        openImg(url) {
-            // this.dialogImageUrl = this.uploadUrl + url
-            this.dialogImageUrl = url
-            this.dialogVisible = true
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map((item) => item.agreementId)
-            console.log(this.ids)
-            this.single = selection.length != 1
-            this.multiple = !selection.length
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.reset()
-            // const agreementId = row.agreementId
-            // let param = {
-            //     agreementId: row.agreementId,
-            // }
-            var id = row.agreementId;
-            getAgreementInfoId(id).then((response) => {
-                this.form = response.data
-                if (response.data.leaseDay == null) {
-                    this.form.leaseDay = undefined
-                }
-                this.fileList = []
-                this.checkUrlList = []
-                this.checkUrlNameList = []
-                if (
-                    response.data &&
-                    typeof response.data.fileUrl === 'string' &&
-                    typeof response.data.fileName === 'string'
-                ) {
-                    try {
-                        if (response.data.fileUrl != '') {
-                            let [urlArr, nameArr] = [
-                                response.data.fileUrl,
-                                response.data.fileName,
-                            ].map((str) => str.split(','))
-
-                            if (urlArr.length !== nameArr.length) {
-                                return
-                            }
-                            console.log(urlArr)
-                            let fileList = urlArr.map((url, i) => ({
-                                name: nameArr[i],
-                                url: `${this.uploadUrl}${url}`,
-                            }))
-                            console.log(fileList)
-                            this.fileList = fileList
-                            this.checkUrlList = urlArr
-                            this.checkUrlNameList = nameArr
-                        }
-                    } catch (error) {
-                        console.error('处理合同照片时发生错误:', error)
-                    }
-                }
-
-                this.open = true
-                this.title = '修改协议'
-            })
-        },
-        /** 提交按钮 */
-        submitForm: function () {
-            this.form.fileUrl = this.checkUrlList.join(',')
-            this.form.fileName = this.checkUrlNameList.join(',')
-            this.form.projectId = this.form.proId;
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    if (this.form.agreementId != undefined) {
-                        updateAgreement(this.form).then((response) => {
-                            this.$modal.msgSuccess('修改成功')
-                            this.open = false
-                            this.getList()
-                        })
-                    } else {
-                        addAgreement(this.form).then((response) => {
-                            this.$modal.msgSuccess('新增成功')
-                            this.open = false
-                            this.getList()
-                        })
-                    }
-                }
-            })
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            // const agreementId = row.agreementId;
-            // let param = {
-            //     agreementId: row.agreementId + '',
-            // }
-
-            var id = row.agreementId + '';
-            this.$modal
-                .confirm('是否确认删除所选择的数据项？')
-                .then(function () {
-                    return removeAgreement(id)
-                })
-                .then(() => {
-                    this.getList()
-                    this.$modal.msgSuccess('删除成功')
-                })
-                .catch(() => {})
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            if (this.ids.length) {
-                this.download(
-                    'material/agreementInfo/export',
-                    {
-                        dataCondition: this.ids,
-                    },
-                    `协议_${new Date().getTime()}.xlsx`,
-                )
-            } else {
-                this.$modal.msgWarning('请选择要导出的数据')
-            }
-        },
+          })
+        }else{
+          this.businessLicenseListTemp = [];
+        }
+        this.showHouse = true
+        this.title = '修改'
+      })
     },
-}
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.resetForm("form");
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.keyWord=null;
+      this.handleQuery();
+    },
+
+    //** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(async valid => {
+        if (valid) {
+          if (this.form.supplierId != undefined) {
+            const reqData = new FormData();
+            if(this.businessLicenseListTemp.length!=0){
+              await  this.getImaUploadEdit(),
+                await this.editAgreementTemp(this.form);
+              await this.deleteFile();
+            }else{
+              await this.editAgreementTemp(this.form);
+              await this.deleteFile();
+            }
+
+          } else {
+            if(this.businessLicenseListTemp.length!=0){
+              await  this.getImaUpload(),
+                await this.addAgreementTemp(this.form);
+            }else{
+              await this.addAgreementTemp(this.form);
+            }
+
+          }
+        }
+      });
+      this.uploadKey = Date.now();
+    },
+
+    async getImaUpload(){
+      this.businessLicenseFileList = []
+      const reqData = new FormData()
+      const {fileTwo} = await this.getFileData()
+      let res = await imgUpLoadThree(fileTwo);
+      console.log('res',res)
+      if (res.code === 200) {
+        res.data.forEach(item=>{
+          let objTwo = { 'name': item.name, 'url': item.url,'modelId': null, 'fileType':4, 'taskType':9};
+          this.businessLicenseFileList.push(objTwo);
+        })
+      } else {
+        this.$modal.msgError(res.msg);
+      }
+    },
+
+    async getImaUploadEdit(){
+      this.businessLicenseFileList = []
+      const {fileTwo} = await this.getFileData()
+      console.log('fileTwo',fileTwo)
+      this.businessLicenseListTemp.forEach(item=>{
+        if(item.status=='success'){
+          let objThree = { 'name': item.name, 'url': item.url,'modelId': this.modelIdTemp, 'fileType':4, 'taskType':9};
+          this.businessLicenseFileList.push(objThree);
+        }
+      })
+      if(fileTwo.length!=0){
+        let res = await imgUpLoadThree(fileTwo);
+        if (res.code === 200) {
+          res.data.forEach(item=>{
+            let objTwo = { 'name': item.name, 'url': item.url,'modelId': this.modelIdTemp, 'fileType':4, 'taskType':9};
+            this.businessLicenseFileList.push(objTwo);
+          })
+        } else {
+          this.$modal.msgError(res.msg);
+        }
+      }
+    },
+
+    async addAgreementTemp(form){
+      this.form.bmFileInfos=this.businessLicenseFileList
+      addAgreement(form).then(response => {
+        this.$modal.msgSuccess("新增成功");
+        this.showHouse = false;
+        this.getList();
+        this.delBusinessFileIdList=[];
+        this.businessLicenseListTemp=[];
+        this.businessLicenseFileList=[];
+
+      });
+    },
+
+    async editAgreementTemp(form){
+      this.form.bmFileInfos=this.businessLicenseFileList
+      editAgreement(form).then(response => {
+        this.$modal.msgSuccess("修改成功");
+        this.showHouse = false;
+        this.getList();
+        this.delBusinessFileIdList=[];
+        this.businessLicenseListTemp=[];
+        this.businessLicenseFileList=[];
+      });
+    },
+
+    async deleteFile(){
+      if(this.delBusinessFileIdList.length>0){
+        this.delBusinessFileIdList.forEach(async item=>{
+          const urlcode = Base64.encode(item)
+          const urlen = encodeURIComponent(urlcode)
+          await deleteFile(urlen);
+        })
+      }
+    },
+
+
+    async convertToBase64(data) {
+      const url = data;
+
+      try {
+        const response = await fetch(url);
+        if (!response.ok) {
+          throw new Error('网络响应不正常');
+        }
+        const blob = await response.blob();
+        const reader = new FileReader();
+
+        reader.onloadend = () => {
+          this.base64Data = reader.result; // 获取 Base64 数据并存储
+        };
+
+        reader.readAsDataURL(blob); // 将 Blob 读取为 Data URL
+      } catch (error) {
+        console.error('获取文件失败:', error);
+      }
+    },
+
+    // 取消按钮
+    cancel() {
+      this.showHouse = false;
+      this.delBusinessFileIdList=[];
+      this.businessLicenseListTemp=[]
+      this.businessLicenseFileList=[];
+      this.uploadKey = Date.now();
+      this.reset();
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const supplierId = row.supplierId
+      this.$modal
+        .confirm('是否确认删除数据项？')
+        .then(function () {
+          return delAgreement(supplierId)
+        })
+        .then(() => {
+          this.$modal.msgSuccess('删除成功')
+          this.getList()
+        })
+        .catch(() => {})
+    },
+
+    handleExport() {
+      this.download('/material/wh_house_info/export', {
+        ...this.queryParams
+      }, `仓库管理_${new Date().getTime()}.xlsx`)
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+  }
+};
 </script>
 <style lang="scss" scoped>
+.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;
+  width: 60px !important;
+  margin-bottom: 10px;
 }
 //隐藏图片上传框的css
 ::v-deep.disabled {
-    .el-upload--picture-card {
-        display: none;
-    }
+  .el-upload--picture-card {
+    display: none;
+  }
+}
+::v-deep .el-upload-list--picture-card{
+  display: flex;
+}
+::v-deep .el-upload-list__item {
+  margin-bottom: 20px;
+  overflow: revert;
+}
+::v-deep .el-upload-list__item-actions{
+  overflow:hidden;
+}
+.upload-demo{
+  display: flex;
+}
+.el-upload-list__item-thumbnail{
+  height: 145px!important;
+}
+.picture-card-container{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+.picture-card{
+  width: 100%;
+  height: 100%;
+  object-fit:cover;
+  justify-content: center;
+  // border: 1px solid  #ddd;
+  // border-radius: 4px;
+}
+.file-name{
+  width: 90%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  position: absolute;
+  bottom: -35px;
+  margin-top: 8px;
+  text-align: center;
+  font-size: 12px;
+  color:#333;
+  z-index: 999999;
+}
+.file-overlay{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  font-size: 20px;
 }
 </style>

From 9d5bcd5b4fe0e77ffbd96a22cd38ba067b91b4fd Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 12 Nov 2024 18:43:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?lsun=20=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/lease/protocol/index.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index 87f7867e..7709b123 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -645,7 +645,9 @@ export default {
     //** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(async valid => {
-        if (valid) {
+        this.form.projectId = this.form.proId;
+        await this.addAgreementTemp(this.form);
+        /*if (valid) {
           if (this.form.supplierId != undefined) {
             const reqData = new FormData();
             if(this.businessLicenseListTemp.length!=0){
@@ -658,15 +660,18 @@ export default {
             }
 
           } else {
+            console.log(1)
             if(this.businessLicenseListTemp.length!=0){
+              console.log(2)
               await  this.getImaUpload(),
                 await this.addAgreementTemp(this.form);
             }else{
+              console.log(3)
               await this.addAgreementTemp(this.form);
             }
 
           }
-        }
+        }*/
       });
       this.uploadKey = Date.now();
     },
@@ -679,7 +684,7 @@ export default {
       console.log('res',res)
       if (res.code === 200) {
         res.data.forEach(item=>{
-          let objTwo = { 'name': item.name, 'url': item.url,'modelId': null, 'fileType':4, 'taskType':9};
+          let objTwo = { 'name': item.name, 'url': item.url, 'taskType':10};
           this.businessLicenseFileList.push(objTwo);
         })
       } else {

From 3bce0ae64940cf3b6e14f34878770add07040a40 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Wed, 13 Nov 2024 13:56:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?lsun=20=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/lease/protocol/index.vue | 121 +++++++++++++++-----
 1 file changed, 93 insertions(+), 28 deletions(-)

diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index 7709b123..5580bf3b 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -11,6 +11,19 @@
         />
       </el-form-item>
 
+      <el-form-item label="开始日期">
+        <el-date-picker v-model="queryParams.time" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="状态">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+          <el-option label="删除" value="0"></el-option>
+          <el-option label="启用" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <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>
@@ -60,11 +73,9 @@
       <el-table-column label="授权人" align="center" prop="authPerson" sortable/>
       <el-table-column label="授权人电话" align="center" prop="phone" sortable/>
       <el-table-column label="租赁单位类型" align="center">
-        <template v-if="houseList.protocol ==1">
-          <dict-tag>内部单位</dict-tag>
-        </template>
-        <template v-if="houseList.protocol ==2">
-          <dict-tag>外部单位</dict-tag>
+        <template slot-scope="scope">
+          <span v-if="scope.row.protocol == '1'">内部单位</span>
+          <span v-if="scope.row.protocol == '2'">外部单位</span>
         </template>
       </el-table-column>
 
@@ -89,7 +100,7 @@
             size="mini"
             type="text"
             icon="el-icon-zoom-in"
-            @click="handleUpdate(scope.row)"
+            @click="handleView(scope.row)"
           >
             查看
           </el-button>
@@ -236,6 +247,17 @@
           </el-col>
         </el-row>
 
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="租赁单位类型">
+              <el-select v-model="form.protocol" placeholder="请选择租赁单位类型" clearable>
+                <el-option label="内部单位" value="1"></el-option>
+                <el-option label="外部单位" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="营业执照">
           <el-upload
             class = "upload-demo"
@@ -278,7 +300,7 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="showConfirmButton">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -297,6 +319,7 @@ import { downloadFile,downloadFileData } from '@/utils/download'
 import { getToken } from '@/utils/auth'
 import {Base64} from 'js-base64'
 import { forEach } from 'jszip';
+import {listUser} from "@/api/system/user";
 export default {
   name: "supplier",
   data() {
@@ -320,6 +343,8 @@ export default {
       // 非多个禁用
       multiple: true,
 
+      // 日期范围
+      dateRange: [],
 
       // 显示搜索条件
       showSearch: true,
@@ -343,21 +368,15 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      showConfirmButton:true,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        keyWord:undefined
+        keyWord:undefined,
+        status:undefined,
+        time: null, //申请时间
       },
-      // 查询参数
-      queryTeam: {
-        pageNum: 1,
-        pageSize: 10,
-        name: undefined,
-        sex: undefined,
-        teamId: undefined,
-      },
-
       fileList:[],
       businessLicenseFileList:[],
       businessLicenseListTemp:[],
@@ -570,7 +589,15 @@ export default {
 
     async getList() {
       this.loading = true;
-      getListAgreement(this.queryParams).then(response => {
+      const params = {
+        keyWord: this.queryParams.keyWord,
+        startTime: this.queryParams.time && this.queryParams.time[0],
+        endTime: this.queryParams.time && this.queryParams.time[1],
+        pageSize: this.queryParams.pageSize,
+        pageNum: this.queryParams.pageNum,
+        status: this.queryParams.status
+      };
+      getListAgreement(this.addDateRange(params)).then(response => {
         this.houseList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -609,8 +636,11 @@ export default {
       this.businessLicenseFileList=[];
       const supplierId = row.supplierId;
       this.modelIdTemp = row.supplierId;
-      getAgreementDetail(supplierId).then((response) => {
+
+      var id = row.agreementId;
+      getAgreementDetail(id).then((response) => {
         this.form = response.data;
+        this.form.proId = response.data.projectId;
         if(response.data.bmFileInfos!=null){
           this.businessLicenseListTemp = response.data.bmFileInfos;
           this.businessLicenseListTemp.forEach(item=>{
@@ -629,6 +659,40 @@ export default {
         this.title = '修改'
       })
     },
+
+    handleView(row){
+      this.reset()
+      this.uploadKey = Date.now();
+      this.delBusinessFileIdList=[];
+      this.businessLicenseListTemp=[];
+      this.businessLicenseFileList=[];
+      const supplierId = row.supplierId;
+      this.modelIdTemp = row.supplierId;
+
+      var id = row.agreementId;
+      getAgreementDetail(id).then((response) => {
+        this.form = response.data;
+        this.form.proId = response.data.projectId;
+        if(response.data.bmFileInfos!=null){
+          this.businessLicenseListTemp = response.data.bmFileInfos;
+          this.businessLicenseListTemp.forEach(item=>{
+            if(item.name.includes('/')){
+              const fileNameWithTimestamp = item.name.split('/').pop();
+              const parts = fileNameWithTimestamp.split('_');
+              const fileType = item.name.split('.').pop();
+              const mainFileName = parts.slice(0, parts.length - 1).join('_');
+              item.name = mainFileName + '.' +fileType;
+            }
+          })
+        }else{
+          this.businessLicenseListTemp = [];
+        }
+        this.showHouse = true
+        this.showConfirmButton = false
+        this.title = '查询'
+      })
+    },
+
     // 表单重置
     reset() {
       this.form = {};
@@ -637,8 +701,10 @@ export default {
 
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
       this.queryParams.keyWord=null;
+      this.queryParams.status=null;
+      this.queryParams.time = [];
+      this.resetForm("queryForm");
       this.handleQuery();
     },
 
@@ -646,9 +712,8 @@ export default {
     submitForm() {
       this.$refs["form"].validate(async valid => {
         this.form.projectId = this.form.proId;
-        await this.addAgreementTemp(this.form);
-        /*if (valid) {
-          if (this.form.supplierId != undefined) {
+        if (valid) {
+          if (this.form.agreementId != undefined) {
             const reqData = new FormData();
             if(this.businessLicenseListTemp.length!=0){
               await  this.getImaUploadEdit(),
@@ -671,7 +736,7 @@ export default {
             }
 
           }
-        }*/
+        }
       });
       this.uploadKey = Date.now();
     },
@@ -784,11 +849,11 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const supplierId = row.supplierId
+      var id = row.agreementId
       this.$modal
         .confirm('是否确认删除数据项？')
         .then(function () {
-          return delAgreement(supplierId)
+          return delAgreement(id)
         })
         .then(() => {
           this.$modal.msgSuccess('删除成功')
@@ -798,9 +863,9 @@ export default {
     },
 
     handleExport() {
-      this.download('/material/wh_house_info/export', {
+      this.download('/material/bm_agreement_info/export', {
         ...this.queryParams
-      }, `仓库管理_${new Date().getTime()}.xlsx`)
+      }, `协议管理 _${new Date().getTime()}.xlsx`)
     },
 
     /** 搜索按钮操作 */