gm-printer 10.25.0 → 10.25.2

package/package.json

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

package/src/common/editor_edit_field.js

@@ -459,7 +459,10 @@ class EditorField extends React.Component {
                 let subtotalFields = subtotal?.fields?.[0].valueField
                 if (subtotalFields === 'total_item_price')
                   subtotalFields = '下单金额'
-                if (subtotalFields === 'real_item_price')
+                if (
+                  subtotalFields === 'real_item_price' ||
+                  !subtotal?.fields?.[0].valueField
+                )
                   subtotalFields = '出库金额'
                 return (
                   <Radio
@@ -548,7 +551,10 @@ class EditorField extends React.Component {
                 value={fields.value}
                 key={fields.id}
                 inputName='overallOrderRadio'
-                checked={overallOrder?.fields?.[0]?.valueField === fields.id}
+                checked={
+                  (overallOrder?.fields?.[0]?.valueField ?? '出库金额') ===
+                  fields.id
+                }
                 radioChecked={() => editStore.setOverallOrderValueField(fields)}
               />
             )

package/src/common/editor_store.js

@@ -607,6 +607,26 @@ class EditorStore {
     if (this.selectedRegion) {
       this.overallOrderShow = !this.overallOrderShow
       const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const colSpanLength = getColSpanLength(table)
+      if (!this.config.contents[arr[2]].subtotal.fields?.[0]) {
+        // 兼容已经存在的配送单据，他们的配置存在后端的，没有subtotal这个配置，给加上
+        set(table, {
+          subtotal: {
+            show: true,
+            fields: [
+              {
+                name: '每页合计：',
+                valueField: '下单金额',
+                style: {
+                  fontWeight: 'bold'
+                },
+                colSpan: colSpanLength
+              }
+            ]
+          }
+        })
+      }
       this.config.contents[arr[2]].subtotal.fields[0].valueField = fields.id
 
       const fieldList = this.config.contents[arr[2]].subtotal.fields
@@ -1348,6 +1368,26 @@ class EditorStore {
     if (this.selectedRegion) {
       this.overallOrderShow = !this.overallOrderShow
       const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const colSpanLength = getColSpanLength(table)
+      if (!this.config.contents[arr[2]].overallOrder.fields?.[0]) {
+        // 兼容已经存在的配送单据，他们的配置存在后端的，没有overallOrder这个配置，给加上
+        set(table, {
+          overallOrder: {
+            show: true,
+            fields: [
+              {
+                name: '整单合计：',
+                valueField: '下单金额',
+                style: {
+                  fontWeight: 'bold'
+                },
+                colSpan: colSpanLength
+              }
+            ]
+          }
+        })
+      }
       const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
       const oldValueField = overallOrderConfig.fields?.[0]
       this.config.contents[arr[2]]?.overallOrder &&