gm-printer 10.14.9 → 10.14.11-alpha.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.
- package/.eslintcache +1 -1
- package/package.json +1 -1
- package/src/common/editor_edit_field.js +22 -2
- package/src/common/editor_store.js +147 -17
- package/src/common/util.js +6 -1
- package/src/printer/store.js +1 -1
- package/src/printer/table_subtotal_tr.js +15 -2
package/.eslintcache
CHANGED
|
@@ -1 +1 @@
|
|
|
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":17964,"mtime":1653994316941,"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":10150,"mtime":1653986949852,"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":470,"column":15,"nodeType":"203","endLine":470,"endColumn":53},{"ruleId":"201","severity":1,"message":"202","line":519,"column":11,"nodeType":"203","endLine":519,"endColumn":53},{"ruleId":"204","severity":2,"message":"205","line":568,"column":22,"nodeType":"206","messageId":"207","endLine":568,"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"]
|
|
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":41535,"mtime":1657506863570,"results":"69","hashOfConfig":"70"},{"size":4898,"mtime":1639992402586,"results":"71","hashOfConfig":"51"},{"size":18730,"mtime":1657273006398,"results":"72","hashOfConfig":"70"},{"size":14908,"mtime":1652855804615,"results":"73","hashOfConfig":"49"},{"size":2165,"mtime":1638949854481,"results":"74","hashOfConfig":"51"},{"size":2165,"mtime":1638949840121,"results":"75","hashOfConfig":"51"},{"size":2223,"mtime":1638949823846,"results":"76","hashOfConfig":"51"},{"size":2356,"mtime":1650083974574,"results":"77","hashOfConfig":"49"},{"size":3367,"mtime":1638949855771,"results":"78","hashOfConfig":"51"},{"size":2305,"mtime":1638949843817,"results":"79","hashOfConfig":"51"},{"size":3294,"mtime":1638949855131,"results":"80","hashOfConfig":"51"},{"size":2850,"mtime":1638949842017,"results":"81","hashOfConfig":"51"},{"size":4157,"mtime":1638949853726,"results":"82","hashOfConfig":"51"},{"size":605,"mtime":1638949882777,"results":"83","hashOfConfig":"51"},{"size":1175,"mtime":1638949720500,"results":"84","hashOfConfig":"51"},{"size":18012,"mtime":1654600080184,"results":"85","hashOfConfig":"49"},{"size":332,"mtime":1644573509040,"results":"86","hashOfConfig":"54"},{"size":4080,"mtime":1648536160221,"results":"87","hashOfConfig":"49"},{"size":8842,"mtime":1646363892377,"results":"88","hashOfConfig":"54"},{"size":4317,"mtime":1646376602197,"results":"89","hashOfConfig":"54"},{"size":9440,"mtime":1644993553716,"results":"90","hashOfConfig":"54"},{"size":724,"mtime":1644808940649,"results":"91","hashOfConfig":"54"},{"size":1717,"mtime":1648466368772,"results":"92","hashOfConfig":"49"},{"size":5582,"mtime":1657266077415,"results":"93","hashOfConfig":"70"},{"size":10150,"mtime":1653986949852,"results":"94","hashOfConfig":"49"},{"size":9001,"mtime":1648713828033,"results":"95","hashOfConfig":"49"},{"size":3152,"mtime":1648713745966},{"size":1901,"mtime":1650082399244,"results":"96","hashOfConfig":"49"},{"size":600,"mtime":1657265851639,"results":"97","hashOfConfig":"70"},{"filePath":"98","messages":"99","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1h9xfdh",{"filePath":"100","messages":"101","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"jpc0be",{"filePath":"102","messages":"103","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"104","messages":"105","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1qaimc",{"filePath":"106","messages":"107","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"108","messages":"109","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"110","messages":"111","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"112","messages":"113","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"114","messages":"115","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"116","messages":"117","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"118","messages":"119","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"120","messages":"121","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"122","messages":"123","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"124","messages":"125","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"126","messages":"127","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"128","messages":"129","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"130","messages":"131","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"132","messages":"133","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"134","messages":"135","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"su5mnm",{"filePath":"136","messages":"137","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"138","messages":"139","errorCount":1,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"140","messages":"141","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"142","messages":"143","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"144","messages":"145","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"146","messages":"147","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"148","messages":"149","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"150","messages":"151","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"152","messages":"153","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"154","messages":"155","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"156","messages":"157","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"158","messages":"159","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"160","messages":"161","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"162","messages":"163","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"164","messages":"165","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"166","messages":"167","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"168","messages":"169","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"170","messages":"171","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"172","messages":"173","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"174","messages":"175","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"176","messages":"177","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"178","messages":"179","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"180","messages":"181","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"182","messages":"183","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"184","messages":"185","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"186","messages":"187","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"188","messages":"189","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",["190","191"],"/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",["192","193","194","195","196"],"/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",["197"],"/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":"198","severity":2,"message":"199","line":10,"column":29,"nodeType":"200","endLine":10,"endColumn":35},{"ruleId":"198","severity":2,"message":"201","line":145,"column":63,"nodeType":"200","endLine":145,"endColumn":71},{"ruleId":"202","severity":1,"message":"203","line":315,"column":13,"nodeType":"204","endLine":315,"endColumn":49},{"ruleId":"202","severity":1,"message":"203","line":333,"column":13,"nodeType":"204","endLine":333,"endColumn":56},{"ruleId":"202","severity":1,"message":"203","line":490,"column":15,"nodeType":"204","endLine":490,"endColumn":53},{"ruleId":"202","severity":1,"message":"203","line":539,"column":11,"nodeType":"204","endLine":539,"endColumn":53},{"ruleId":"205","severity":2,"message":"206","line":588,"column":22,"nodeType":"207","messageId":"208","endLine":588,"endColumn":31},{"ruleId":"205","severity":2,"message":"206","line":120,"column":14,"nodeType":"207","messageId":"208","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
CHANGED
|
@@ -20,6 +20,7 @@ import {
|
|
|
20
20
|
import { get, toJS } from 'mobx'
|
|
21
21
|
import PropTypes from 'prop-types'
|
|
22
22
|
import { subtotalRadioList } from './util'
|
|
23
|
+
import _ from 'lodash'
|
|
23
24
|
|
|
24
25
|
@inject('editStore')
|
|
25
26
|
@observer
|
|
@@ -226,6 +227,13 @@ class EditorField extends React.Component {
|
|
|
226
227
|
(editStore.computedTableSpecialConfig?.subtotal &&
|
|
227
228
|
get(subtotal, 'isCustomCells')) ||
|
|
228
229
|
false
|
|
230
|
+
|
|
231
|
+
// 打印账户总计金额
|
|
232
|
+
const printAccount =
|
|
233
|
+
(editStore.computedTableSpecialConfig?.subtotal &&
|
|
234
|
+
get(subtotal, 'isPrintAccount')) ||
|
|
235
|
+
false
|
|
236
|
+
|
|
229
237
|
// 整单合计是否大写
|
|
230
238
|
const overallOrderNeedUpperCase =
|
|
231
239
|
(editStore.computedTableSpecialConfig?.overallOrder &&
|
|
@@ -433,7 +441,15 @@ class EditorField extends React.Component {
|
|
|
433
441
|
</Flex>
|
|
434
442
|
</div>
|
|
435
443
|
)}
|
|
436
|
-
|
|
444
|
+
{/* 结款单不需要这个配置 */}
|
|
445
|
+
{!isSomeSubtotalTr && (
|
|
446
|
+
<EditorSubtotalCheck
|
|
447
|
+
subtotalCheckDisabled
|
|
448
|
+
subtotalChecked={printAccount}
|
|
449
|
+
subtotalCheckOnChange={editStore.setPrintAccount}
|
|
450
|
+
subtotalCheckText='打印账户总计金额'
|
|
451
|
+
/>
|
|
452
|
+
)}
|
|
437
453
|
<EditorSubtotalCheck
|
|
438
454
|
subtotalCheckDisabled
|
|
439
455
|
subtotalChecked={subtotalNeedUpperCase}
|
|
@@ -464,8 +480,12 @@ class EditorField extends React.Component {
|
|
|
464
480
|
subtotalCheckText='开启自定义单元格'
|
|
465
481
|
/>
|
|
466
482
|
<Text
|
|
483
|
+
// 只有自定义单元格的valueField值是空的,以后自每页合计,记得加type,之前没加,都无法区分
|
|
467
484
|
value={
|
|
468
|
-
subtotal && subtotal?.fields?.
|
|
485
|
+
subtotal && subtotal?.fields?.length > 1
|
|
486
|
+
? _.find(subtotal?.fields, item => !item.valueField)?.name ??
|
|
487
|
+
''
|
|
488
|
+
: ''
|
|
469
489
|
}
|
|
470
490
|
onChange={editStore.setSubtotalFields}
|
|
471
491
|
style={{ width: '65px', margin: '5px 0 5px 80px' }}
|
|
@@ -3,6 +3,7 @@ import { action, computed, observable, set, toJS } from 'mobx'
|
|
|
3
3
|
import { pageTypeMap } from '../config'
|
|
4
4
|
import _ from 'lodash'
|
|
5
5
|
import { dispatchMsg, getBlockName, exchange, getColSpanLength } from '../util'
|
|
6
|
+
import { accountRadioList } from './util'
|
|
6
7
|
import React from 'react'
|
|
7
8
|
|
|
8
9
|
class EditorStore {
|
|
@@ -83,6 +84,15 @@ class EditorStore {
|
|
|
83
84
|
colSpan: 6 // 产品说3个,开启自定义单元格,客户不满意,改成6个
|
|
84
85
|
}
|
|
85
86
|
|
|
87
|
+
// 每页合计打印账户总计金额
|
|
88
|
+
@observable
|
|
89
|
+
subtotalAccountConfigFields = {
|
|
90
|
+
name: '总计金额:',
|
|
91
|
+
valueField: '下单金额',
|
|
92
|
+
colSpan: 3,
|
|
93
|
+
type: 'useSummarize'
|
|
94
|
+
}
|
|
95
|
+
|
|
86
96
|
@computed
|
|
87
97
|
get computedPrinterKey() {
|
|
88
98
|
return _.map(this.config, (v, k) => {
|
|
@@ -560,8 +570,11 @@ class EditorStore {
|
|
|
560
570
|
]
|
|
561
571
|
})
|
|
562
572
|
} else {
|
|
573
|
+
// 重新计算下单元格的格数
|
|
563
574
|
table.subtotal.fields[0].colSpan =
|
|
564
|
-
colSpanLength -
|
|
575
|
+
colSpanLength -
|
|
576
|
+
(table.subtotal.fields?.[1]?.colSpan ?? 0) -
|
|
577
|
+
(table.subtotal.fields?.[2]?.colSpan ?? 0)
|
|
565
578
|
}
|
|
566
579
|
}
|
|
567
580
|
|
|
@@ -571,6 +584,14 @@ class EditorStore {
|
|
|
571
584
|
this.overallOrderShow = !this.overallOrderShow
|
|
572
585
|
const arr = this.selectedRegion.split('.')
|
|
573
586
|
this.config.contents[arr[2]].subtotal.fields[0].valueField = fields.id
|
|
587
|
+
|
|
588
|
+
const fieldList = this.config.contents[arr[2]].subtotal.fields
|
|
589
|
+
// 打印账户总计金额的valueField也要修改
|
|
590
|
+
if (_.find(fieldList, item => item.type === 'useSummarize')) {
|
|
591
|
+
// 打印账户总计金额 固定是数组的第二个
|
|
592
|
+
this.config.contents[arr[2]].subtotal.fields[1].valueField =
|
|
593
|
+
accountRadioList[fields.id]
|
|
594
|
+
}
|
|
574
595
|
}
|
|
575
596
|
}
|
|
576
597
|
|
|
@@ -881,7 +902,7 @@ class EditorStore {
|
|
|
881
902
|
const _selectedRegion = this.selectedRegion || _defaultRegion
|
|
882
903
|
const arr = _selectedRegion.split('.')
|
|
883
904
|
if (arr.includes('table')) {
|
|
884
|
-
const height = this.config.contents[arr[2]]
|
|
905
|
+
const height = this.config.contents[arr[2]]?.customerRowHeight
|
|
885
906
|
resHeight = height === undefined ? 23 : height
|
|
886
907
|
}
|
|
887
908
|
}
|
|
@@ -1082,6 +1103,86 @@ class EditorStore {
|
|
|
1082
1103
|
}
|
|
1083
1104
|
}
|
|
1084
1105
|
|
|
1106
|
+
// 每页合计打印账户总计金额
|
|
1107
|
+
// 写的很垃圾,因为每页合计这里改了4、5次,各种兼容,我人麻了
|
|
1108
|
+
// 每页合计这一行单元格,要计算每个要占几列,就很烦
|
|
1109
|
+
@action.bound
|
|
1110
|
+
setPrintAccount() {
|
|
1111
|
+
if (this.selectedRegion) {
|
|
1112
|
+
// 作用:触发组件的更新
|
|
1113
|
+
this.overallOrderShow = !this.overallOrderShow
|
|
1114
|
+
const arr = this.selectedRegion.split('.')
|
|
1115
|
+
const table = this.config.contents[arr[2]]
|
|
1116
|
+
const subtotalConfig = table?.subtotal
|
|
1117
|
+
// 没有显示每页合计的时候不可以设置
|
|
1118
|
+
if (!subtotalConfig?.show) return
|
|
1119
|
+
// 多栏表格情况,计算colSpan总列数
|
|
1120
|
+
const colSpanLength = getColSpanLength(table)
|
|
1121
|
+
const oldPrintAccount = subtotalConfig?.isPrintAccount
|
|
1122
|
+
|
|
1123
|
+
set(subtotalConfig, {
|
|
1124
|
+
isPrintAccount: !oldPrintAccount
|
|
1125
|
+
})
|
|
1126
|
+
// 兼容已经存在后端的模板,每页合计直接是显示的,导致每页合计配置没有fields,isCustomCells,手动添加上
|
|
1127
|
+
if (oldPrintAccount === undefined && !subtotalConfig.fields) {
|
|
1128
|
+
set(subtotalConfig, {
|
|
1129
|
+
fields: [
|
|
1130
|
+
{
|
|
1131
|
+
name: '每页合计:',
|
|
1132
|
+
valueField: 'real_item_price',
|
|
1133
|
+
colSpan: colSpanLength
|
|
1134
|
+
}
|
|
1135
|
+
]
|
|
1136
|
+
})
|
|
1137
|
+
}
|
|
1138
|
+
// 开启打印账户总计金额
|
|
1139
|
+
if (subtotalConfig?.isPrintAccount) {
|
|
1140
|
+
// 同时还开启了自定义单元格选项
|
|
1141
|
+
if (subtotalConfig?.fields?.length === 2) {
|
|
1142
|
+
// fields添加自定义单元格
|
|
1143
|
+
subtotalConfig.fields = [
|
|
1144
|
+
subtotalConfig.fields[0],
|
|
1145
|
+
this.subtotalAccountConfigFields,
|
|
1146
|
+
subtotalConfig.fields[1]
|
|
1147
|
+
]
|
|
1148
|
+
// 重新计算合并单元格的个数
|
|
1149
|
+
subtotalConfig.fields[0].colSpan = Math.floor(colSpanLength / 3)
|
|
1150
|
+
subtotalConfig.fields[1].colSpan = Math.floor(colSpanLength / 3)
|
|
1151
|
+
subtotalConfig.fields[2].colSpan =
|
|
1152
|
+
colSpanLength -
|
|
1153
|
+
subtotalConfig.fields[0].colSpan -
|
|
1154
|
+
subtotalConfig.fields[1].colSpan
|
|
1155
|
+
} else {
|
|
1156
|
+
// fields添加自定义单元格
|
|
1157
|
+
subtotalConfig.fields = [
|
|
1158
|
+
subtotalConfig.fields[0],
|
|
1159
|
+
this.subtotalAccountConfigFields
|
|
1160
|
+
]
|
|
1161
|
+
// 重新计算合并单元格的个数
|
|
1162
|
+
subtotalConfig.fields[0].colSpan =
|
|
1163
|
+
colSpanLength - subtotalConfig.fields[1].colSpan
|
|
1164
|
+
}
|
|
1165
|
+
} else {
|
|
1166
|
+
// 关闭打印账户总计金额
|
|
1167
|
+
// 存在自定义单元格
|
|
1168
|
+
if (subtotalConfig?.fields?.length === 3) {
|
|
1169
|
+
subtotalConfig.fields = [
|
|
1170
|
+
subtotalConfig.fields[0],
|
|
1171
|
+
this.subtotalConfigFields
|
|
1172
|
+
]
|
|
1173
|
+
// 重新计算合并单元格的个数
|
|
1174
|
+
subtotalConfig.fields[0].colSpan =
|
|
1175
|
+
colSpanLength - subtotalConfig.fields[1].colSpan
|
|
1176
|
+
} else {
|
|
1177
|
+
// 关闭,fields只有一个
|
|
1178
|
+
subtotalConfig.fields = [subtotalConfig.fields[0]]
|
|
1179
|
+
// 重新计算合并单元格的个数
|
|
1180
|
+
subtotalConfig.fields[0].colSpan = colSpanLength
|
|
1181
|
+
}
|
|
1182
|
+
}
|
|
1183
|
+
}
|
|
1184
|
+
}
|
|
1185
|
+
|
|
1085
1186
|
// 每页合计开启自定义单元格
|
|
1086
1187
|
@action.bound
|
|
1087
1188
|
setSubtotalCustomCells() {
|
|
@@ -1114,21 +1215,48 @@ class EditorStore {
|
|
|
1114
1215
|
}
|
|
1115
1216
|
// 开启自定义单元格
|
|
1116
1217
|
if (subtotalConfig?.isCustomCells) {
|
|
1117
|
-
//
|
|
1118
|
-
subtotalConfig
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
|
|
1124
|
-
|
|
1125
|
-
|
|
1126
|
-
|
|
1218
|
+
// 同时还开启了自定义单元格选项
|
|
1219
|
+
if (subtotalConfig?.fields?.length === 2) {
|
|
1220
|
+
// fields添加自定义单元格
|
|
1221
|
+
subtotalConfig.fields = [
|
|
1222
|
+
subtotalConfig.fields[0],
|
|
1223
|
+
this.subtotalAccountConfigFields,
|
|
1224
|
+
this.subtotalConfigFields
|
|
1225
|
+
]
|
|
1226
|
+
// 重新计算合并单元格的个数
|
|
1227
|
+
subtotalConfig.fields[0].colSpan = Math.floor(colSpanLength / 3)
|
|
1228
|
+
subtotalConfig.fields[1].colSpan = Math.floor(colSpanLength / 3)
|
|
1229
|
+
subtotalConfig.fields[2].colSpan =
|
|
1230
|
+
colSpanLength -
|
|
1231
|
+
subtotalConfig.fields[0].colSpan -
|
|
1232
|
+
subtotalConfig.fields[1].colSpan
|
|
1233
|
+
} else {
|
|
1234
|
+
// fields添加自定义单元格
|
|
1235
|
+
subtotalConfig.fields = [
|
|
1236
|
+
subtotalConfig.fields[0],
|
|
1237
|
+
this.subtotalConfigFields
|
|
1238
|
+
]
|
|
1239
|
+
// 重新计算合并单元格的个数
|
|
1240
|
+
subtotalConfig.fields[0].colSpan =
|
|
1241
|
+
colSpanLength - subtotalConfig.fields[1].colSpan
|
|
1242
|
+
}
|
|
1127
1243
|
} else {
|
|
1128
|
-
//
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1244
|
+
// 关闭自定义单元格
|
|
1245
|
+
// 存在打印账户总计金额
|
|
1246
|
+
if (subtotalConfig?.fields?.length === 3) {
|
|
1247
|
+
subtotalConfig.fields = [
|
|
1248
|
+
subtotalConfig.fields[0],
|
|
1249
|
+
this.subtotalAccountConfigFields
|
|
1250
|
+
]
|
|
1251
|
+
// 重新计算合并单元格的个数
|
|
1252
|
+
subtotalConfig.fields[0].colSpan =
|
|
1253
|
+
colSpanLength - subtotalConfig.fields[1].colSpan
|
|
1254
|
+
} else {
|
|
1255
|
+
// 关闭,fields只有一个
|
|
1256
|
+
subtotalConfig.fields = [subtotalConfig.fields[0]]
|
|
1257
|
+
// 重新计算合并单元格的个数
|
|
1258
|
+
subtotalConfig.fields[0].colSpan = colSpanLength
|
|
1259
|
+
}
|
|
1132
1260
|
}
|
|
1133
1261
|
}
|
|
1134
1262
|
}
|
|
@@ -1143,7 +1271,9 @@ class EditorStore {
|
|
|
1143
1271
|
|
|
1144
1272
|
if (subtotalConfig.isCustomCells) {
|
|
1145
1273
|
const subtotalConfig = table?.subtotal.fields
|
|
1146
|
-
subtotalConfig
|
|
1274
|
+
subtotalConfig.length === 3
|
|
1275
|
+
? (subtotalConfig[2].name = value)
|
|
1276
|
+
: (subtotalConfig[1].name = value)
|
|
1147
1277
|
}
|
|
1148
1278
|
}
|
|
1149
1279
|
}
|
package/src/common/util.js
CHANGED
package/src/printer/store.js
CHANGED
|
@@ -130,7 +130,7 @@ class PrinterStore {
|
|
|
130
130
|
const _selectedRegion = this.selectedRegion || _defaultRegion
|
|
131
131
|
const arr = _selectedRegion.split('.')
|
|
132
132
|
if (arr.includes('table')) {
|
|
133
|
-
const height = this.config.contents[arr[2]]
|
|
133
|
+
const height = this.config.contents[arr[2]]?.customerRowHeight
|
|
134
134
|
return height === undefined ? 23 : height
|
|
135
135
|
}
|
|
136
136
|
}
|
|
@@ -68,6 +68,12 @@ const SubtotalTr = props => {
|
|
|
68
68
|
).toFixed(2)
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
const getData = field => {
|
|
72
|
+
const data = printerStore.data.common
|
|
73
|
+
console.log('list, field', field, data, data[field])
|
|
74
|
+
|
|
75
|
+
return data?.[field] ?? ''
|
|
76
|
+
}
|
|
71
77
|
// 每页小计
|
|
72
78
|
// show 是否展示小计,fields<Array> 合计的字段和展现的name,displayName 是否显示名字
|
|
73
79
|
if (show && printerStore.ready) {
|
|
@@ -133,11 +139,18 @@ const SubtotalTr = props => {
|
|
|
133
139
|
}
|
|
134
140
|
>
|
|
135
141
|
{/* 这样写是为了支持自定义单元,index = 1时是自定义单元格 */}
|
|
136
|
-
{
|
|
142
|
+
{item.type === 'useSummarize'
|
|
143
|
+
? getData(item.valueField)
|
|
144
|
+
: index === 0
|
|
145
|
+
? sumData(list, item.valueField)
|
|
146
|
+
: ''}
|
|
147
|
+
{/* {index === 0 ? sumData(list, item.valueField) : ''} */}
|
|
137
148
|
</span>
|
|
138
149
|
{subtotal?.needUpperCase && ( // 是否需要大写金额
|
|
139
150
|
<span>
|
|
140
|
-
{
|
|
151
|
+
{item.type === 'useSummarize'
|
|
152
|
+
? coverDigit2Uppercase(getData(item.valueField))
|
|
153
|
+
: index === 0
|
|
141
154
|
? '大写:' +
|
|
142
155
|
coverDigit2Uppercase(sumData(list, item.valueField))
|
|
143
156
|
: ''}
|