Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

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;
+}

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;
-}

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;
   }

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)

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;

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 {

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;

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 {

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) {

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;

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,
         },
       },