From b0a7197cfed4705a63ed32ddc83cac6fb09a017f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 14:04:29 +0800
Subject: [PATCH] 13
---
src/main/webapp/static/js/agvWrkMast/agvWrkMast.js | 18
src/main/webapp/static/js/agvWrkMastLog/agvWrkMastLog.js | 18
src/main/webapp/static/js/agvWrkDetl/agvWrkDetl.js | 486 ++++++++++++
src/main/webapp/views/agvWrkDetlLog/agvWrkDetlLog_detail.html | 174 ++++
src/main/webapp/views/agvWrkDetl/agvWrkDetl.html | 69 +
src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java | 178 ++++
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 169 ++++
src/main/webapp/static/js/agvWrkDetlLog/agvWrkDetlLog.js | 484 ++++++++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 2
src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java | 126 +++
src/main/webapp/views/agvWrkMastLog/agvWrkMastLog.html | 4
src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java | 143 +++
src/main/webapp/views/agvWrkDetlLog/agvWrkDetlLog.html | 89 ++
src/main/webapp/views/agvWrkMast/agvWrkMast.html | 4
/dev/null | 164 ----
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2
src/main/webapp/views/agvWrkDetl/agvWrkDetl_detail.html | 130 +++
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 2
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 2
19 files changed, 2,074 insertions(+), 190 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java b/src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java
new file mode 100644
index 0000000..6015d46
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java
@@ -0,0 +1,126 @@
+package com.zy.asrs.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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class AgvWrkDetlController extends BaseController {
+
+ @Autowired
+ private WrkDetlService wrkDetlService;
+
+ @RequestMapping(value = "/agvWrkDetl/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkDetlService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/agvWrkDetl/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(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ excludeTrash(param);
+ EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(WrkDetl.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("appe_time", false);
+ }
+ return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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 = "/agvWrkDetl/add/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗘坊鍔�")
+ public R add(WrkDetl wrkDetl) {
+ wrkDetlService.insert(wrkDetl);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkDetl/delete/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗垹闄�")
+ public R delete(@RequestParam String param) {
+ List<WrkDetl> list = JSONArray.parseArray(param, WrkDetl.class);
+ if (Cools.isEmpty(list)) {
+ return R.error();
+ }
+ for (WrkDetl entity : list) {
+ wrkDetlService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkDetl/export/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗鍑�")
+ public R export(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetl"));
+ convert(map, wrapper);
+ List<WrkDetl> list = wrkDetlService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/agvWrkDetlQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WrkDetl> page = wrkDetlService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkDetl wrkDetl : page.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkDetl.getWrkNo());
+ map.put("value", wrkDetl.getWrkNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/agvWrkDetl/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkDetlService.selectOne(wrapper)) {
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkDetl.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java
new file mode 100644
index 0000000..131b34b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java
@@ -0,0 +1,178 @@
+package com.zy.asrs.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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.WrkDetlLog;
+import com.zy.asrs.service.WrkDetlLogService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class AgvWrkDetlLogController extends BaseController {
+
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+
+ @RequestMapping(value = "/agvWrkDetlLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkDetlLogService.selectById(String.valueOf(id)));
+ }
+
+ /**
+ * 鏍规嵁宸ヤ綔涓绘。鏌ョ湅鏄庣粏鏃讹紝宸ヤ綔鍙疯繃婊ゆ槑缁�
+ */
+ @RequestMapping(value = "/agvWrkDetlLogByMast/list/auth")
+ @ManagerAuth
+ public R list1(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Integer wrk_no,
+ @RequestParam String ioTime) {
+ EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(wrk_no) && wrk_no != 0) {
+ wrapper.eq("wrk_no", wrk_no);
+ }
+ if (!Cools.isEmpty(ioTime)) {
+ wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
+ }
+ return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/agvWrkDetlLog/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<WrkDetlLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("modi_time", false);
+ }
+ return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ // 12.12鏂板锛屽伐浣滄槑缁嗗巻鍙叉。杩囨护鎵嬪姩鍙栨秷鐨勫伐浣滄槑缁�
+ @RequestMapping(value = "/agvWrkDetlLogs/list/auth")
+ @ManagerAuth
+ public R listWrkDetlLogs(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ try {
+ excludeTrash(param);
+ EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("appe_time", false);
+ }
+ return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ } catch (Exception e) {
+ return R.error("寮傚父" + e);
+ }
+ }
+
+ 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 = "/agvWrkDetlLog/add/auth")
+ @ManagerAuth
+ public R add(WrkDetlLog wrkDetlLog) {
+ wrkDetlLogService.insert(wrkDetlLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkDetlLog/update/auth")
+ @ManagerAuth
+ public R update(WrkDetlLog wrkDetlLog) {
+ if (Cools.isEmpty(wrkDetlLog) || null == wrkDetlLog.getWrkNo()) {
+ return R.error();
+ }
+ wrkDetlLogService.updateById(wrkDetlLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkDetlLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam String param) {
+ List<WrkDetlLog> list = JSONArray.parseArray(param, WrkDetlLog.class);
+ if (Cools.isEmpty(list)) {
+ return R.error();
+ }
+ for (WrkDetlLog entity : list) {
+ wrkDetlLogService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkDetlLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param) {
+ EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetlLog"));
+ convert(map, wrapper);
+ List<WrkDetlLog> list = wrkDetlLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/agvWrkDetlLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WrkDetlLog> page = wrkDetlLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkDetlLog wrkDetlLog : page.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkDetlLog.getWrkNo());
+ map.put("value", wrkDetlLog.getWrkNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/agvWrkDetlLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkDetlLog> wrapper = new EntityWrapper<WrkDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkDetlLogService.selectOne(wrapper)) {
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkDetlLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
new file mode 100644
index 0000000..b181520
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -0,0 +1,169 @@
+package com.zy.asrs.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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class AgvWrkMastController extends BaseController {
+
+ @Autowired
+ private WrkMastService wrkMastService;
+
+ @RequestMapping(value = "/agvWrkMast/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkMastService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/agvWrkMast/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(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ excludeTrash(param);
+ EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(WrkMast.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
+ }
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("io_time", false);
+ }
+ return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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.eq(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/agvWrkMast/add/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ坊鍔�")
+ public R add(WrkMast wrkMast) {
+ wrkMast.setModiUser(getUserId());
+ wrkMast.setModiTime(new Date());
+ wrkMast.setAppeUser(getUserId());
+ wrkMast.setAppeTime(new Date());
+ wrkMastService.insert(wrkMast);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkMast/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
+ public R update(WrkMast wrkMast) {
+ if (Cools.isEmpty(wrkMast) || null == wrkMast.getWrkNo()) {
+ return R.error();
+ }
+ wrkMast.setModiUser(getUserId());
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkMast/delete/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
+ public R delete(@RequestParam String param) {
+ List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
+ if (Cools.isEmpty(list)) {
+ return R.error();
+ }
+ for (WrkMast entity : list) {
+ wrkMastService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkMast/export/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
+ public R export(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
+ convert(map, wrapper);
+ List<WrkMast> list = wrkMastService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/agvWrkMastQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+ wrapper.like("wrk_no", condition);
+ Page<WrkMast> page = wrkMastService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkMast wrkMast : page.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMast.getWrkNo());
+ map.put("value", wrkMast.getWrkNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/agvWrkMast/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastService.selectOne(wrapper)) {
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkMast.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkMast/add/pri/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍔犱紭鍏堢骇")
+ public R addPri(@RequestBody List<WrkMast> list) {
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
+ for (WrkMast entity : list) {
+ entity.setIoPri(entity.getIoPri() + 1);
+ }
+ wrkMastService.updateBatchById(list);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkMast/red/pri/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｉ檷浣庝紭鍏堢骇")
+ public R redPri(@RequestBody List<WrkMast> list) {
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
+ for (WrkMast entity : list) {
+ entity.setIoPri(entity.getIoPri() - 1);
+ }
+ wrkMastService.updateBatchById(list);
+ return R.ok();
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
new file mode 100644
index 0000000..23a93a4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
@@ -0,0 +1,143 @@
+package com.zy.asrs.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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.WrkMastLog;
+import com.zy.asrs.service.WrkMastLogService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class AgvWrkMastLogController extends BaseController {
+
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+
+ @RequestMapping(value = "/agvWrkMastLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkMastLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/agvWrkMastLog/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(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ excludeTrash(param);
+ EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
+ }
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("modi_time", false);
+ }
+ return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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 {
+ if (entry.getKey().equals("manu_type")) {
+ wrapper.like(entry.getKey(), val);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
+ }
+
+ @RequestMapping(value = "/agvWrkMastLog/add/auth")
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ坊鍔�")
+ public R add(WrkMastLog wrkMastLog) {
+ wrkMastLogService.insert(wrkMastLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkMastLog/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
+ public R update(WrkMastLog wrkMastLog) {
+ if (Cools.isEmpty(wrkMastLog) || null == wrkMastLog.getId()) {
+ return R.error();
+ }
+ wrkMastLogService.updateById(wrkMastLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkMastLog/delete/auth")
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ垹闄�")
+ public R delete(@RequestParam String param) {
+ List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
+ if (Cools.isEmpty(list)) {
+ return R.error();
+ }
+ for (WrkMastLog entity : list) {
+ wrkMastLogService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/agvWrkMastLog/export/auth")
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
+ public R export(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastLog"));
+ convert(map, wrapper);
+ List<WrkMastLog> list = wrkMastLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/agvWrkMastLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkMastLog wrkMastLog : page.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMastLog.getId());
+ map.put("value", wrkMastLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/agvWrkMastLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkMastLog> wrapper = new EntityWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastLogService.selectOne(wrapper)) {
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/webapp/static/js/agvWrkDetl/agvWrkDetl.js b/src/main/webapp/static/js/agvWrkDetl/agvWrkDetl.js
new file mode 100644
index 0000000..e246446
--- /dev/null
+++ b/src/main/webapp/static/js/agvWrkDetl/agvWrkDetl.js
@@ -0,0 +1,486 @@
+var pageCurr;
+function getCol() {
+ var cols = [
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width: 160}
+ ];
+ cols.push.apply(cols, detlCols);
+ cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+ return cols;
+}
+
+layui.use(['table','laydate', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#agvWrkDetl',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/agvWrkDetl/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ 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();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(locMast)', 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
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(agvWrkDetl)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'addData':
+ layer.open({
+ type: 2,
+ title: '鏂板',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'agvWrkDetl_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ case 'refreshData':
+ tableIns.reload({
+ page: {
+ curr: pageCurr
+ }
+ });
+ limit();
+ break;
+ case 'deleteData':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/agvWrkDetl/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ 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 = {
+ 'wrkDetl': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/agvWrkDetl/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)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(agvWrkDetl)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'agvWrkDetl_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'agvWrkDetl_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ top.convertDisabled(layer.getChildFrame('', index), true);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ case 'modiUser':
+ var param = top.reObject(data).modiUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '淇敼浜哄憳璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+ case 'appeUser':
+ var param = top.reObject(data).appeUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '鍒涘缓鑰呰鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+
+ }
+ });
+
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ form.on('submit(save)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add");
+ });
+
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(edit)', function () {
+ method("update")
+ });
+
+ function method(name){
+ var index = layer.load(1, {
+ shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ });
+ var data = {
+// id: $('#id').val(),
+ wrkNo: $('#wrkNo').val(),
+ ioTime: top.strToDate($('#ioTime\\$').val()),
+ matnr: $('#matnr').val(),
+ lgnum: $('#lgnum').val(),
+ tbnum: $('#tbnum').val(),
+ tbpos: $('#tbpos').val(),
+ zmatid: $('#zmatid').val(),
+ maktx: $('#maktx').val(),
+ werks: $('#werks').val(),
+ anfme: $('#anfme').val(),
+ altme: $('#altme').val(),
+ zpallet: $('#zpallet').val(),
+ bname: $('#bname').val(),
+ memo: $('#memo').val(),
+ modiUser: $('#modiUser').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ appeUser: $('#appeUser').val(),
+ appeTime: top.strToDate($('#appeTime\\$').val()),
+ nista: $('#nista').val(),
+
+ };
+ $.ajax({
+ url: baseUrl+"/agvWrkDetl/"+name+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(data),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.layer.closeAll();
+ parent.$(".layui-laypage-btn")[0].click();
+ $("#data-detail :input").each(function () {
+ $(this).val("");
+ });
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ layer.close(index);
+ }
+ })
+ }
+
+ // 澶嶉�夋浜嬩欢
+ form.on('checkbox(detailCheckbox)', function (data) {
+ var el = data.elem;
+ if (el.checked) {
+ $(el).val('Y');
+ } else {
+ $(el).val('N');
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(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;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
+}
+
+function setFormVal(el, data, showImg) {
+ for (var val in data) {
+ var find = el.find(":input[id='" + val + "']");
+ if (find[0]!=null){
+ if (find[0].type === 'checkbox'){
+ if (data[val]==='Y'){
+ find.attr("checked","checked");
+ find.val('Y');
+ } else {
+ find.remove("checked");
+ find.val('N');
+ }
+ continue;
+ }
+ }
+ find.val(data[val]);
+ if (showImg){
+ var next = find.next();
+ if (next.get(0)){
+ if (next.get(0).localName === "img") {
+ find.hide();
+ next.attr("src", data[val]);
+ next.show();
+ }
+ }
+ }
+ }
+}
+
+function detailScreen(index) {
+ var detail = layer.getChildFrame('#data-detail', index);
+ var height = detail.height()+60;
+ if (height > ($(window).height()*0.9)) {
+ height = ($(window).height()*0.8);
+ }
+ layer.style(index, {
+// top: (($(window).height()-height)/3)+"px",
+ height: height+'px'
+ });
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/src/main/webapp/static/js/agvWrkDetlLog/agvWrkDetlLog.js b/src/main/webapp/static/js/agvWrkDetlLog/agvWrkDetlLog.js
new file mode 100644
index 0000000..05d905c
--- /dev/null
+++ b/src/main/webapp/static/js/agvWrkDetlLog/agvWrkDetlLog.js
@@ -0,0 +1,484 @@
+var pageCurr;
+function getCol() {
+ var cols = [
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ];
+ cols.push.apply(cols, detlCols);
+ cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
+ )
+ return cols;
+}
+
+layui.use(['table','laydate', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#agvWrkDetlLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/agvWrkDetlLog/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ 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();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(locMast)', 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
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(agvWrkDetlLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'addData':
+ layer.open({
+ type: 2,
+ title: '鏂板',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'agvWrkDetlLog_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ case 'deleteData':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/agvWrkDetlLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ 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 = {
+ 'wrkDetlLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/agvWrkDetlLog/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)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(agvWrkDetlLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'agvWrkDetlLog_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'agvWrkDetlLog_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ top.convertDisabled(layer.getChildFrame('', index), true);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ case 'modiUser':
+ var param = top.reObject(data).modiUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '淇敼浜哄憳璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: "baseUrl+/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+ case 'appeUser':
+ var param = top.reObject(data).appeUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '鍒涘缓鑰呰鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: "baseUrl+/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+
+ }
+ });
+
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ form.on('submit(save)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add");
+ });
+
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(edit)', function () {
+ method("update")
+ });
+
+ function method(name){
+ var index = layer.load(1, {
+ shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ });
+ var data = {
+// id: $('#id').val(),
+ wrkNo: $('#wrkNo').val(),
+ ioTime: top.strToDate($('#ioTime\\$').val()),
+ matnr: $('#matnr').val(),
+ lgnum: $('#lgnum').val(),
+ tbnum: $('#tbnum').val(),
+ tbpos: $('#tbpos').val(),
+ zmatid: $('#zmatid').val(),
+ maktx: $('#maktx').val(),
+ werks: $('#werks').val(),
+ anfme: $('#anfme').val(),
+ altme: $('#altme').val(),
+ zpallet: $('#zpallet').val(),
+ bname: $('#bname').val(),
+ memo: $('#memo').val(),
+ modiUser: $('#modiUser').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ appeUser: $('#appeUser').val(),
+ appeTime: top.strToDate($('#appeTime\\$').val()),
+ nista: $('#nista').val(),
+
+ };
+ $.ajax({
+ url: baseUrl+"/agvWrkDetlLog/"+name+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(data),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.layer.closeAll();
+ parent.$(".layui-laypage-btn")[0].click();
+ $("#data-detail :input").each(function () {
+ $(this).val("");
+ });
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ layer.close(index);
+ }
+ })
+ }
+
+ // 澶嶉�夋浜嬩欢
+ form.on('checkbox(detailCheckbox)', function (data) {
+ var el = data.elem;
+ if (el.checked) {
+ $(el).val('Y');
+ } else {
+ $(el).val('N');
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(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;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
+}
+
+function setFormVal(el, data, showImg) {
+ for (var val in data) {
+ var find = el.find(":input[id='" + val + "']");
+ if (find[0]!=null){
+ if (find[0].type === 'checkbox'){
+ if (data[val]==='Y'){
+ find.attr("checked","checked");
+ find.val('Y');
+ } else {
+ find.remove("checked");
+ find.val('N');
+ }
+ continue;
+ }
+ }
+ find.val(data[val]);
+ if (showImg){
+ var next = find.next();
+ if (next.get(0)){
+ if (next.get(0).localName === "img") {
+ find.hide();
+ next.attr("src", data[val]);
+ next.show();
+ }
+ }
+ }
+ }
+}
+
+function clearFormVal(el) {
+ $(':input', el)
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+}
+
+function detailScreen(index) {
+ var detail = layer.getChildFrame('#data-detail', index);
+ var height = detail.height()+60;
+ if (height > ($(window).height()*0.9)) {
+ height = ($(window).height()*0.8);
+ }
+ layer.style(index, {
+// top: (($(window).height()-height)/3)+"px",
+ height: height+'px'
+ });
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js b/src/main/webapp/static/js/agvWrkMast/agvWrkMast.js
similarity index 94%
rename from src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
rename to src/main/webapp/static/js/agvWrkMast/agvWrkMast.js
index 853a29c..f29b466 100644
--- a/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
+++ b/src/main/webapp/static/js/agvWrkMast/agvWrkMast.js
@@ -11,9 +11,9 @@
// 鏁版嵁娓叉煋
tableIns = table.render({
- elem: '#wrkMastExecute',
+ elem: '#agvWrkMast',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkMastExecute/list/auth',
+ url: baseUrl+'/agvWrkMast/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -67,7 +67,7 @@
});
// 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(wrkMastExecute)', function (obj) {
+ table.on('sort(agvWrkMast)', function (obj) {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
@@ -81,7 +81,7 @@
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(wrkMastExecute)', function (obj) {
+ table.on('toolbar(agvWrkMast)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
switch(obj.event) {
case 'addData':
@@ -111,11 +111,11 @@
exportData[this.name] = this.value;
});
var param = {
- 'wrkMastExecute': exportData,
+ 'agvWrkMast': exportData,
'fields': fields
};
$.ajax({
- url: baseUrl+"/wrkMastExecute/export/auth",
+ url: baseUrl+"/agvWrkMast/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -138,7 +138,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(wrkMastExecute)', function(obj){
+ table.on('tool(agvWrkMast)', function(obj){
var data = obj.data;
switch (obj.event) {
case 'edit':
@@ -163,7 +163,7 @@
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/wrkMastExecute/"+(mData?'update':'add')+"/auth",
+ url: baseUrl+"/agvWrkMast/"+(mData?'update':'add')+"/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
@@ -197,7 +197,7 @@
layer.close(i);
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/wrkMastExecute/delete/auth",
+ url: baseUrl+"/agvWrkMast/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: ids},
method: 'POST',
diff --git a/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js b/src/main/webapp/static/js/agvWrkMastLog/agvWrkMastLog.js
similarity index 93%
rename from src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
rename to src/main/webapp/static/js/agvWrkMastLog/agvWrkMastLog.js
index 7d18f82..cc22fe0 100644
--- a/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
+++ b/src/main/webapp/static/js/agvWrkMastLog/agvWrkMastLog.js
@@ -11,9 +11,9 @@
// 鏁版嵁娓叉煋
tableIns = table.render({
- elem: '#wrkMastExecuteLog',
+ elem: '#agvWrkMastLog',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkMastExecuteLog/list/auth',
+ url: baseUrl+'/agvWrkMastLog/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -67,7 +67,7 @@
});
// 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(wrkMastExecuteLog)', function (obj) {
+ table.on('sort(agvWrkMastLog)', function (obj) {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
@@ -81,7 +81,7 @@
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(wrkMastExecuteLog)', function (obj) {
+ table.on('toolbar(agvWrkMastLog)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
switch(obj.event) {
case 'addData':
@@ -111,11 +111,11 @@
exportData[this.name] = this.value;
});
var param = {
- 'wrkMastExecuteLog': exportData,
+ 'agvWrkMastLog': exportData,
'fields': fields
};
$.ajax({
- url: baseUrl+"/wrkMastExecuteLog/export/auth",
+ url: baseUrl+"/agvWrkMastLog/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -138,7 +138,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(wrkMastExecuteLog)', function(obj){
+ table.on('tool(agvWrkMastLog)', function(obj){
var data = obj.data;
switch (obj.event) {
case 'edit':
@@ -163,7 +163,7 @@
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/wrkMastExecuteLog/"+(mData?'update':'add')+"/auth",
+ url: baseUrl+"/agvWrkMastLog/"+(mData?'update':'add')+"/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
@@ -197,7 +197,7 @@
layer.close(i);
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/wrkMastExecuteLog/delete/auth",
+ url: baseUrl+"/agvWrkMastLog/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: ids},
method: 'POST',
diff --git a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index bff82e3..dcdc898 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -152,7 +152,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'wrkDetl.html',
+ content: 'agvWrkDetl.html',
success: function(layero, index){
}
});
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 686640d..9f3b576 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -148,7 +148,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'wrkDetlLog.html',
+ content: 'agvWrkDetlLog.html',
success: function(layero, index){
}
});
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 2028ec7..851d55c 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -286,7 +286,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'wrkDetl.html',
+ content: 'agvWrkDetl.html',
success: function(layero, index){
}
});
diff --git a/src/main/webapp/static/js/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js b/src/main/webapp/static/js/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js
deleted file mode 100644
index 03c1ee9..0000000
--- a/src/main/webapp/static/js/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js
+++ /dev/null
@@ -1,273 +0,0 @@
-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: '#wrkMastFourWarVehicle',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkMastFourWarVehicle/list/auth',
- page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
- height: 'full-120',
- cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'wrkStart', align: 'center',title: '宸ヤ綔妗ｅ紑濮嬩綅缃�'}
- ,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�'}
- ,{field: 'staStart', align: 'center',title: '鍥涘悜杞︽帴璐т綅缃�'}
- ,{field: 'staEnd', align: 'center',title: '鍥涘悜杞︽斁璐т綅缃�'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'type', align: 'center',title: '绫诲瀷 0:婊＄増 1:绌烘澘'}
- ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�'}
- ,{field: 'lineNumber', align: 'center',title: '琛屽彿'}
- ,{field: 'wrkType', align: 'center',title: '宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�'}
- ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿'}
- ,{field: 'wrkCrn', align: 'center',title: ''}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
- ]],
- 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(wrkMastFourWarVehicle)', 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(wrkMastFourWarVehicle)', 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;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
- case 'exportData':
- admin.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 = {
- 'wrkMastFourWarVehicle': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/wrkMastFourWarVehicle/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(wrkMastFourWarVehicle)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.id]);
- break;
- }
- });
-
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- layDateRender(mData);
- form.val('detail', mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/wrkMastFourWarVehicle/"+(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+"/wrkMastFourWarVehicle/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(data) {
- setTimeout(function () {
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime',
- value: data!==undefined?data['createTime\\$']:null
- });
- layDate.render({
- elem: '#updateTime\\$',
- type: 'datetime',
- value: data!==undefined?data['updateTime\\$']:null
- });
- layDate.render({
- elem: '#bignTime\\$',
- type: 'datetime',
- value: data!==undefined?data['bignTime\\$']:null
- });
-
- }, 300);
- }
- 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/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js b/src/main/webapp/static/js/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js
deleted file mode 100644
index d5dc3f4..0000000
--- a/src/main/webapp/static/js/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js
+++ /dev/null
@@ -1,273 +0,0 @@
-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: '#wrkMastFourWarVehicleLog',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkMastFourWarVehicleLog/list/auth',
- page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
- height: 'full-120',
- cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'wrkStart', align: 'center',title: '宸ヤ綔妗ｅ紑濮嬩綅缃�'}
- ,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�'}
- ,{field: 'staStart', align: 'center',title: '鍥涘悜杞︽帴璐т綅缃�'}
- ,{field: 'staEnd', align: 'center',title: '鍥涘悜杞︽斁璐т綅缃�'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'type', align: 'center',title: '绫诲瀷 0:婊＄増 1:绌烘澘'}
- ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�'}
- ,{field: 'lineNumber', align: 'center',title: '琛屽彿'}
- ,{field: 'wrkType', align: 'center',title: '宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�'}
- ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿'}
- ,{field: 'wrkCrn', align: 'center',title: ''}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
- ]],
- 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(wrkMastFourWarVehicleLog)', 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(wrkMastFourWarVehicleLog)', 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;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
- case 'exportData':
- admin.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 = {
- 'wrkMastFourWarVehicleLog': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/wrkMastFourWarVehicleLog/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(wrkMastFourWarVehicleLog)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.id]);
- break;
- }
- });
-
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- layDateRender(mData);
- form.val('detail', mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/wrkMastFourWarVehicleLog/"+(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+"/wrkMastFourWarVehicleLog/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(data) {
- setTimeout(function () {
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime',
- value: data!==undefined?data['createTime\\$']:null
- });
- layDate.render({
- elem: '#updateTime\\$',
- type: 'datetime',
- value: data!==undefined?data['updateTime\\$']:null
- });
- layDate.render({
- elem: '#bignTime\\$',
- type: 'datetime',
- value: data!==undefined?data['bignTime\\$']:null
- });
-
- }, 300);
- }
- 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/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index e637bfa..a481c7a 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -235,7 +235,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'wrkDetlLog.html',
+ content: 'agvWrkDetlLog.html',
success: function(layero, index){
}
});
diff --git a/src/main/webapp/views/agvWrkDetl/agvWrkDetl.html b/src/main/webapp/views/agvWrkDetl/agvWrkDetl.html
new file mode 100644
index 0000000..19ed2f8
--- /dev/null
+++ b/src/main/webapp/views/agvWrkDetl/agvWrkDetl.html
@@ -0,0 +1,69 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ #btn-export {
+ margin-top: 10px;
+ }
+ </style>
+</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="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
+ </div>
+ </div>
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="io_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <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="agvWrkDetl" lay-filter="agvWrkDetl"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <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" lay-event="detail">璇︽儏</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/agvWrkDetl/agvWrkDetl.js?v=1" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/agvWrkDetl/agvWrkDetl_detail.html b/src/main/webapp/views/agvWrkDetl/agvWrkDetl_detail.html
new file mode 100644
index 0000000..7a277b8
--- /dev/null
+++ b/src/main/webapp/views/agvWrkDetl/agvWrkDetl_detail.html
@@ -0,0 +1,130 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="ioTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>
+ <div class="layui-input-inline">
+ <input id="matnr" class="layui-input" type="text" lay-verify="required" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>浠� 搴� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="lgnum" class="layui-input" type="text" lay-verify="required" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>杞偍璇锋眰缂栧彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="tbnum" class="layui-input" type="text" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>琛� 椤� 鐩細</label>
+ <div class="layui-input-inline">
+ <input id="tbpos" class="layui-input" type="text" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>鐗╂枡鏍囩ID锛�</label>
+ <div class="layui-input-inline">
+ <input id="zmatid" class="layui-input" type="text" lay-verify="required" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐗╂枡鎻忚堪锛�</label>
+ <div class="layui-input-inline">
+ <input id="maktx" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸ャ��銆�鍘傦細</label>
+ <div class="layui-input-inline">
+ <input id="werks" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏁般��銆�閲忥細</label>
+ <div class="layui-input-inline">
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍗曘��銆�浣嶏細</label>
+ <div class="layui-input-inline">
+ <input id="altme" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鎵樼洏鏉＄爜锛�</label>
+ <div class="layui-input-inline">
+ <input id="zpallet" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐢ㄦ埛ID锛�</label>
+ <div class="layui-input-inline">
+ <input id="bname" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">澶囥��銆�娉細</label>
+ <div class="layui-input-inline">
+ <input id="memo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="nista" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<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/agvWrkDetl/agvWrkDetl.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/agvWrkDetlLog/agvWrkDetlLog.html b/src/main/webapp/views/agvWrkDetlLog/agvWrkDetlLog.html
new file mode 100644
index 0000000..69cb1f3
--- /dev/null
+++ b/src/main/webapp/views/agvWrkDetlLog/agvWrkDetlLog.html
@@ -0,0 +1,89 @@
+<!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/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="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="order_no" placeholder="璁㈠崟缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="璐у搧鐗瑰緛" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="anfme" 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="agvWrkDetlLog" lay-filter="agvWrkDetlLog"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</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/agvWrkDetlLog/agvWrkDetlLog.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/agvWrkDetlLog/agvWrkDetlLog_detail.html b/src/main/webapp/views/agvWrkDetlLog/agvWrkDetlLog_detail.html
new file mode 100644
index 0000000..72bf6f1
--- /dev/null
+++ b/src/main/webapp/views/agvWrkDetlLog/agvWrkDetlLog_detail.html
@@ -0,0 +1,174 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="ioTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栧彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="matnr" class="layui-input" type="text" lay-verify="required" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>浠� 搴� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="lgnum" class="layui-input" type="text" lay-verify="required" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>杞偍璇锋眰缂栧彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="tbnum" class="layui-input" type="text" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>琛� 椤� 鐩細</label>
+ <div class="layui-input-inline">
+ <input id="tbpos" class="layui-input" type="text" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鐗╂枡鏍囩ID锛�</label>
+ <div class="layui-input-inline">
+ <input id="zmatid" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐗╂枡鎻忚堪锛�</label>
+ <div class="layui-input-inline">
+ <input id="maktx" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸ャ��銆�鍘傦細</label>
+ <div class="layui-input-inline">
+ <input id="werks" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏁般��銆�閲忥細</label>
+ <div class="layui-input-inline">
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍗曘��銆�浣嶏細</label>
+ <div class="layui-input-inline">
+ <input id="altme" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鎵樼洏鏉＄爜锛�</label>
+ <div class="layui-input-inline">
+ <input id="zpallet" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐢ㄦ埛ID锛�</label>
+ <div class="layui-input-inline">
+ <input id="bname" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">澶囥��銆�娉細</label>
+ <div class="layui-input-inline">
+ <input id="memo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="modiUser$" 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="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍒� 寤� 鑰咃細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="nista" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<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/wrkDetlLog/wrkDetlLog.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html b/src/main/webapp/views/agvWrkMast/agvWrkMast.html
similarity index 97%
copy from src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
copy to src/main/webapp/views/agvWrkMast/agvWrkMast.html
index dbc9179..eca500b 100644
--- a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
+++ b/src/main/webapp/views/agvWrkMast/agvWrkMast.html
@@ -42,7 +42,7 @@
</div>
</div>
</div>
- <table class="layui-hide" id="wrkMastExecuteLog" lay-filter="wrkMastExecuteLog"></table>
+ <table class="layui-hide" id="agvWrkMast" lay-filter="agvWrkMast"></table>
</div>
</div>
</div>
@@ -64,7 +64,7 @@
<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/wrkMastExecuteLog/wrkMastExecuteLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvWrkMast/agvWrkMast.js" charset="utf-8"></script>
</body>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
diff --git a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html b/src/main/webapp/views/agvWrkMastLog/agvWrkMastLog.html
similarity index 97%
rename from src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
rename to src/main/webapp/views/agvWrkMastLog/agvWrkMastLog.html
index dbc9179..c92176c 100644
--- a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
+++ b/src/main/webapp/views/agvWrkMastLog/agvWrkMastLog.html
@@ -42,7 +42,7 @@
</div>
</div>
</div>
- <table class="layui-hide" id="wrkMastExecuteLog" lay-filter="wrkMastExecuteLog"></table>
+ <table class="layui-hide" id="agvWrkMastLog" lay-filter="agvWrkMastLog"></table>
</div>
</div>
</div>
@@ -64,7 +64,7 @@
<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/wrkMastExecuteLog/wrkMastExecuteLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvWrkMastLog/agvWrkMastLog.js" charset="utf-8"></script>
</body>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
diff --git a/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html b/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
deleted file mode 100644
index 9033dab..0000000
--- a/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
+++ /dev/null
@@ -1,206 +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">
-</head>
-<body>
-
-<div class="layui-fluid">
- <div class="layui-card">
- <div class="layui-card-body">
- <div class="layui-form toolbar" id="search-box">
- <div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
- </div>
- </div>
- </div>
- <table class="layui-hide" id="wrkMastExecute" lay-filter="wrkMastExecute"></table>
- </div>
- </div>
-</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</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/wrkMastExecute/wrkMastExecute.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-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="souLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐩爣搴撲綅: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="endLocNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍘熸ゼ灞�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="souFloor" placeholder="璇疯緭鍏ュ師妤煎眰">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐩爣妤煎眰: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="endFloor" placeholder="璇疯緭鍏ョ洰鏍囨ゼ灞�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">婧愮珯鐐�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="souStaNo" placeholder="璇疯緭鍏ユ簮绔欑偣">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐩爣绔欑偣: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="endStaNo" placeholder="璇疯緭鍏ョ洰鏍囩珯鐐�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">褰撳墠鑺傜偣: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="nowPosition" placeholder="璇疯緭鍏ュ綋鍓嶈妭鐐�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐩爣鑺傜偣: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="endPosition" 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="ioType" placeholder="璇疯緭鍏ヤ换鍔＄被鍨�" style="display: none">
- <input id="ioType$" name="ioType$" 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="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" 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="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">宸ヤ綔鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ伐浣滄椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="modiTime" id="modiTime$" 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="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="modiUser$" name="modiUser$" 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="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" 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="appeTime" id="appeTime$" 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="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">
- <input id="appeUser$" name="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" 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="status" placeholder="璇疯緭鍏ヤ换鍔＄姸鎬�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
- </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/wrkMastFourWarVehicle/wrkMastFourWarVehicle.html b/src/main/webapp/views/wrkMastFourWarVehicle/wrkMastFourWarVehicle.html
deleted file mode 100644
index 0273322..0000000
--- a/src/main/webapp/views/wrkMastFourWarVehicle/wrkMastFourWarVehicle.html
+++ /dev/null
@@ -1,164 +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">
-</head>
-<body>
-
-<div class="layui-fluid">
- <div class="layui-card">
- <div class="layui-card-body">
- <div class="layui-form toolbar" id="search-box">
- <div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
- </div>
- </div>
- </div>
- <table class="layui-hide" id="wrkMastFourWarVehicle" lay-filter="wrkMastFourWarVehicle"></table>
- </div>
- </div>
-</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</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/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-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 layui-form-required">宸ヤ綔鍙�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔妗ｅ紑濮嬩綅缃�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkStart" placeholder="璇疯緭鍏ュ伐浣滄。寮�濮嬩綅缃�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔妗ｇ粨鏉熶綅缃�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkEnd" placeholder="璇疯緭鍏ュ伐浣滄。缁撴潫浣嶇疆" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍥涘悜杞︽帴璐т綅缃�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="staStart" placeholder="璇疯緭鍏ュ洓鍚戣溅鎺ヨ揣浣嶇疆" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍥涘悜杞︽斁璐т綅缃�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="staEnd" placeholder="璇疯緭鍏ュ洓鍚戣溅鏀捐揣浣嶇疆" lay-vertype="tips" lay-verify="required">
- </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">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">绫诲瀷 0:婊＄増 1:绌烘澘: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 0:婊＄増 1:绌烘澘" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">琛屽彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkType" placeholder="璇疯緭鍏ュ伐浣滅被鍨� 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏍囪鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkCrn" 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/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html b/src/main/webapp/views/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html
deleted file mode 100644
index 1dbd071..0000000
--- a/src/main/webapp/views/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html
+++ /dev/null
@@ -1,164 +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">
-</head>
-<body>
-
-<div class="layui-fluid">
- <div class="layui-card">
- <div class="layui-card-body">
- <div class="layui-form toolbar" id="search-box">
- <div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
- </div>
- </div>
- </div>
- <table class="layui-hide" id="wrkMastFourWarVehicleLog" lay-filter="wrkMastFourWarVehicleLog"></table>
- </div>
- </div>
-</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</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/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-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 layui-form-required">宸ヤ綔鍙�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔妗ｅ紑濮嬩綅缃�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkStart" placeholder="璇疯緭鍏ュ伐浣滄。寮�濮嬩綅缃�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔妗ｇ粨鏉熶綅缃�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkEnd" placeholder="璇疯緭鍏ュ伐浣滄。缁撴潫浣嶇疆" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍥涘悜杞︽帴璐т綅缃�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="staStart" placeholder="璇疯緭鍏ュ洓鍚戣溅鎺ヨ揣浣嶇疆" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍥涘悜杞︽斁璐т綅缃�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="staEnd" placeholder="璇疯緭鍏ュ洓鍚戣溅鏀捐揣浣嶇疆" lay-vertype="tips" lay-verify="required">
- </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">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">绫诲瀷 0:婊＄増 1:绌烘澘: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 0:婊＄増 1:绌烘澘" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">琛屽彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkType" placeholder="璇疯緭鍏ュ伐浣滅被鍨� 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏍囪鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkCrn" 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>
-
--
Gitblit v1.9.1