From 56b48f78fb89d8e1c42b352febdf33882d3f0333 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 九月 2023 17:01:06 +0800
Subject: [PATCH] #项目状态
---
src/main/webapp/static/js/order/order.js | 1 +
src/main/java/com/zy/crm/manager/entity/Order.java | 12 +++++++-----
src/main/java/com/zy/crm/manager/controller/OrderController.java | 2 +-
src/main/webapp/views/order/order.html | 8 ++++++++
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index 6d66486..51ddfb2 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -77,7 +77,7 @@
order.setCreateTime(new Date());
order.setUpdateBy(getUserId());
order.setUpdateTime(new Date());
- order.setStatus(1);
+ order.setStatus(0);
order.setStep(1);
orderService.insert(order);
diff --git a/src/main/java/com/zy/crm/manager/entity/Order.java b/src/main/java/com/zy/crm/manager/entity/Order.java
index 36c4605..2104193 100644
--- a/src/main/java/com/zy/crm/manager/entity/Order.java
+++ b/src/main/java/com/zy/crm/manager/entity/Order.java
@@ -138,9 +138,9 @@
private String files;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value= "椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}")
private Integer status;
/**
@@ -295,10 +295,12 @@
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
- case 1:
- return "姝ｅ父";
case 0:
- return "绂佺敤";
+ return "璺熻釜涓�";
+ case 1:
+ return "瀹屾垚";
+ case 2:
+ return "鍏抽棴";
default:
return String.valueOf(this.status);
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 9c2b829..f26a216 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -148,6 +148,7 @@
,{field: 'city', align: 'left',title: '甯�', hide: true}
,{field: 'district', align: 'left',title: '鍘�', hide: true}
,{field: 'town', align: 'left',title: '闀�', hide: true}
+ ,{field: 'status$', align: 'left',title: '鐘舵��'}
,{field: 'files', align: 'left',title: '闄勪欢', hide: true}
,{field: 'updateBy$', align: 'left',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index ca2c67f..d96c06c 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -152,6 +152,14 @@
</div>
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">椤圭洰鐘舵�� : </label>
+ <div class="layui-input-block">
+ <input type="radio" name="status" value="0" title="璺熻釜涓�"/>
+ <input type="radio" name="status" value="1" title="瀹屾垚"/>
+ <input type="radio" name="status" value="2" title="鍏抽棴"/>
+ </div>
+ </div>
</div>
<div class="layui-col-md6">
<div class="layui-form-item">
--
Gitblit v1.9.1