From 62890605b8f9010d9364e71acd8ef5a1100766fc Mon Sep 17 00:00:00 2001
From: yujinlong <yjl09601@163.com>
Date: Tue, 12 Nov 2024 11:29:33 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=B4=A2=E7=A8=8E=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BC=98=E5=8C=96&less=E5=85=A8=E5=B1=80=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/design/common.less                        | 31 ++++++++++++++++++
 src/design/public.less                        | 32 -------------------
 src/views/financialTax/bankJournal/index.vue  |  6 ----
 .../expenseAccount/detail/columns.tsx         | 13 +++++++-
 .../detail/components/SearchTable.vue         |  6 ----
 .../expenseAccount/detail/index.vue           | 11 +++----
 .../financialTax/expenseAccount/index.vue     |  6 ----
 .../incomeInvoice/detail/columns.tsx          |  4 +--
 .../incomeInvoice/detail/index.vue            | 12 -------
 .../financialTax/incomeInvoice/index.vue      |  6 ----
 vite.config.ts                                |  2 +-
 11 files changed, 51 insertions(+), 78 deletions(-)
 create mode 100644 src/design/common.less

diff --git a/src/design/common.less b/src/design/common.less
new file mode 100644
index 00000000..679f5de3
--- /dev/null
+++ b/src/design/common.less
@@ -0,0 +1,31 @@
+.flex_arrange(@direction: row, @justify: center, @align: center) {
+  display: flex;
+  flex-direction: @direction;
+  justify-content: @justify;
+  align-items: @align;
+}
+
+.line-feed() {
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: break-spaces;
+  hyphens: auto;
+}
+
+.ellipses() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  -o-text-overflow: hidden;
+  -webkit-box-orient: vertical;
+}
+
+.text_ellipsis_rowX(@lineNum: 2) {
+  text-overflow: -o-ellipsis-lastline;
+  overflow: hidden; //溢出内容隐藏
+  text-overflow: ellipsis; //文本溢出部分用省略号表示
+  display: -webkit-box; //特别显示模式
+  -webkit-line-clamp: @lineNum; //行数
+  line-clamp: @lineNum;
+  -webkit-box-orient: vertical;
+}
diff --git a/src/design/public.less b/src/design/public.less
index 3eb5daad..c1f59946 100644
--- a/src/design/public.less
+++ b/src/design/public.less
@@ -294,35 +294,3 @@ h5 {
 .anticon-exclamation-circle {
   // display: none!important;
 }
-
-.flex_arrange(@direction: row, @justify: center, @align: center) {
-  display: flex;
-  flex-direction: @direction;
-  justify-content: @justify;
-  align-items: @align;
-}
-
-.line-feed() {
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: break-spaces;
-  hyphens: auto;
-}
-
-.ellipses() {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  -o-text-overflow: hidden;
-  -webkit-box-orient: vertical;
-}
-
-.text_ellipsis_rowX(@lineNum: 2) {
-  text-overflow: -o-ellipsis-lastline;
-  overflow: hidden; //溢出内容隐藏
-  text-overflow: ellipsis; //文本溢出部分用省略号表示
-  display: -webkit-box; //特别显示模式
-  -webkit-line-clamp: @lineNum; //行数
-  line-clamp: @lineNum;
-  -webkit-box-orient: vertical;
-}
diff --git a/src/views/financialTax/bankJournal/index.vue b/src/views/financialTax/bankJournal/index.vue
index 2d4db333..f1c1a3cb 100644
--- a/src/views/financialTax/bankJournal/index.vue
+++ b/src/views/financialTax/bankJournal/index.vue
@@ -152,12 +152,6 @@
   })
 </script>
 <style lang="less" scoped>
-  .flex_arrange(@direction: row, @justify: center, @align: center) {
-    display: flex;
-    flex-direction: @direction;
-    justify-content: @justify;
-    align-items: @align;
-  }
   :deep(.ant-table.ant-table-bordered > .ant-table-container) {
     border-left: none !important;
   }
diff --git a/src/views/financialTax/expenseAccount/detail/columns.tsx b/src/views/financialTax/expenseAccount/detail/columns.tsx
index b152c296..1154eb24 100644
--- a/src/views/financialTax/expenseAccount/detail/columns.tsx
+++ b/src/views/financialTax/expenseAccount/detail/columns.tsx
@@ -146,6 +146,13 @@ export const columns: BasicColumn[] = [
 
 export const getDetailForm = (type: PageType): FormSchema[] => {
   return [
+    {
+      field: 'infoClientBankId',
+      label: '',
+      component: 'Input',
+      colProps: { span: 4 },
+      show: false,
+    },
     {
       field: 'bankName',
       label: '开户行',
@@ -167,9 +174,10 @@ export const getDetailForm = (type: PageType): FormSchema[] => {
                 const dataResult = res?.data || []
                 const defaultData = dataResult.find((item) => item.isInvoiceDefault)
 
-                if (defaultData) {
+                if (defaultData && type === 'ADD') {
                   formModel.payeeAccountNumber = defaultData.bankAccountNo
                   formModel.bankName = defaultData.bankName
+                  formModel.infoClientBankId = defaultData.id
                 }
                 resolve(res?.data || [])
               })
@@ -180,9 +188,11 @@ export const getDetailForm = (type: PageType): FormSchema[] => {
           onChange: (e, obj) => {
             if (e && obj) {
               formModel.payeeAccountNumber = obj.bankAccountNo
+              formModel.infoClientBankId = obj.id
             }
             if (!e && !obj) {
               formModel.payeeAccountNumber = ''
+              formModel.infoClientBankId = ''
             }
           },
         }
@@ -229,6 +239,7 @@ export const getDetailForm = (type: PageType): FormSchema[] => {
       component: 'InputNumber',
       componentProps: ({ formModel }) => {
         return {
+          precision: 2,
           onChange: (e) => {
             nextTick(() => {
               formModel.amountUppercase = digitUppercase(formModel?.amount || 0)
diff --git a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
index 9b145ec4..292fc2dd 100644
--- a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
+++ b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
@@ -163,12 +163,6 @@
 </script>
 
 <style lang="less" scoped>
-  .flex_arrange(@direction: row, @justify: center, @align: center) {
-    display: flex;
-    flex-direction: @direction;
-    justify-content: @justify;
-    align-items: @align;
-  }
   :deep(.ant-table-footer) {
     padding: 0px !important;
     background: white;
diff --git a/src/views/financialTax/expenseAccount/detail/index.vue b/src/views/financialTax/expenseAccount/detail/index.vue
index aa2b50f8..5af1f7e9 100644
--- a/src/views/financialTax/expenseAccount/detail/index.vue
+++ b/src/views/financialTax/expenseAccount/detail/index.vue
@@ -241,6 +241,7 @@
         id: route.query.id as string,
       })
       setFieldsValue({
+        infoClientBankId: res.data.infoClientBankId,
         bankName: res.data.bankName,
         payeeName: res.data.payeeName,
         payeeAccountNumber: res.data.payeeAccountNumber,
@@ -292,6 +293,10 @@
 
   const saveFunc = async (callback?: Function | undefined) => {
     await validate()
+    if (!getFieldsValue().bankName) {
+      createMessage.warning('请填写开户行信息')
+      return
+    }
     if (!billTableData.value.length) {
       createMessage.warning('请至少引入一条发票')
       return
@@ -431,12 +436,6 @@
 </script>
 
 <style lang="less" scoped>
-  .flex_arrange(@direction: row, @justify: center, @align: center) {
-    display: flex;
-    flex-direction: @direction;
-    justify-content: @justify;
-    align-items: @align;
-  }
   .page-wrapper {
     background: #ffffff;
     .ant-divider-vertical {
diff --git a/src/views/financialTax/expenseAccount/index.vue b/src/views/financialTax/expenseAccount/index.vue
index ef4831c5..c964976c 100644
--- a/src/views/financialTax/expenseAccount/index.vue
+++ b/src/views/financialTax/expenseAccount/index.vue
@@ -186,12 +186,6 @@
   }
 </script>
 <style lang="less" scoped>
-  .flex_arrange(@direction: row, @justify: center, @align: center) {
-    display: flex;
-    flex-direction: @direction;
-    justify-content: @justify;
-    align-items: @align;
-  }
   .SvgImg {
     width: 18px;
     height: 18px;
diff --git a/src/views/financialTax/incomeInvoice/detail/columns.tsx b/src/views/financialTax/incomeInvoice/detail/columns.tsx
index 20d8268d..bb52aba7 100644
--- a/src/views/financialTax/incomeInvoice/detail/columns.tsx
+++ b/src/views/financialTax/incomeInvoice/detail/columns.tsx
@@ -212,11 +212,11 @@ export const columns: BasicColumn[] = [
 
 export const getDisplayValLabel = (displayItem, detailInfo): string => {
   if (displayItem['key'] === 'reimbursementDesc') {
-    return detailInfo.reimbursementId
+    return detailInfo?.reimbursementId
       ? `报销单号${detailInfo.reimbursementId}使用，报销人：${
           detailInfo.reimburser
         }，报销时间：${moment(detailInfo.createTime).format('YYYY-MM-DD')} ，事由：${
-          detailInfo.reason ?? '-'
+          detailInfo?.reason ?? '-'
         }`
       : '-'
   } else {
diff --git a/src/views/financialTax/incomeInvoice/detail/index.vue b/src/views/financialTax/incomeInvoice/detail/index.vue
index 4f3458fd..00475cd6 100644
--- a/src/views/financialTax/incomeInvoice/detail/index.vue
+++ b/src/views/financialTax/incomeInvoice/detail/index.vue
@@ -181,18 +181,6 @@
 </script>
 
 <style lang="less" scoped>
-  .flex_arrange(@direction: row, @justify: center, @align: center) {
-    display: flex;
-    flex-direction: @direction;
-    justify-content: @justify;
-    align-items: @align;
-  }
-  .line-feed() {
-    word-break: break-all;
-    word-wrap: break-word;
-    white-space: break-spaces;
-    hyphens: auto;
-  }
   .ds-income-invoice-wrapper {
     background: #ffffff;
     :deep(.ant-table-title) {
diff --git a/src/views/financialTax/incomeInvoice/index.vue b/src/views/financialTax/incomeInvoice/index.vue
index 4a93ed65..bc81ecea 100644
--- a/src/views/financialTax/incomeInvoice/index.vue
+++ b/src/views/financialTax/incomeInvoice/index.vue
@@ -145,12 +145,6 @@
 </script>
 
 <style lang="less" scoped>
-  .flex_arrange(@direction: row, @justify: center, @align: center) {
-    display: flex;
-    flex-direction: @direction;
-    justify-content: @justify;
-    align-items: @align;
-  }
   .ds-fee-settle-main-table {
     .status-box {
       .flex_arrange;
diff --git a/vite.config.ts b/vite.config.ts
index 990ecb9d..3f09fa80 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -92,7 +92,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       preprocessorOptions: {
         less: {
           modifyVars: generateModifyVars(),
-          // additionalData: `@import "${pathResolve('src/design/public.less')}";`,
+          additionalData: `@import "${pathResolve('src/design/common.less')}";`,
           javascriptEnabled: true,
         },
       },