gm-printer 10.25.0-beta.0 → 10.26.0-beta.0

package/package.json

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

package/src/common/editor_edit_field.js

@@ -455,12 +455,6 @@ class EditorField extends React.Component {
             <Flex>{i18next.t('合计栏打印金额')}：</Flex>
             <Flex style={{ marginLeft: 57 }}>
               {subtotalRadioList.map(fields => {
-                // 兼容
-                let subtotalFields = subtotal?.fields?.[0].valueField
-                if (subtotalFields === 'total_item_price')
-                  subtotalFields = '下单金额'
-                if (subtotalFields === 'real_item_price')
-                  subtotalFields = '出库金额'
                 return (
                   <Radio
                     style={{ marginLeft: 5 }}
@@ -468,7 +462,7 @@ class EditorField extends React.Component {
                     value={fields.value}
                     key={fields.id}
                     inputName='subtotalRadio'
-                    checked={subtotalFields === fields.id}
+                    checked={subtotal?.fields?.[0].valueField === fields.id}
                     radioChecked={() => editStore.subtotalRadioCheck(fields)}
                   />
                 )
@@ -539,21 +533,6 @@ class EditorField extends React.Component {
             onChange={this.handleOverallOrderStyleChange}
           />
         </Flex>
-        <Flex style={{ marginLeft: 57 }}>
-          {subtotalRadioList.map((fields, i) => {
-            return (
-              <Radio
-                style={{ marginLeft: 5 }}
-                id={`${fields.id}${i}`}
-                value={fields.value}
-                key={fields.id}
-                inputName='overallOrderRadio'
-                checked={overallOrder?.fields?.[0]?.valueField === fields.id}
-                radioChecked={() => editStore.setOverallOrderValueField(fields)}
-              />
-            )
-          })}
-        </Flex>
         <EditorSubtotalCheck
           subtotalCheckDisabled
           subtotalChecked={overallOrderNeedUpperCase}

package/src/common/editor_store.js

@@ -810,6 +810,21 @@ class EditorStore {
         break
       }
 
+      case 'qrcode': {
+        blocks.push({
+          type: 'qrcode',
+          text: value,
+          style: {
+            position: 'absolute',
+            left: '0px',
+            top: '0px',
+            width: '100px',
+            height: '100px'
+          }
+        })
+        break
+      }
+
       default: {
         blocks.push({
           text: `${key}：${value}`,
@@ -1193,7 +1208,7 @@ class EditorStore {
           fields: [
             {
               name: '每页合计：',
-              valueField: '出库金额',
+              valueField: 'real_item_price',
               colSpan: colSpanLength
             }
           ]
@@ -1342,19 +1357,6 @@ class EditorStore {
     }
   }
 
-  // 整单合计金额单选设置
-  @action.bound
-  setOverallOrderValueField({ id }) {
-    if (this.selectedRegion) {
-      this.overallOrderShow = !this.overallOrderShow
-      const arr = this.selectedRegion.split('.')
-      const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
-      const oldValueField = overallOrderConfig.fields?.[0]
-      this.config.contents[arr[2]]?.overallOrder &&
-        set(oldValueField, { valueField: id })
-    }
-  }
-
   // 整单合计设置大写金额
   @action.bound
   setOverallOrderUpperCase() {

package/src/common/util.js

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

package/src/printer/table_subtotal_tr.js

@@ -30,11 +30,10 @@ const SubtotalTr = props => {
         isUpperCaseBefore, // 决定小写金额是否在前
         isUpperLowerCaseSeparate, // 决定大小写金额是否分开在两端
         style,
-
         fields = [
           {
             name: i18next.t('每页合计：'),
-            valueField: '出库金额'
+            valueField: 'real_item_price'
           }
         ],
         displayName = false // 是否展示字段名
@@ -69,30 +68,6 @@ const SubtotalTr = props => {
     ).toFixed(2)
   }
 
-  // 计算合计
-  const sumData2 = (list, field) => {
-    // 兼容之前
-    if (field === 'total_item_price') field = '下单金额'
-    if (field === 'real_item_price') field = '出库金额'
-    if (field === 'settle_money2') field = '结算金额'
-    if (field === 'total_money2') field = '金额'
-    return _.reduce(
-      list,
-      (a, b) => {
-        let result = a
-        result = a.plus(b[field] || 0)
-        if (b?.[field + MULTI_SUFFIX]) {
-          result = result.plus(b?.[field + MULTI_SUFFIX])
-        }
-        if (b?.[field + MULTI_SUFFIX3]) {
-          result = result.plus(b?.[field + MULTI_SUFFIX3])
-        }
-        return result
-      },
-      Big(0)
-    ).toFixed(2)
-  }
-
   const getData = field => {
     const data = printerStore.data.common
     return data?.[field] ?? ''
@@ -107,7 +82,7 @@ const SubtotalTr = props => {
       const sum = {}
 
       _.each(fields, v => {
-        sum[v.name] = sumData2(list, v.valueField)
+        sum[v.name] = sumData(list, v.valueField)
       })
       let subtotalStr = ''
       for (const name in sum) {
@@ -165,7 +140,7 @@ const SubtotalTr = props => {
                       {item.type === 'useSummarize'
                         ? getData(item.valueField)
                         : index === 0
-                        ? sumData2(list, item.valueField)
+                        ? sumData(list, item.valueField)
                         : ''}
                       {/* {index === 0 ? sumData(list, item.valueField) : ''} */}
                     </span>
@@ -176,9 +151,7 @@ const SubtotalTr = props => {
                             coverDigit2Uppercase(getData(item.valueField))
                           : index === 0
                           ? '大写：' +
-                            coverDigit2Uppercase(
-                              sumData2(list, item.valueField)
-                            )
+                            coverDigit2Uppercase(sumData(list, item.valueField))
                           : ''}
                       </span>
                     )}