From 976882dc2122eb1a12ad175416b41704e1a22a99 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 10 一月 2022 08:26:03 +0800
Subject: [PATCH] 代码更新

---
 src/main/java/zy/cloud/wms/manager/service/FlowStatusService.java          |    8 
 src/main/java/zy/cloud/wms/manager/mapper/FlowStatusMapper.java            |   12 
 src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java    |  123 +++++
 src/main/webapp/static/js/cstmr/cstmr.js                                   |    5 
 src/main/webapp/views/item/item.html                                       |   62 +-
 src/main/java/zy/cloud/wms/manager/entity/Cstmr.java                       |   20 
 src/main/webapp/static/js/flowStatus/flowStatus.js                         |  245 +++++++++++
 src/main/webapp/views/flowStatus/flowStatus.html                           |  106 ++++
 src/main/java/zy/cloud/wms/manager/entity/Item.java                        |   40 +
 src/main/resources/mapper/FlowStatusMapper.xml                             |   17 
 src/main/java/zy/cloud/wms/common/CodeBuilder.java                         |    4 
 /dev/null                                                                  |  430 -------------------
 src/main/webapp/views/cstmr/cstmr.html                                     |   21 
 src/main/java/zy/cloud/wms/manager/service/impl/FlowStatusServiceImpl.java |   12 
 src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java                  |  132 ++++++
 src/main/java/flowStatus.sql                                               |   18 
 src/main/resources/application.yml                                         |    2 
 src/main/webapp/static/js/item/item.js                                     |   37 +
 18 files changed, 779 insertions(+), 515 deletions(-)

diff --git a/src/main/java/flowStatus.sql b/src/main/java/flowStatus.sql
new file mode 100644
index 0000000..ad5964f
--- /dev/null
+++ b/src/main/java/flowStatus.sql
@@ -0,0 +1,18 @@
+-- save flowStatus record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'flowStatus/flowStatus.html', 'flowStatus绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'flowStatus#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'flowStatus#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'flowStatus#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'flowStatus#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'flowStatus#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'flowStatus/flowStatus.html', N'flowStatus绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'flowStatus#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'flowStatus#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'flowStatus#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'flowStatus#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'flowStatus#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/item.sql b/src/main/java/item.sql
deleted file mode 100644
index 4028a37..0000000
--- a/src/main/java/item.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save item record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'item/item.html', 'item绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'item#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'item#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'item#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'item#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'item#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'item/item.html', N'item绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'item#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'item#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'item#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'item#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'item#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/itemDetl.sql b/src/main/java/itemDetl.sql
deleted file mode 100644
index 7cbdfc3..0000000
--- a/src/main/java/itemDetl.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save itemDetl record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'itemDetl/itemDetl.html', 'itemDetl绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'itemDetl#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'itemDetl#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'itemDetl#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'itemDetl#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'itemDetl#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'itemDetl/itemDetl.html', N'itemDetl绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'itemDetl#view', N'鏌ヨ', '30527', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'itemDetl#btn-add', N'鏂板', '30527', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'itemDetl#btn-edit', N'缂栬緫', '30527', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'itemDetl#btn-delete', N'鍒犻櫎', '30527', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'itemDetl#btn-export', N'瀵煎嚭', '30527', '3', '4', '1');
diff --git a/src/main/java/receiveDetl.sql b/src/main/java/receiveDetl.sql
deleted file mode 100644
index a8f219d..0000000
--- a/src/main/java/receiveDetl.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save receiveDetl record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'receiveDetl/receiveDetl.html', 'receiveDetl绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'receiveDetl#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'receiveDetl#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'receiveDetl#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'receiveDetl#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'receiveDetl#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'receiveDetl/receiveDetl.html', N'receiveDetl绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'receiveDetl#view', N'鏌ヨ', '30533', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'receiveDetl#btn-add', N'鏂板', '30533', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'receiveDetl#btn-edit', N'缂栬緫', '30533', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'receiveDetl#btn-delete', N'鍒犻櫎', '30533', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'receiveDetl#btn-export', N'瀵煎嚭', '30533', '3', '4', '1');
diff --git a/src/main/java/zy/cloud/wms/common/CodeBuilder.java b/src/main/java/zy/cloud/wms/common/CodeBuilder.java
index 8ae6b79..e14e0c2 100644
--- a/src/main/java/zy/cloud/wms/common/CodeBuilder.java
+++ b/src/main/java/zy/cloud/wms/common/CodeBuilder.java
@@ -20,10 +20,10 @@
 //        generator.password="xltys1995";
 //        generator.table="sys_host";
         // sqlserver
-        generator.url="localhost:1433;databasename=wms_saas";
+        generator.url="localhost:1433;databasename=zypms";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="man_receive_detl";
+        generator.table="sys_flow_status";
         generator.packagePath="zy.cloud.wms.manager";
         generator.sqlOsType = SqlOsType.SQL_SERVER;
 //        generator.js = false;
diff --git a/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java b/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java
new file mode 100644
index 0000000..bf75dc8
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java
@@ -0,0 +1,123 @@
+package zy.cloud.wms.manager.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.FlowStatus;
+import zy.cloud.wms.manager.service.FlowStatusService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import zy.cloud.wms.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class FlowStatusController extends BaseController {
+
+    @Autowired
+    private FlowStatusService flowStatusService;
+
+    @RequestMapping(value = "/flowStatus/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(flowStatusService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/flowStatus/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(flowStatusService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    private void convert(Map<String, Object> map, EntityWrapper wrapper){
+        for (Map.Entry<String, Object> entry : map.entrySet()){
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
+    @RequestMapping(value = "/flowStatus/add/auth")
+    @ManagerAuth
+    public R add(FlowStatus flowStatus) {
+        flowStatusService.insert(flowStatus);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/flowStatus/update/auth")
+	@ManagerAuth
+    public R update(FlowStatus flowStatus){
+        if (Cools.isEmpty(flowStatus) || null==flowStatus.getId()){
+            return R.error();
+        }
+        flowStatusService.updateById(flowStatus);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/flowStatus/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            flowStatusService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/flowStatus/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("flowStatus"));
+        convert(map, wrapper);
+        List<FlowStatus> list = flowStatusService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/flowStatusQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<FlowStatus> page = flowStatusService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (FlowStatus flowStatus : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", flowStatus.getId());
+            map.put("value", flowStatus.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/flowStatus/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<FlowStatus> wrapper = new EntityWrapper<FlowStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != flowStatusService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(FlowStatus.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Cstmr.java b/src/main/java/zy/cloud/wms/manager/entity/Cstmr.java
index 3454f0b..977c23a 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Cstmr.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Cstmr.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import zy.cloud.wms.system.entity.Host;
 import zy.cloud.wms.system.entity.User;
 import zy.cloud.wms.system.service.HostService;
@@ -16,6 +17,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Data
 @TableName("man_cstmr")
 public class Cstmr implements Serializable {
 
@@ -105,22 +107,12 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @TableField("user_code")
+    private String userCode;
+
     public Cstmr() {}
 
-    public Cstmr(Long hostId, String uuid,String name,String contacts,String tel,String addr,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
-        this.hostId = hostId;
-        this.uuid = uuid;
-        this.name = name;
-        this.contacts = contacts;
-        this.tel = tel;
-        this.addr = addr;
-        this.status = status;
-        this.createBy = createBy;
-        this.createTime = createTime;
-        this.updateBy = updateBy;
-        this.updateTime = updateTime;
-        this.memo = memo;
-    }
+
 
 //    Cstmr cstmr = new Cstmr(
 //            null,    // 瀹㈡埛缂栧彿[闈炵┖]
diff --git a/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java b/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
new file mode 100644
index 0000000..18f2f6e
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
@@ -0,0 +1,132 @@
+package zy.cloud.wms.manager.entity;
+
+import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@TableName("sys_flow_status")
+public class FlowStatus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 鍞竴id
+     */
+    @ApiModelProperty(value= "鍞竴id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 鑺傜偣绫诲瀷
+     */
+    @ApiModelProperty(value= "鑺傜偣绫诲瀷")
+    private Integer type;
+
+    /**
+     * 鑺傜偣鍚嶇О
+     */
+    @ApiModelProperty(value= "鑺傜偣鍚嶇О")
+    private String name;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
+
+    @ApiModelProperty(value= "")
+    private String str1;
+
+    @ApiModelProperty(value= "")
+    private String str2;
+
+    @ApiModelProperty(value= "")
+    private String str3;
+
+    public FlowStatus() {}
+
+    public FlowStatus(Integer type,String name,String memo,String str1,String str2,String str3) {
+        this.type = type;
+        this.name = name;
+        this.memo = memo;
+        this.str1 = str1;
+        this.str2 = str2;
+        this.str3 = str3;
+    }
+
+//    FlowStatus flowStatus = new FlowStatus(
+//            null,    // 鑺傜偣绫诲瀷
+//            null,    // 鑺傜偣鍚嶇О
+//            null,    // 澶囨敞
+//            null,    // 
+//            null,    // 
+//            null    // 
+//    );
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public String getStr1() {
+        return str1;
+    }
+
+    public void setStr1(String str1) {
+        this.str1 = str1;
+    }
+
+    public String getStr2() {
+        return str2;
+    }
+
+    public void setStr2(String str2) {
+        this.str2 = str2;
+    }
+
+    public String getStr3() {
+        return str3;
+    }
+
+    public void setStr3(String str3) {
+        this.str3 = str3;
+    }
+
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index c5fcfa6..84ade5b 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import zy.cloud.wms.system.entity.Host;
 import zy.cloud.wms.system.entity.User;
@@ -17,6 +18,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Data
 @TableName("man_item")
 public class Item implements Serializable {
 
@@ -139,25 +141,29 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @TableField("type")
+    private String type;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("real_start_time")
+    private Date realStartTime;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("real_end_time")
+    private Date realEndTime;
+
+    @TableField("real_month")
+    private Integer realMonth;
+
+    @TableField("duty_department")
+    private String dutyDepartment;
+
+    @TableField("duty_man")
+    private String dutyMan;
+
     public Item() {}
 
-    public Item(Long hostId, String uuid,String name,String inUuid,String cstmrUuid,String cstmr,String member,String leader,Date startTime,Date endTime,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
-        this.hostId = hostId;
-        this.name = name;
-        this.inUuid = inUuid;
-        this.cstmrUuid = cstmrUuid;
-        this.cstmr = cstmr;
-        this.member = member;
-        this.leader = leader;
-        this.startTime = startTime;
-        this.endTime = endTime;
-        this.status = status;
-        this.createBy = createBy;
-        this.createTime = createTime;
-        this.updateBy = updateBy;
-        this.updateTime = updateTime;
-        this.memo = memo;
-    }
+
 
 //    Item item = new Item(
 //            null,    // 椤圭洰缂栧彿[闈炵┖]
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/FlowStatusMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/FlowStatusMapper.java
new file mode 100644
index 0000000..f5b3932
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/mapper/FlowStatusMapper.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.mapper;
+
+import zy.cloud.wms.manager.entity.FlowStatus;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface FlowStatusMapper extends BaseMapper<FlowStatus> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/FlowStatusService.java b/src/main/java/zy/cloud/wms/manager/service/FlowStatusService.java
new file mode 100644
index 0000000..5de1af5
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/FlowStatusService.java
@@ -0,0 +1,8 @@
+package zy.cloud.wms.manager.service;
+
+import zy.cloud.wms.manager.entity.FlowStatus;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface FlowStatusService extends IService<FlowStatus> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/FlowStatusServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/FlowStatusServiceImpl.java
new file mode 100644
index 0000000..2ab6f69
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/FlowStatusServiceImpl.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.service.impl;
+
+import zy.cloud.wms.manager.mapper.FlowStatusMapper;
+import zy.cloud.wms.manager.entity.FlowStatus;
+import zy.cloud.wms.manager.service.FlowStatusService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("flowStatusService")
+public class FlowStatusServiceImpl extends ServiceImpl<FlowStatusMapper, FlowStatus> implements FlowStatusService {
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9d82566..2c13c95 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
 #    password: xltys1995
     # sql-server
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;databasename=wms_saas
+    url: jdbc:sqlserver://localhost:1433;databasename=zypms
     username: sa
     password: sa@123
   mvc:
diff --git a/src/main/resources/mapper/FlowStatusMapper.xml b/src/main/resources/mapper/FlowStatusMapper.xml
new file mode 100644
index 0000000..48a6ab1
--- /dev/null
+++ b/src/main/resources/mapper/FlowStatusMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="zy.cloud.wms.manager.mapper.FlowStatusMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.FlowStatus">
+        <id column="id" property="id" />
+        <result column="type" property="type" />
+        <result column="name" property="name" />
+        <result column="memo" property="memo" />
+        <result column="str1" property="str1" />
+        <result column="str2" property="str2" />
+        <result column="str3" property="str3" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index b64dc24..75ecfbb 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -23,6 +23,7 @@
             {type: 'checkbox'}
             // ,{field: 'id', align: 'center',title: 'ID'}
             // ,{field: 'uuid', align: 'center',title: '瀹㈡埛缂栧彿'}
+            ,{field: 'userCode', align: "center", title: '瀹㈡埛浠ｇ爜'}
             ,{field: 'name', align: 'center',title: '瀹㈡埛鍚嶇О'}
             ,{field: 'contacts', align: 'center',title: '鑱旂郴浜�'}
             ,{field: 'tel', align: 'center',title: '鑱旂郴鐢佃瘽'}
@@ -30,8 +31,8 @@
             // ,{field: 'status$', align: 'center',title: '鐘舵��'}
             // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
             // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-            ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
-            ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+            // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+            // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
diff --git a/src/main/webapp/static/js/flowStatus/flowStatus.js b/src/main/webapp/static/js/flowStatus/flowStatus.js
new file mode 100644
index 0000000..7853818
--- /dev/null
+++ b/src/main/webapp/static/js/flowStatus/flowStatus.js
@@ -0,0 +1,245 @@
+var pageCurr;
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#flowStatus',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/flowStatus/list/auth',
+        page: true,
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        cols: [[
+            {type: 'checkbox'}
+            ,{field: 'id', align: 'center',title: '鍞竴id'}
+            ,{field: 'type', align: 'center',title: '鑺傜偣绫诲瀷'}
+            ,{field: 'name', align: 'center',title: '鑺傜偣鍚嶇О'}
+            ,{field: 'memo', align: 'center',title: '澶囨敞'}
+            ,{field: 'str1', align: 'center',title: ''}
+            ,{field: 'str2', align: 'center',title: ''}
+            ,{field: 'str3', align: 'center',title: ''}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(flowStatus)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(flowStatus)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               var ids = checkStatus.map(function (d) {
+                   return d.id;
+               });
+               del(ids);
+               break;
+            case 'exportData':
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'flowStatus': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/flowStatus/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(flowStatus)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                var ids = [data.id];
+                del(ids);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender();
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/flowStatus/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/flowStatus/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender() {
+    
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index c79fb00..ee2c360 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -21,22 +21,28 @@
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
-            ,{field: 'id', align: 'center',title: 'ID'}
-            ,{field: 'hostId', align: 'center',title: ''}
+            // ,{field: 'id', align: 'center',title: 'ID'}
+            // ,{field: 'hostId', align: 'center',title: ''}
             ,{field: 'uuid', align: 'center',title: '椤圭洰缂栧彿'}
             ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
-            ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿'}
-            ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
+            // ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿'}
+            // ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
             ,{field: 'cstmr', align: 'center',title: '瀹㈡埛'}
-            ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
-            ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
+            // ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
+            // ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
             ,{field: 'startTime$', align: 'center',title: '寮�濮嬫椂闂�'}
+            ,{field: 'realStartTime', align: 'center', title: '鐪熷疄寮�濮嬫椂闂�'}
             ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
-            ,{field: 'status$', align: 'center',title: '鐘舵��'}
-            ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
-            ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-            ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
-            ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+            ,{field: 'realEndTime', align: 'center', title: '鐪熷疄缁撴潫鏃堕棿'}
+            ,{field: 'type', align: 'center', title: '椤圭洰绫诲瀷'}
+            ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
+            ,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
+            ,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
+            // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+            // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+            // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+            // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+            // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
@@ -248,7 +254,14 @@
         elem: '#updateTime\\$',
         type: 'datetime'
     });
-
+    layDate.render({
+        elem: '#realStartTime\\$'
+        ,type: 'datetime'
+    });
+    layDate.render({
+        elem: '#realEndTime\\$'
+        ,type: 'datetime'
+    });
     }
     layDateRender();
 
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 2768018..cd5cc6e 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -63,6 +63,14 @@
         <div class="layui-row">
             <div class="layui-col-md6">
                 <div class="layui-form-item">
+                    <label class="layui-form-label">
+                        瀹㈡埛浠ｅ彿:
+                    </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="userCode" placeholder="璇疯緭鍏ュ鎴蜂唬鍙�(鑻辨枃)">
+                    </div>
+                </div>
+                <div class="layui-form-item">
                     <label class="layui-form-label">瀹㈡埛鍚嶇О: </label>
                     <div class="layui-input-block">
                         <input class="layui-input" name="name" placeholder="璇疯緭鍏ュ鎴峰悕绉�">
@@ -74,12 +82,7 @@
                         <input class="layui-input" name="contacts" placeholder="璇疯緭鍏ヨ仈绯讳汉">
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">鑱旂郴鐢佃瘽: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="tel" placeholder="璇疯緭鍏ヨ仈绯荤數璇�">
-                    </div>
-                </div>
+
              </div>
             <div class="layui-col-md6">
                 <div class="layui-form-item">
@@ -94,6 +97,12 @@
                         <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鑱旂郴鐢佃瘽: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="tel" placeholder="璇疯緭鍏ヨ仈绯荤數璇�">
+                    </div>
+                </div>
             </div>
         </div>
         <hr class="layui-bg-gray">
diff --git a/src/main/webapp/views/flowStatus/flowStatus.html b/src/main/webapp/views/flowStatus/flowStatus.html
new file mode 100644
index 0000000..7c5a711
--- /dev/null
+++ b/src/main/webapp/views/flowStatus/flowStatus.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+        </div>
+    </div>
+    <!-- 寰呮坊鍔� -->
+    <div id="data-search-btn" class="layui-btn-container layui-form-item">
+        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+    </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+    <table class="layui-hide" id="flowStatus" lay-filter="flowStatus"></table>
+</div>
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+    </div>
+</script>
+
+<script type="text/html" id="operate">
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/flowStatus/flowStatus.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <form id="detail" lay-filter="detail" class="layui-form admin-form">
+        <input name="id" type="hidden">
+        <div class="layui-row">
+            <div class="layui-col-md12">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鑺傜偣绫诲瀷: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="type" placeholder="璇疯緭鍏ヨ妭鐐圭被鍨�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鑺傜偣鍚嶇О: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="name" placeholder="璇疯緭鍏ヨ妭鐐瑰悕绉�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">澶囨敞: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="str1" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="str2" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="str3" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+
+             </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 01ce03e..18ff943 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -87,27 +87,27 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">椤圭洰鎴愬憳: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="member" placeholder="璇疯緭鍏ラ」鐩垚鍛�">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">椤圭洰缁忕悊: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="leader" placeholder="璇疯緭鍏ラ」鐩粡鐞�">
-                    </div>
-                </div>
-                <div class="layui-form-item">
                     <label class="layui-form-label">寮�濮嬫椂闂�: </label>
                     <div class="layui-input-block">
                         <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ュ紑濮嬫椂闂�">
                     </div>
                 </div>
                 <div class="layui-form-item">
+                    <label class="layui-form-label">鐪熷疄寮�濮嬫椂闂�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="realStartTime" id="realStartTime$" placeholder="璇疯緭鍏ュ紑濮嬫椂闂�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
                     <label class="layui-form-label">缁撴潫鏃堕棿: </label>
                     <div class="layui-input-block">
                         <input class="layui-input" name="endTime" id="endTime$" placeholder="璇疯緭鍏ョ粨鏉熸椂闂�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鐪熷疄缁撴潫鏃堕棿: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="realEndTime" id="realEndTime$" placeholder="璇疯緭鍏ョ粨鏉熸椂闂�">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -118,6 +118,24 @@
                             <option value="1">姝ｅ父</option>
                             <option value="0">绂佺敤</option>
                         </select>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鏃堕棿璺ㄥ害: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">璐ｄ换浜�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="dutyMan" id="dutyMan$" placeholder="璇疯緭鍏ヨ矗浠讳汉">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="dutyDepartment" id="dutyDepartment$" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -132,28 +150,11 @@
                         </div>
                     </div>
                 </div>
+
                 <div class="layui-form-item">
                     <label class="layui-form-label">娣诲姞鏃堕棿: </label>
                     <div class="layui-input-block">
                         <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">淇敼浜哄憳: </label>
-                    <div class="layui-input-block cool-auto-complete">
-                        <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
-                        <input id="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
-                            <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">淇敼鏃堕棿: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -162,7 +163,6 @@
                         <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
                     </div>
                 </div>
-
              </div>
         </div>
         <hr class="layui-bg-gray">
diff --git a/src/main/webapp/views/node/node.html b/src/main/webapp/views/node/node.html
deleted file mode 100644
index f5d2ccb..0000000
--- a/src/main/webapp/views/node/node.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title></title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
-    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
-    <style>
-        #detail {
-            padding: 25px 30px 0 0;
-        }
-        .ew-tree-table-box {
-            height: 100%;
-        }
-    </style>
-</head>
-<body>
-
-<!-- 姝ｆ枃寮�濮� -->
-<div class="layui-fluid">
-    <div class="layui-card">
-        <div class="layui-card-body">
-            <!-- 鏁版嵁琛ㄦ牸 -->
-            <table id="node"></table>
-        </div>
-    </div>
-</div>
-
-<script type="text/html" id="toolbar">
-    <div class="layui-btn-container" style="width: 100%">
-        <button lay-event="add" class="layui-btn layui-btn-sm layui-btn-normal icon-btn"><i class="layui-icon">&#xe654;</i>娣诲姞</button>&nbsp;
-        <button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon">&#xe640;</i>鍒犻櫎</button>
-        <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="printBatch">鎵归噺鎵撳嵃</button>
-        <!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
-        <div class="dropdown-menu" style="margin-left: 0">
-            <button class="layui-btn layui-btn-sm icon-btn layui-btn-primary" style="margin-top: 2px">&nbsp;鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
-            <ul class="dropdown-menu-nav dark">
-                <div class="dropdown-anchor"></div>
-                <li class="title">1st menu</li>
-                <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>
-                <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>
-                <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>
-                <hr>
-                <li class="title">2nd menu</li>
-                <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>
-            </ul>
-        </div>
-    </div>
-</script>
-
-<script type="text/html" id="typeTpl">
-    {{# if( d.type === 1){ }}
-    <span name="type" class="layui-badge layui-badge-red" ><span style="display: none">{{d.number}}</span>浠撳簱</span>
-    {{# } else if(d.type === 2){ }}
-    <span name="type" class="layui-badge layui-badge-blue" ><span style="display: none">{{d.number}}</span>搴撳尯</span>
-    {{# } else if(d.type === 3){ }}
-    <span name="type" class="layui-badge layui-badge-green" ><span style="display: none">{{d.number}}</span>璐т綅</span>
-    {{# } else { }}
-    <span name="type" class="layui-badge layui-badge-gray" ><span style="display: none">{{d.number}}</span>鍏朵粬</span>
-    {{# } }}
-</script>
-
-<script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs btn-del" lay-event="del">鍒犻櫎</a>
-</script>
-
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
-    <form id="detail" lay-filter="detail" class="layui-form">
-        <input name="id" type="hidden">
-        <input name="uuid" type="hidden">
-        <input name="path" type="hidden">
-        <input name="pathName" type="hidden">
-        <input name="level" type="hidden">
-        <input name="sort" type="hidden">
-        <input name="leading" type="hidden">
-        <input name="barcode" type="hidden">
-        <input name="major" type="hidden">
-        <input name="createTime$" type="hidden">
-        <input name="createBy" type="hidden">
-        <input name="updateTime$" type="hidden">
-        <input name="updateBy" type="hidden">
-        <div class="layui-row">
-            <div class="layui-col-md6">
-                <div class="layui-form-item">
-                    <label class="layui-form-label">涓婄骇鑿滃崟</label>
-                    <div class="layui-input-block">
-                        <div id="nodeParentSel" class="ew-xmselect-tree"></div>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">绫诲瀷</label>
-                    <div class="layui-input-block">
-                        <select name="type" lay-vertype="tips" lay-verify="required" required="">
-                            <option value="">璇烽�夋嫨绫诲瀷</option>
-                            <option value="1">浠撳簱</option>
-                            <option value="2">搴撳尯</option>
-                            <option value="3">璐т綅</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-col-md6">
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">缂栧彿/鍚嶇О</label>
-                    <div class="layui-input-block">
-                        <input name="name" placeholder="璇疯緭鍏ョ紪鍙�/鍚嶇О" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">澶囨敞</label>
-                    <div class="layui-input-block">
-                        <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <hr class="layui-bg-gray">
-        <div class="layui-form-item text-right">
-            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
-            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
-        </div>
-    </form>
-</script>
-<!-- 鎵撳嵃妯℃澘 -->
-<script type="text/template" id="locPrintTpl">
-    {{#each data}}
-    <img class="template-code" src="{{this.barcodeUrl}}" width="100%">
-    <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
-        <span>{{this.item}}</span>
-    </div>
-    {{/each}}
-</script>
-<div id="printBox" style="display: none;"></div>
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-
-<script>
-    var insTb;
-    var admin;
-    layui.config({
-        base: baseUrl + "/static/layui/lay/modules/"
-    }).extend({
-        dropdown: 'dropdown/dropdown',
-    }).use(['form','treeTable', 'admin', 'xmSelect', 'dropdown', 'element'], function() {
-        var $ = layui.jquery;
-        var layer = layui.layer;
-        var form = layui.form;
-        admin = layui.admin;
-        var treeTable = layui.treeTable;
-        var xmSelect = layui.xmSelect;
-        var tbDataList = [];
-
-        insTb = treeTable.render({
-            elem: '#node',
-            url: baseUrl+'/node/list/tree/auth',
-            headers: {token: localStorage.getItem('token')},
-            height: 'full-200',
-            toolbar: '#toolbar',
-            tree: {
-                iconIndex: 2,           // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
-                isPidData: true,        // 鏄惁鏄痠d銆乸id褰㈠紡鏁版嵁
-                idName: 'id',           // id瀛楁鍚嶇О
-                pidName: 'parentId'     // pid瀛楁鍚嶇О
-            },
-            cols: [[
-                {type: 'checkbox'}
-                ,{type: 'numbers'}
-                ,{field: 'name', align: 'left',title: '缂栧彿/鍚嶇О', minWidth: 150}
-                // ,{field: 'uuid', left: 'center',title: '缂栧彿/鍚嶇О', minWidth: 150}
-                ,{field: 'type$', align: 'center',title: '绫诲瀷', templet: '#typeTpl'}
-                // ,{field: 'leading', align: 'center',title: '璐熻矗浜�'}
-                // ,{field: 'img', align: 'center',title: '鍥剧墖', hide: true}
-                // ,{field: 'brief', align: 'center',title: '绠�瑕佹弿杩�'}
-                // ,{field: 'count', align: 'center',title: '鏁伴噺'}
-                // ,{field: 'sort', align: 'center',title: '鎺掑簭'}
-                ,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
-                ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
-                ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
-                ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
-
-                ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-            ]],
-            done: function (data) {
-                $('.ew-tree-table-box').css('height', '100%');
-                insTb.expandAll();
-                tbDataList = data;
-            }
-        });
-
-        /* 琛ㄦ牸澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
-        treeTable.on('toolbar(node)', function (obj) {
-            var checkRows = insTb.checkStatus();
-            if (obj.event === 'add') { // 娣诲姞
-                showEditModel();
-            } else if (obj.event === 'del') { // 鍒犻櫎
-                if (checkRows.length === 0) {
-                    layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
-                    return;
-                }
-                var ids = checkRows.map(function (d) {
-                    if (!d.LAY_INDETERMINATE) {
-                        return d.id;
-                    } else {
-                        return null;
-                    }
-                });
-                doDel({ids: ids});
-            } else if (obj.event === 'printBatch') {
-                if (checkRows.length === 0) {
-                    layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁', {icon: 2});
-                    return;
-                }
-                var printContent = checkRows.map(function (d) {
-                    if (!d.LAY_INDETERMINATE && d.type === 3) {
-                        return d.name;
-                    } else {
-                        return null;
-                    }
-                });
-                printBatch(printContent, 1);
-            }
-        });
-
-        /* 琛ㄦ牸鎿嶄綔鍒楃偣鍑讳簨浠� */
-        treeTable.on('tool(node)', function (obj) {
-            if (obj.event === 'edit') { // 淇敼
-                showEditModel(obj.data);
-            } else if (obj.event === 'del') { // 鍒犻櫎
-                doDel(obj);
-            }
-        });
-
-        /* 鏄剧ず琛ㄥ崟寮圭獥 */
-        function showEditModel(mData) {
-            admin.open({
-                type: 1,
-                area: '600px',
-                title: (mData ? '淇敼' : '娣诲姞') + '璐т綅',
-                content: $('#editDialog').html(),
-                success: function (layero, dIndex) {
-                    // 鍥炴樉琛ㄥ崟鏁版嵁
-                    form.val('detail', mData);
-                    // 琛ㄥ崟鎻愪氦浜嬩欢
-                    form.on('submit(editSubmit)', function (data) {
-                        data.field.parentId = insXmSel.getValue('valueStr');
-                        var loadIndex = layer.load(2);
-                        $.ajax({
-                            url: baseUrl+"/node/"+(mData?'update':'add')+"/auth",
-                            headers: {'token': localStorage.getItem('token')},
-                            data: data.field,
-                            method: 'POST',
-                            success: function (res) {
-                                layer.close(loadIndex);
-                                if (res.code === 200){
-                                    layer.close(dIndex);
-                                    layer.msg(res.msg, {icon: 1});
-                                    insTb.refresh();
-                                } else if (res.code === 403){
-                                    top.location.href = baseUrl+"/";
-                                }else {
-                                    layer.msg(res.msg, {icon: 2});
-                                }
-                            }
-                        })
-                        return false;
-                    });
-                    // 娓叉煋涓嬫媺鏍�
-                    var insXmSel = xmSelect.render({
-                        el: '#nodeParentSel',
-                        height: '250px',
-                        data: insTb.options.data,
-                        initValue: mData ? [mData.parentId] : [],
-                        model: {label: {type: 'text'}},
-                        prop: {
-                            name: 'name',
-                            value: 'id'
-                        },
-                        radio: true,
-                        clickClose: true,
-                        tree: {
-                            show: true,
-                            indent: 15,
-                            strict: false,
-                            expandedKeys: true
-                        }
-                    });
-                    // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
-                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
-                    layui.form.render('select');
-                }
-            });
-        }
-
-        /* 鍒犻櫎 */
-        function doDel(obj) {
-            layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
-                skin: 'layui-layer-admin',
-                shade: .1
-            }, function (i) {
-                layer.close(i);
-                var loadIndex = layer.load(2);
-                var ids;
-                if (obj.data) {
-                    ids = [];
-                    ids[0] = obj.data.id;
-                } else {
-                    ids = obj.ids;
-                }
-                $.ajax({
-                    url: baseUrl+"/node/delete0/auth",
-                    headers: {'token': localStorage.getItem('token')},
-                    data: {ids: ids},
-                    method: 'POST',
-                    success: function (res) {
-                        layer.close(loadIndex);
-                        if (res.code === 200){
-                            layer.msg(res.msg, {icon: 1});
-                            insTb.refresh();
-                        } else if (res.code === 403){
-                            top.location.href = baseUrl+"/";
-                        } else {
-                            layer.msg(res.msg, {icon: 2});
-                        }
-                    }
-                })
-            });
-        }
-
-        // 鎵归噺鎵撳嵃
-        function printBatch(printMsgList, type) {
-            var data = [];
-            for (var i = 0; i<printMsgList.length; i ++) {
-                if (printMsgList[i] != null && printMsgList[i] !== '') {
-                    var barcodeUrl;
-                    if (type === 1) {
-                        barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"&param="+printMsgList[i]+"&width="+200+"&height="+70;
-                    } else {
-                        barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"&param="+printMsgList[i]+"&width="+400+"&height="+180;
-                    }
-                    data.push({
-                        item: printMsgList[i],
-                        barcodeUrl: barcodeUrl
-                    })
-                }
-            }
-            var tpl = $('#locPrintTpl').html();
-            var template = Handlebars.compile(tpl);
-            var html = template({data: data});
-            var box = $("#printBox");
-            box.html(html);
-            box.show();
-            box.print({mediaPrint:true});
-            box.hide();
-        }
-
-    });
-
-    // excel瀵煎叆妯℃澘涓嬭浇
-    function excelMouldDownload(){
-        layer.load(1, {shade: [0.1,'#fff']});
-        location.href = baseUrl + "/node/excel/import/mould";
-        layer.closeAll('loading');
-    }
-
-    // excel瀵煎叆
-    function importExcel() {
-        $("#importExcel").trigger("click");
-    }
-    function upload(obj){
-        if(!obj.files) {
-            return;
-        }
-        var file = obj.files[0];
-        admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
-            layer.load(1, {shade: [0.1,'#fff']});
-            var url = baseUrl + "/node/excel/import/auth";
-            var form = new FormData();
-            form.append("file", file);
-            xhr = new XMLHttpRequest();
-            xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
-            xhr.setRequestHeader('token', localStorage.getItem('token'));
-            xhr.onload = uploadComplete; //璇锋眰瀹屾垚
-            xhr.onerror =  uploadFailed; //璇锋眰澶辫触
-            xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
-                layer.closeAll('loading');
-                $("#importExcel").val("");
-            };
-            // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
-            xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
-                ot = new Date().getTime();   //璁剧疆涓婁紶寮�濮嬫椂闂�
-                oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
-            };
-            xhr.send(form);
-        }, function(index){
-            $("#importExcel").val("");
-        });
-    }
-    function uploadComplete(evt) {
-        var res = JSON.parse(evt.target.responseText);
-        if(res.code === 200) {
-            layer.msg(res.msg, {icon: 1});
-            insTb.refresh();
-        } else {
-            layer.msg(res.msg, {icon: 2});
-        }
-    }
-    function uploadFailed(evt) {
-        var res = JSON.parse(evt.target.responseText);
-        layer.msg(res.msg, {icon: 2});
-    }
-
-    // excel瀵煎嚭
-    function exportExcel() {
-
-    }
-
-</script>
-</body>
-</html>
-

--
Gitblit v1.9.1