gm-printer 10.14.1-alpha.8 → 10.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.14.1-alpha.8",
+  "version": "10.14.1",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/editor_purchase/context_menu.js

@@ -66,7 +66,6 @@ class ContextMenu extends React.Component {
 
   render() {
     const { editStore, mockData } = this.props
-    console.log('purchase')
     return (
       <CommonContextMenu
         renderTableAction={this.renderOrderActionBtn}

package/src/editor_settle/context_menu.js

@@ -70,6 +70,7 @@ class ContextMenu extends React.Component {
           selectedRegion={editStore.selectedRegion}
           config={editStore.config}
           data={mockData}
+          isSomeSubtotalTr
         />
       </CommonContextMenu>
     )

package/src/printer/do_print.js

@@ -53,12 +53,13 @@ function init({ isTest, isTipZoom = true } = {}) {
   }
 }
 
-function toDoPrint({ data, config }) {
+function toDoPrint({ data, config }, isSomeSubtotalTr) {
   return new window.Promise(resolve => {
     const $app = $printer.contentWindow.document.getElementById('appContainer')
     ReactDOM.unmountComponentAtNode($app)
     ReactDOM.render(
       <Printer
+        isSomeSubtotalTr={isSomeSubtotalTr} // 每页合计是否需要展示多个字段
         config={config}
         data={data}
         onReady={() => {
@@ -112,10 +113,10 @@ function toDoPrintFinanceBatch(list, isPrint = true) {
   })
 }
 
-function doPrint({ data, config }, isTest) {
+function doPrint({ data, config }, isTest, isSomeSubtotalTr) {
   init({ isTest })
 
-  return toDoPrint({ data, config })
+  return toDoPrint({ data, config }, isSomeSubtotalTr)
 }
 function doBatchPrint(
   list,

package/src/printer/page.js

@@ -26,7 +26,6 @@ class Page extends React.Component {
       paddingBottom,
       paddingLeft
     } = printerStore.config.page.gap
-    console.log('isFontFamily', isFontFamily)
 
     const {
       size: { width, height },

package/src/printer/printer.js

@@ -159,7 +159,7 @@ class Printer extends React.Component {
   }
 
   renderPage() {
-    const { printerStore } = this.props
+    const { printerStore, isSomeSubtotalTr } = this.props
     const { config, remainPageHeight, isAutoFilling } = printerStore
     return (
       <>
@@ -195,6 +195,7 @@ class Printer extends React.Component {
                         }}
                         placeholder={`${i18next.t('区域')} ${panel.index}`}
                         pageIndex={i}
+                        isSomeSubtotalTr={isSomeSubtotalTr}
                       />
                     )
 
@@ -322,6 +323,7 @@ Printer.propTypes = {
   data: PropTypes.object.isRequired,
   config: PropTypes.object.isRequired,
   onReady: PropTypes.func,
+  isSomeSubtotalTr: PropTypes.bool,
   getremainpageHeight: PropTypes.func
 }
 

package/src/printer/table.js

@@ -146,7 +146,8 @@ class Table extends React.Component {
       name,
       range,
       pageIndex,
-      printerStore
+      printerStore,
+      isSomeSubtotalTr
     } = this.props
 
     // 数据
@@ -165,6 +166,7 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
+            isSomeSubtotalTr={isSomeSubtotalTr}
           />
           <PageSummary {...this.props} />
         </>
@@ -179,6 +181,7 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
+            isSomeSubtotalTr={isSomeSubtotalTr}
           />
         </>
       )
@@ -337,7 +340,8 @@ Table.propTypes = {
   range: PropTypes.object.isRequired,
   pageIndex: PropTypes.number.isRequired,
   placeholder: PropTypes.string,
-  printerStore: PropTypes.object
+  printerStore: PropTypes.object,
+  isSomeSubtotalTr: PropTypes.bool
 }
 
 export default Table

package/src/printer/table_subtotal_tr.js

@@ -2,13 +2,11 @@ import React from 'react'
 import i18next from '../../locales'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import { MULTI_SUFFIX } from '../config'
+import { MULTI_SUFFIX, MULTI_SUFFIX3 } from '../config'
 import Big from 'big.js'
 import { coverDigit2Uppercase, getDataKey } from '../util'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
-import { Flex } from '../components'
-
 /**
  * 每页合计组件,分页计算后,根据range来统计每页合计数据
  * @param props
@@ -35,7 +33,8 @@ const SubtotalTr = props => {
       }
     },
     range,
-    printerStore
+    printerStore,
+    isSomeSubtotalTr
   } = props
 
   const tableData = printerStore.data._table[getDataKey(dataKey, arrange)] || []
@@ -48,11 +47,15 @@ const SubtotalTr = props => {
 
         const _origin = b._origin || {}
         const _origin2 = b['_origin' + MULTI_SUFFIX] || {}
+        const _origin3 = b['_origin' + MULTI_SUFFIX3] || {}
 
         result = a.plus(_origin[field] || 0)
         if (_origin2[field]) {
           result = result.plus(_origin2[field])
         }
+        if (_origin3[field]) {
+          result = result.plus(_origin3[field])
+        }
         return result
       },
       Big(0)
@@ -73,64 +76,91 @@ const SubtotalTr = props => {
     // 定义每页小记的左右两侧内容
     let subtotalLeftContent
     let subtotalRightContent
-
-    for (const name in sum) {
-      const price = sum[name]
-      const priceUpperCase = get(subtotal, 'needUpperCase') // needUpperCase在初始模板中undefined,所以必须用这个方法
-        ? '大写：' + coverDigit2Uppercase(price)
-        : ''
-      if (displayName) {
-        // 大写金额是否在前
-        if (isUpperCaseBefore) {
-          subtotalLeftContent = `${name}${priceUpperCase}`
-          subtotalRightContent = `${price}`
+    let subtotalStr = ''
+    // 结款单
+    if (isSomeSubtotalTr) {
+      for (const name in sum) {
+        const price = sum[name]
+        const priceUpperCase = get(subtotal, 'needUpperCase') // needUpperCase在初始模板中undefined,所以必须用这个方法
+          ? '大写：' + coverDigit2Uppercase(price)
+          : ''
+        if (displayName) {
+          subtotalStr += `${name} ${price}   ${priceUpperCase}    `
         } else {
-          subtotalLeftContent = `${price}`
-          subtotalRightContent = `${name} ${priceUpperCase}`
+          subtotalStr += `${price}   ${priceUpperCase}    `
         }
-      } else {
-        if (isUpperCaseBefore) {
-          subtotalLeftContent = `${priceUpperCase}`
-          subtotalRightContent = `${price}`
+      }
+
+      return (
+        <tr>
+          <td
+            colSpan={99}
+            style={{ fontWeight: 'bold', ...style }}
+            dangerouslySetInnerHTML={{
+              __html: `${i18next.t('每页合计')}：${subtotalStr}`
+            }}
+          />
+        </tr>
+      )
+    } else {
+      for (const name in sum) {
+        const price = sum[name]
+        const priceUpperCase = get(subtotal, 'needUpperCase') // needUpperCase在初始模板中undefined,所以必须用这个方法
+          ? '大写：' + coverDigit2Uppercase(price)
+          : ''
+        if (displayName) {
+          // 大写金额是否在前
+          if (isUpperCaseBefore) {
+            subtotalLeftContent = `${name}${priceUpperCase}`
+            subtotalRightContent = `${price}`
+          } else {
+            subtotalLeftContent = `${price}`
+            subtotalRightContent = `${name} ${priceUpperCase}`
+          }
         } else {
-          subtotalLeftContent = `${price}`
-          subtotalRightContent = `${priceUpperCase}`
+          if (isUpperCaseBefore) {
+            subtotalLeftContent = `${priceUpperCase}`
+            subtotalRightContent = `${price}`
+          } else {
+            subtotalLeftContent = `${price}`
+            subtotalRightContent = `${priceUpperCase}`
+          }
         }
       }
-    }
 
-    return (
-      <tr>
-        <td
-          colSpan={99}
-          style={{ fontWeight: 'bold', ...style }}
-          // dangerouslySetInnerHTML={{
-          //   __html: `${i18next.t('每页合计')}：${subtotalStr}`
-          // }}flex-grow: 1
-        >
-          {/* 大写金额和小写金额分开在表格的两侧，通过控制类名实现，添加类名后，覆盖原来的居中、靠右靠左 */}
-          <div
-            className={
-              isUpperLowerCaseSeparate
-                ? 'gm-printer-subtotal-UpperLowerCaseSeparate-outer'
-                : ''
-            }
+      return (
+        <tr>
+          <td
+            colSpan={99}
+            style={{ fontWeight: 'bold', ...style }}
+            // dangerouslySetInnerHTML={{
+            //   __html: `${i18next.t('每页合计')}：${subtotalStr}`
+            // }}flex-grow: 1
           >
-            {i18next.t('每页合计')}：
-            <span
+            {/* 大写金额和小写金额分开在表格的两侧，通过控制类名实现，添加类名后，覆盖原来的居中、靠右靠左 */}
+            <div
               className={
                 isUpperLowerCaseSeparate
-                  ? 'gm-printer-subtotal-UpperLowerCaseSeparate-inter'
+                  ? 'gm-printer-subtotal-UpperLowerCaseSeparate-outer'
                   : ''
               }
             >
-              <span>&nbsp;&nbsp;{subtotalLeftContent}&nbsp;&nbsp;</span>
-              <span>&nbsp;&nbsp;{subtotalRightContent}&nbsp;&nbsp;</span>
-            </span>
-          </div>
-        </td>
-      </tr>
-    )
+              {i18next.t('每页合计')}：
+              <span
+                className={
+                  isUpperLowerCaseSeparate
+                    ? 'gm-printer-subtotal-UpperLowerCaseSeparate-inter'
+                    : ''
+                }
+              >
+                <span>&nbsp;&nbsp;{subtotalLeftContent}&nbsp;&nbsp;</span>
+                <span>&nbsp;&nbsp;{subtotalRightContent}&nbsp;&nbsp;</span>
+              </span>
+            </div>
+          </td>
+        </tr>
+      )
+    }
   } else {
     return null
   }

package/src/util.js

@@ -141,7 +141,12 @@ const coverDigit2Uppercase = n => {
         )
       ] + fraction[i]
   }
+  // 1.06 --- 壹元零陆分
   right = right.replace(/(零分)/, '').replace(/(零角)/, '零')
+  // 1.00 --- 壹元整
+  right = right === '零' ? '整' : right
+  // 1.60 --- 壹元陆角整 1.66 --- 壹元陆角陆分
+  right = /角$/.test(right) ? right + '整' : right
   n = Math.floor(n)
 
   for (i = 0; i < unit[0].length && n > 0; i++) {
@@ -155,10 +160,10 @@ const coverDigit2Uppercase = n => {
 
   return (
     head +
-    (
-      left.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零') +
-      (right === '零' ? '整' : right)
-    ).replace(/^整$/, '零元整')
+    (left.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零') + right).replace(
+      /^整$/,
+      '零元整'
+    )
   )
 }