diff --git a/components.d.ts b/components.d.ts
index 2359034..1398bfc 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -12,6 +12,7 @@ declare module 'vue' {
EditorWang: typeof import('./src/components/com/editorWang.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton']
ElCard: typeof import('element-plus/es')['ElCard']
+ ElCascader: typeof import('element-plus/es')['ElCascader']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
diff --git a/src/http/api/equip.ts b/src/http/api/equip.ts
index da27618..7b04c34 100644
--- a/src/http/api/equip.ts
+++ b/src/http/api/equip.ts
@@ -19,3 +19,6 @@ export const apiSelectInfo = (params: any) => {
export const apiOff = (params: any) => {
return post(`/off/edit`, params)
}
+export const typeTreeSelect = (params: any) => {
+ return get(`/type/treeSelect`, params)
+}
diff --git a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue
index 87d3d21..5bd467f 100644
--- a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue
+++ b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue
@@ -102,8 +102,8 @@ const rejectCallBack = async (row: any, value: any) => {
maId: form.maId,
id: form.creator,
applyCompany: form.companyName,
- type: "1",
- status: '1'
+ type: "2",
+ status: '2'
}
]
diff --git a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/headerTop.vue b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/headerTop.vue
index c31f682..ce05a92 100644
--- a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/headerTop.vue
+++ b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/headerTop.vue
@@ -5,7 +5,7 @@
-
+
@@ -15,60 +15,81 @@
-
-
+
+
-
+
查询
重置
-
-
-
- 批量审批
+
+
+
+ 批量审批
- 导出
-
+ 导出
+
+
-
-
+
diff --git a/src/views/enterpriseEquipmentManage/equipmentListingApproval/index.vue b/src/views/enterpriseEquipmentManage/equipmentListingApproval/index.vue
index a3a6467..75787ee 100644
--- a/src/views/enterpriseEquipmentManage/equipmentListingApproval/index.vue
+++ b/src/views/enterpriseEquipmentManage/equipmentListingApproval/index.vue
@@ -179,7 +179,7 @@ const auditBatchFn =()=>{
}
const batchFn=(ev:any)=>{
-
+
}
diff --git a/src/views/enterpriseManagement/businessReview/com/headerTop.vue b/src/views/enterpriseManagement/businessReview/com/headerTop.vue
index 1bf2a1c..e566bf0 100644
--- a/src/views/enterpriseManagement/businessReview/com/headerTop.vue
+++ b/src/views/enterpriseManagement/businessReview/com/headerTop.vue
@@ -44,7 +44,12 @@ const serachFn = () => {
}
const resetFn=()=>{
- emits('reset')
+ filterForm.keyword= ''
+ filterForm.companyName=''
+ filterForm.userName=''
+ filterForm.creditCode=''
+ filterForm.dataRange= getdatatime()
+ emits('reset',filterForm)
}
const exportFn =()=>{
diff --git a/src/views/enterpriseManagement/businessReview/index.vue b/src/views/enterpriseManagement/businessReview/index.vue
index ee5b763..623bf57 100644
--- a/src/views/enterpriseManagement/businessReview/index.vue
+++ b/src/views/enterpriseManagement/businessReview/index.vue
@@ -124,8 +124,9 @@ const searchFn = (params:any) => {
initTableList()
}
-const resetFn = () => {
-
+const resetFn =(params:any) => {
+ searchParams = params
+ initTableList()
}
const exportFn = async () => {
diff --git a/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue b/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue
index 18f03a8..a3d5c38 100644
--- a/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue
+++ b/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue
@@ -28,8 +28,8 @@
diff --git a/src/views/enterpriseManagement/enterpriseEntryReview/index.vue b/src/views/enterpriseManagement/enterpriseEntryReview/index.vue
index b542ed0..a4c3bf7 100644
--- a/src/views/enterpriseManagement/enterpriseEntryReview/index.vue
+++ b/src/views/enterpriseManagement/enterpriseEntryReview/index.vue
@@ -106,8 +106,12 @@ const searchFn = (params: any) => {
initTableList()
}
-const resetFn = () => {
-
+const resetFn =(params: any) => {
+ searchParams = params
+ console.log("searchParams", params)
+ searchParams.beginTime = moment(params.dataRange[0]).format('yyyy-MM-DD')
+ searchParams.endTime = moment(params.dataRange[1]).format('yyyy-MM-DD')
+ initTableList()
}
const exportFn = async () => {
diff --git a/src/views/enterpriseManagement/enterpriseInfo/com/headerTop.vue b/src/views/enterpriseManagement/enterpriseInfo/com/headerTop.vue
index e461c72..02c5dd5 100644
--- a/src/views/enterpriseManagement/enterpriseInfo/com/headerTop.vue
+++ b/src/views/enterpriseManagement/enterpriseInfo/com/headerTop.vue
@@ -41,7 +41,11 @@ const serachFn = () => {
}
const resetFn=()=>{
- emits('reset')
+ filterForm.companyName=''
+ filterForm.creditCode=''
+ filterForm.userName=''
+ filterForm.dataRange=getdatatime()
+ emits('reset',filterForm)
}
const exportFn =()=>{
diff --git a/src/views/enterpriseManagement/enterpriseInfo/index.vue b/src/views/enterpriseManagement/enterpriseInfo/index.vue
index 18a285b..67fd08c 100644
--- a/src/views/enterpriseManagement/enterpriseInfo/index.vue
+++ b/src/views/enterpriseManagement/enterpriseInfo/index.vue
@@ -131,8 +131,9 @@ const searchFn = (params: any) => {
initTableList()
}
-const resetFn = () => {
-
+const resetFn = (params: any) => {
+ searchParams = params
+ initTableList()
}
const exportFn = () => {
diff --git a/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue b/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue
index bda06a1..f1ff04a 100644
--- a/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue
+++ b/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue
@@ -1,6 +1,6 @@