Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn

haoxuan

2023-10-10 b169e0fe3ecad3713880626bd6152c58d8ed4222

 src/views/service/serviceContract/DetailServiceContract.vue

@@ -200,8 +200,8 @@
      showSummary: {
        show: true,
        total: true,
        sumProp: ["other1", "other2", "other3", "other4"],
        mergeNumber: 3
        sumProp: ["amount", "price", "total"],
        mergeNumber: 1
      },
      productTableList: {},
      addConfig: {}
@@ -269,7 +269,7 @@
        },
        {
          leftStr: "创建时间",
          leftValue: "",
          leftValue: item.createTime,
          rightStr: "数量合计",
          rightValue: ""
        }