gm-printer 10.14.5 → 10.14.7

package/.eslintcache

@@ -0,0 +1 @@
+[{"/Users/min/Documents/GMFE/gm-util/gm-printer/src/util.js":"1","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/get_css.js":"2","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcode.js":"3","/Users/min/Documents/GMFE/gm-util/gm-printer/src/index.js":"4","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/context_menu.js":"5","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/context_menu.js":"6","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/context_menu.js":"7","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/context_menu.js":"8","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/context_menu.js":"9","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor_special_table.js":"10","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/context_menu.js":"11","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/context_menu.js":"12","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/context_menu.js":"13","/Users/min/Documents/GMFE/gm-util/gm-printer/src/config.js":"14","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_store.js":"15","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_shadow_dom.js":"16","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/get_editor_css.js":"17","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_title.js":"18","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_store.js":"19","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_select.js":"20","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_edit_field.js":"21","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/component.js":"22","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/editor.js":"23","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/editor.js":"24","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/editor.js":"25","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/editor.js":"26","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/editor.js":"27","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor.js":"28","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account_statement/editor.js":"29","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/editor.js":"30","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/editor.js":"31","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/tooltip/index.js":"32","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_special_field.js":"33","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/store.js":"34","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/index.js":"35","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/do_print.js":"36","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/finance_printer.js":"37","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table_subtotal_tr.js":"38","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table.js":"39","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/finance_batch_printer.js":"40","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/page.js":"41","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_subtotal_tr.js":"42","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table.js":"43","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/printer.js":"44","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/flex/index.js":"45","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_overallOrder_tr.js":"46","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/util.js":"47"},{"size":7813,"mtime":1648799098282,"results":"48","hashOfConfig":"49"},{"size":291,"mtime":1638935573926,"results":"50","hashOfConfig":"51"},{"size":523,"mtime":1638935549030,"results":"52","hashOfConfig":"51"},{"size":1139,"mtime":1644572548725,"results":"53","hashOfConfig":"54"},{"size":2293,"mtime":1638948548042,"results":"55","hashOfConfig":"51"},{"size":2292,"mtime":1638948522492,"results":"56","hashOfConfig":"51"},{"size":1078,"mtime":1638948543271,"results":"57","hashOfConfig":"51"},{"size":2067,"mtime":1648466228565,"results":"58","hashOfConfig":"49"},{"size":2991,"mtime":1638948535719,"results":"59","hashOfConfig":"51"},{"size":4379,"mtime":1638935458586,"results":"60","hashOfConfig":"51"},{"size":2428,"mtime":1648466380496,"results":"61","hashOfConfig":"49"},{"size":2955,"mtime":1647850650993,"results":"62","hashOfConfig":"54"},{"size":4170,"mtime":1648640206253,"results":"63","hashOfConfig":"49"},{"size":2833,"mtime":1638861837310,"results":"64","hashOfConfig":"51"},{"size":4212,"mtime":1638935746667,"results":"65","hashOfConfig":"51"},{"size":861,"mtime":1638931446915,"results":"66","hashOfConfig":"51"},{"size":178,"mtime":1638931439249,"results":"67","hashOfConfig":"51"},{"size":3272,"mtime":1648713847909,"results":"68","hashOfConfig":"49"},{"size":36060,"mtime":1652856289268,"results":"69","hashOfConfig":"49"},{"size":4898,"mtime":1639992402586,"results":"70","hashOfConfig":"51"},{"size":17885,"mtime":1652855800277,"results":"71","hashOfConfig":"49"},{"size":14908,"mtime":1652855804615,"results":"72","hashOfConfig":"49"},{"size":2165,"mtime":1638949854481,"results":"73","hashOfConfig":"51"},{"size":2165,"mtime":1638949840121,"results":"74","hashOfConfig":"51"},{"size":2223,"mtime":1638949823846,"results":"75","hashOfConfig":"51"},{"size":2356,"mtime":1650083974574,"results":"76","hashOfConfig":"49"},{"size":3367,"mtime":1638949855771,"results":"77","hashOfConfig":"51"},{"size":2305,"mtime":1638949843817,"results":"78","hashOfConfig":"51"},{"size":3294,"mtime":1638949855131,"results":"79","hashOfConfig":"51"},{"size":2850,"mtime":1638949842017,"results":"80","hashOfConfig":"51"},{"size":4157,"mtime":1638949853726,"results":"81","hashOfConfig":"51"},{"size":605,"mtime":1638949882777,"results":"82","hashOfConfig":"51"},{"size":1175,"mtime":1638949720500,"results":"83","hashOfConfig":"51"},{"size":15067,"mtime":1648801216882,"results":"84","hashOfConfig":"49"},{"size":332,"mtime":1644573509040,"results":"85","hashOfConfig":"54"},{"size":4080,"mtime":1648536160221,"results":"86","hashOfConfig":"49"},{"size":8842,"mtime":1646363892377,"results":"87","hashOfConfig":"54"},{"size":4317,"mtime":1646376602197,"results":"88","hashOfConfig":"54"},{"size":9440,"mtime":1644993553716,"results":"89","hashOfConfig":"54"},{"size":724,"mtime":1644808940649,"results":"90","hashOfConfig":"54"},{"size":1717,"mtime":1648466368772,"results":"91","hashOfConfig":"49"},{"size":5049,"mtime":1650085552191,"results":"92","hashOfConfig":"49"},{"size":9717,"mtime":1648628215217,"results":"93","hashOfConfig":"49"},{"size":9001,"mtime":1648713828033,"results":"94","hashOfConfig":"49"},{"size":3152,"mtime":1648713745966},{"size":1901,"mtime":1650082399244,"results":"95","hashOfConfig":"49"},{"size":460,"mtime":1652857240696,"results":"96","hashOfConfig":"49"},{"filePath":"97","messages":"98","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1h9xfdh",{"filePath":"99","messages":"100","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"jpc0be",{"filePath":"101","messages":"102","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"103","messages":"104","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1qaimc",{"filePath":"105","messages":"106","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"107","messages":"108","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"109","messages":"110","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"111","messages":"112","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"113","messages":"114","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"115","messages":"116","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"117","messages":"118","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"119","messages":"120","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"121","messages":"122","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"123","messages":"124","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"125","messages":"126","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"127","messages":"128","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"129","messages":"130","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"131","messages":"132","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"133","messages":"134","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"135","messages":"136","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"137","messages":"138","errorCount":1,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"139","messages":"140","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"141","messages":"142","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"143","messages":"144","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"145","messages":"146","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"147","messages":"148","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"149","messages":"150","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"151","messages":"152","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"153","messages":"154","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"155","messages":"156","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"157","messages":"158","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"159","messages":"160","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"161","messages":"162","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"163","messages":"164","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"165","messages":"166","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"167","messages":"168","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"169","messages":"170","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"171","messages":"172","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"173","messages":"174","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"175","messages":"176","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"177","messages":"178","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"179","messages":"180","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"181","messages":"182","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"183","messages":"184","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"185","messages":"186","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"187","messages":"188","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/min/Documents/GMFE/gm-util/gm-printer/src/util.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/get_css.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcode.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor_special_table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/config.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_store.js",["189","190"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_shadow_dom.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/get_editor_css.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_title.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_store.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_select.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_edit_field.js",["191","192","193","194","195"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/component.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account_statement/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/tooltip/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_special_field.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/store.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/do_print.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/finance_printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table_subtotal_tr.js",["196"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/finance_batch_printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/page.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_subtotal_tr.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_overallOrder_tr.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/util.js",[],{"ruleId":"197","severity":2,"message":"198","line":10,"column":29,"nodeType":"199","endLine":10,"endColumn":35},{"ruleId":"197","severity":2,"message":"200","line":145,"column":63,"nodeType":"199","endLine":145,"endColumn":71},{"ruleId":"201","severity":1,"message":"202","line":307,"column":13,"nodeType":"203","endLine":307,"endColumn":49},{"ruleId":"201","severity":1,"message":"202","line":325,"column":13,"nodeType":"203","endLine":325,"endColumn":56},{"ruleId":"201","severity":1,"message":"202","line":468,"column":15,"nodeType":"203","endLine":468,"endColumn":53},{"ruleId":"201","severity":1,"message":"202","line":517,"column":11,"nodeType":"203","endLine":517,"endColumn":53},{"ruleId":"204","severity":2,"message":"205","line":566,"column":22,"nodeType":"206","messageId":"207","endLine":566,"endColumn":31},{"ruleId":"204","severity":2,"message":"205","line":120,"column":14,"nodeType":"206","messageId":"207","endLine":120,"endColumn":23},"react/prop-types","'config' is missing in props validation","Identifier","'mockData' is missing in props validation","react/jsx-handler-names","Handler function for onChange prop key must begin with 'handle'","JSXAttribute","gmfe/i18n-check","t函数的key只能为字符串常量(Literal)，请使用单引号或双引号包裹","MemberExpression","isVariable"]

package/package.json

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

package/src/common/component.js

@@ -602,16 +602,16 @@ Title.propTypes = {
   text: PropTypes.object
 }
 
-const Radio = ({ id, value, radioChecked, checked }) => (
-  <div>
+const Radio = ({ id, value, radioChecked, checked, style, inputName }) => (
+  <div style={style}>
     <input
       type='radio'
       value={value}
       id={id}
-      name='radio'
+      name={inputName ?? 'radio'}
       onChange={radioChecked}
       checked={checked}
-      style={{ margin: '5px 10px 0 0' }}
+      style={{ margin: '5px 5px 0 0' }}
     />
     <label htmlFor={id}>{value}</label>
     <Gap />
@@ -621,6 +621,8 @@ const Radio = ({ id, value, radioChecked, checked }) => (
 Radio.propTypes = {
   id: PropTypes.string,
   value: PropTypes.string,
+  style: PropTypes.string,
+  inputName: PropTypes.string,
   radioChecked: PropTypes.func,
   checked: PropTypes.bool
 }

package/src/common/editor_edit_field.js

@@ -14,10 +14,12 @@ import {
   Textarea,
   Title,
   TipInfo,
-  Text
+  Text,
+  Radio
 } from '../common/component'
 import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
+import { subtotalRadioList } from './util'
 
 @inject('editStore')
 @observer
@@ -399,7 +401,7 @@ class EditorField extends React.Component {
         />
 
         <Flex>
-          <Flex>{i18next.t('合计设置')}：</Flex>
+          <Flex>{i18next.t('每页合计设置')}：</Flex>
           <Fonter
             style={subtotalStyle}
             onChange={this.handleSubtotalStyleChange}
@@ -410,6 +412,28 @@ class EditorField extends React.Component {
             onChange={this.handleSubtotalStyleChange}
           />
         </Flex>
+        <Gap />
+        {!isSomeSubtotalTr && (
+          <div>
+            <Flex>{i18next.t('合金栏打印金额')}：</Flex>
+            <Flex style={{ marginLeft: 57 }}>
+              {subtotalRadioList.map(fields => {
+                return (
+                  <Radio
+                    style={{ marginLeft: 5 }}
+                    id={fields.id}
+                    value={fields.value}
+                    key={fields.id}
+                    inputName='subtotalRadio'
+                    checked={subtotal?.fields?.[0].valueField === fields.id}
+                    radioChecked={() => editStore.subtotalRadioCheck(fields)}
+                  />
+                )
+              })}
+            </Flex>
+          </div>
+        )}
+
         <EditorSubtotalCheck
           subtotalCheckDisabled
           subtotalChecked={subtotalNeedUpperCase}

package/src/common/editor_store.js

@@ -80,7 +80,7 @@ class EditorStore {
   subtotalConfigFields = {
     name: '',
     valueField: '',
-    colSpan: 3 // 产品说3个,开启自定义单元格
+    colSpan: 6 // 产品说3个,开启自定义单元格,客户不满意，改成6个
   }
 
   @computed
@@ -565,6 +565,15 @@ class EditorStore {
     }
   }
 
+  @action
+  subtotalRadioCheck(fields) {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      this.config.contents[arr[2]].subtotal.fields[0].valueField = fields.id
+    }
+  }
+
   @action
   setOverallOrderShow(name) {
     const arr = name.split('.')

package/src/common/util.js

@@ -0,0 +1,19 @@
+import i18next from '../../locales'
+
+/**
+ * 每页合计设置单选按钮
+ * id的值是用来计算每页的金额总数，不要轻易随便改
+ * id值暂时使用_origin的值，可优化改为{{列.xxxx}}的值，改起来有代价，先不改
+ */
+const subtotalRadioList = [
+  {
+    value: i18next.t('下单金额'),
+    id: 'total_item_price'
+  },
+  {
+    value: i18next.t('出库金额'),
+    id: 'real_item_price'
+  }
+]
+
+export { subtotalRadioList }

package/src/editor_account/context_menu.js

@@ -59,27 +59,29 @@ class ContextMenu extends React.Component {
       editStore: { isAutoFilling }
     } = this.props
     const arr = name.split('.')
-    const { subtotal } = this.props.editStore.config.contents[arr[2]]
-    // const keyArr = dataKey.split('_')
 
-    // const isMultiActive = keyArr.includes('multi')
+    const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
+    const keyArr = dataKey.split('_')
+
+    const isMultiActive = keyArr.includes('multi')
     // const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
 
     return (
       <>
-        {/* <div
-          onClick={this.handleChangeTableDataKey.bind(this, 'multi', name)}
-          className={isMultiActive ? 'active' : ''}
-        >
-          {i18next.t('双栏商品')}
-        </div>
+        {/*
         <div
           onClick={this.handleChangeTableDataKey.bind(this, 'category', name)}
           className={isCategoryActive ? 'active' : ''}
         >
           {i18next.t('商品分类')}
         </div> */}
+        <div
+          onClick={this.handleChangeTableDataKey.bind(this, 'multi', name)}
+          className={isMultiActive ? 'active' : ''}
+        >
+          {i18next.t('双栏商品')}
+        </div>
         <div
           onClick={this.handleSubtotal.bind(this, name)}
           className={isSubtotalActive ? 'active' : ''}