From 033279994ad8e09071581ce0c916e2aab68de948 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 16 Apr 2026 17:38:24 +0800
Subject: [PATCH] =?UTF-8?q?1.1.20=20=E7=A4=BC=E5=93=81=E3=80=81=E9=82=AE?=
 =?UTF-8?q?=E5=AF=84=E3=80=81=E5=BC=80=E7=A5=A8=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/crm/crmGiftInfo/index.vue     |  2 +-
 src/views/oa/crm/crmMailingApply/index.vue | 24 +++++++++++-----------
 src/views/oa/erp/finInvoiceInfo/index.vue  | 24 ++++++++++++----------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/views/oa/crm/crmGiftInfo/index.vue b/src/views/oa/crm/crmGiftInfo/index.vue
index 7ca9fb4..c44be02 100644
--- a/src/views/oa/crm/crmGiftInfo/index.vue
+++ b/src/views/oa/crm/crmGiftInfo/index.vue
@@ -44,7 +44,7 @@
 
       <el-table v-loading="loading" border :data="crmGiftInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column type="index" label="序号" width="60" align="center" />
+<!--        <el-table-column type="index" label="序号" width="60" align="center" />-->
         <el-table-column label="礼品编码" align="center" prop="giftCode" min-width="120" v-if="columns[0].visible" />
         <el-table-column label="礼品名称" align="center" prop="giftName" min-width="150" v-if="columns[1].visible" />
         <el-table-column label="规格型号" align="center" prop="specification" min-width="120" v-if="columns[2].visible" />
diff --git a/src/views/oa/crm/crmMailingApply/index.vue b/src/views/oa/crm/crmMailingApply/index.vue
index 3985696..ff942a8 100644
--- a/src/views/oa/crm/crmMailingApply/index.vue
+++ b/src/views/oa/crm/crmMailingApply/index.vue
@@ -59,7 +59,7 @@
 
       <el-table v-loading="loading" border :data="crmMailingApplyList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" type="index" width="60" align="center" />
+<!--        <el-table-column label="序号" type="index" width="60" align="center" />-->
         <el-table-column label="申请编号" align="center" prop="mailingApplyCode" min-width="140" />
         <el-table-column label="申请日期" align="center" prop="applicationDate" width="120">
           <template #default="scope">
@@ -88,26 +88,26 @@
             <dict-tag :options="logistics_status" :value="scope.row.logisticsStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" width="200" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
           <template #default="scope">
             <!-- 查看按钮：非草稿状态显示 -->
             <el-tooltip content="查看" placement="top" v-if="scope.row.mailingApplyStatus !== '1'">
-              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['oa/crm:crmMailingApply:query']"></el-button>
+              <el-button link type="primary" icon="DocumentChecked" @click="handleView(scope.row)" v-hasPermi="['oa/crm:crmMailingApply:query']"></el-button>
             </el-tooltip>
             <!-- 修改按钮：仅草稿状态显示 -->
             <el-tooltip content="修改" placement="top" v-if="scope.row.mailingApplyStatus === '1'">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:crmMailingApply:edit']"></el-button>
             </el-tooltip>
             <!-- 审批记录按钮：审批中或已审批状态显示 -->
-            <el-tooltip content="审批记录" placement="top" v-if="scope.row.mailingApplyStatus === '2' || scope.row.mailingApplyStatus === '3'">
-              <el-button
-                link
-                type="primary"
-                icon="Tickets"
-                @click="handleApprovalRecord(scope.row)"
-                v-hasPermi="['oa/crm:crmMailingApply:query']"
-              ></el-button>
-            </el-tooltip>
+<!--            <el-tooltip content="审批记录" placement="top" v-if="scope.row.mailingApplyStatus === '2' || scope.row.mailingApplyStatus === '3'">-->
+<!--              <el-button-->
+<!--                link-->
+<!--                type="primary"-->
+<!--                icon="Tickets"-->
+<!--                @click="handleApprovalRecord(scope.row)"-->
+<!--                v-hasPermi="['oa/crm:crmMailingApply:query']"-->
+<!--              ></el-button>-->
+<!--            </el-tooltip>-->
             <!-- 删除按钮：仅草稿状态显示 -->
             <el-tooltip content="删除" placement="top" v-if="scope.row.mailingApplyStatus === '1'">
               <el-button
diff --git a/src/views/oa/erp/finInvoiceInfo/index.vue b/src/views/oa/erp/finInvoiceInfo/index.vue
index f28c177..a4b64e4 100644
--- a/src/views/oa/erp/finInvoiceInfo/index.vue
+++ b/src/views/oa/erp/finInvoiceInfo/index.vue
@@ -4,6 +4,9 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+            <el-form-item label="申请编号" prop="invoiceCode">
+              <el-input v-model="queryParams.invoiceCode" placeholder="请输入申请编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item label="项目号" prop="projectCode">
               <el-input v-model="queryParams.projectCode" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -29,11 +32,11 @@
                   <el-option v-for="dict in invoice_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
-<!--              <el-form-item label="流程状态" prop="flowStatus">-->
-<!--                <el-select v-model="queryParams.flowStatus" placeholder="请选择流程状态" clearable @keyup.enter="handleQuery">-->
-<!--                  <el-option v-for="dict in wf_business_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
+              <!--              <el-form-item label="流程状态" prop="flowStatus">-->
+              <!--                <el-select v-model="queryParams.flowStatus" placeholder="请选择流程状态" clearable @keyup.enter="handleQuery">-->
+              <!--                  <el-option v-for="dict in wf_business_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>-->
+              <!--                </el-select>-->
+              <!--              </el-form-item>-->
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
@@ -54,14 +57,14 @@
           <!--            </el-button>-->
           <!--          </el-col>-->
           <!--          <el-col :span="1.5">-->
-          <!--            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:finInvoiceInfo:remove']"-->
-          <!--              >删除-->
-          <!--            </el-button>-->
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:finInvoiceInfo:remove']"
+            >删除
+          </el-button>
           <!--          </el-col>-->
           <!--          <el-col :span="1.5">-->
           <!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:finInvoiceInfo:export']">导出 </el-button>-->
           <!--          </el-col>-->
-          <!--          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>-->
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
@@ -116,13 +119,12 @@
                 link
                 type="primary"
                 size="small"
-                icon="View"
+                icon="DocumentChecked"
                 @click="handleUpdate(scope.row, 'view')"
                 v-hasPermi="['oa:erp/budgetInfo:view']"
               >
               </el-button>
             </el-tooltip>
-
             <el-tooltip content="修改" placement="top">
               <el-button
                 link