合并分支

zuozhengqing

2024-03-29 bc0b37e98ba17b8a4c97d853c87e2b12e447b012

 src/views/other/commonDialog/SelectCommonDialog.vue

@@ -103,11 +103,13 @@
      searchSel: {},
      keyword: "",
      keywordType: "",
      showProductCol: ["产品名称", "产品编号", "销售单价", "单位", "产品规格", "型号"],
      showPurchaseCol: ["产品名称", "产品编号", "供应商", "采购单价", "单位", "产品规格", "型号"],
      showProductCol: ["产品名称", "产品编号", "采购单价", "单位", "产品规格", "型号"],
      tableProductColumn: [
        { label: "产品名称", prop: "name", isClick: true },
        { label: "产品编号", prop: "number" },
        { label: "销售单价", prop: "purchasePrice" },
        { label: "供应商", prop: "supplierName" },
        { label: "采购单价", prop: "purchasePrice" },
        { label: "单位", prop: "unit" },
        { label: "产品规格", prop: "specifications" },
        { label: "型号", prop: "modelNumber" }
@@ -132,7 +134,12 @@
    },
    setTable() {
      if (this.editConfig.title === "产品名称") {
        this.showCol = this.showProductCol
        if (this.sign == "purchase") {
          this.showCol = this.showPurchaseCol
        } else {
          this.showCol = this.showProductCol
        }

        this.tableColumn = this.tableProductColumn
      }
      this.tableList = {
@@ -184,8 +191,15 @@
        if (res.code === 200) {
          if (res.data.list && res.data.list.length > 0) {
            const list = res.data.list.map((item) => {
              return {
                ...item
              if (this.sign == "purchase") {
                return {
                  ...item,
                  supplierName: item.supplier?.name
                }
              } else {
                return {
                  ...item
                }
              }
            })
            this.tableList.tableInfomation = list