gm-printer 10.24.0 → 10.25.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/.eslintcache +1 -1
  2. package/package.json +2 -2
  3. package/src/common/editor_edit_field.js +22 -1
  4. package/src/common/editor_store.js +14 -1
  5. package/src/common/util.js +10 -5
  6. package/src/printer/table.js +7 -7
  7. package/src/printer/table_subtotal_tr.js +31 -4
package/.eslintcache CHANGED
@@ -1 +1 @@
1
- [{"/Users/fruit/Documents/gmfe/gm-printer/src/printer/table.js":"1"},{"size":10907,"mtime":1718338893543}]
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","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_add_field.js":"48","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/counter.js":"49","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/common_context_menu.js":"50","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_diy_overallOrder_tr.js":"51"},{"size":7813,"mtime":1648799098282,"results":"52","hashOfConfig":"53"},{"size":291,"mtime":1638935573926,"results":"54","hashOfConfig":"55"},{"size":523,"mtime":1638935549030,"results":"56","hashOfConfig":"55"},{"size":1139,"mtime":1644572548725,"results":"57","hashOfConfig":"58"},{"size":2293,"mtime":1638948548042,"results":"59","hashOfConfig":"55"},{"size":2292,"mtime":1638948522492,"results":"60","hashOfConfig":"55"},{"size":1078,"mtime":1638948543271,"results":"61","hashOfConfig":"55"},{"size":2067,"mtime":1648466228565,"results":"62","hashOfConfig":"53"},{"size":2991,"mtime":1638948535719,"results":"63","hashOfConfig":"55"},{"size":4379,"mtime":1638935458586,"results":"64","hashOfConfig":"55"},{"size":2428,"mtime":1648466380496,"results":"65","hashOfConfig":"53"},{"size":2955,"mtime":1647850650993,"results":"66","hashOfConfig":"58"},{"size":5660,"mtime":1695026529575,"results":"67","hashOfConfig":"68"},{"size":2833,"mtime":1638861837310,"results":"69","hashOfConfig":"55"},{"size":4212,"mtime":1638935746667,"results":"70","hashOfConfig":"55"},{"size":861,"mtime":1638931446915,"results":"71","hashOfConfig":"55"},{"size":178,"mtime":1638931439249,"results":"72","hashOfConfig":"55"},{"size":3272,"mtime":1648713847909,"results":"73","hashOfConfig":"53"},{"size":46636,"mtime":1695028084459,"results":"74","hashOfConfig":"68"},{"size":4898,"mtime":1639992402586,"results":"75","hashOfConfig":"55"},{"size":21854,"mtime":1695028069713,"results":"76","hashOfConfig":"68"},{"size":15155,"mtime":1657626470824,"results":"77","hashOfConfig":"78"},{"size":2165,"mtime":1638949854481,"results":"79","hashOfConfig":"55"},{"size":2165,"mtime":1638949840121,"results":"80","hashOfConfig":"55"},{"size":2223,"mtime":1638949823846,"results":"81","hashOfConfig":"55"},{"size":2356,"mtime":1650083974574,"results":"82","hashOfConfig":"53"},{"size":3367,"mtime":1638949855771,"results":"83","hashOfConfig":"55"},{"size":2305,"mtime":1638949843817,"results":"84","hashOfConfig":"55"},{"size":3294,"mtime":1638949855131,"results":"85","hashOfConfig":"55"},{"size":2850,"mtime":1638949842017,"results":"86","hashOfConfig":"55"},{"size":4157,"mtime":1638949853726,"results":"87","hashOfConfig":"55"},{"size":605,"mtime":1638949882777,"results":"88","hashOfConfig":"55"},{"size":1175,"mtime":1638949720500,"results":"89","hashOfConfig":"55"},{"size":18215,"mtime":1670988134370,"results":"90","hashOfConfig":"78"},{"size":332,"mtime":1644573509040,"results":"91","hashOfConfig":"58"},{"size":4080,"mtime":1648536160221,"results":"92","hashOfConfig":"53"},{"size":8842,"mtime":1646363892377,"results":"93","hashOfConfig":"58"},{"size":4317,"mtime":1646376602197,"results":"94","hashOfConfig":"58"},{"size":9440,"mtime":1644993553716,"results":"95","hashOfConfig":"58"},{"size":724,"mtime":1644808940649,"results":"96","hashOfConfig":"58"},{"size":1717,"mtime":1648466368772,"results":"97","hashOfConfig":"53"},{"size":5563,"mtime":1658392065200,"results":"98","hashOfConfig":"78"},{"size":10376,"mtime":1695025236432,"results":"99","hashOfConfig":"68"},{"size":9001,"mtime":1648713828033,"results":"100","hashOfConfig":"53"},{"size":3152,"mtime":1648713745966},{"size":1901,"mtime":1650082399244,"results":"101","hashOfConfig":"53"},{"size":600,"mtime":1657507507231,"results":"102","hashOfConfig":"78"},{"size":1945,"mtime":1657624830918,"results":"103","hashOfConfig":"78"},{"size":2009,"mtime":1659343100368,"results":"104","hashOfConfig":"78"},{"size":9861,"mtime":1659343100367,"results":"105","hashOfConfig":"78"},{"size":2513,"mtime":1695028123275,"results":"106","hashOfConfig":"68"},{"filePath":"107","messages":"108","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1h9xfdh",{"filePath":"109","messages":"110","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"jpc0be",{"filePath":"111","messages":"112","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"113","messages":"114","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1qaimc",{"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":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"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},"yfiwrq",{"filePath":"133","messages":"134","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"135","messages":"136","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"137","messages":"138","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"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":1,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"149","messages":"150","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"su5mnm",{"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":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"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":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"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},{"filePath":"189","messages":"190","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"191","messages":"192","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"193","messages":"194","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"195","messages":"196","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"197","messages":"198","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"199","messages":"200","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"201","messages":"202","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"203","messages":"204","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"205","messages":"206","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"/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",["207","208"],"/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",["209","210","211","212","213"],"/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",["214"],"/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",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_add_field.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/counter.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/common_context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_diy_overallOrder_tr.js",["215"],{"ruleId":"216","severity":2,"message":"217","line":10,"column":29,"nodeType":"218","endLine":10,"endColumn":35},{"ruleId":"216","severity":2,"message":"219","line":145,"column":63,"nodeType":"218","endLine":145,"endColumn":71},{"ruleId":"220","severity":1,"message":"221","line":344,"column":13,"nodeType":"222","endLine":344,"endColumn":49},{"ruleId":"220","severity":1,"message":"221","line":362,"column":13,"nodeType":"222","endLine":362,"endColumn":56},{"ruleId":"220","severity":1,"message":"221","line":519,"column":15,"nodeType":"222","endLine":519,"endColumn":53},{"ruleId":"220","severity":1,"message":"221","line":568,"column":11,"nodeType":"222","endLine":568,"endColumn":53},{"ruleId":"223","severity":2,"message":"224","line":669,"column":22,"nodeType":"225","messageId":"226","endLine":669,"endColumn":31},{"ruleId":"223","severity":2,"message":"224","line":120,"column":14,"nodeType":"225","messageId":"226","endLine":120,"endColumn":23},{"ruleId":"227","severity":2,"message":"228","line":13,"column":5,"nodeType":"218","endLine":13,"endColumn":11},"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","no-unused-vars","'config' is assigned a value but never used."]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gm-printer",
3
- "version": "10.24.0",
3
+ "version": "10.25.0-beta.0",
4
4
  "description": "diy printer",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -112,4 +112,4 @@
112
112
  "dependencies": {
113
113
  "qrcode.react": "^0.9.2"
114
114
  }
115
- }
115
+ }
package/src/common/editor_edit_field.js CHANGED
@@ -455,6 +455,12 @@ class EditorField extends React.Component {
455
455
  <Flex>{i18next.t('合计栏打印金额')}：</Flex>
456
456
  <Flex style={{ marginLeft: 57 }}>
457
457
  {subtotalRadioList.map(fields => {
458
+ // 兼容
459
+ let subtotalFields = subtotal?.fields?.[0].valueField
460
+ if (subtotalFields === 'total_item_price')
461
+ subtotalFields = '下单金额'
462
+ if (subtotalFields === 'real_item_price')
463
+ subtotalFields = '出库金额'
458
464
  return (
459
465
  <Radio
460
466
  style={{ marginLeft: 5 }}
@@ -462,7 +468,7 @@ class EditorField extends React.Component {
462
468
  value={fields.value}
463
469
  key={fields.id}
464
470
  inputName='subtotalRadio'
465
- checked={subtotal?.fields?.[0].valueField === fields.id}
471
+ checked={subtotalFields === fields.id}
466
472
  radioChecked={() => editStore.subtotalRadioCheck(fields)}
467
473
  />
468
474
  )
@@ -533,6 +539,21 @@ class EditorField extends React.Component {
533
539
  onChange={this.handleOverallOrderStyleChange}
534
540
  />
535
541
  </Flex>
542
+ <Flex style={{ marginLeft: 57 }}>
543
+ {subtotalRadioList.map((fields, i) => {
544
+ return (
545
+ <Radio
546
+ style={{ marginLeft: 5 }}
547
+ id={`${fields.id}${i}`}
548
+ value={fields.value}
549
+ key={fields.id}
550
+ inputName='overallOrderRadio'
551
+ checked={overallOrder?.fields?.[0]?.valueField === fields.id}
552
+ radioChecked={() => editStore.setOverallOrderValueField(fields)}
553
+ />
554
+ )
555
+ })}
556
+ </Flex>
536
557
  <EditorSubtotalCheck
537
558
  subtotalCheckDisabled
538
559
  subtotalChecked={overallOrderNeedUpperCase}
package/src/common/editor_store.js CHANGED
@@ -1193,7 +1193,7 @@ class EditorStore {
1193
1193
  fields: [
1194
1194
  {
1195
1195
  name: '每页合计：',
1196
- valueField: 'real_item_price',
1196
+ valueField: '出库金额',
1197
1197
  colSpan: colSpanLength
1198
1198
  }
1199
1199
  ]
@@ -1342,6 +1342,19 @@ class EditorStore {
1342
1342
  }
1343
1343
  }
1344
1344
 
1345
+ // 整单合计金额单选设置
1346
+ @action.bound
1347
+ setOverallOrderValueField({ id }) {
1348
+ if (this.selectedRegion) {
1349
+ this.overallOrderShow = !this.overallOrderShow
1350
+ const arr = this.selectedRegion.split('.')
1351
+ const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
1352
+ const oldValueField = overallOrderConfig.fields?.[0]
1353
+ this.config.contents[arr[2]]?.overallOrder &&
1354
+ set(oldValueField, { valueField: id })
1355
+ }
1356
+ }
1357
+
1345
1358
  // 整单合计设置大写金额
1346
1359
  @action.bound
1347
1360
  setOverallOrderUpperCase() {
package/src/common/util.js CHANGED
@@ -3,22 +3,27 @@ import i18next from '../../locales'
3
3
  /**
4
4
  * 每页合计设置单选按钮
5
5
  * id的值是用来计算每页的金额总数，不要轻易随便改
6
- * id值暂时使用_origin的值，可优化改为{{列.xxxx}}的值，改起来有代价，先不改
7
6
  */
7
+ // 整单合计和每页合计栏都使用的这个
8
8
  const subtotalRadioList = [
9
9
  {
10
10
  value: i18next.t('下单金额'),
11
- id: 'total_item_price'
11
+ id: '下单金额'
12
12
  },
13
13
  {
14
14
  value: i18next.t('出库金额'),
15
- id: 'real_item_price'
15
+ id: '出库金额'
16
+ },
17
+ {
18
+ value: i18next.t('实际金额'),
19
+ id: '实际金额'
16
20
  }
17
21
  ]
18
22
 
19
23
  const accountRadioList = {
20
- total_item_price: i18next.t('下单金额'),
21
- real_item_price: i18next.t('出库金额')
24
+ 下单金额: i18next.t('下单金额'),
25
+ 出库金额: i18next.t('出库金额'),
26
+ 实际金额: i18next.t('实际金额')
22
27
  }
23
28
 
24
29
  export { subtotalRadioList, accountRadioList }
package/src/printer/table.js CHANGED
@@ -118,7 +118,7 @@ class Table extends React.Component {
118
118
  text: val.text.replace(/{{(.*?)}}/g, s => {
119
119
  // 再匹配 列.xxx 相关的
120
120
  s = s.replace(
121
- /(列.[\u4e00-\u9fa5]*[0-9A-Za-z_]*[\u4e00-\u9fa5]*[0-9A-Za-z_]*[\u4e00-\u9fa5]*)/g,
121
+ /(列.[\u4e00-\u9fa5]*[0-9A-Za-z_]?[\u4e00-\u9fa5]*[A-Za-z_]*[\u4e00-\u9fa5]*)/g,
122
122
  m => m + `${MULTI_SUFFIX}${colNum}`
123
123
  )
124
124
  return s
@@ -291,13 +291,13 @@ class Table extends React.Component {
291
291
  dangerouslySetInnerHTML={{
292
292
  __html: col.isSpecialColumn
293
293
  ? printerStore.templateSpecialDetails(
294
- col,
295
- dataKey,
296
- i
297
- )
294
+ col,
295
+ dataKey,
296
+ i
297
+ )
298
298
  : printerStore
299
- .templateTable(col.text, dataKey, i, pageIndex)
300
- .replace(/\(\)/g, '')
299
+ .templateTable(col.text, dataKey, i, pageIndex)
300
+ .replace(/\(\)/g, '')
301
301
  }}
302
302
  />
303
303
  )
package/src/printer/table_subtotal_tr.js CHANGED
@@ -30,10 +30,11 @@ const SubtotalTr = props => {
30
30
  isUpperCaseBefore, // 决定小写金额是否在前
31
31
  isUpperLowerCaseSeparate, // 决定大小写金额是否分开在两端
32
32
  style,
33
+
33
34
  fields = [
34
35
  {
35
36
  name: i18next.t('每页合计：'),
36
- valueField: 'real_item_price'
37
+ valueField: '出库金额'
37
38
  }
38
39
  ],
39
40
  displayName = false // 是否展示字段名
@@ -68,6 +69,30 @@ const SubtotalTr = props => {
68
69
  ).toFixed(2)
69
70
  }
70
71
 
72
+ // 计算合计
73
+ const sumData2 = (list, field) => {
74
+ // 兼容之前
75
+ if (field === 'total_item_price') field = '下单金额'
76
+ if (field === 'real_item_price') field = '出库金额'
77
+ if (field === 'settle_money2') field = '结算金额'
78
+ if (field === 'total_money2') field = '金额'
79
+ return _.reduce(
80
+ list,
81
+ (a, b) => {
82
+ let result = a
83
+ result = a.plus(b[field] || 0)
84
+ if (b?.[field + MULTI_SUFFIX]) {
85
+ result = result.plus(b?.[field + MULTI_SUFFIX])
86
+ }
87
+ if (b?.[field + MULTI_SUFFIX3]) {
88
+ result = result.plus(b?.[field + MULTI_SUFFIX3])
89
+ }
90
+ return result
91
+ },
92
+ Big(0)
93
+ ).toFixed(2)
94
+ }
95
+
71
96
  const getData = field => {
72
97
  const data = printerStore.data.common
73
98
  return data?.[field] ?? ''
@@ -82,7 +107,7 @@ const SubtotalTr = props => {
82
107
  const sum = {}
83
108
 
84
109
  _.each(fields, v => {
85
- sum[v.name] = sumData(list, v.valueField)
110
+ sum[v.name] = sumData2(list, v.valueField)
86
111
  })
87
112
  let subtotalStr = ''
88
113
  for (const name in sum) {
@@ -140,7 +165,7 @@ const SubtotalTr = props => {
140
165
  {item.type === 'useSummarize'
141
166
  ? getData(item.valueField)
142
167
  : index === 0
143
- ? sumData(list, item.valueField)
168
+ ? sumData2(list, item.valueField)
144
169
  : ''}
145
170
  {/* {index === 0 ? sumData(list, item.valueField) : ''} */}
146
171
  </span>
@@ -151,7 +176,9 @@ const SubtotalTr = props => {
151
176
  coverDigit2Uppercase(getData(item.valueField))
152
177
  : index === 0
153
178
  ? '大写：' +
154
- coverDigit2Uppercase(sumData(list, item.valueField))
179
+ coverDigit2Uppercase(
180
+ sumData2(list, item.valueField)
181
+ )
155
182
  : ''}
156
183
  </span>
157
184
  )}