gm-printer 10.28.10 → 10.29.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.28.10",
+  "version": "10.29.0-beta.0",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/editor_store.js

@@ -1021,6 +1021,7 @@ class EditorStore {
             specialConfig: { style: {} },
             dataKey: defaultTableDataKey, // 默认
             subtotal: defaultTableSubtotal, // 默认的每页合计配置
+            customerTag: false, // 特殊标记，用于提供用户干预功能标记
             columns: [
               {
                 head: i18next.t('表头'),

package/src/editor_purchase/editor.js

@@ -10,6 +10,7 @@ import EditorSelect from '../common/editor_select'
 import EditorField from '../common/editor_edit_field'
 import EditorAddField from '../common/editor_add_field'
 import EditorSpecialTable from './editor_special_table'
+import EditorSumTable from './editor_sum_table'
 import ContextMenu from './context_menu'
 import i18next from '../../locales'
 import withStore from '../common/hoc_with_store'
@@ -47,7 +48,8 @@ class Editor extends React.Component {
             <EditorAddField addFields={addFields} />
             <Gap height='5px' />
             <EditorSpecialTable addFields={addFields} />
-
+            <Gap height='5px' />
+            <EditorSumTable addFields={addFields} />
             <div id='gm-printer-tip' />
 
             <div id='gm-printer-modal' />

package/src/editor_purchase/editor_sum_table.js

@@ -0,0 +1,48 @@
+/* eslint-disable react/prop-types */
+import i18next from '../../locales'
+// @ts-ignore
+import React, { Component } from 'react'
+import { Flex, Switch } from '../components/index'
+import { inject, observer } from 'mobx-react'
+
+// @ts-ignore
+@inject('editStore')
+// @ts-ignore
+@observer
+class TableDetailEditor extends Component {
+  handleSwitchChange = val => {
+    const { editStore } = this.props
+    editStore.doSomething(val)
+  }
+
+  render() {
+    const { editStore } = this.props
+    console.log(this.props)
+    const {
+      addFields: { sumTableConfig }
+    } = this.props
+    if (editStore.computedRegionIsTable) {
+      return (
+        <div className='gm-margin-top-5'>
+          <Flex>
+            <div className='gm-margin-right-10'>
+              {sumTableConfig.label || i18next.t('配置')}
+            </div>
+            <Switch
+              checked={editStore.customerTag}
+              onChange={this.handleSwitchChange}
+            />
+          </Flex>
+          {sumTableConfig.showTips && (
+            <div className='gm-margin-top-5' style={{ color: 'red' }}>
+              {sumTableConfig.tips}
+            </div>
+          )}
+        </div>
+      )
+    }
+    return null
+  }
+}
+
+export default TableDetailEditor

package/src/editor_purchase/store.js

@@ -1,13 +1,20 @@
 import EditorStore from '../common/editor_store'
-import { action } from 'mobx'
+import { action, observable } from 'mobx'
 import i18next from '../../locales'
 
 class Store extends EditorStore {
   constructor({ defaultTableDataKey }) {
     super()
     this.defaultTableDataKey = defaultTableDataKey // 修改默认dataKey
+    const arr = this.selectedRegion?.split('.')
+    if (arr?.length > 2) {
+      this.customerTag = this.config.contents[arr[2]].customerTag
+    }
   }
 
+  @observable
+  customerTag = false
+
   /* start---------设置采购明细相关--------- */
   @action.bound
   setPurchaseTableKey(dataKey) {
@@ -99,6 +106,12 @@ class Store extends EditorStore {
   }
 
   /* end---------设置采购明细相关--------- */
+  @action.bound
+  doSomething(val) {
+    const arr = this.selectedRegion.split('.')
+    this.config.contents[arr[2]].customerTag = val
+    this.customerTag = val
+  }
 }
 
 export default new Store({ defaultTableDataKey: 'purchase_no_detail' })

package/src/printer/do_print.js

@@ -89,7 +89,7 @@ function toDoPrintBatch(list, isPrint = true) {
             // isPrint &&
             //   templateType !== 'longPrint' &&
             //   $printer.contentWindow.print()
-            console.log('templateType', templateType)
+            // console.log('templateType', templateType)
             isPrint && $printer.contentWindow.print()
             resolve()
           }, $app)