From 8d15ae10e5c282d8195d5851b2ae27d06544f4a9 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 21 九月 2022 10:32:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/RowLastnoService.java | 2
src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java | 7 +
src/main/java/com/zy/common/web/WcsController.java | 35 +++++++
pom.xml | 2
src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java | 12 ++
/dev/null | 18 ---
src/main/webapp/static/js/locCheck/locCheck.js | 116 ++++++++++++----------
src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java | 26 +++++
src/main/java/com/zy/asrs/controller/LocCheckController.java | 6 +
src/main/java/com/zy/asrs/service/LocCheckService.java | 1
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/common/service/CommonService.java | 12 --
src/main/resources/application.yml | 4
13 files changed, 158 insertions(+), 85 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3baad37..ac5d73e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
</dependencies>
<build>
- <finalName>lywms</finalName>
+ <finalName>stwms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/LocCheckController.java b/src/main/java/com/zy/asrs/controller/LocCheckController.java
index 269cc12..8549423 100644
--- a/src/main/java/com/zy/asrs/controller/LocCheckController.java
+++ b/src/main/java/com/zy/asrs/controller/LocCheckController.java
@@ -120,4 +120,10 @@
return R.ok();
}
+ @RequestMapping("/locCheck/create/auth")
+ public R autoCreate(String prec){
+ locCheckService.autoCreatePick(prec);
+ return R.ok("鍒涘缓鎷ｈ揣鍗曟垚鍔�");
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java b/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
index 1a1ca80..f683f26 100644
--- a/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.RowLastno;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
@Mapper
@@ -11,4 +13,9 @@
RowLastno findBySection(Integer row);
+ @Update("update asr_row_lastno set wrk_mk = 1 where whs_type = 1")
+ void updateInitWrkMk();
+
+ @Update("update asr_row_lastno set wrk_mk = 1 where whs_type = #{whs}")
+ void updateNextWrkMk(@Param("whs") int i);
}
diff --git a/src/main/java/com/zy/asrs/service/LocCheckService.java b/src/main/java/com/zy/asrs/service/LocCheckService.java
index 89bc5b4..db3fe91 100644
--- a/src/main/java/com/zy/asrs/service/LocCheckService.java
+++ b/src/main/java/com/zy/asrs/service/LocCheckService.java
@@ -5,4 +5,5 @@
public interface LocCheckService extends IService<LocCheck> {
+ void autoCreatePick(String prec);
}
diff --git a/src/main/java/com/zy/asrs/service/RowLastnoService.java b/src/main/java/com/zy/asrs/service/RowLastnoService.java
index 66fb173..2fb6c8a 100644
--- a/src/main/java/com/zy/asrs/service/RowLastnoService.java
+++ b/src/main/java/com/zy/asrs/service/RowLastnoService.java
@@ -7,4 +7,6 @@
RowLastno findBySection(Integer row);
+ Integer selectNextWhsType();
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java
index 0107e67..d1e91e5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java
@@ -1,12 +1,24 @@
package com.zy.asrs.service.impl;
+import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.mapper.LocCheckMapper;
import com.zy.asrs.entity.LocCheck;
import com.zy.asrs.service.LocCheckService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.service.ManLocDetlService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("locCheckService")
public class LocCheckServiceImpl extends ServiceImpl<LocCheckMapper, LocCheck> implements LocCheckService {
+ @Autowired
+ private ManLocDetlService manLocDetlService;
+ @Override
+ public void autoCreatePick(String prec) {
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(null);
+
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
index 4926799..49bc63f 100644
--- a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
@@ -1,6 +1,8 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.mapper.RowLastnoMapper;
import com.zy.asrs.service.RowLastnoService;
@@ -13,4 +15,28 @@
public RowLastno findBySection(Integer row) {
return this.baseMapper.findBySection(row);
}
+
+ @Override
+ public Integer selectNextWhsType() {
+ RowLastno wrk_mk = this.selectOne(new EntityWrapper<RowLastno>()
+ .eq("wrk_mk", 1));
+ if (Cools.isEmpty(wrk_mk)) {
+ this.baseMapper.updateInitWrkMk();
+ return 1;
+ }else {
+ int i = this.selectCount(null);
+ if (wrk_mk.getWhsType() >= i){
+ this.baseMapper.updateInitWrkMk();
+ wrk_mk.setWrkMk("0");
+ this.update(wrk_mk,new EntityWrapper<RowLastno>()
+ .eq("whs_type",wrk_mk.getWhsType()));
+ }else {
+ this.baseMapper.updateNextWrkMk(wrk_mk.getWhsType()+1);
+ wrk_mk.setWrkMk("0");
+ this.update(wrk_mk,new EntityWrapper<RowLastno>()
+ .eq("whs_type",wrk_mk.getWhsType()));
+ }
+ return wrk_mk.getWhsType();
+ }
+ }
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 11f066a..813d3db 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -50,7 +50,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
+ * @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
@@ -100,15 +100,7 @@
// whsType = getWhsType(sourceStaNo, times);
StartupDto startupDto = new StartupDto();
- if (sourceStaNo < 200){
- whsType = 1;
- } else if (sourceStaNo > 199 && sourceStaNo < 300){
- whsType = 2;
- } else if (sourceStaNo > 299 && sourceStaNo < 400){
- whsType = 3;
- } else if (sourceStaNo > 399){
- whsType = 4;
- }
+
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 06099a0..1ed25a3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -43,6 +43,8 @@
private WaitPakinService waitPakinService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private RowLastnoService rowLastnoService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -98,6 +100,39 @@
return R.ok().add(dto);
}
+ @PostMapping("/auto/emptyIn/v1")
+ @ResponseBody
+ public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
+
+ // 妫�绱㈠簱浣�
+ StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 15, null, locTypeDto,0);
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(dto.getWorkNo());
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(1L);
+ wrkMast.setIoPri(13D);
+ wrkMast.setIoType(10);
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setFullPlt("N"); // 婊℃澘锛歂
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setMemo("鑷姩绌烘墭鍏ュ簱");
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
+ }
+
/**
* 鍏ㄦ澘鍏ュ簱
*/
diff --git a/src/main/java/locCheck.sql b/src/main/java/locCheck.sql
deleted file mode 100644
index a7cf3be..0000000
--- a/src/main/java/locCheck.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save locCheck record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck/locCheck.html', 'locCheck绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck/locCheck.html', N'locCheck绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#view', N'鏌ヨ', '60565', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#btn-add', N'鏂板', '60565', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#btn-edit', N'缂栬緫', '60565', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#btn-delete', N'鍒犻櫎', '60565', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#btn-export', N'瀵煎嚭', '60565', '3', '4', '1');
diff --git a/src/main/java/saasLog.sql b/src/main/java/saasLog.sql
deleted file mode 100644
index c67ce09..0000000
--- a/src/main/java/saasLog.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save saasLog record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'saasLog/saasLog.html', 'saasLog绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'saasLog#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'saasLog#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'saasLog#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'saasLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'saasLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'saasLog/saasLog.html', N'saasLog绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'saasLog#view', N'鏌ヨ', '60558', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'saasLog#btn-add', N'鏂板', '60558', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'saasLog#btn-edit', N'缂栬緫', '60558', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'saasLog#btn-delete', N'鍒犻櫎', '60558', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'saasLog#btn-export', N'瀵煎嚭', '60558', '3', '4', '1');
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b51131d..506af8a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=hylyasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index f65aef1..88c58cc 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/lywms";
+var baseUrl = "/stwms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
diff --git a/src/main/webapp/static/js/locCheck/locCheck.js b/src/main/webapp/static/js/locCheck/locCheck.js
index 0dc953c..26a8ec1 100644
--- a/src/main/webapp/static/js/locCheck/locCheck.js
+++ b/src/main/webapp/static/js/locCheck/locCheck.js
@@ -1,7 +1,7 @@
var pageCurr;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
+}).use(['table', 'laydate', 'form', 'admin'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -13,7 +13,7 @@
tableIns = table.render({
elem: '#locCheck',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/locCheck/list/auth',
+ url: baseUrl + '/locCheck/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -21,20 +21,20 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox', hide:true}
- ,{field: 'id', align: 'center',title: '鍞竴ID' , hide:true}
- ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
- ,{field: 'originAnfme', align: 'center',title: '鐩樼偣鍓嶆暟閲�'}
- ,{field: 'type$', align: 'center',title: '鐘舵��'}
- ,{field: 'realAnfme', align: 'center',title: '鐪熷疄鏁伴噺'}
- ,{field: 'createBy', align: 'center',title: '鍒涘缓浜�' , hide:true}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿', hide:true}
- ,{field: 'updateBy', align: 'center',title: '淇敼浜�', hide:true}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
+ {type: 'checkbox', hide: true}
+ , {field: 'id', align: 'center', title: '鍞竴ID', hide: true}
+ , {field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
+ , {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'}
+ , {field: 'originAnfme', align: 'center', title: '鐩樼偣鍓嶆暟閲�'}
+ , {field: 'type$', align: 'center', title: '鐘舵��'}
+ , {field: 'realAnfme', align: 'center', title: '鐪熷疄鏁伴噺'}
+ , {field: 'createBy', align: 'center', title: '鍒涘缓浜�', hide: true}
+ , {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿', hide: true}
+ , {field: 'updateBy', align: 'center', title: '淇敼浜�', hide: true}
+ , {field: 'updateTime$', align: 'center', title: '淇敼鏃堕棿', hide: true}
+ , {field: 'memo', align: 'center', title: '澶囨敞', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 120}
]],
request: {
pageName: 'curr',
@@ -51,11 +51,11 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -63,7 +63,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(locCheck)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
@@ -77,23 +77,23 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(locCheck)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
+ 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;
+ 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=[];
+ 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);
@@ -101,7 +101,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -109,18 +109,18 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/locCheck/export/auth",
+ url: baseUrl + "/locCheck/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ 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');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2})
}
@@ -132,7 +132,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(locCheck)', function(obj){
+ table.on('tool(locCheck)', function (obj) {
var data = obj.data;
switch (obj.event) {
case 'edit':
@@ -157,19 +157,19 @@
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/locCheck/"+(mData?'update':'add')+"/auth",
+ url: baseUrl + "/locCheck/" + (mData ? 'update' : 'add') + "/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.close(dIndex);
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -191,17 +191,17 @@
layer.close(i);
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/locCheck/delete/auth",
+ url: baseUrl + "/locCheck/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: ids},
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2});
}
@@ -220,7 +220,16 @@
success: function (layero, dIndex) {
form.render('select');
form.on('submit(pakin)', function (data) {
- data.field.selectPerc
+ var prec = $("#selectPerc option:selected").val();
+ $.ajax({
+ url: baseUrl + "/locCheck/create/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {'prec': prec},
+ method: 'POST',
+ success: function (res) {
+ console.log(res);
+ }
+ })
})
}
});
@@ -239,32 +248,33 @@
layDate.render({
elem: '#createTime\\$',
type: 'datetime',
- value: data!==undefined?data['createTime\\$']:null
+ value: data !== undefined ? data['createTime\\$'] : null
});
layDate.render({
elem: '#updateTime\\$',
type: 'datetime',
- value: data!==undefined?data['updateTime\\$']:null
+ value: data !== undefined ? data['updateTime\\$'] : null
});
}, 300);
}
+
layDateRender();
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
function tableReload(child) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
- });
+ });
}
--
Gitblit v1.9.1