From 2be17adffb5e055ed563ba73c928a5842c45a81e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 14:04:37 +0800
Subject: [PATCH] 属性对比
---
h5/pages/index/index.vue | 2 +-
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 5 ++++-
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 5 ++++-
company_admin/.env.development | 2 +-
company_admin/src/views/business/goods.vue | 2 +-
server/company/src/main/resources/application.yml | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/company_admin/.env.development b/company_admin/.env.development
index d53d032..f27a4ff 100644
--- a/company_admin/.env.development
+++ b/company_admin/.env.development
@@ -3,7 +3,7 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
-VUE_APP_API = 'http://192.168.0.15:10022/'
+VUE_APP_API = 'http://192.168.0.35:10022/'
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
diff --git a/company_admin/src/views/business/goods.vue b/company_admin/src/views/business/goods.vue
index ff3547d..d1d0c5a 100644
--- a/company_admin/src/views/business/goods.vue
+++ b/company_admin/src/views/business/goods.vue
@@ -68,7 +68,7 @@
<el-button type="primary" :loading="isWorking.export" @click="bulkOperation(0)">鎵归噺涓婃灦</el-button>
<el-button type="primary" :loading="isWorking.export" @click="bulkOperation(1)">鎵归噺涓嬫灦</el-button>
- <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:goods:delete']">鍒犻櫎</el-button></li> -->
+ <el-button style="background: red;border-color:red" type="primary" :loading="isWorking.export" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:goods:delete']">鎵归噺鍒犻櫎</el-button>
</ul>
<el-table
v-loading="isWorking.search"
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index 8a67013..19f0bfb 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -231,7 +231,7 @@
<view class="label">{{child.name}}锛�</view>
<view class="value">{{child.val}}</view>
</view>
- <view v-if="item.param2" class="paramline"></view>
+ <view v-if="item.param2.length>0" class="paramline"></view>
<view class="item" v-if="item.param2" v-for="(child, j) in item.param2" :key="child.index">
<view class="label">{{child.name}}锛�</view>
<view class="value">{{child.val}}</view>
diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index ac52ad2..6787c56 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index f6890ba..7a8c622 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -525,7 +525,10 @@
return;
}
String attrName = attr.substring(0,index);
- if(StringUtils.isBlank(attrName) || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О") || StringUtils.equals(attrName, "鍟嗗搧缂栧彿")){
+ if(StringUtils.isBlank(attrName)
+ || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О")
+ || StringUtils.equals(attrName, "鍟嗗搧缂栧彿")
+ || StringUtils.equals(attrName, "搴楅摵")){
return;
}
String val = attr.substring(index+1);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index 02cde3d..0f972e2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -401,7 +401,10 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- goodsMapper.deleteBatchIds(ids);
+ for(Integer id : ids){
+ deleteById(id);
+ }
+// goodsMapper.deleteBatchIds(ids);
}
@Override
--
Gitblit v1.9.3