From b0b2378ee01defd753805f21851849659038770c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 09 四月 2021 18:21:44 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java | 23 ++++++-
src/main/webapp/static/js/order/order.js | 64 ++++++++++++---------
src/main/webapp/views/order/order.html | 35 +++++++++++
3 files changed, 89 insertions(+), 33 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java b/src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java
index 7bb4246..72397b4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java
@@ -16,10 +16,7 @@
import zy.cloud.wms.manager.entity.DocType;
import zy.cloud.wms.manager.service.DocTypeService;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class DocTypeController extends BaseController {
@@ -63,6 +60,11 @@
@RequestMapping(value = "/docType/add/auth")
@ManagerAuth
public R add(DocType docType) {
+ docType.setCreateBy(getUserId());
+ docType.setCreateTime(new Date());
+ docType.setStatus(1);
+ docType.setUpdateBy(getUserId());
+ docType.setUpdateTime(new Date());
docTypeService.insert(docType);
return R.ok();
}
@@ -73,6 +75,8 @@
if (Cools.isEmpty(docType) || null==docType.getDocId()){
return R.error();
}
+ docType.setUpdateBy(getUserId());
+ docType.setUpdateTime(new Date());
docTypeService.updateById(docType);
return R.ok();
}
@@ -90,6 +94,17 @@
return R.ok();
}
+ @RequestMapping(value = "/docType/delete/one/auth")
+ @ManagerAuth
+ public R deleteOne(@RequestParam String param){
+ DocType docType = JSONArray.parseObject(param, DocType.class);
+ if (Cools.isEmpty(docType)){
+ return R.error();
+ }
+ docTypeService.delete(new EntityWrapper<>(docType));
+ return R.ok();
+ }
+
@RequestMapping(value = "/docType/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f8836e8..d74d7e2 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -48,8 +48,8 @@
});
/* 琛ㄦ牸鎼滅储 */
- form.on('submit(docTypeTable)', function (data) {
- insTb.reload({where: data.field});
+ form.on('submit(docTypeTableSearch)', function (data) {
+ insTb.reload({where: {doc_name: data.field.docName}});
return false;
});
@@ -76,27 +76,31 @@
admin.open({
type: 1,
title: (mData ? '淇敼' : '娣诲姞') + '瀛楀吀',
- content: $('#dictEditDialog').html(),
+ content: $('#docTypeEditDialog').html(),
success: function (layero, dIndex) {
// 鍥炴樉琛ㄥ崟鏁版嵁
- form.val('dictEditForm', mData);
+ form.val('docTypeEditForm', mData);
// 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(dictEditSubmit)', function (data) {
+ form.on('submit(docTypeEditSubmit)', function (data) {
var loadIndex = layer.load(2);
- $.get(mData ? '../../json/ok.json' : '../../json/ok.json', data.field, function (res) {
- layer.close(loadIndex);
- if (200 === res.code) {
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- if (obj) {
- obj.update(data.field);
- } else {
+ $.ajax({
+ url: baseUrl+"/docType/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
insTb.reload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
}
- } else {
- layer.msg(res.msg, {icon: 2});
}
- }, 'json');
+ })
return false;
});
}
@@ -111,18 +115,24 @@
}, function (i) {
layer.close(i);
var loadIndex = layer.load(2);
- $.get('../../json/ok.json', {
- id: obj.data.dictId,
- }, function (res) {
- layer.close(loadIndex);
- if (200 === res.code) {
- layer.msg(res.msg, {icon: 1});
- obj.del();
- $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
- } else {
- layer.msg(res.msg, {icon: 2});
+ $.ajax({
+ url: baseUrl+"/docType/delete/one/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(obj.data)},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.closeAll();
+ insTb.reload();
+ $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
}
- }, 'json');
+ })
});
}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index e707048..fd88883 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -65,10 +65,10 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline" style="max-width: 140px;">
- <input name="dictName" class="layui-input" placeholder="杈撳叆瀛楀吀鍚嶇О"/>
+ <input name="docName" class="layui-input" placeholder="杈撳叆鍗曟嵁绫诲瀷"/>
</div>
<div class="layui-inline">
- <button class="layui-btn icon-btn" lay-filter="dictTbSearch" lay-submit>
+ <button class="layui-btn icon-btn" lay-filter="docTypeTableSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
</div>
@@ -112,6 +112,37 @@
</div>
</div>
+<!-- 鍗曟嵁绫诲瀷琛ㄥ崟 -->
+<script type="text/html" id="docTypeEditDialog">
+ <form id="docTypeEditForm" lay-filter="docTypeEditForm" class="layui-form model-form">
+ <input name="dictId" type="hidden"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绫诲瀷缂栫爜:</label>
+ <div class="layui-input-block">
+ <input name="docId" placeholder="璇疯緭鍏ョ被鍨嬬紪鐮�" class="layui-input"
+ lay-verType="tips" lay-verify="required" required/>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绫诲瀷鍚嶇О:</label>
+ <div class="layui-input-block">
+ <input name="docName" placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" class="layui-input"
+ lay-verType="tips" lay-verify="required" required/>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞:</label>
+ <div class="layui-input-block">
+ <textarea name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="docTypeEditSubmit" lay-submit>淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</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>
--
Gitblit v1.9.1