gm-printer 10.11.5-beta2 → 10.11.5

package/src/editor/store.js

@@ -18,64 +18,64 @@ class Store extends EditorStore {
             text: i18next.t('{{列.序号}}')
           },
           {
-            head: i18next.t('商品名'),
+            head: i18next.t('组合商品名'),
             headStyle: {
               textAlign: 'center'
             },
             style: {
               textAlign: 'center'
             },
-            text: i18next.t('{{列.组合商品_名}}')
+            text: i18next.t('{{列.组合商品名}}')
           },
           {
-            head: i18next.t('商品编码'),
+            head: i18next.t('类型'),
             headStyle: {
               textAlign: 'center'
             },
             style: {
               textAlign: 'center'
             },
-            text: i18next.t('{{列.组合商品_自定义编码}}')
+            text: i18next.t('{{列.类型}}')
           },
           {
-            head: i18next.t('包装单位'),
+            head: i18next.t('下单数'),
             headStyle: {
               textAlign: 'center'
             },
             style: {
               textAlign: 'center'
             },
-            text: i18next.t('{{列.组合商品_包装单位}}')
+            text: i18next.t('{{列.下单数}}')
           },
           {
-            head: i18next.t('下单数'),
+            head: i18next.t('销售单位'),
             headStyle: {
               textAlign: 'center'
             },
             style: {
               textAlign: 'center'
             },
-            text: i18next.t('{{列.组合商品_下单数}}')
+            text: i18next.t('{{列.销售单位}}')
           },
           {
-            head: i18next.t('单价'),
+            head: i18next.t('含税单价(销售单位)'),
             headStyle: {
               textAlign: 'center'
             },
             style: {
               textAlign: 'center'
             },
-            text: i18next.t('{{列.组合商品_单价}}')
+            text: i18next.t('{{列.含税单价_销售单位}}')
           },
           {
-            head: i18next.t('下单金额'),
+            head: i18next.t('下单金额(参考金额)'),
             headStyle: {
               textAlign: 'center'
             },
             style: {
               textAlign: 'center'
             },
-            text: i18next.t('{{列.组合商品_下单金额}}')
+            text: i18next.t('{{列.下单金额_参考金额}}')
           }
         ]
         break
@@ -255,6 +255,91 @@ class Store extends EditorStore {
         ]
         break
       }
+      case 'turnover': {
+        target.columns = [
+          {
+            head: i18next.t('序号'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.序号}}')
+          },
+          {
+            head: i18next.t('周转物名称'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.周转物名称}}')
+          },
+          {
+            head: i18next.t('单位'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.单位}}')
+          },
+          {
+            head: i18next.t('关联商品'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.关联商品}}')
+          },
+          {
+            head: i18next.t('单个货值'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.单个货值}}')
+          },
+          {
+            head: i18next.t('预借出数'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.预借出数}}')
+          },
+          {
+            head: i18next.t('借出数'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.借出数}}')
+          },
+          {
+            head: i18next.t('货值'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.货值}}')
+          }
+        ]
+        break
+      }
       default:
     }
   }

package/src/{editor_cannibalize → editor_account}/context_menu.js

@@ -2,12 +2,13 @@ import i18next from '../../locales'
 import React from 'react'
 import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
+import _ from 'lodash'
 import { Printer } from '../printer'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
   { value: 'line', text: i18next.t('插入线条') },
-  { value: 'image', text: i18next.t('插入图片') }
+  { value: 'counter', text: i18next.t('插入分类汇总') }
 ]
 
 @inject(stores => ({
@@ -16,41 +17,66 @@ const blockTypeList = [
 }))
 @observer
 class ContextMenu extends React.Component {
+  /**
+   * 是否存在每页合计按钮,非异常明细才有按钮
+   * @param name => ContextMenu 的 this.state.name
+   * @return {boolean}
+   */
+  hasSubtotalBtn = name => {
+    if (!name) return false
+    const noSubtotalList = ['abnormal', 'abnormalDetails']
+    const arr = name.split('.')
+    if (_.includes(arr, 'table')) {
+      const dataKey = this.props.editStore.config.contents[arr[2]].dataKey
+      return !_.includes(noSubtotalList, dataKey)
+    }
+  }
+
   handleChangeTableDataKey = (key, name) => {
     const { editStore } = this.props
 
-    editStore.changeTableDataKeyStockout(name, key)
+    editStore.changeTableDataKey(name, key)
+  }
+
+  handleSubtotal = name => {
+    const { editStore } = this.props
+
+    editStore.setSubtotalShow(name)
   }
 
   renderOrderActionBtn = name => {
+    if (!this.hasSubtotalBtn(name)) {
+      return null
+    }
+
     const arr = name.split('.')
-    const { dataKey } = this.props.editStore.config.contents[arr[2]]
+    const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
 
-    const isQuantityActive = keyArr.includes('quantity')
-    // const isMoneyActive = keyArr.includes('money')
-    const isMultiActive = keyArr.includes('multi')
+    // const isMultiActive = keyArr.includes('multi')
+    // const isCategoryActive = keyArr.includes('category')
+    const isSubtotalActive = subtotal.show
 
     return (
       <>
-        <div
+        {/* <div
           onClick={this.handleChangeTableDataKey.bind(this, 'multi', name)}
           className={isMultiActive ? 'active' : ''}
         >
           {i18next.t('双栏商品')}
         </div>
         <div
-          onClick={this.handleChangeTableDataKey.bind(this, 'quantity', name)}
-          className={isQuantityActive ? 'active' : ''}
-        >
-          {i18next.t('调拨数小计')}
-        </div>
-        {/* <div
-          onClick={this.handleChangeTableDataKey.bind(this, 'money', name)}
-          className={isMoneyActive ? 'active' : ''}
+          onClick={this.handleChangeTableDataKey.bind(this, 'category', name)}
+          className={isCategoryActive ? 'active' : ''}
         >
-          {i18next.t('调拨金额小计')}
+          {i18next.t('商品分类')}
         </div> */}
+        <div
+          onClick={this.handleSubtotal.bind(this, name)}
+          className={isSubtotalActive ? 'active' : ''}
+        >
+          {i18next.t('每页合计')}
+        </div>
       </>
     )
   }

package/src/{editor_cannibalize → editor_account}/editor.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import { Flex } from '../components'
+import { Flex, ToolTip } from '../components'
 import { Gap, Title } from '../common/component'
 import editStore from './store'
 import { observer, inject } from 'mobx-react'
@@ -13,15 +13,13 @@ import ContextMenu from './context_menu'
 import i18next from '../../locales'
 import withStore from '../common/hoc_with_store'
 
-const tableDataKeyList = [{ value: 'orders', text: i18next.t('全部商品') }]
-
 @withStore(editStore)
 @inject('editStore')
 @observer
 class Editor extends React.Component {
   render() {
-    const { onSave, showEditor, addFields } = this.props
-    // console.log('挑拨单数据',this.props)
+    const { onSave, showEditor, addFields, showNewDate } = this.props
+
     return (
       <div className='gm-printer-edit'>
         <Flex className='gm-printer-edit-title-fixed'>
@@ -30,8 +28,16 @@ class Editor extends React.Component {
             text={
               <span className='gm-text-desc gm-padding-left-5'>
                 {i18next.t(
-                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能，更多详情点击'
                 )}
+                <a
+                  href='https://v.qq.com/x/page/t08044292dd.html'
+                  target='_blank'
+                  className='btn-link'
+                  rel='noopener noreferrer'
+                >
+                  {i18next.t('查看视频教程')}
+                </a>
               </span>
             }
           />
@@ -41,11 +47,18 @@ class Editor extends React.Component {
           <div className='gm-printer-edit-zone'>
             <EditorTitle onSave={onSave} />
             <Gap height='10px' />
+            <>
+              <>{i18next.t('模版类型')}</>
+              <ToolTip text='表示该模板是针对单一商户的配送单模板（商户配送单），或是账户合并打印配送单（账户配送单）的模板。' />
+              <span>{':' + i18next.t('账户配送单')}</span>
+            </>
+            <Gap height='10px' />
             <EditorSelect />
             <Gap height='5px' />
-            <EditorField tableDataKeyList={tableDataKeyList} />
+            <EditorField showNewDate={showNewDate} />
             <Gap height='5px' />
             <EditorAddField addFields={addFields} />
+            <Gap height='5px' />
 
             <div id='gm-printer-tip' />
 
@@ -66,11 +79,13 @@ Editor.propTypes = {
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
   mockData: PropTypes.object.isRequired,
-  addFields: PropTypes.object.isRequired
+  addFields: PropTypes.object.isRequired,
+  showNewDate: PropTypes.bool
 }
 
 Editor.deaultProps = {
-  onSave: _.noop
+  onSave: _.noop,
+  showNewDate: false
 }
 
 export default Editor

package/src/editor_account/index.js

@@ -0,0 +1,4 @@
+import withShadowDom from '../common/hoc_with_shadow_dom'
+import EditorAccount from './editor'
+
+export default withShadowDom(EditorAccount)

package/src/editor_account/store.js

@@ -0,0 +1,263 @@
+import EditorStore from '../common/editor_store'
+import i18next from '../../locales'
+
+class Store extends EditorStore {
+  // 复写父类方法
+  setTableDataKeyEffect(target, dataKey) {
+    switch (dataKey) {
+      case 'combination': {
+        target.columns = [
+          {
+            head: i18next.t('序号'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.序号}}')
+          },
+          {
+            head: i18next.t('商品名'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.组合商品_名}}')
+          },
+          {
+            head: i18next.t('商品编码'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.组合商品_自定义编码}}')
+          },
+          {
+            head: i18next.t('包装单位'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.组合商品_包装单位}}')
+          },
+          {
+            head: i18next.t('下单数'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.组合商品_下单数}}')
+          },
+          {
+            head: i18next.t('单价'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.组合商品_单价}}')
+          },
+          {
+            head: i18next.t('下单金额'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.组合商品_下单金额}}')
+          }
+        ]
+        break
+      }
+      case 'reward': {
+        target.columns = [
+          {
+            head: i18next.t('积分商品名'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.积分商品名}}')
+          },
+          {
+            head: i18next.t('规格'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.规格}}')
+          },
+          {
+            head: i18next.t('兑换数'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.兑换数}}')
+          },
+          {
+            head: i18next.t('消耗积分'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.消耗积分}}')
+          }
+        ]
+        break
+      }
+      case 'abnormal': {
+        target.columns = [
+          {
+            head: i18next.t('商品名'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.商品名}}')
+          },
+          {
+            head: i18next.t('异常原因'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.异常原因}}')
+          },
+          {
+            head: i18next.t('异常数量'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.异常数量}}')
+          },
+          {
+            head: i18next.t('异常金额'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.异常金额}}')
+          }
+        ]
+        break
+      }
+      case 'orders': {
+        target.columns = [
+          {
+            head: i18next.t('序号'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.序号}}')
+          },
+          {
+            head: i18next.t('类别'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.类别}}')
+          },
+          {
+            head: i18next.t('商品名'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.商品名}}')
+          },
+          {
+            head: i18next.t('规格'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.规格}}')
+          },
+          {
+            head: i18next.t('下单数'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.下单数}}{{列.销售单位}}')
+          },
+          {
+            head: i18next.t('出库数(基本单位)'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.出库数_基本单位}}{{列.基本单位}}')
+          },
+          {
+            head: i18next.t('单价(基本单位)'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.单价_基本单位}}')
+          },
+          {
+            head: i18next.t('出库金额'),
+            headStyle: {
+              textAlign: 'center'
+            },
+            style: {
+              textAlign: 'center'
+            },
+            text: i18next.t('{{列.出库金额}}')
+          }
+        ]
+        break
+      }
+      default:
+    }
+  }
+}
+
+export default new Store()

package/src/editor_purchase/context_menu.js

@@ -42,7 +42,6 @@ class ContextMenu extends React.Component {
     const arr = name.split('.')
     const { dataKey } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
-    console.log('dataKey', dataKey, name)
 
     const isMultiActive = keyArr.includes('multi')
     const isCategoryActive = keyArr.includes('category')

package/src/editor_purchase/editor_special_table.js

@@ -17,7 +17,11 @@ import { inject, observer } from 'mobx-react'
 
 const dataKeyList = [
   { value: 'purchase_no_detail', text: i18next.t('不打印明细') },
-  { value: 'purchase_last_col', text: i18next.t('单列-总表最后一列') },
+  { value: 'purchase_last_col', text: i18next.t('单列-总表最后一列（换行）') },
+  {
+    value: 'purchase_last_col_noLineBreak',
+    text: i18next.t('单列-总表最后一列（不换行）')
+  },
   { value: 'purchase_one_row', text: i18next.t('单列-总表下方一行') },
   { value: 'purchase_flex_2', text: i18next.t('双栏-总表下方一行两栏') },
   { value: 'purchase_flex_4', text: i18next.t('四栏-总表下方一行四栏') }
@@ -59,7 +63,6 @@ class TableDetailEditor extends React.Component {
       <div>
         <Title title={i18next.t('设置采购明细')} />
         <Gap />
-
         <Flex alignCenter className='gm-padding-top-5'>
           <div>{i18next.t('采购明细')}：</div>
           <Select