Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-17 42819fb733c99c39b705edcc022e5801f28e8cb0

 src/views/sales/subOrder/index.vue

@@ -119,7 +119,7 @@
        infomation: {}
      },
      showSummary: {
        show: true,
        show: false,
        sumProp: ["productAmount"],
        mergeNumber: 6
      },
@@ -167,6 +167,7 @@
  methods: {
    setTable() {
      this.tableList = {
        selectIndex:true,
        tableInfomation: [],
        allcol: [],
        showcol: this.showCol,