From 2dac5e60a15af22add5e52ddbb217a2c6b75499a Mon Sep 17 00:00:00 2001
From: 13218645326 <sjf13651675634@163.com>
Date: Sat, 9 Dec 2023 21:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  1 +
 src/http/api/equip.ts                         |  3 +
 .../equipmentListingApproval/com/addCom.vue   |  4 +-
 .../com/headerTop.vue                         | 73 ++++++++++++-------
 .../equipmentListingApproval/index.vue        |  2 +-
 .../businessReview/com/headerTop.vue          |  7 +-
 .../businessReview/index.vue                  |  5 +-
 .../enterpriseEntryReview/com/headerTop.vue   | 15 ++--
 .../enterpriseEntryReview/index.vue           |  8 +-
 .../enterpriseInfo/com/headerTop.vue          |  6 +-
 .../enterpriseInfo/index.vue                  |  5 +-
 .../enterpriseType/com/headerTop.vue          |  8 +-
 .../enterpriseType/index.vue                  |  5 +-
 13 files changed, 95 insertions(+), 47 deletions(-)

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 @@
             <!-- <el-form-item label="关键字">
                 <el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
             </el-form-item> -->
-          
+
             <el-form-item label="编码">
                 <el-input v-model="filterForm.code" placeholder="请输入编码" clearable />
             </el-form-item>
@@ -15,60 +15,81 @@
             <el-form-item label="企业名称">
                 <el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
             </el-form-item>
-            <el-form-item label="企业名称">
-                <el-input v-model="filterForm.typeId" placeholder="请输入企业名称" clearable />
+            <el-form-item label="装备类型">
+                <el-cascader :options="treeList" filterable v-model="filterForm.typeId" clearable :props="{
+                    label: 'name',
+                    value: 'id'
+
+                }" />
             </el-form-item>
-            <el-form-item >
+            <el-form-item>
                 <el-button type="primary" @click="serachFn">查询</el-button>
                 <el-button type="plain" @click="resetFn">重置</el-button>
-          
-            </el-form-item> 
-            <el-form-item >
-                <el-button type="primary" :disabled="props.selectItemList.length==0" @click="auditBatchFn">批量审批</el-button>
+
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" :disabled="props.selectItemList.length == 0" @click="auditBatchFn">批量审批</el-button>
                 <!-- <el-button type="primary" :disabled="props.selectItemList.length==0"  @click="deleteBatchFn">批量下架</el-button> -->
-            <el-button type="primary" @click="exportFn">导出</el-button>
-            </el-form-item> 
+                <el-button type="primary" @click="exportFn">导出</el-button>
+            </el-form-item>
+
 
 
-          
         </el-form>
- 
+
     </el-card>
 </template>
 
 <script lang="ts" setup>
-const emits = defineEmits(['search','reset','auditBatch','export','deleteBatch'])
+const emits = defineEmits(['search', 'reset', 'auditBatch', 'export', 'deleteBatch'])
+import { typeTreeSelect } from "http/api/equip"
 const props = defineProps({
-    selectItemList:{
-        type:Array,
-        default:[]
+    selectItemList: {
+        type: Array,
+        default: []
     }
 })
 const filterForm = reactive({
-    code:"",
-    name:'',
-    companyName:"",
-    typeId:''
+    code: "",
+    name: '',
+    companyName: "",
+    typeId: ''
 })
 
+const treeList = ref([])
+
 const serachFn = () => {
-    emits('search',filterForm)
+    emits('search', filterForm)
 }
 
-const resetFn=()=>{
-    emits('reset')
+const resetFn = () => {
+    filterForm.code = ""
+    filterForm.name = ''
+    filterForm.companyName = ""
+    filterForm.typeId = ''
+
+    emits('reset', filterForm)
 }
 
-const exportFn =()=>{
+const exportFn = () => {
     emits('export')
 }
-const auditBatchFn =()=>{
+const auditBatchFn = () => {
     emits('auditBatch')
 }
-const deleteBatchFn =()=>{
+const deleteBatchFn = () => {
     emits('deleteBatch')
 }
 
+const initTreeData = async () => {
+    const res: any = await typeTreeSelect({})
+    console.log("RES", res)
+    treeList.value = res.data
+}
+
+onMounted(() => {
+    initTreeData()
+})
 </script>
 
 <style scoped lang="scss"></style>
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 @@
 
 <script lang="ts" setup>
 const emits = defineEmits(['search', 'reset', 'export'])
-import {getdatatime} from "utils/time"
-const filterForm:any = reactive({
+import { getdatatime } from "utils/time"
+const filterForm: any = reactive({
     keyword: '',
     companyName: '',
     creditCode: '',
@@ -58,15 +58,20 @@ const serachFn = () => {
 }
 
 const resetFn = () => {
-    emits('reset')
+    filterForm.keyword = ''
+    filterForm.companyName = ''
+    filterForm.creditCode = ''
+    filterForm.dataRange =  getdatatime()
+    filterForm.userName = ''
+    emits('reset',filterForm)
 }
 
 const exportFn = () => {
     emits('export')
 }
 
-onMounted(()=>{
-    filterForm.dataRange =   getdatatime()
+onMounted(() => {
+    filterForm.dataRange = getdatatime()
 })
 
 </script>
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 @@
 <template>
     <el-card shadow="always" class="search_header_top_row1">
-        <el-form :inline="true" :model="filterForm" class="demo-form-inline">
+        <el-form :inline="true" ref="formRef" :model="filterForm" class="demo-form-inline">
             <el-form-item label="企业类型">
                 <el-input v-model.trim="filterForm.name" placeholder="请输入企业类型" clearable maxlength="30" />
             </el-form-item>
@@ -24,7 +24,7 @@
  
 <script lang="ts" setup>
 const emits = defineEmits(['search', 'reset', 'export', 'add'])
-
+const formRef = ref()
 const isEnableList = reactive({
     list: [{
 
@@ -47,7 +47,9 @@ const serachFn = () => {
 }
 
 const resetFn = () => {
-    emits('reset')
+    filterForm.name = ''
+    filterForm.status = ''
+    emits('reset',filterForm)
 }
 
 const exportFn = () => {
diff --git a/src/views/enterpriseManagement/enterpriseType/index.vue b/src/views/enterpriseManagement/enterpriseType/index.vue
index ea50189..ccadb5a 100644
--- a/src/views/enterpriseManagement/enterpriseType/index.vue
+++ b/src/views/enterpriseManagement/enterpriseType/index.vue
@@ -92,8 +92,9 @@ const searchFn = (params: any) => {
     initTableList()
 }
 
-const resetFn = () => {
-
+const resetFn =  (params: any) => {
+    searchParams = params
+    initTableList()
 }
 
 const sortFn = () => {