From b48383cfbab275b7b5c870549d11903908128a07 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 11 八月 2023 13:24:54 +0800
Subject: [PATCH] #核价功能完善
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 16 ++-
src/main/webapp/static/js/priOnline/priOnline.js | 4
src/main/java/com/zy/crm/manager/entity/PriQuote.java | 11 +-
src/main/webapp/views/priSales/priSales.html | 2
src/main/webapp/views/priQuoteBudget/priQuoteBudget.html | 2
src/main/webapp/views/priQuote/priQuote.html | 2
src/main/java/com/zy/crm/manager/controller/PriOnlineController.java | 26 ++----
src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js | 4
src/main/java/com/zy/crm/manager/controller/PriSalesController.java | 18 ++--
src/main/webapp/static/js/priQuote/priQuote.js | 4
src/main/java/com/zy/crm/manager/entity/PriOnline.java | 11 +-
src/main/java/com/zy/crm/manager/controller/PlanController.java | 25 ++++++
src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java | 18 ++--
src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java | 11 +-
src/main/java/com/zy/crm/manager/entity/Plan.java | 6 +
src/main/webapp/static/js/priSales/priSales.js | 4
src/main/java/com/zy/crm/manager/entity/PriSales.java | 20 +---
src/main/webapp/views/priOnline/priOnline.html | 8 +-
18 files changed, 109 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 9cd35c5..2e95f41 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -18,6 +18,7 @@
import com.zy.crm.common.utils.SetOfUtils;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
+import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.PlanFoll;
import com.zy.crm.manager.entity.PlanType;
@@ -514,6 +515,30 @@
return R.ok(result);
}
+ @RequestMapping(value = "/planQueryName/auth")
+ @ManagerAuth
+ public R queryName(String condition) {
+ EntityWrapper<Plan> wrapper = new EntityWrapper<>();
+ wrapper.like("name", condition);
+ Long id = getRole().getId();
+ if (id.equals(1L)) {
+ wrapper.eq("host_id", 1);
+ } else if (id.equals(2L)) {
+ wrapper.eq("dept_id", getDeptId());
+ } else {
+ wrapper.eq("user_id", getUserId());
+ }
+ Page<Plan> page = planService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Plan plan : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", plan.getId());
+ map.put("value", plan.getName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
@RequestMapping(value = "/plan/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java b/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
index 37dfe12..6f155f2 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
@@ -5,20 +5,14 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
-import com.zy.crm.manager.entity.Item;
-import com.zy.crm.manager.entity.Order;
-import com.zy.crm.manager.entity.Pri;
-import com.zy.crm.manager.entity.PriOnline;
-import com.zy.crm.manager.service.ItemService;
-import com.zy.crm.manager.service.OrderService;
-import com.zy.crm.manager.service.PriOnlineService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.service.PriService;
import com.zy.crm.system.entity.Role;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
@@ -41,7 +35,7 @@
private PriService priService;
@Autowired
- private OrderService orderService;
+ private PlanService planService;
@RequestMapping(value = "/priOnline/{id}/auth")
@ManagerAuth
@@ -137,13 +131,13 @@
priOnline.setStatus(0);
//涓氬姟鍛�
// Item item = itemService.selectById(priOnline.getItemId());
- Order order = orderService.selectById(priOnline.getItemId());
- priOnline.setMemberId(order.getUserId());
+ Plan plan = planService.selectById(priOnline.getItemId());
+ priOnline.setMemberId(plan.getUserId());
//璁剧疆椤圭洰娴佺▼
- order.setStep(2);
- orderService.updateById(order);
+ plan.setStep(2);
+ planService.updateById(plan);
priOnlineService.insert(priOnline);
return R.ok();
@@ -174,8 +168,8 @@
priOnline.setDeptId(getDeptId());
//涓氬姟鍛�
// Item item = itemService.selectById(priOnline.getItemId());
- Order order = orderService.selectById(priOnline.getItemId());
- priOnline.setMemberId(order.getUserId());
+ Plan plan = planService.selectById(priOnline.getItemId());
+ priOnline.setMemberId(plan.getUserId());
priOnlineService.insert(priOnline);
return R.ok();
@@ -312,7 +306,7 @@
for (PriOnline priOnline : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priOnline.getId());
- map.put("value", priOnline.getOrderNum() + "/" + priOnline.getOrderId$() + "/" + priOnline.getMemberId$());
+ map.put("value", priOnline.getOrderNum() + "/" + priOnline.getPlanId$() + "/" + priOnline.getMemberId$());
result.add(map);
}
return R.ok(result);
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
index e1e96c0..60f110d 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
@@ -13,9 +13,11 @@
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.Item;
+import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.PriQuoteBudget;
import com.zy.crm.manager.entity.PriSales;
import com.zy.crm.manager.service.ItemService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.manager.service.PriQuoteBudgetService;
import com.zy.crm.manager.service.PriSalesService;
import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -37,7 +39,7 @@
private PriQuoteBudgetService priQuoteBudgetService;
@Autowired
- private ItemService itemService;
+ private PlanService planService;
@Autowired
private PriSalesService priSalesService;
@@ -121,12 +123,12 @@
priQuoteBudget.setUpdateTime(new Date());
//涓氬姟鍛�
- Item item = itemService.selectById(priQuoteBudget.getItemId());
- priQuoteBudget.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priQuoteBudget.getItemId());
+ priQuoteBudget.setMemberId(plan.getUserId());
//璁剧疆椤圭洰娴佺▼
- item.setStep(4);
- itemService.updateById(item);
+ plan.setStep(4);
+ planService.updateById(plan);
priQuoteBudgetService.insert(priQuoteBudget);
return R.ok();
@@ -156,8 +158,8 @@
priQuoteBudget.setUpdateTime(new Date());
//涓氬姟鍛�
- Item item = itemService.selectById(priQuoteBudget.getItemId());
- priQuoteBudget.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priQuoteBudget.getItemId());
+ priQuoteBudget.setMemberId(plan.getUserId());
priQuoteBudgetService.insert(priQuoteBudget);
return R.ok();
@@ -223,7 +225,7 @@
for (PriQuoteBudget priQuoteBudget : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priQuoteBudget.getId());
- map.put("value", priQuoteBudget.getInOrderNum() + "/" + priQuoteBudget.getItemId$() + "/" + priQuoteBudget.getMemberId$());
+ map.put("value", priQuoteBudget.getInOrderNum() + "/" + priQuoteBudget.getPlanId$() + "/" + priQuoteBudget.getMemberId$());
result.add(map);
}
return R.ok(result);
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
index ff6b604..05c9a65 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -13,9 +13,11 @@
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.Item;
+import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.PriQuote;
import com.zy.crm.manager.entity.PriQuoteBudget;
import com.zy.crm.manager.service.ItemService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.manager.service.PriQuoteBudgetService;
import com.zy.crm.manager.service.PriQuoteService;
import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -37,7 +39,7 @@
private PriQuoteService priQuoteService;
@Autowired
- private ItemService itemService;
+ private PlanService planService;
@Autowired
private PriQuoteBudgetService priQuoteBudgetService;
@@ -120,12 +122,12 @@
priQuote.setUpdateTime(new Date());
//涓氬姟鍛�
- Item item = itemService.selectById(priQuote.getItemId());
- priQuote.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priQuote.getItemId());
+ priQuote.setMemberId(plan.getUserId());
//璁剧疆椤圭洰娴佺▼
- item.setStep(5);
- itemService.updateById(item);
+ plan.setStep(5);
+ planService.updateById(plan);
priQuoteService.insert(priQuote);
return R.ok();
@@ -155,8 +157,8 @@
priQuote.setUpdateTime(new Date());
//涓氬姟鍛�
- Item item = itemService.selectById(priQuote.getItemId());
- priQuote.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priQuote.getItemId());
+ priQuote.setMemberId(plan.getUserId());
priQuoteService.insert(priQuote);
return R.ok();
diff --git a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java b/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
index 3dc0bdc..0b5eccc 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
@@ -13,9 +13,11 @@
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.Item;
+import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.PriOnline;
import com.zy.crm.manager.entity.PriSales;
import com.zy.crm.manager.service.ItemService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.manager.service.PriOnlineService;
import com.zy.crm.manager.service.PriSalesService;
import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -40,7 +42,7 @@
private PriOnlineService priOnlineService;
@Autowired
- private ItemService itemService;
+ private PlanService planService;
@RequestMapping(value = "/priSales/{id}/auth")
@ManagerAuth
@@ -120,12 +122,12 @@
priSales.setDeptId(getDeptId());
//涓氬姟鍛�
- Item item = itemService.selectById(priSales.getItemId());
- priSales.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priSales.getItemId());
+ priSales.setMemberId(plan.getUserId());
//璁剧疆椤圭洰娴佺▼
- item.setStep(3);
- itemService.updateById(item);
+ plan.setStep(3);
+ planService.updateById(plan);
priSalesService.insert(priSales);
return R.ok();
@@ -155,8 +157,8 @@
priSales.setUpdateTime(new Date());
//涓氬姟鍛�
- Item item = itemService.selectById(priSales.getItemId());
- priSales.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priSales.getItemId());
+ priSales.setMemberId(plan.getUserId());
priSalesService.insert(priSales);
return R.ok();
@@ -222,7 +224,7 @@
for (PriSales priSales : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priSales.getId());
- map.put("value", priSales.getInOrderNum() + "/" + priSales.getItemId$() + "/" + priSales.getMemberId$());
+ map.put("value", priSales.getInOrderNum() + "/" + priSales.getPlanId$() + "/" + priSales.getMemberId$());
result.add(map);
}
return R.ok(result);
diff --git a/src/main/java/com/zy/crm/manager/entity/Plan.java b/src/main/java/com/zy/crm/manager/entity/Plan.java
index 5abbe6b..5a0398d 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -234,6 +234,12 @@
@ApiModelProperty(value= "娉ㄩ噴")
private String memo;
+ /**
+ * 椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}
+ */
+ @ApiModelProperty(value= "椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}")
+ private Integer step;
+
public Plan() {}
public String getHostId$(){
diff --git a/src/main/java/com/zy/crm/manager/entity/PriOnline.java b/src/main/java/com/zy/crm/manager/entity/PriOnline.java
index 45e4b45..f2c7c99 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriOnline.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.ItemService;
import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -138,11 +139,11 @@
// return null;
// }
- public String getOrderId$() {
- OrderService orderService = SpringUtils.getBean(OrderService.class);
- Order order = orderService.selectById(this.itemId);
- if (!Cools.isEmpty(order)){
- return String.valueOf(order.getName());
+ public String getPlanId$() {
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ if (!Cools.isEmpty(plan)){
+ return String.valueOf(plan.getUuid());
}
return null;
}
diff --git a/src/main/java/com/zy/crm/manager/entity/PriQuote.java b/src/main/java/com/zy/crm/manager/entity/PriQuote.java
index b379866..964d462 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriQuote.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriQuote.java
@@ -7,6 +7,7 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.ItemService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -101,11 +102,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getItemId$() {
- ItemService itemService = SpringUtils.getBean(ItemService.class);
- Item item = itemService.selectById(this.itemId);
- if (!Cools.isEmpty(item)){
- return String.valueOf(item.getName());
+ public String getPlanId$() {
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ if (!Cools.isEmpty(plan)){
+ return String.valueOf(plan.getUuid());
}
return null;
}
diff --git a/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java b/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java
index def7b25..c6cbb8d 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java
@@ -7,6 +7,7 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.ItemService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -105,11 +106,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getItemId$() {
- ItemService itemService = SpringUtils.getBean(ItemService.class);
- Item item = itemService.selectById(this.itemId);
- if (!Cools.isEmpty(item)){
- return String.valueOf(item.getName());
+ public String getPlanId$() {
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ if (!Cools.isEmpty(plan)){
+ return String.valueOf(plan.getUuid());
}
return null;
}
diff --git a/src/main/java/com/zy/crm/manager/entity/PriSales.java b/src/main/java/com/zy/crm/manager/entity/PriSales.java
index 95b618f..d548388 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriSales.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriSales.java
@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.ItemService;
import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -106,20 +107,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getItemId$() {
- ItemService itemService = SpringUtils.getBean(ItemService.class);
- Item item = itemService.selectById(this.itemId);
- if (!Cools.isEmpty(item)){
- return String.valueOf(item.getName());
- }
- return null;
- }
-
- public String getOrderId$() {
- OrderService orderService = SpringUtils.getBean(OrderService.class);
- Order order = orderService.selectById(this.itemId);
- if (!Cools.isEmpty(order)){
- return String.valueOf(order.getName());
+ public String getPlanId$() {
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ if (!Cools.isEmpty(plan)){
+ return String.valueOf(plan.getUuid());
}
return null;
}
diff --git a/src/main/webapp/static/js/priOnline/priOnline.js b/src/main/webapp/static/js/priOnline/priOnline.js
index 98d99ba..1a53bac 100644
--- a/src/main/webapp/static/js/priOnline/priOnline.js
+++ b/src/main/webapp/static/js/priOnline/priOnline.js
@@ -86,7 +86,7 @@
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80,hide: true}
,{field: 'templateName', align: 'center',title: '鏍镐环鍚�',hide: false}
,{field: 'orderNum', align: 'center',title: '鏍镐环鍗曞彿'}
- ,{field: 'orderId$', align: 'center',title: '椤圭洰鍚�'}
+ ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
@@ -394,7 +394,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
- content: 'priOnline_detail.html?item_id=' + data.field.itemId + "&pri_id=" + data.field.priId,
+ content: 'priOnline_detail.html?item_id=' + data.field.planId + "&pri_id=" + data.field.priId,
success: function(layero, index){
clearFormVal(layer.getChildFrame('#detail', index));
// layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
diff --git a/src/main/webapp/static/js/priQuote/priQuote.js b/src/main/webapp/static/js/priQuote/priQuote.js
index fbd3755..1b0e9ea 100644
--- a/src/main/webapp/static/js/priQuote/priQuote.js
+++ b/src/main/webapp/static/js/priQuote/priQuote.js
@@ -90,7 +90,7 @@
,{field: 'templateName', align: 'center',title: '妯℃澘鍚�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
,{field: 'orderNum', align: 'center',title: '鎶ヤ环棰勭畻鍗曞彿'}
,{field: 'inOrderNum', align: 'center',title: '鎶ヤ环缂栧彿'}
- ,{field: 'itemId$', align: 'center',title: '椤圭洰鍚�'}
+ ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�'}
@@ -460,7 +460,7 @@
traditional:true,
success: function (res) {
if (res.code === 200){
- $("#itemName").val(res.data.itemId$)
+ $("#planId").val(res.data.planId$)
$("#priSalesNum").val(res.data.orderNum)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
diff --git a/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js b/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
index c582cea..f4b2b90 100644
--- a/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
+++ b/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
@@ -86,7 +86,7 @@
,{field: 'templateName', align: 'center',title: '妯℃澘鍚�'}
,{field: 'orderNum', align: 'center',title: '浜у搧璐圭敤鏄庣粏鍗曞彿'}
,{field: 'inOrderNum', align: 'center',title: '棰勭畻缂栧彿'}
- ,{field: 'itemId$', align: 'center',title: '椤圭洰鍚�'}
+ ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�'}
@@ -442,7 +442,7 @@
success: function (res) {
console.log(res)
if (res.code === 200){
- $("#itemName").val(res.data.itemId$)
+ $("#planId").val(res.data.planId$)
$("#priOrderNum").val(res.data.orderNum)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
diff --git a/src/main/webapp/static/js/priSales/priSales.js b/src/main/webapp/static/js/priSales/priSales.js
index 6265666..4201b0c 100644
--- a/src/main/webapp/static/js/priSales/priSales.js
+++ b/src/main/webapp/static/js/priSales/priSales.js
@@ -86,7 +86,7 @@
,{field: 'templateName', align: 'center',title: '妯℃澘鍚�'}
,{field: 'orderNum', align: 'center',title: '鏍镐环璁㈠崟鍙�'}
,{field: 'inOrderNum', align: 'center',title: '鏄庣粏缂栧彿'}
- ,{field: 'itemId$', align: 'center',title: '椤圭洰鍚�'}
+ ,{field: 'planId$', align: 'center',title: '椤圭洰鍚�'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�'}
@@ -445,7 +445,7 @@
success: function (res) {
console.log(res)
if (res.code === 200){
- $("#itemName").val(res.data.itemId$)
+ $("#planId").val(res.data.planId$)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
diff --git a/src/main/webapp/views/priOnline/priOnline.html b/src/main/webapp/views/priOnline/priOnline.html
index cbface0..2ba4fbe 100644
--- a/src/main/webapp/views/priOnline/priOnline.html
+++ b/src/main/webapp/views/priOnline/priOnline.html
@@ -97,11 +97,11 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">椤圭洰鍚�: </label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none" lay-verify="required">
- <input id="orderId$" name="orderId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩悕" onfocus=this.blur()>
+ <input class="layui-input" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none" lay-verify="required">
+ <input id="planId$" name="planId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩悕" onfocus=this.blur()>
<div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="orderQueryNameBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="orderQueryNameBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="planQueryNameBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="planQueryNameBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
diff --git a/src/main/webapp/views/priQuote/priQuote.html b/src/main/webapp/views/priQuote/priQuote.html
index 9d3c6f1..25d5756 100644
--- a/src/main/webapp/views/priQuote/priQuote.html
+++ b/src/main/webapp/views/priQuote/priQuote.html
@@ -134,7 +134,7 @@
<div class="layui-form-item">
<label class="layui-form-label">椤圭洰鍚�: </label>
<div class="layui-input-block">
- <input class="layui-input" id="itemName" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
+ <input class="layui-input" id="planId" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
</div>
</div>
diff --git a/src/main/webapp/views/priQuoteBudget/priQuoteBudget.html b/src/main/webapp/views/priQuoteBudget/priQuoteBudget.html
index 1a7e11d..fd0c7b6 100644
--- a/src/main/webapp/views/priQuoteBudget/priQuoteBudget.html
+++ b/src/main/webapp/views/priQuoteBudget/priQuoteBudget.html
@@ -130,7 +130,7 @@
<div class="layui-form-item">
<label class="layui-form-label">椤圭洰鍚�: </label>
<div class="layui-input-block">
- <input class="layui-input" id="itemName" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
+ <input class="layui-input" id="planId" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
</div>
</div>
diff --git a/src/main/webapp/views/priSales/priSales.html b/src/main/webapp/views/priSales/priSales.html
index fdafe6b..ea98625 100644
--- a/src/main/webapp/views/priSales/priSales.html
+++ b/src/main/webapp/views/priSales/priSales.html
@@ -130,7 +130,7 @@
<div class="layui-form-item">
<label class="layui-form-label">椤圭洰鍚�: </label>
<div class="layui-input-block">
- <input class="layui-input" id="orderId$" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
+ <input class="layui-input" id="planId" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
</div>
</div>
--
Gitblit v1.9.1