From bc09bc87234065abe7130b84c92f81f143f5f3e7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 16:25:06 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 1 +
admin/src/components/business/OperaJkCustomerImportWindow.vue | 1 +
admin/src/components/business/OperaCategoryJkLineWindow.vue | 1 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java | 3 +++
4 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/admin/src/components/business/OperaCategoryJkLineWindow.vue b/admin/src/components/business/OperaCategoryJkLineWindow.vue
index f4f4cdb..d2b2680 100644
--- a/admin/src/components/business/OperaCategoryJkLineWindow.vue
+++ b/admin/src/components/business/OperaCategoryJkLineWindow.vue
@@ -25,6 +25,7 @@
return {
// 琛ㄥ崟鏁版嵁
form: {
+ id:null,
name: '',
type: 4,
sortnum: null,
diff --git a/admin/src/components/business/OperaJkCustomerImportWindow.vue b/admin/src/components/business/OperaJkCustomerImportWindow.vue
index 1da3322..da46999 100644
--- a/admin/src/components/business/OperaJkCustomerImportWindow.vue
+++ b/admin/src/components/business/OperaJkCustomerImportWindow.vue
@@ -10,6 +10,7 @@
>
<p class="tip-warn"><i class="el-icon-warning"></i>瀵煎叆璇存槑锛�<br>
1.璇峰厛涓嬭浇鏂囦欢妯℃澘锛屽苟鎸夌収妯℃澘瑕佸幓濉啓琛ㄦ牸鍐呭;<br>
+ 2.寤鸿姣忔瀵煎叆鏁版嵁閲忎笉澶т簬3000锛屽彲閲囧彇鍒嗘壒瀵煎叆;<br>
</p>
<el-form class="demo-form-inline" >
<el-form-item label="瀹㈡埛淇℃伅" required>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
index 792e207..c0220a8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
@@ -61,6 +61,9 @@
@ApiModelProperty(value = "褰撳墠绾胯矾鏁�", example = "1")
//@ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
private Integer lineNum;
+ @ApiModelProperty(value = "鏈�鏂颁紭鍖栫嚎璺暟", example = "1")
+ //@ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
+ private Integer planLineNum;
@ApiModelProperty(value = "閫佽揣閲�", example = "1")
@ExcelColumn(name="閫佽揣閲忥紙鏉★級",index = 4,width = 10)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
index f957eef..d3c1ca2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
@@ -366,6 +366,7 @@
}else{
tModel = new JkSketch();
tModel.setLineNum(getLineNumByOrders(orders.getCategoryId(),newOrderList));
+ tModel.setPlanLineNum(tModel.getLineNum());
tModel.setCreator(orders.getCreator());
tModel.setCreateDate(orders.getCreateDate());
tModel.setCategoryId(orders.getCategoryId());
--
Gitblit v1.9.3