Merge remote-tracking branch 'origin/zzq'

zzq

2023-09-26 25b727a5dc28f3c2d225c5e017da58f35c6b84b3

 src/views/productManage/productCategory/AddProductCategoryDialog.vue

@@ -15,13 +15,15 @@
            <span>打印</span>
          </span> -->
          <span class="btn" style="margin-left: 15px">
            <el-button
            <i class="el-icon-s-tools"></i>
            <span>动作</span>
            <!-- <el-button
              plain
              size="mini"
              style="margin-left: 15px"
              @click="deleteClick"
              >删除</el-button
            >
            > -->
          </span>
          <el-button
            v-if="showEdit"
@@ -324,10 +326,15 @@
    delClick() {},
    // 产品
    productClick() {
      this.$router.push({
        path: "/productManage/productList",
        query: { name: "产品" },
      });
      this.$refs.form.validate((valid) => {
        if (valid) {
          this.$router.push({
            path: "/productManage/product",
            query: { categoryName:this.editConfig.infomation.name, id: this.editConfig.title === "新建"?'':this.editConfig.infomation.id},
          });
        }
      })
      
    },
  },
};