From 42614f46b1979426ccbee7962305b547f89ac922 Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Fri, 23 Jan 2026 16:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/FormPage.vue |  2 +-
 src/pages/cst/org/Org.vue        | 67 +++++++++++---------------------
 src/pages/cst/org/org.d.ts       | 62 +----------------------------
 3 files changed, 25 insertions(+), 106 deletions(-)

diff --git a/src/components/page/FormPage.vue b/src/components/page/FormPage.vue
index d84b05e..4401afd 100644
--- a/src/components/page/FormPage.vue
+++ b/src/components/page/FormPage.vue
@@ -230,7 +230,7 @@ onMounted(doSearch)
         v-bind="tableProps"
       >
         <slot name="columns"/>
-        <ElTableColumn v-if="!Colls.isEmpty(actionColumn)" :width="actionColumn?.width?? '180'" fixed="right" label="操作">
+        <ElTableColumn v-if="!Colls.isEmpty(actionColumn?.tableActions)" :width="actionColumn?.width?? '180'" fixed="right" label="操作">
           <template #default="scope">
             <div class="action-btn">
               <template v-for="(tableAction,i) in actionColumn!.tableActions.filter(it=>(it.show==null?true:it.show(scope)))" :key="'action-btn-'+i">
diff --git a/src/pages/cst/org/Org.vue b/src/pages/cst/org/Org.vue
index 0176f52..70f56e7 100644
--- a/src/pages/cst/org/Org.vue
+++ b/src/pages/cst/org/Org.vue
@@ -4,31 +4,22 @@
     :action-column="actionColumn"
     :paging="paging">
     <template #searchFormItem="{searchForm}">
-      <ElFormItem label="统一社会信用代码">
-        <ElInput v-model="searchForm.uscc" placeholder="统一社会信用代码"/>
+      <ElFormItem label="客户名称">
+        <ElInput v-model="searchForm.customerName" placeholder="客户名称"/>
+      </ElFormItem>
+      <ElFormItem label="联系电话">
+        <ElInput v-model="searchForm.phone" placeholder="联系电话"/>
       </ElFormItem>
       <ElFormItem label="企业名称">
         <ElInput v-model="searchForm.orgName" placeholder="企业名称"/>
       </ElFormItem>
-      <ElFormItem label="法人名称">
-        <ElInput v-model="searchForm.legalRepresentative" placeholder="法人名称"/>
-      </ElFormItem>
-      <ElFormItem label="市">
-        <ElInput v-model="searchForm.cityName" placeholder="市"/>
-      </ElFormItem>
-      <ElFormItem label="区县">
-        <ElInput v-model="searchForm.areaName" placeholder="区县"/>
-      </ElFormItem>
-      <ElFormItem label="乡镇街道">
-        <ElInput v-model="searchForm.townName" placeholder="乡镇街道"/>
-      </ElFormItem>
-      <ElFormItem label="详细地址">
-        <ElInput v-model="searchForm.address" placeholder="详细地址"/>
+      <ElFormItem label="代码">
+        <ElInput v-model="searchForm.uscc" placeholder="统一社会信用代码"/>
       </ElFormItem>
     </template>
     <template #simpleSearchFormItem="{searchForm}">
       <ElFormItem>
-        <ElInput v-model="searchForm.uscc" placeholder="统一社会信用代码"/>
+        <ElInput v-model="searchForm.customerName" placeholder="客户名称"/>
       </ElFormItem>
       <ElFormItem>
         <ElInput v-model="searchForm.orgName" placeholder="企业名称"/>
@@ -36,37 +27,17 @@
     </template>
     <template #columns>
       <!-- ，GeTiHu-个体户、QiYe--企业 -->
-      <ElTableColumn label="主体类型" prop="orgCategoryTxt"/>
-      <!-- <ElTableColumn label="统一社会信用代码" prop="uscc" /> -->
-      <ElTableColumn label="企业名称" prop="orgName" width="140"/>
-      <ElTableColumn label="营业执照" width="100px">
-        <template #default="{ row }">
-          <el-image :preview-src-list="[AppApi.fileUrl(row.businessLicense)]" :src="AppApi.fileUrl(row.businessLicense)" preview-teleported show-progress style="width: 60px; height: 60px"/>
-        </template>
-      </ElTableColumn>
+      <ElTableColumn label="客户名称" prop="customerName"/>
+      <ElTableColumn label="联系电话" prop="phone"/>
+      <ElTableColumn label="企业名称" prop="orgName"/>
+      <ElTableColumn label="统一社会信用代码" prop="uscc"/>
       <ElTableColumn label="法人名称" prop="legalRepresentative"/>
-      <!-- <ElTableColumn label="法人身份证号" prop="idcard" />
-       <ElTableColumn label="身份证有效期" prop="idcardStartTime"/>
-        <ElTableColumn label="身份证有效期" prop="idcardEndTime"/> -->
-      <ElTableColumn label="身份证正面" prop="idcardFront" width="100">
+      <ElTableColumn label="主体类型" prop="orgCategoryTxt"/>
+      <ElTableColumn label="营业执照" width="80">
         <template #default="{ row }">
-          <el-image :preview-src-list="[AppApi.fileUrl(row.idcardFront)]" :src="AppApi.fileUrl(row.idcardFront)" preview-teleported show-progress style="width: 60px; height: 60px"/>
+          <ElImage :preview-src-list="[AppApi.fileUrl(row.businessLicense)]" :src="AppApi.fileUrl(row.businessLicense)" preview-teleported show-progress style="width: 32px; height: 32px"/>
         </template>
       </ElTableColumn>
-      <ElTableColumn label="身份证反面" prop="idcardBack" width="100">
-        <template #default="{ row }">
-          <el-image :preview-src-list="[AppApi.fileUrl(row.idcardBack)]" :src="AppApi.fileUrl(row.idcardBack)" preview-teleported show-progress style="width: 60px; height: 60px"/>
-        </template>
-      </ElTableColumn>
-      <!-- <ElTableColumn label="省" prop="provinceName"/>
-        <ElTableColumn label="市" prop="cityName"/> -->
-      <ElTableColumn label="区县" prop="areaName"/>
-      <ElTableColumn label="乡镇街道" prop="townName"/>
-      <ElTableColumn label="详细地址" prop="address" width="180"/>
-      <!-- <ElTableColumn label="经度" prop="lng" />
-      <ElTableColumn label="纬度" prop="lat" /> -->
-      <ElTableColumn label="创建时间" prop="createTime" width="140"/>
-      <ElTableColumn label="修改时间" prop="modifyTime" width="140"/>
     </template>
     <OrgForm ref="orgForm" :research="research"/>
   </FormPage>
@@ -84,6 +55,12 @@ const formPageIns = useTemplateRef<ComponentExposed<typeof FormPage>>('formPage'
 const actionColumn = reactive<ActionColumnType<OrgTypes.SearchOrgResult>>({
   tableActions: [
     {
+      tooltip: '详情',
+      icon: 'Postcard',
+      action({row}) {
+      },
+    },
+    /* {
       icon: 'Delete',
       loading: false,
       type: 'danger',
@@ -98,7 +75,7 @@ const actionColumn = reactive<ActionColumnType<OrgTypes.SearchOrgResult>>({
             return true
           })
       },
-    },
+     }, */
   ],
 })
 
diff --git a/src/pages/cst/org/org.d.ts b/src/pages/cst/org/org.d.ts
index 855dc85..98fe209 100644
--- a/src/pages/cst/org/org.d.ts
+++ b/src/pages/cst/org/org.d.ts
@@ -3,64 +3,14 @@ export {}
 declare global {
   namespace OrgTypes {
     interface SearchOrgParam extends G.PageParam {
-      // Id
-      id?: string
-      // 主体类型，GeTiHu-->个体户、QiYe-->企业
-      orgCategory?: string
+      customerName?: string
+      phone?: string
       // 统一社会信用代码
       uscc?: string
       // 企业名称
       orgName?: string
-      // 营业执照
-      businessLicense?: string
-      // 营业执照有效期
-      licenseStartTime?: string
-      // 营业执照有效期
-      licenseEndTime?: string
       // 法人名称
       legalRepresentative?: string
-      // 法人身份证号
-      idcard?: string
-      // 法人身份证有效期
-      idcardStartTime?: string
-      // 法人身份证有效期
-      idcardEndTime?: string
-      // 法人身份证正面
-      idcardFront?: string
-      // 法人身份证反面
-      idcardBack?: string
-      // 省；代码
-      province?: string
-      // 市；代码
-      city?: string
-      // 区县；代码
-      area?: string
-      // 乡镇街道；代码
-      town?: string
-      // 省；名称
-      provinceName?: string
-      // 市；名称
-      cityName?: string
-      // 区县；名称
-      areaName?: string
-      // 乡镇街道；名称
-      townName?: string
-      // 详细地址
-      address?: string
-      // 经度
-      lng?: number
-      // 纬度
-      lat?: number
-      // 创建人 Id； sys_user.id
-      creatorId?: string
-      // 修改人 Id； sys_user.id
-      modifierId?: string
-      // 创建时间
-      createTime?: string
-      // 修改时间
-      modifyTime?: string
-      // 是否删除； 0-->未删除、1-->已删除
-      deleted?: boolean
     }
 
     interface SearchOrgResult {
@@ -112,16 +62,8 @@ declare global {
       lng?: number
       // 纬度
       lat?: number
-      // 创建人 Id； sys_user.id
-      creatorId?: string
-      // 修改人 Id； sys_user.id
-      modifierId?: string
       // 创建时间
       createTime?: string
-      // 修改时间
-      modifyTime?: string
-      // 是否删除； 0-->未删除、1-->已删除
-      deleted?: boolean
     }
 
     interface AddOrgParam {