合并分支

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 === "产品名称") {
        if (this.sign == "purchase") {
          this.showCol = this.showPurchaseCol
        } else {
        this.showCol = this.showProductCol
        }

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

 src/views/purchaseManage/purchase/index.vue

@@ -743,7 +743,8 @@
            this.$message.error(res.msg ? res.msg + "," : "" + "获取信息失败！")
          }
        })
      } else if (this.TabsIndex == 0||
      } else if (
        this.TabsIndex == 0 ||
        (this.TabsIndex == 2 && row.status == 8) ||
        (this.TabsIndex == 2 && row.status == 2) ||
        (this.TabsIndex == 2 && row.status == 3)

 src/views/supplierManage/supplier/index.vue

@@ -58,7 +58,7 @@
            :amount-view="false"
            :show-screen="false"
            :show-action-btn="false"
            :placeholder="'请输入产品名称'"
            :placeholder="'请输入产品名称/产品规格/产品编码'"
            @searchClick="onProductFilterSearch"
          >
            <template slot="leftButton">
@@ -341,7 +341,7 @@
    // 搜索产品
    onProductFilterSearch(searchText) {
      this.productPagerOptions.currPage = 1
      this.getProductList("name", searchText)
      this.getProductList("keyword", searchText)
    },
    // 新建供应商
    addBtnClick() {