gm-printer 10.41.1 → 10.41.2

package/src/common/util.js

@@ -1,10 +1,9 @@
 import i18next from '../../locales'
 
 /**
- * 每页合计设置单选按钮
- * id的值是用来计算每页的金额总数，不要轻易随便改
+ * 每页合计金额单选
+ * id 与 data_to_key 中文 key 对齐，用于对本页行求和，不要轻易改 id
  */
-// 整单合计和每页合计栏都使用的这个
 const subtotalRadioList = [
   {
     value: i18next.t('下单金额'),
@@ -17,6 +16,61 @@ const subtotalRadioList = [
   {
     value: i18next.t('实际金额'),
     id: '实际金额'
+  },
+  {
+    value: i18next.t('变化前金额'),
+    id: '变化前金额'
+  },
+  {
+    value: i18next.t('下单金额（不含税）'),
+    id: '下单金额_不含税'
+  },
+  {
+    value: i18next.t('实收金额'),
+    id: '实收金额'
+  },
+  {
+    value: i18next.t('实收金额（不含税）'),
+    id: '实收金额_不含税'
+  }
+]
+
+/**
+ * 整单合计金额单选（比每页合计多「出库金额（不含税）」）
+ * id 与 data.common 中文 key 对齐，取订单已算金额，不重算
+ */
+const overallOrderRadioList = [
+  {
+    value: i18next.t('下单金额'),
+    id: '下单金额'
+  },
+  {
+    value: i18next.t('出库金额'),
+    id: '出库金额'
+  },
+  {
+    value: i18next.t('实际金额'),
+    id: '实际金额'
+  },
+  {
+    value: i18next.t('变化前金额'),
+    id: '变化前金额'
+  },
+  {
+    value: i18next.t('下单金额（不含税）'),
+    id: '下单金额_不含税'
+  },
+  {
+    value: i18next.t('出库金额（不含税）'),
+    id: '出库金额_不含税'
+  },
+  {
+    value: i18next.t('实收金额'),
+    id: '实收金额'
+  },
+  {
+    value: i18next.t('实收金额（不含税）'),
+    id: '实收金额_不含税'
   }
 ]
 
@@ -26,4 +80,4 @@ const accountRadioList = {
   实际金额: i18next.t('实际金额')
 }
 
-export { subtotalRadioList, accountRadioList }
+export { subtotalRadioList, overallOrderRadioList, accountRadioList }

package/src/editor_purchase/editor.js

@@ -21,6 +21,7 @@ import withStore from '../common/hoc_with_store'
 class Editor extends React.Component {
   render() {
     const { onSave, showEditor, addFields, isPurchase } = this.props
+    const editFieldConfig = addFields?.editFieldConfig
 
     return (
       <div className='gm-printer-edit'>
@@ -43,7 +44,7 @@ class Editor extends React.Component {
             <Gap height='10px' />
             <EditorSelect isPurchase={isPurchase} />
             <Gap height='5px' />
-            <EditorField />
+            <EditorField editFieldConfig={editFieldConfig} />
             <Gap height='5px' />
             <EditorAddField addFields={addFields} />
             <Gap height='5px' />

package/src/editor_purchase/editor_special_table.js

@@ -14,6 +14,11 @@ import {
 } from '../common/component'
 import _ from 'lodash'
 import { inject, observer } from 'mobx-react'
+import {
+  buildDataKey,
+  getDataKeyPrefix,
+  isDetailOneRowSelectKey,
+} from '../common/data_key_util'
 
 const dataKeyList = [
   { value: 'purchase_no_detail', text: i18next.t('不打印明细') },
@@ -57,8 +62,11 @@ const detailSortOptionsForMerchant = [
 @observer
 class TableDetailEditor extends React.Component {
   handleDataKeyChange = dataKey => {
-    const { editStore } = this.props
-    editStore.setPurchaseTableKey(dataKey)
+    const { editStore, addFields } = this.props
+    editStore.setPurchaseTableKey(
+      dataKey,
+      addFields.specialTableConfig
+    )
   }
 
   handlePurchaseSettingKeyChange = dataKey => {
@@ -74,28 +82,32 @@ class TableDetailEditor extends React.Component {
   }
 
   handleDetailAddField = ({ key, value }) => {
-    const { editStore, config } = this.props
-    if (editStore.computedDataKey === 'purchase_detail_one_row') {
-      // 序号 {{列.序号}}
+    const { editStore, config, addFields } = this.props
+    if (isDetailOneRowSelectKey(editStore.computedDataKey)) {
       const transform = str => {
         return str
-          .replace(/{{\s*([^}]+)\s*}}/g, '{{$1}}') // 先标准化（去掉多余空格）
+          .replace(/{{\s*([^}]+)\s*}}/g, '{{$1}}')
           .replace(/{{([^.\s}]+)}}/g, '{{列.$1}}')
       }
+      const prefix = getDataKeyPrefix(config.dataKey)
+      const rolSkuKey = buildDataKey(prefix, 'independent_rol_sku')
+      const rolAddressKey = buildDataKey(prefix, 'independent_rol_address')
       if (
         config.purchaseSettingKey === 'goods' &&
-        config.dataKey !== 'purchase_independent_rol_sku'
+        config.dataKey !== rolSkuKey
       ) {
-        editStore.setPurchaseTableKey('purchase_independent_rol_sku')
+        editStore.setPurchaseTableKey(rolSkuKey, addFields.specialTableConfig)
       } else if (
         config.purchaseSettingKey === 'merchant' &&
-        config.dataKey !== 'purchase_independent_rol_address'
+        config.dataKey !== rolAddressKey
       ) {
-        editStore.setPurchaseTableKey('purchase_independent_rol_address')
+        editStore.setPurchaseTableKey(
+          rolAddressKey,
+          addFields.specialTableConfig
+        )
       }
 
       editStore.addFieldToTable({ key, value: transform(value) })
-
       return
     }
     editStore.specialTextAddField('*' + value)
@@ -113,7 +125,7 @@ class TableDetailEditor extends React.Component {
 
   render() {
     const {
-      addFields: { detailFields },
+      addFields: { detailFields, specialTableConfig = {} },
       editStore
     } = this.props
     const {
@@ -123,18 +135,28 @@ class TableDetailEditor extends React.Component {
       specialConfig: { template_text, style }
     } = this.props.config
 
+    const title = specialTableConfig.title || i18next.t('设置采购明细')
+    const label = specialTableConfig.label || i18next.t('采购明细')
+    // 外部可整体覆盖下拉选项（dataKeyList），否则按 hideDataKeys 过滤默认列表
+    const baseDataKeyList = specialTableConfig.dataKeyList || dataKeyList
+    const hideDataKeys = specialTableConfig.hideDataKeys || []
+    const visibleDataKeyList = _.filter(
+      baseDataKeyList,
+      v => !hideDataKeys.includes(v.value)
+    )
+
     return (
       <div>
-        <Title title={i18next.t('设置采购明细')} />
+        <Title title={title} />
         <Gap />
         <Flex alignCenter className='gm-padding-top-5'>
-          <div>{i18next.t('采购明细')}：</div>
+          <div>{label}：</div>
           <Select
             className='gm-printer-edit-select'
             value={editStore.computedDataKey}
             onChange={this.handleDataKeyChange}
           >
-            {_.map(dataKeyList, v => (
+            {_.map(visibleDataKeyList, v => (
               <Option key={v.value} value={v.value}>
                 {v.text}
               </Option>
@@ -142,7 +164,7 @@ class TableDetailEditor extends React.Component {
           </Select>
         </Flex>
 
-        {editStore.computedDataKey === 'purchase_detail_one_row' && (
+        {isDetailOneRowSelectKey(editStore.computedDataKey) && (
           <>
             <Flex alignCenter className='gm-padding-top-5'>
               <div>{i18next.t('打印设置')}：</div>
@@ -210,7 +232,7 @@ class TableDetailEditor extends React.Component {
               </Flex>
             </div>
 
-            {editStore.computedDataKey !== 'purchase_detail_one_row' && (
+            {!isDetailOneRowSelectKey(editStore.computedDataKey) && (
               <>
                 <div className='gm-padding-top-5'>
                   <div>{i18next.t('字段设置')}：</div>

package/src/editor_purchase/editor_sum_table.js

@@ -16,10 +16,14 @@ class TableDetailEditor extends Component {
   }
 
   render() {
-    const { editStore } = this.props
     const {
       addFields: { sumTableConfig }
     } = this.props
+    // 业务侧可传 sumTableConfig.hide=true 隐藏「汇总表」开关；默认展示
+    if (sumTableConfig?.hide) {
+      return null
+    }
+    const { editStore } = this.props
     if (editStore.computedRegionIsTable) {
       const arr = editStore.selectedRegion.split('.')
       const tableConfig = editStore.config.contents[arr[2]]

package/src/editor_purchase/store.js

@@ -1,55 +1,71 @@
 import EditorStore from '../common/editor_store'
 import { action, observable } from 'mobx'
 import i18next from '../../locales'
+import { getDataKeySuffix, isLastColDataKey } from '../common/data_key_util'
+
+const getPurchaseDefaultDetailText = () =>
+  i18next.t('{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}')
+
+/** 创建/切换「单列-最后一列」时，明细列 text 应与 template_text 一致 */
+const resolveDetailTemplateText = (tableConfig, specialTableConfig) => {
+  const existing = tableConfig.specialConfig?.template_text
+  if (existing) return existing
+  if (specialTableConfig && specialTableConfig.defaultDetailText !== undefined) {
+    return specialTableConfig.defaultDetailText
+  }
+  return getPurchaseDefaultDetailText()
+}
+
+const syncLastColColumnText = (tableConfig) => {
+  if (!isLastColDataKey(tableConfig.dataKey)) return
+  const templateText = tableConfig.specialConfig?.template_text
+  if (!templateText) return
+  const specialCol = tableConfig.columns?.find((o) => o.isSpecialColumn)
+  if (specialCol) specialCol.text = templateText
+}
 
 class Store extends EditorStore {
   constructor({ defaultTableDataKey }) {
     super()
-    this.defaultTableDataKey = defaultTableDataKey // 修改默认dataKey
+    this.defaultTableDataKey = defaultTableDataKey
   }
 
   @observable
   customerTag = false
 
-  /* start---------设置采购明细相关--------- */
   @action.bound
-  setPurchaseTableKey(dataKey) {
-    // 先移除选中项,安全第一
+  init(config, data) {
+    super.init(config, data)
+    config?.contents?.forEach((tableConfig) => {
+      if (tableConfig?.type === 'table') syncLastColColumnText(tableConfig)
+    })
+  }
+
+  @action.bound
+  setPurchaseTableKey(dataKey, specialTableConfig) {
     this.selected = null
     this.setTableDataKey(dataKey)
 
     const arr = this.selectedRegion.split('.')
     const tableConfig = this.config.contents[arr[2]]
 
-    // 先去掉所有明细列
-    const newCols = tableConfig.columns.filter(o => !o.isSpecialColumn)
+    const newCols = tableConfig.columns.filter((o) => !o.isSpecialColumn)
     tableConfig.columns.replace(newCols)
 
-    // 单列-总表最后一列,在columns上修改
-    if (
-      dataKey === 'purchase_last_col' ||
-      dataKey === 'purchase_last_col_noLineBreak'
-    ) {
+    if (isLastColDataKey(dataKey)) {
+      const templateText = resolveDetailTemplateText(tableConfig, specialTableConfig)
       tableConfig.columns.push({
         head: i18next.t('明细'),
         headStyle: { textAlign: 'center' },
         style: { textAlign: 'left' },
         isSpecialColumn: true,
         separator: '+',
-        // detailsType: 'purchase_last_col',
         specialDetailsKey: '__details',
-        text: i18next.t(
-          '{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}'
-        )
+        text: templateText,
       })
-      // 通过detailsType属性区分单列-总表最后一列的数据是否换行展示
-      dataKey === 'purchase_last_col'
-        ? (tableConfig.columns[
-            tableConfig.columns.length - 1
-          ].detailLastColType = 'purchase_last_col')
-        : (tableConfig.columns[
-            tableConfig.columns.length - 1
-          ].detailLastColType = 'purchase_last_col_noLineBreak')
+      const suffix = getDataKeySuffix(dataKey)
+      tableConfig.columns[tableConfig.columns.length - 1].detailLastColType =
+        suffix === 'last_col' ? 'purchase_last_col' : 'purchase_last_col_noLineBreak'
     }
   }
 
@@ -59,13 +75,9 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.template_text = value
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.text = value
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.text = value
     }
   }
 
@@ -75,13 +87,9 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.style = value
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.style = value
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.style = value
     }
   }
 
@@ -91,17 +99,12 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.template_text += fieldText
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.text += fieldText
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.text += fieldText
     }
   }
 
-  /* end---------设置采购明细相关--------- */
   @action.bound
   switchCustomerTag(val) {
     const arr = this.selectedRegion.split('.')

package/src/printer/long_print_table/index.js

@@ -111,7 +111,8 @@ class Table extends React.Component {
       range,
       pageIndex,
       printerStore,
-      isSomeSubtotalTr
+      isSomeSubtotalTr,
+      isLastTablePage
     } = this.props
     // 数据
     dataKey = getDataKey(dataKey, arrange)
@@ -202,7 +203,8 @@ class Table extends React.Component {
                               ? printerStore.templateSpecialDetails(
                                   col,
                                   dataKey,
-                                  i
+                                  i,
+                                  config.specialConfig?.template_text
                                 )
                               : printerStore
                                   .templateTable(
@@ -227,6 +229,7 @@ class Table extends React.Component {
           range={range}
           config={config}
           printerStore={printerStore}
+          isLastTablePage={isLastTablePage}
         />
         <DiyOverallOrder
           range={range}
@@ -307,7 +310,8 @@ class Table extends React.Component {
                             ? printerStore.templateSpecialDetails(
                                 col,
                                 dataKey,
-                                i
+                                i,
+                                config.specialConfig?.template_text
                               )
                             : printerStore
                                 .templateTable(col.text, dataKey, i, pageIndex)
@@ -327,6 +331,7 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
+            isLastTablePage={isLastTablePage}
           />
           <DiyOverallOrder
             range={range}
@@ -385,7 +390,12 @@ Table.propTypes = {
   pageIndex: PropTypes.number.isRequired,
   placeholder: PropTypes.string,
   printerStore: PropTypes.object,
-  isSomeSubtotalTr: PropTypes.bool
+  isSomeSubtotalTr: PropTypes.bool,
+  isLastTablePage: PropTypes.bool
+}
+
+Table.defaultProps = {
+  isLastTablePage: true
 }
 
 export default Table

package/src/printer/printer.js

@@ -13,6 +13,20 @@ import MergePage from './merge_page'
 import { LONG_PRINT } from '../config'
 import Big from 'big.js'
 
+/** 当前 panel 是否为该表格 content 在全部分页中的最后一次出现 */
+const isLastTablePanel = (pages, pageIndex, panelIndexInPage, tableIndex) => {
+  for (let pi = pages.length - 1; pi >= 0; pi--) {
+    const page = pages[pi] || []
+    for (let pji = page.length - 1; pji >= 0; pji--) {
+      const p = page[pji]
+      if (p?.type === 'table' && p.index === tableIndex) {
+        return pi === pageIndex && pji === panelIndexInPage
+      }
+    }
+  }
+  return true
+}
+
 // Header Sign Footer 相对特殊，要单独处理
 const Header = props => (
   <Panel {...props} name='header' placeholder={i18next.t('页眉')} />
@@ -272,6 +286,12 @@ class Printer extends React.Component {
                         placeholder={`${i18next.t('区域')} ${panel.index}`}
                         pageIndex={i}
                         isSomeSubtotalTr={isSomeSubtotalTr}
+                        isLastTablePage={isLastTablePanel(
+                          printerStore.pages,
+                          i,
+                          ii,
+                          panel.index
+                        )}
                       />
                     )
 

package/src/printer/store.js

@@ -7,6 +7,7 @@ import {
   getArrayMid,
   getOverallOrderTrHeight
 } from '../util'
+import { isIndependentRolDataKey } from '../common/data_key_util'
 import _ from 'lodash'
 import Big from 'big.js'
 import { Tip } from '../components'
@@ -604,13 +605,14 @@ class PrinterStore {
    */
   templateTableRowSpan(text, dataKey, index, begin) {
     try {
-      if (
-        dataKey !== 'purchase_detail_one_row' &&
-        dataKey !== 'purchase_independent_rol_sku' &&
-        dataKey !== 'purchase_independent_rol_address' &&
-        dataKey !== 'taxRateSales' &&
-        dataKey !== 'ordinary'
-      ) {
+      // 采购 / 分拣「按明细单行」展开后才做合并单元格（后缀 independent_rol_*）
+      const canMerge =
+        isIndependentRolDataKey(dataKey) ||
+        dataKey === 'taxRateSales' ||
+        dataKey === 'ordinary' ||
+        dataKey === 'purchase_detail_one_row' ||
+        dataKey === 'sorting_detail_detail_one_row'
+      if (!canMerge) {
         return null
       }
       const list = this.data._table[dataKey] || this.data._table.orders
@@ -696,12 +698,15 @@ class PrinterStore {
     }
   }
 
-  templateSpecialDetails(col, dataKey, index) {
-    // 做好保护，出错就返回 text
+  templateSpecialDetails(col, dataKey, index, fallbackText = '') {
     const { specialDetailsKey, text, detailLastColType, separator } = col
+    const templateText = text || fallbackText
+    if (!templateText) return ''
     try {
       const row = this.data._table[dataKey][index]
-      const compiled = _.template(text, { interpolate: /{{([\s\S]+?)}}/g })
+      const compiled = _.template(templateText, {
+        interpolate: /{{([\s\S]+?)}}/g,
+      })
       let detailsList = row[specialDetailsKey] || []
 
       /** 简单处理下数据 */
@@ -724,7 +729,7 @@ class PrinterStore {
 
       return detailsList
     } catch (err) {
-      return text
+      return templateText
     }
   }
 

package/src/printer/table.js

@@ -169,7 +169,8 @@ class Table extends React.Component {
       range,
       pageIndex,
       printerStore,
-      isSomeSubtotalTr
+      isSomeSubtotalTr,
+      isLastTablePage
     } = this.props
     // 数据
     dataKey = getDataKey(dataKey, arrange)
@@ -411,7 +412,8 @@ class Table extends React.Component {
                             ? printerStore.templateSpecialDetails(
                                 col,
                                 dataKey,
-                                i
+                                i,
+                                config.specialConfig?.template_text
                               )
                             : printerStore
                                 .templateTable(col.text, dataKey, i, pageIndex)
@@ -445,6 +447,7 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
+            isLastTablePage={isLastTablePage}
           />
           <DiyOverallOrder
             range={range}
@@ -503,7 +506,12 @@ Table.propTypes = {
   pageIndex: PropTypes.number.isRequired,
   placeholder: PropTypes.string,
   printerStore: PropTypes.object,
-  isSomeSubtotalTr: PropTypes.bool
+  isSomeSubtotalTr: PropTypes.bool,
+  isLastTablePage: PropTypes.bool
+}
+
+Table.defaultProps = {
+  isLastTablePage: true
 }
 
 export default Table