From 80ac55d84a88fc4d332db0d3c16cdd826385c01d Mon Sep 17 00:00:00 2001
From: yujinlong <yjl09601@163.com>
Date: Mon, 4 Nov 2024 15:13:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=B4=A2?=
 =?UTF-8?q?=E7=A8=8E=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Table/src/components/RenderComponent.vue  |  8 +++---
 .../Table/src/components/TableAction.vue      |  4 +--
 src/components/Table/src/types/tableAction.ts |  3 ++-
 src/views/financialTax/bankJournal/index.vue  |  7 +++--
 .../detail/components/SearchTable.vue         |  4 +--
 .../expenseAccount/detail/index.vue           |  4 +--
 .../financialTax/expenseAccount/index.vue     | 27 +++++++++----------
 .../incomeInvoice/detail/index.vue            |  4 +--
 .../financialTax/incomeInvoice/index.vue      | 12 ++++-----
 9 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/src/components/Table/src/components/RenderComponent.vue b/src/components/Table/src/components/RenderComponent.vue
index 9da7f0c1..fa319541 100644
--- a/src/components/Table/src/components/RenderComponent.vue
+++ b/src/components/Table/src/components/RenderComponent.vue
@@ -2,11 +2,9 @@
   <renderComponent />
 </template>
 <script lang="ts" setup>
-  import { VNode } from 'vue'
-
-  const props = defineProps<{
-    renderProp: VNode
-  }>()
+  const props = defineProps({
+    renderProp: [String, Object],
+  })
   const renderComponent = {
     render: () => {
       return props.renderProp
diff --git a/src/components/Table/src/components/TableAction.vue b/src/components/Table/src/components/TableAction.vue
index 4ee5a4cc..569f7417 100644
--- a/src/components/Table/src/components/TableAction.vue
+++ b/src/components/Table/src/components/TableAction.vue
@@ -3,7 +3,7 @@
     <template v-for="(action, index) in getActions" :key="`${index}-${action.label}`">
       <Tooltip v-if="action.tooltip" v-bind="getTooltip(action.tooltip)">
         <PopConfirmButton v-bind="action">
-          <RenderComponent v-if="action.isCustomIcon" :renderProp="action.icon" />
+          <RenderComponent v-if="action.isCustomIcon" :renderProp="action.customIcon" />
           <template v-else>
             <Icon v-if="action.icon" :icon="action.icon" :class="{ 'mr-1': !!action.label }" />
             <template v-if="action.label">{{ action.label }}</template>
@@ -11,7 +11,7 @@
         </PopConfirmButton>
       </Tooltip>
       <PopConfirmButton v-else v-bind="action">
-        <RenderComponent v-if="action.isCustomIcon" :renderProp="action.icon" />
+        <RenderComponent v-if="action.isCustomIcon" :renderProp="action.customIcon" />
         <template v-else>
           <Icon v-if="action.icon" :icon="action.icon" :class="{ 'mr-1': !!action.label }" />
           <template v-if="action.label">{{ action.label }}</template>
diff --git a/src/components/Table/src/types/tableAction.ts b/src/components/Table/src/types/tableAction.ts
index 1674ac73..f2fe67c7 100644
--- a/src/components/Table/src/types/tableAction.ts
+++ b/src/components/Table/src/types/tableAction.ts
@@ -7,7 +7,8 @@ export interface ActionItem extends ButtonProps {
   label?: string
   color?: 'success' | 'error' | 'warning'
   isCustomIcon?: boolean
-  icon?: string | JSX.Element | VNode
+  icon?: string
+  customIcon?: string | JSX.Element | VNode
   popConfirm?: PopConfirm
   disabled?: boolean
   divider?: boolean
diff --git a/src/views/financialTax/bankJournal/index.vue b/src/views/financialTax/bankJournal/index.vue
index d6725684..b738b02a 100644
--- a/src/views/financialTax/bankJournal/index.vue
+++ b/src/views/financialTax/bankJournal/index.vue
@@ -49,7 +49,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, onMounted } from 'vue'
+  import { ref, onMounted, h } from 'vue'
   import type { BankItem } from './columns'
   import { columns, searchFormSchema, bankNoFormat } from './columns'
   import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table'
@@ -125,12 +125,11 @@
   const getActionOptList = (record): ActionItem[] => {
     return [
       {
-        /* icon: h('i', {
+        customIcon: h('i', {
           class: 'iconfont icon-xiazai',
           style: { color: '#257afa', fontSize: '14px' },
         }),
-        isCustomIcon: true, */
-        icon: 'ant-design:cloud-download-outlined',
+        isCustomIcon: true,
         tooltip: '下载',
         onClick: handleDownload.bind(null, record),
       },
diff --git a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
index 8ace2851..32c80678 100644
--- a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
+++ b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
@@ -32,7 +32,7 @@
                 class="iconfont icon-fuzhi3"
                 style="color: #257afa; font-size: 14px; margin-right: 4px; cursor: pointer"
                 v-if="record.invoiceNumber"
-                @click="copyHandle(record)"
+                @click.stop="copyHandle(record)"
               ></i>
               <span>{{ record.invoiceNumber || '' }}</span>
             </template>
@@ -55,7 +55,7 @@
   </a-modal>
 </template>
 <script lang="ts" setup>
-  import { ref, defineEmits, computed, watch } from 'vue'
+  import { ref, defineEmits, computed, watch, unref } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { columns, searchFormSchema } from './columns'
   import { GetInvoiceList } from '../../api'
diff --git a/src/views/financialTax/expenseAccount/detail/index.vue b/src/views/financialTax/expenseAccount/detail/index.vue
index 4fb952ef..f269369c 100644
--- a/src/views/financialTax/expenseAccount/detail/index.vue
+++ b/src/views/financialTax/expenseAccount/detail/index.vue
@@ -56,7 +56,7 @@
                 class="iconfont icon-fuzhi3"
                 style="color: #257afa; font-size: 14px; margin-right: 4px; cursor: pointer"
                 v-if="record.invoiceNumber"
-                @click="copyHandle(record)"
+                @click.stop="copyHandle(record)"
               ></i>
               <span>{{ record.invoiceNumber || '' }}</span>
             </template>
@@ -98,7 +98,7 @@
   </a-spin>
 </template>
 <script lang="ts" setup>
-  import { ref, computed } from 'vue'
+  import { ref, computed, unref } from 'vue'
   import { Divider } from 'ant-design-vue'
   import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table'
   import SearchTable from './components/SearchTable.vue'
diff --git a/src/views/financialTax/expenseAccount/index.vue b/src/views/financialTax/expenseAccount/index.vue
index 3af41e40..0ccae8cb 100644
--- a/src/views/financialTax/expenseAccount/index.vue
+++ b/src/views/financialTax/expenseAccount/index.vue
@@ -32,13 +32,13 @@
         <template v-if="column.key === 'action'">
           <TableAction :actions="getActionOptList(record)" />
         </template>
-        <template v-if="column.dataIndex == 'invoiceNumber'">
-          <span>{{ record.invoiceNumber || '' }}</span>
+        <template v-if="column.dataIndex == 'reimbursementId'">
+          <span>{{ record.reimbursementId || '' }}</span>
           <i
             class="iconfont icon-fuzhi3"
             style="color: #257afa; font-size: 14px; margin-left: 4px; cursor: pointer"
-            v-if="record.invoiceNumber"
-            @click="copyHandle(record)"
+            v-if="record.reimbursementId"
+            @click.stop="copyHandle(record)"
           ></i>
         </template>
         <template v-if="column.dataIndex == 'reimbursementType'">
@@ -56,6 +56,7 @@
   </div>
 </template>
 <script setup lang="ts">
+  import { unref, h } from 'vue'
   import { ReimbursementGetList, ReimbursementDelete } from './api.js'
   import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table'
   import { formatParams } from '/@/hooks/web/common'
@@ -121,14 +122,12 @@
     const canEditable = [0, 2, 4].includes(record.reimbursementType)
     return [
       {
-        icon: canEditable ? 'clarity:note-edit-line' : 'ant-design:file-text-outlined',
-        /* icon: canEditable
-          ? 'clarity:note-edit-line'
-          : h('i', {
-              class: 'iconfont icon-chakan',
-              style: { color: '#257afa', fontSize: '16px' },
-            }), */
-        // isCustomIcon: !canEditable,
+        customIcon: h('i', {
+          class: 'iconfont icon-chakan',
+          style: { color: '#257afa', fontSize: '16px' },
+        }),
+        icon: 'clarity:note-edit-line',
+        isCustomIcon: !canEditable,
         tooltip: canEditable ? '编辑' : '查看',
         onClick: GoDetailed.bind(null, record),
       },
@@ -158,8 +157,8 @@
       })
   }
   const copyHandle = (row: BillItem) => {
-    const { clipboardRef, isSuccessRef } = useCopyToClipboard(row.invoiceNumber)
-    clipboardRef.value = row.invoiceNumber
+    const { clipboardRef, isSuccessRef } = useCopyToClipboard(row.reimbursementId)
+    clipboardRef.value = row.reimbursementId
     if (unref(isSuccessRef)) {
       createMessage.success('复制成功！')
     }
diff --git a/src/views/financialTax/incomeInvoice/detail/index.vue b/src/views/financialTax/incomeInvoice/detail/index.vue
index 7454cda4..70a2f73b 100644
--- a/src/views/financialTax/incomeInvoice/detail/index.vue
+++ b/src/views/financialTax/incomeInvoice/detail/index.vue
@@ -51,7 +51,7 @@
                 class="iconfont icon-fuzhi3"
                 style="color: #257afa; font-size: 14px; margin-right: 4px; cursor: pointer"
                 v-if="record.invoiceNumber"
-                @click="copyHandle(record)"
+                @click.stop="copyHandle(record)"
               ></i>
               <span>{{ record.invoiceNumber || '' }}</span>
             </template>
@@ -62,7 +62,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue'
+  import { ref, unref } from 'vue'
   import { SvgIcon } from '/@/components/Icon'
   import { BasicTable, useTable } from '/@/components/Table'
   import { GetInfo } from '../api'
diff --git a/src/views/financialTax/incomeInvoice/index.vue b/src/views/financialTax/incomeInvoice/index.vue
index 40fe2a59..705b5744 100644
--- a/src/views/financialTax/incomeInvoice/index.vue
+++ b/src/views/financialTax/incomeInvoice/index.vue
@@ -29,7 +29,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted } from 'vue'
+  import { onMounted, unref, h } from 'vue'
   import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table'
   import { GetList } from './api'
   import { formatParams } from '/@/hooks/web/common'
@@ -90,22 +90,20 @@
   const getActionOptList = (record): ActionItem[] => {
     return [
       {
-        icon: 'ant-design:file-text-outlined',
-        /* icon: h('i', {
+        customIcon: h('i', {
           class: 'iconfont icon-chakan',
           style: { color: '#257afa', fontSize: '16px' },
         }),
-        isCustomIcon: true, */
+        isCustomIcon: true,
         tooltip: '明细',
         onClick: handleDetails.bind(null, record),
       },
       {
-        icon: 'ant-design:cloud-download-outlined',
-        /* icon: h('i', {
+        customIcon: h('i', {
           class: 'iconfont icon-xiazai',
           style: { color: '#257afa', fontSize: '14px' },
         }),
-        isCustomIcon: true, */
+        isCustomIcon: true,
         tooltip: '下载',
         onClick: handleDownload.bind(null, record),
       },

From 14a84862cabc5dad8ab1cc150d3edb32c27161d6 Mon Sep 17 00:00:00 2001
From: yujinlong <yjl09601@163.com>
Date: Mon, 4 Nov 2024 15:37:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E6=B5=8B=E8=AF=95=E5=8C=85=20a?=
 =?UTF-8?q?ntd=20=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E5=99=A8=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BD=BF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.test => .env.integration | 0
 package.json                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .env.test => .env.integration (100%)

diff --git a/.env.test b/.env.integration
similarity index 100%
rename from .env.test
rename to .env.integration
diff --git a/package.json b/package.json
index c3994975..553ee5dc 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "serve": "npm run dev",
     "dev": "vite",
     "build": "cross-env NODE_ENV=production vite build && esno ./build/script/postBuild.ts",
-    "build:test": "cross-env vite build --mode test && esno ./build/script/postBuild.ts",
+    "build:test": "cross-env vite build --mode integration && esno ./build/script/postBuild.ts",
     "build:no-cache": "pnpm clean:cache && npm run build",
     "report": "cross-env REPORT=true npm run build",
     "type:check": "vue-tsc --noEmit --skipLibCheck",