From 68e3dd308664ec032d8bce246d8408cbcdc5e7ff Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 15 May 2024 15:22:34 +0800
Subject: [PATCH] '1111'
---
ABAP_AS_WITH_POOL.jcoDestination | 2 +-
.../customer/CustomerController.java | 12 +
.../customer/service/ICustomerService.java | 7 +
.../service/impl/CustomerServiceImpl.java | 10 +
ruoyi-ui/package.json | 1 +
ruoyi-ui/src/api/customer/customer.js | 13 +
ruoyi-ui/src/main.js | 5 +
.../src/views/customer/customer/index.vue | 21 +-
ruoyi-ui/src/views/redBook/productSelect.vue | 304 +++++++++---------
ruoyi-ui/src/views/redBook/quots.vue | 18 +-
10 files changed, 230 insertions(+), 163 deletions(-)
diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
index 6316cd3..cc7ac88 100644
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@@ -1,5 +1,5 @@
#for tests only !
-#Tue May 07 17:18:59 CST 2024
+#Wed May 15 15:21:44 CST 2024
jco.destination.pool_capacity=10
jco.client.lang=ZH
jco.client.ashost=172.19.0.120
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
index b8bb14a..d13de6d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
@@ -6,6 +6,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.constant.WebsocketConst;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.UUID;
@@ -92,6 +93,17 @@ public class CustomerController extends BaseController
util.exportExcel(response, list, "客户管理数据");
}
+ /**
+ * 状态修改
+ */
+ @PreAuthorize("@ss.hasPermi('customer:customer:list')")
+ @Log(title = "客户状态修改", businessType = BusinessType.UPDATE)
+ @PutMapping("/changCusStatus")
+ public AjaxResult changCusStatus(@RequestBody Customer customer)
+ {
+ return toAjax(customerService.changCusStatus(customer));
+ }
+
/**
* 获取客户管理详细信息
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/service/ICustomerService.java b/ruoyi-system/src/main/java/com/ruoyi/customer/service/ICustomerService.java
index 78ca274..84d5842 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/customer/service/ICustomerService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/customer/service/ICustomerService.java
@@ -58,4 +58,11 @@ public interface ICustomerService
* @return 结果
*/
public int deleteCustomerByCusId(String cusId);
+
+ /**
+ * 状态修改
+ * @param customer
+ * @return
+ */
+ int changCusStatus(Customer customer);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java
index fe40f69..9e7ef47 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java
@@ -112,6 +112,16 @@ public class CustomerServiceImpl implements ICustomerService
return customerMapper.deleteCustomerByCusId(cusId);
}
+ /**
+ * 状态修改
+ * @param customer
+ * @return
+ */
+ @Override
+ public int changCusStatus(Customer customer) {
+ return customerMapper.updateCustomer(customer);
+ }
+
/**
* 新增银行信息
*
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 95d0ed2..610200f 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -55,6 +55,7 @@
"quill": "1.3.7",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
+ "splitpanes": "^2.4.1",
"vant": "^2.13.2",
"vue": "2.6.12",
"vue-count-to": "1.0.13",
diff --git a/ruoyi-ui/src/api/customer/customer.js b/ruoyi-ui/src/api/customer/customer.js
index 8e3282e..13537a5 100644
--- a/ruoyi-ui/src/api/customer/customer.js
+++ b/ruoyi-ui/src/api/customer/customer.js
@@ -17,6 +17,19 @@ export function getCustomer(cusId) {
})
}
+// 客户状态修改
+export function changCusStatus(cusId, cusState) {
+ const data = {
+ cusId,
+ cusState
+ }
+ return request({
+ url: '/customer/customer/changCusStatus',
+ method: 'put',
+ data: data
+ })
+}
+
// 新增客户管理
export function addCustomer(data) {
return request({
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index a5042c5..06cf2eb 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -19,6 +19,9 @@ import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import { Splitpanes, Pane } from 'splitpanes'
+import 'splitpanes/dist/splitpanes.css'
+
// 分页组件
import Pagination from "@/components/Pagination";
// 自定义表格工具组件
@@ -60,6 +63,8 @@ Vue.component('Editor', Editor)
Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload)
Vue.component('ImagePreview', ImagePreview)
+Vue.component('Splitpanes', Splitpanes)
+Vue.component('Pane', Pane)
Vue.use(directive)
Vue.use(plugins)
diff --git a/ruoyi-ui/src/views/customer/customer/index.vue b/ruoyi-ui/src/views/customer/customer/index.vue
index d6fcacb..7578b81 100644
--- a/ruoyi-ui/src/views/customer/customer/index.vue
+++ b/ruoyi-ui/src/views/customer/customer/index.vue
@@ -131,7 +131,13 @@
-
+
@@ -544,7 +550,7 @@
}