合并分支冲突解决

zuozhengqing

2024-03-20 f4ed5ae8873f65c36b5cf37be264f6ec1e154647

 src/views/purchaseManage/purchase/DetailSupplier.vue

@@ -252,7 +252,7 @@
      this.formInfoList = [
        {
          str: "供应商名称",
          value: item.name,
          value: item.supplier.name,
        },
        {
          str: "合计",
@@ -288,7 +288,7 @@
          leftStr: "采购订单编号",
          leftValue: item.number,
          rightStr: "供应商名称",
          rightValue: item.name,
          rightValue: item.supplier.name,
        },
        {
          leftStr: "采购单状态",