From 5b05fb68b662c873b606db644308247002792e85 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 28 十二月 2023 13:47:44 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html | 214 ++-------
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java | 9
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java | 10
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java | 4
zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml | 8
zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js | 795 +++++++++++++++++++++++--------------
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java | 3
zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html | 150 +++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java | 4
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 3
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java | 2
15 files changed, 725 insertions(+), 491 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/StaDesc.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
similarity index 96%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/StaDesc.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
index 2bb6971..0d3ce27 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/StaDesc.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
@@ -1,14 +1,14 @@
-package com.zy.asrs.common.wms.entity;
+package com.zy.asrs.common.domain.entity;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
+import com.zy.asrs.common.wms.entity.BasDevp;
+import com.zy.asrs.common.wms.entity.BasWrkIotype;
import com.zy.asrs.common.wms.service.BasDevpService;
import com.zy.asrs.common.wms.service.BasWrkIotypeService;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,10 +21,9 @@
import com.zy.asrs.common.sys.service.HostService;
import java.io.Serializable;
-import java.util.Date;
@Data
-@TableName("wms_sta_desc")
+@TableName("common_sta_desc")
public class StaDesc implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/StaDescService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
similarity index 71%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/StaDescService.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
index b8c36e4..5890047 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/StaDescService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.common.wms.service;
+package com.zy.asrs.common.sys.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.StaDesc;
+import com.zy.asrs.common.domain.entity.StaDesc;
import java.util.List;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/StaDescServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
similarity index 76%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/StaDescServiceImpl.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
index cf956b3..bfa2b6b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/StaDescServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
@@ -1,8 +1,8 @@
-package com.zy.asrs.common.wms.service.impl;
+package com.zy.asrs.common.sys.service.impl;
import com.zy.asrs.common.wms.mapper.StaDescMapper;
-import com.zy.asrs.common.wms.entity.StaDesc;
-import com.zy.asrs.common.wms.service.StaDescService;
+import com.zy.asrs.common.domain.entity.StaDesc;
+import com.zy.asrs.common.sys.service.StaDescService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java
index 2473268..7e94f94 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java
@@ -26,7 +26,7 @@
import java.util.Date;
@Data
-@TableName("wms_bas_devp")
+@TableName("common_bas_devp")
public class BasDevp implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
index 8d89985..795960d 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.common.wms.mapper;
-import com.zy.asrs.common.wms.entity.StaDesc;
+import com.zy.asrs.common.domain.entity.StaDesc;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
index 0715e40..be60526 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.LocTypeDto;
import com.zy.asrs.common.domain.dto.StartupDto;
+import com.zy.asrs.common.domain.entity.StaDesc;
+import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
@@ -43,7 +45,7 @@
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
- WrkLastno wrkLastno = wrkLastnoService.getById(wrkMk);
+ WrkLastno wrkLastno = wrkLastnoService.getOne(new LambdaQueryWrapper<WrkLastno>().eq(WrkLastno::getWrkMk, wrkMk));
if (Cools.isEmpty(wrkLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
index 124b4a2..5b007ab 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
@@ -6,8 +6,9 @@
/**
* 鍏ㄦ澘鍏ュ簱
+ *
* @return 搴撲綅鍙�
*/
- String startupFullPutStore(FullStoreParam param, Long userId);
+ String startupFullPutStore(FullStoreParam param, Long userId, Long hostId);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 2872342..065014c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -44,7 +44,7 @@
@Override
@Transactional
- public String startupFullPutStore(FullStoreParam param, Long userId) {
+ public String startupFullPutStore(FullStoreParam param, Long userId, Long hostId) {
// 鍙傛暟闈炵┖鍒ゆ柇
if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
throw new CoolException(BaseRes.PARAM);
@@ -79,6 +79,7 @@
// wrkMast.setAppeTime(now);
// wrkMast.setModiUser(String.valueOf(userId));
// wrkMast.setModiTime(now);
+ wrkMast.setHostId(hostId);
if (!wrkMastService.save(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml
index 31d7dfc..08fa32d 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml
@@ -5,8 +5,8 @@
<select id="getAvailableInSite" resultType="java.lang.Integer">
select
wbd.dev_no
- from wms_bas_devp wbd
- left join wms_sta_desc asd on wbd.dev_no = asd.stn_no
+ from common_bas_devp wbd
+ left join common_sta_desc asd on wbd.dev_no = asd.stn_no
where 1=1
and asd.type_no = #{typeNo}
and wbd.host_id = #{hostId}
@@ -17,8 +17,8 @@
<select id="getAvailableOutSite" resultType="java.lang.Integer">
select
wbd.dev_no
- from wms_bas_devp wbd
- left join wms_sta_desc asd on wbd.dev_no = asd.stn_no
+ from common_bas_devp wbd
+ left join common_sta_desc asd on wbd.dev_no = asd.stn_no
where 1=1
and asd.type_no = #{typeNo}
and wbd.host_id = #{hostId}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
index 32ef0d3..1848497 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.controller;
import com.zy.asrs.common.domain.dto.LocDto;
+import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.entity.OrderDetl;
@@ -10,14 +11,11 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
-import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
index 80076b9..02ddd41 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
@@ -1,11 +1,9 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.StaDesc;
-import com.zy.asrs.common.wms.service.StaDescService;
+import com.zy.asrs.common.domain.entity.StaDesc;
+import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -37,6 +35,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(StaDesc::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(StaDesc::getTypeId, condition);
}
@@ -52,6 +51,7 @@
@RequestMapping(value = "/staDesc/add/auth")
@ManagerAuth
public R add(StaDesc staDesc) {
+ staDesc.setHostId(getHostId());
staDescService.save(staDesc);
return R.ok();
}
@@ -79,6 +79,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(StaDesc::getHostId, getHostId());
wrapper.like(StaDesc::getTypeId, condition);
Page<StaDesc> page = staDescService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +97,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(StaDesc::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(StaDesc::getTypeId, condition);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
index b3c042f..b3c29a7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
@@ -74,7 +74,7 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam, getUserId(), getHostId()));
}
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js b/zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js
index 74c9006..799fd51 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js
@@ -1,15 +1,10 @@
var pageCurr;
-var pageCount = 0;
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin', 'xmSelect'], function(){
+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;
- var admin = layui.admin;
- var xmSelect = layui.xmSelect;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -17,28 +12,28 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/staDesc/page/auth',
page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
- height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'typeId', align: 'center',title: '璺緞ID'}
+// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
+// ,{field: 'typeId', align: 'center',title: '璺緞ID'}
,{field: 'typeNo$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
- ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'}
+ // ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'}
,{field: 'stnNo$', align: 'center',title: '浣滀笟绔欑偣'}
- ,{field: 'stnDesc', align: 'center',title: '绔欑偣鍚嶇О'}
+ ,{field: 'stnDesc', align: 'center',title: '绔欑偣鍚嶇О', edit:'text'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'crnStn$', align: 'center',title: '鍫嗗灈鏈虹珯鐐�'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'hostId$', align: 'center',title: '鎺堟潈鍟嗘埛'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
+ // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
+ // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
request: {
pageName: 'curr',
@@ -59,9 +54,44 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- pageCurr=curr;pageCount=count;
+ 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('edit(staDesc)', function (obj) {
+ layer.confirm('淇濆瓨淇敼?', function(){
+ $.ajax({
+ url: baseUrl+"/staDesc/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject({
+ typeId: obj.data.typeId,
+ stnDesc: obj.value,
+ memo: obj.data.memo
+ }),
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200){
+ $(".layui-laypage-btn")[0].click();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
});
// 鐩戝惉鎺掑簭浜嬩欢
@@ -74,28 +104,74 @@
searchData['orderByType'] = obj.type;
tableIns.reload({
where: searchData,
- page: {curr: 1}
+ page: {
+ curr: 1
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
});
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(staDesc)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id).data;
+ var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'addData':
- showEditModel();
+ layer.open({
+ type: 2,
+ title: '鏂板',
+ maxmin: true,
+ area: ['40%', top.detailHeight],
+ shadeClose: false,
+ content: 'staDesc_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':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.typeId;
- }));
- break;
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/staDesc/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':
- admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -126,7 +202,7 @@
} else if (res.code === 403) {
top.location.href = baseUrl+"/";
} else {
- layer.msg(res.msg, {icon: 2})
+ layer.msg(res.msg)
}
}
});
@@ -139,285 +215,316 @@
table.on('tool(staDesc)', function(obj){
var data = obj.data;
switch (obj.event) {
- case 'edit':
- showEditModel(data);
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'staDesc_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 "del":
- del([data.typeId]);
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: ['40%', top.detailHeight],
+ shadeClose: false,
+ content: 'staDesc_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('#typeId,#typeNo,#stnNo,#crnNo', 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 'typeNo':
+ var param = top.reObject(data).typeNo;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '鍏ュ嚭搴撹鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../basWrkIotype/basWrkIotype_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/basWrkIotype/"+ 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 'stnNo':
+ var param = top.reObject(data).stnNo;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '浣滀笟璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../basDevp/basDevp_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/basDevp/"+ 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 'crnNo':
+ var param = top.reObject(data).crnNo;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '鍫嗗灈鏈鸿鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../basCrnp/basCrnp_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/basCrnp/"+ 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 'crnStn':
+ var param = top.reObject(data).crnStn;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '鍫嗗灈鏈虹珯鐐硅鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../basDevp/basDevp_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/basDevp/"+ 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 '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){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
break;
}
});
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- form.val('detail', mData);
- layDateRender(mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/staDesc/"+(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+"/staDesc/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(true);
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ 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(),
+ typeId: $('#typeId').val(),
+ typeNo: $('#typeNo').val(),
+ typeDesc: $('#typeDesc').val(),
+ stnNo: $('#stnNo').val(),
+ stnDesc: $('#stnDesc').val(),
+ crnNo: $('#crnNo').val(),
+ crnStn: $('#crnStn').val(),
+ memo: $('#memo').val(),
+ modiUser: $('#modiUser').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ appeUser: $('#appeUser').val(),
+ appeTime: top.strToDate($('#appeTime\\$').val()),
+
+ };
+ $.ajax({
+ url: baseUrl+"/staDesc/"+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(true);
+ tableReload(false);
});
// 鏃堕棿閫夋嫨鍣�
- function layDateRender(data) {
- setTimeout(function () {
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime',
- value: data!==undefined?data['modiTime$']:null
- });
- layDate.render({
- elem: '#appeTime\\$',
- type: 'datetime',
- value: data!==undefined?data['appeTime$']:null
- });
-
- }, 100);
- }
- layDateRender();
-
- window.loadBasWrkIotypeSel = function () {
- return xmSelect.render({
- el: '#basWrkIotypeXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/basWrkIotype/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
- window.loadBasDevpSel = function () {
- return xmSelect.render({
- el: '#basDevpXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/basDevp/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
- window.loadBasDevpSel = function () {
- return xmSelect.render({
- el: '#basDevpXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/basDevp/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
- window.loadUserSel = function () {
- return xmSelect.render({
- el: '#userXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/user/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
- window.loadUserSel = function () {
- return xmSelect.render({
- el: '#userXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/user/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
- window.loadHostSel = function () {
- return xmSelect.render({
- el: '#hostXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/host/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
});
@@ -427,17 +534,85 @@
parent.layer.closeAll();
});
-function tableReload(search) {
- if (pageCount === 0 || search) {
- let searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- tableIns.reload({
- where: searchData,
- page: {curr: pageCurr}
- });
- } else {
- $(".layui-laypage-btn")[0].click();
+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/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
index 664f790..52d7dbf 100644
--- a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
+++ b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
@@ -7,52 +7,79 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>
-<div 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="condition" 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="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </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 id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="typeNo" name="type_no" class="layui-input" type="text" style="display: none">
+ <input id="typeNo$" 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="basWrkIotypeQueryBytypeNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryBytypeNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
</div>
- <table class="layui-hide" id="staDesc" lay-filter="staDesc"></table>
</div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="stn_no" placeholder="绔欑偣缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="crn_stn" placeholder="鍫嗗灈鏈虹珯鐐�" autocomplete="off">
+ </div>
+ </div>
+ <!--<div class="layui-inline">-->
+ <!--<label class="layui-form-label">缂栥��銆�鍙凤細</label>-->
+ <!--<div class="layui-input-inline">-->
+ <!--<input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="layui-inline">-->
+ <!--<label class="layui-form-label">鍫嗗灈鏈虹珯鐐癸細</label>-->
+ <!--<div class="layui-input-inline cool-auto-complete">-->
+ <!--<input id="crnStn" class="layui-input" name="crn_stn" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+ <!--<input id="crnStn$" 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="basDevpQueryBycrnStn" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+ <!--<select class="cool-auto-complete-window-select" data-key="basDevpQueryBycrnStnSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+ <!--</select>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block;margin-left: 15px">
+ <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="staDesc" lay-filter="staDesc"></table>
+</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm 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>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ <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>
@@ -60,130 +87,9 @@
<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/staDesc/staDesc.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <div 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 cool-auto-complete">
- <input class="layui-input" name="typeNo" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" lay-vertype="tips" lay-verify="required" style="display: none">
- <input id="typeNo$" name="typeNo$" 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="basWrkIotypeQueryBytypeNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryBytypeNoSelect" 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="typeDesc" placeholder="璇疯緭鍏ヤ綔涓氱被鍨�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">浣滀笟绔欑偣: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="stnNo" placeholder="璇疯緭鍏ヤ綔涓氱珯鐐�" lay-vertype="tips" lay-verify="required" style="display: none">
- <input id="stnNo$" name="stnNo$" 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="basDevpQueryBystnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystnNoSelect" 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="stnDesc" 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="crnNo" 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 cool-auto-complete">
- <input class="layui-input" name="crnStn" placeholder="璇疯緭鍏ュ爢鍨涙満绔欑偣" style="display: none">
- <input id="crnStn$" name="crnStn$" 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="basDevpQueryBycrnStn" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBycrnStnSelect" 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="memo" 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="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="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="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="hostId" placeholder="璇疯緭鍏ユ巿鏉冨晢鎴�" style="display: none">
- <input id="hostId$" name="hostId$" 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="hostQueryByhostId" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="hostQueryByhostIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </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>
- </div>
-</script>
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
</html>
diff --git a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html
new file mode 100644
index 0000000..1b8b66c
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html
@@ -0,0 +1,150 @@
+<!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" style="text-align: center">
+ <!--
+ <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%;display:none">
+ <label class="layui-form-label"><span class="not-null">*</span>璺緞ID锛�</label>
+ <div class="layui-input-inline">
+ <input id="typeId" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label"><span class="not-null">*</span>鍏ュ嚭搴撶被鍨嬶細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="typeNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none">
+ <input id="typeNo$" 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="basWrkIotypeQueryBytypeNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryBytypeNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">浣滀笟绫诲瀷锛�</label>
+ <div class="layui-input-inline">
+ <input id="typeDesc" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label"><span class="not-null">*</span>浣滀笟绔欑偣锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="stnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none">
+ <input id="stnNo$" 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="basDevpQueryBystnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">绔欑偣鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input id="stnDesc" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label"><span class="not-null">*</span>鍫嗗灈鏈哄彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="crnNo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">鍫嗗灈鏈虹珯鐐癸細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="crnStn" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="crnStn$" 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="basDevpQueryBycrnStn" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basDevpQueryBycrnStnSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <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 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%;display: none">
+ <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%;display: none">
+ <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%;display: none">
+ <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
+ </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/staDesc/staDesc.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1