From b04b1f186c4250e6894823f990189950508d877d Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 19 三月 2024 14:47:33 +0800
Subject: [PATCH] 修改

---
 web/src/views/modules/basicInfo/XhProductModel.vue                                                             |    8 +++++---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java       |    3 ++-
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index c9941ec..6325f6f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -57,7 +57,7 @@
         @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
         @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
         @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
-        @ApiImplicitParam(name = "nodeType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "node_type^EQ"),
+        @ApiImplicitParam(name = "productType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "product_type^EQ"),
         @ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING)
     })
     public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java
index b4bbeef..494118a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java
@@ -28,7 +28,8 @@
      * @return
      */
     public List<TyProductModel> page(QueryFilter queryFilter) {
-        return baseDao.getList(queryFilter.getQueryParams());
+        List<TyProductModel> list =baseDao.getList(queryFilter.getQueryParams());
+        return list ;
     }
 
     /**
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 38c680e..b1b8929 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -56,9 +56,9 @@
     data() {
       return {
         url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
+        productType: '',
         dataForm: {
           name: '',
-          productType: '',
           type:'',
           pid: '',
           srcId:'',
@@ -72,11 +72,12 @@
     },
     methods: {
       add() {
-        if (this.dataForm.type !== '4') {
+        this.dataForm.type=this.productType
+        if (this.dataForm.type !== '3') {
           console.log(1111)
           console.log(this.dataForm.type,'add() {')
           this.dataForm.type = this.dataForm.type - 1
-        } else if (this.dataForm.type === '4') {
+        } else if (this.dataForm.type === '3') {
           console.log(2222)
           console.log(this.dataForm.type,'add() {')
           this.dataForm.type = this.dataForm.type - 2
@@ -100,6 +101,7 @@
         console.log(data)
         this.dataForm.pid = data.id
         this.dataForm.type = data.productType
+        this.productType = data.productType
         this.$refs.tableObj.query()
       }
     }

--
Gitblit v1.9.1