gm-printer 10.38.4 → 10.38.6

package/package.json

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

package/src/examining_report_editor/store.js

@@ -2,33 +2,6 @@ import EditorStore from '../common/editor_store'
 import { action, toJS } from 'mobx'
 import i18next from '../../locales'
 
-const DEFAULT_TABLE_COLUMNS = [
-  {
-    head: i18next.t('序号'),
-    text: i18next.t('{{列.序号}}'),
-    style: { textAlign: 'center' },
-    headStyle: { textAlign: 'center' }
-  },
-  {
-    head: i18next.t('样品名称'),
-    text: i18next.t('{{列.样品名称}}'),
-    style: { textAlign: 'center' },
-    headStyle: { textAlign: 'center' }
-  },
-  {
-    head: i18next.t('样品编码'),
-    text: i18next.t('{{列.样品编码}}'),
-    style: { textAlign: 'center' },
-    headStyle: { textAlign: 'center' }
-  },
-  {
-    head: i18next.t('检测结果'),
-    text: i18next.t('{{列.检测结果}}'),
-    style: { textAlign: 'center' },
-    headStyle: { textAlign: 'center' }
-  }
-]
-
 class Store extends EditorStore {
   constructor({ defaultTableDataKey }) {
     super()
@@ -39,7 +12,14 @@ class Store extends EditorStore {
     return {
       dataKey: this.defaultTableDataKey,
       subtotal: { show: false },
-      columns: DEFAULT_TABLE_COLUMNS
+      columns: [
+        {
+          head: i18next.t('表头'),
+          text: i18next.t('{{列.表头}}'),
+          style: { textAlign: 'center' },
+          headStyle: { textAlign: 'center' }
+        }
+      ]
     }
   }
 
@@ -51,9 +31,6 @@ class Store extends EditorStore {
 
   @action.bound
   addContent(name, index, type, tableConfig = null) {
-    if (type === 'table' && !tableConfig) {
-      tableConfig = this.getDefaultTableConfig()
-    }
     super.addContent(name, index, type, tableConfig)
     this.config = toJS(this.config)
   }

package/src/index.js

@@ -3,7 +3,7 @@ import '../locales'
 import Editor, { Editor2 } from './editor'
 
 import EditorPurchase from './editor_purchase'
-import examiningReportEditor from './examining_report_editor'
+import EditorExaminingReport from './examining_report_editor'
 import EditorStockIn from './editor_stockin'
 import EditorStockOut from './editor_stockout'
 import EditorSettle from './editor_settle'
@@ -33,7 +33,7 @@ export {
   EditorStockIn,
   EditorStockOut,
   EditorPurchase,
-  examiningReportEditor,
+  EditorExaminingReport,
   EditorSettle,
   EditorStatement,
   EditorAccoutStatement,

package/src/printer/store.js

@@ -552,7 +552,8 @@ class PrinterStore {
         dataKey !== 'purchase_detail_one_row' &&
         dataKey !== 'purchase_independent_rol_sku' &&
         dataKey !== 'purchase_independent_rol_address' &&
-        dataKey !== 'taxRateSales'
+        dataKey !== 'taxRateSales' &&
+        dataKey !== 'ordinary'
       ) {
         return null
       }