From 9b55957f6a1f01941b0d4d5a6668f18a9d612e86 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 10:32:58 +0800
Subject: [PATCH] sf
---
platform/src/views/business/companyUser.vue | 16 ++++++++++++++--
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 4 ++--
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 2 ++
platform/.env.production | 2 +-
company_admin/.env.development | 12 +++---------
platform/.env.development | 4 +---
6 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/company_admin/.env.development b/company_admin/.env.development
index afbd247..3a826cf 100644
--- a/company_admin/.env.development
+++ b/company_admin/.env.development
@@ -1,15 +1,9 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
VUE_APP_CONTEXT_PATH = '/'
-# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
-
# VUE_APP_API = 'http://192.168.0.35:10022/'
-# VUE_APP_API = 'http://192.168.0.15:10022/'
-VUE_APP_API_PREFIX = '/preselect_web_interface'
-VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface'
-
-# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
-
VUE_APP_CONTEXT_PATH = '/preselect_web'
VUE_APP_API_PREFIX = '/preselect_web_interface'
-VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface'
\ No newline at end of file
+#VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface'
+
+VUE_APP_API = 'https://yx.ahapp.net/web_interface_v2/'
diff --git a/platform/.env.development b/platform/.env.development
index 0b72619..cc27d3a 100644
--- a/platform/.env.development
+++ b/platform/.env.development
@@ -9,7 +9,5 @@
# 鐒︽澗
#VUE_APP_API = 'http://192.168.0.36:10023'
# 姹熻悕
-VUE_APP_API = 'http://192.168.0.35:10023'
+VUE_APP_API = 'http://localhost:10023'
-# #娴嬭瘯鏈嶅姟鍣�
-VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
diff --git a/platform/.env.production b/platform/.env.production
index 0693cdc..2d7318e 100644
--- a/platform/.env.production
+++ b/platform/.env.production
@@ -8,4 +8,4 @@
# http://yx.ahapp.net/admin_interface/doc.html
# VUE_APP_API = 'https://yx.ahapp.net/admin_interface'
-VUE_APP_API = 'https://127.0.0.1:10023/
\ No newline at end of file
+VUE_APP_API = 'https://127.0.0.1:10023/
diff --git a/platform/src/views/business/companyUser.vue b/platform/src/views/business/companyUser.vue
index a0b541d..a0c60a9 100644
--- a/platform/src/views/business/companyUser.vue
+++ b/platform/src/views/business/companyUser.vue
@@ -48,11 +48,22 @@
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="140px" align="center"></el-table-column>
+ <el-table-column
+ v-permissions="['system:user:resetPwd']"
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.resetPwdWindow.open(row)" v-permissions="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-button>
+ </template>
+ </el-table-column>
</el-table>
+
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
-
+ <ResetPwdWindow ref="resetPwdWindow"/>
</TableLayout>
</template>
@@ -61,10 +72,11 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { updateById } from '@/api/system/user'
+import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
export default {
name: 'Company',
extends: BaseTable,
- components: { TableLayout, Pagination },
+ components: { TableLayout, Pagination, ResetPwdWindow},
data() {
return {
oepnValidDate: [],
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 00d40f0..e503e33 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -14,8 +14,8 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-@Component
-@EnableScheduling
+//@Component
+//@EnableScheduling
public class ScheduleTool {
@Autowired
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 ce663b5..fc4b844 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
@@ -379,6 +379,7 @@
if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){
for (int i = 0; i < goodsParamList.size(); i++) {
GoodsParam goodsParam = goodsParamList.get(i);
+ goodsParam.setId(null);
goodsParam.setCreator(user.getId());
goodsParam.setCreateDate(new Date());
goodsParam.setIsdeleted(Constants.ZERO);
@@ -508,6 +509,7 @@
if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){
for (int i = 0; i < goodsParamList.size(); i++) {
GoodsParam goodsParam = goodsParamList.get(i);
+ goodsParam.setId(null);
goodsParam.setCreator(user.getId());
goodsParam.setCreateDate(new Date());
goodsParam.setIsdeleted(Constants.ZERO);
--
Gitblit v1.9.3