Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM

haoxuan

2023-11-15 a6649a3319e9f5e9260848872d8cddabfcfc7553

 src/views/supplierManage/supplier/AddNewProduct.vue

@@ -96,16 +96,18 @@
            if (this.editConfig.title === "添加") {
              createProduct({
                list: this.tableData
              }).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message.success("添加成功")
                  this.$parent.getProductList()
                }
              }).catch(e=>{
                console.log(e)
              })
                .then((res) => {
                  console.log(res)
                  this.editConfig.visible = false
                  if (res.code === 200) {
                    this.$message.success("添加成功")
                    this.$parent.getProductList()
                  }
                })
                .catch((e) => {
                  console.log(e)
                })
            } else {
              const params = this.saveParams()
              updateProduct(params).then((res) => {
@@ -164,7 +166,7 @@
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
          { label: "产品名称", prop: "name", productName: true, isRequird: true },
          { label: "产品名称", prop: "name", productName: true, isRequird: true, width: 250 },
          { label: "产品编码", prop: "number" },
          { label: "计量单位", prop: "unit" },
          { label: "规格型号", prop: "specifications" },