Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

zuozhengqing

2023-10-16 5233bff9efb1830ea9b13661944637ee6d22e364

Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

 src/views/service/serviceContract/index.vue

@@ -289,7 +289,9 @@
        quotation_number: row.quotation.number,
        currency: "人民币",
        sale_chance_name: row.SaleChance.name,
        contact_name: row.contact.name
        contact_name: row.contact.name,
        serviceContractTypeId: row.serviceContractTypeId === 0 ? null : row.serviceContractTypeId,
        serviceContractStatusId: row.serviceContractStatusId === 0 ? null : row.serviceContractStatusId
      }
    },
    // 删除