diff --git a/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmReceiptController.java b/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmReceiptController.java
index 6aee369..5fd5a34 100644
--- a/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmReceiptController.java
+++ b/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmReceiptController.java
@@ -1,6 +1,8 @@
package com.ruoyi.crm.controller;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.UUID;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.crm.domain.CrmReceipt;
@@ -78,6 +80,7 @@ public class CrmReceiptController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody CrmReceipt crmReceipt)
{
+ crmReceipt.setReceiptCode("HK_"+ UUID.randomUUID().toString().replace("-","").substring(0,6));
return toAjax(crmReceiptService.insertCrmReceipt(crmReceipt));
}
diff --git a/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmReceiveController.java b/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmReceiveController.java
index dc66c94..c6531fa 100644
--- a/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmReceiveController.java
+++ b/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmReceiveController.java
@@ -1,6 +1,7 @@
package com.ruoyi.crm.controller;
import java.util.List;
+import java.util.UUID;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.crm.domain.CrmOrder;
@@ -80,6 +81,7 @@ public class CrmReceiveController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody CrmReceive crmReceive)
{
+ crmReceive.setReceiveCode("YS_"+UUID.randomUUID().toString().replace("-","").substring(0,6));
return toAjax(crmReceiveService.insertCrmReceive(crmReceive));
}
diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html
index 59fe39c..03e4ae4 100644
--- a/ruoyi-ui/public/index.html
+++ b/ruoyi-ui/public/index.html
@@ -8,7 +8,7 @@
name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
/>
-
+
<%= webpackConfig.name %>
-
+
-
+
-
-
+
+
{{ parseTime(scope.row.receiveDate, '{y}-{m}-{d}') }}
-
+
-
+
@@ -261,9 +261,9 @@
>
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -273,26 +322,32 @@ import 'echarts/lib/chart/map';
// 引入js
import "echarts/map/js/china.js";
import {indexData, infoDate, infoTop, infoTotalTop} from "../api/crm";
-// import {customerList} from "@/api/crm/order";
+import {customerList} from "@/api/crm/order";
+import {getCustomer, listPersonCustomers} from "../api/crm/customer";
+import {addPlan, updatePlan} from "../api/crm/plan";
+import {addRecord, updateRecord} from "../api/crm/record";
export default {
-
+ dicts: ['follow_up_type'],
components: {
PanelGroup,
// WeekCalendar
ElCard: Card,
ElCalendar: Calendar,
-
},
data() {
return {
+ customerList:[],
// 表单参数
form: {},
// 是否显示弹出层
open: false,
customerData: {},
followupData: {},
- todayFollowupList: [],
+ todayFollowupList: [
+
+
+ ],
todayUpdates: [],
topPeople: [],
totalAmount: '',
@@ -306,9 +361,24 @@ export default {
this.initData();
this.initTop();
this.totalTop();
+ this.getPersonCustomerList();
// this.initMap();
},
methods: {
+ //回显客户编号
+ doChangeCustomerNumber(){
+ getCustomer(this.form.customerId).then(response => {
+ this.form.customerNumber = response.data.code
+ });
+ },
+ /** 查询客户列表 */
+ getPersonCustomerList () {
+ this.loading = true
+ listPersonCustomers().then((response) => {
+ this.customerList = response.data;
+ this.loading = false
+ })
+ },
/** 查询订单的客户列表 */
getPersonOrderList () {
this.loading = true
@@ -347,7 +417,26 @@ export default {
this.todayUpdates = response.data.today_updates;
})
},
-
+ /** 提交按钮 */
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.id != null) {
+ updateRecord(this.form).then(response => {
+ this.$modal.msgSuccess("修改成功");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addRecord(this.form).then(response => {
+ this.$modal.msgSuccess("新增成功");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
// initMap() {
// let myChart = ECharts.init(this.$refs.echarts1);
// let option = {
@@ -502,7 +591,7 @@ export default {
indexData().then((response) => {
this.customerData = response.data.customer_info;
this.followupData = response.data.followup_info;
- this.todayFollowupList = response.data.today_followup_list;
+ // this.todayFollowupList = response.data.today_followup_list;
// this.todayUpdates = response.data.today_updates;
})
},
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 0d168ab..dc0a67c 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -2,7 +2,7 @@