From e34c002fefc989c22c69918319a55394e72e50d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 09:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/waitPakin/waitPakin.js | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index fbfef1a..48592a7 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -1,9 +1,10 @@
var pageCurr;
function getCol() {
- var cols = [
- ];
+ var cols = [ {type: 'checkbox'} ];
cols.push.apply(cols, detlCols);
- cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+ cols.push({field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'userName$', align: 'center',title: '鎿嶄綔浜�'}
+ ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.status === 'Y'){html += " checked ";}
html += ">";
@@ -20,12 +21,15 @@
return cols;
}
-layui.use(['table','laydate', 'form'], function(){
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'tableMerge'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var tableMerge = layui.tableMerge;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -55,6 +59,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ // tableMerge.render(this);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -98,6 +103,33 @@
table.on('toolbar(waitPakin)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
+ case 'addWrk':
+ if (checkStatus.data.length === 0){
+ layer.msg('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�', {icon: 2});
+ } else {
+ layer.confirm('纭畾鐢熸垚宸ヤ綔妗ｄ换鍔″悧', function(){
+ $.ajax({
+ url: baseUrl+"/create/waitPain/wrkMast/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(checkStatus.data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ });
+ }
+ break;
case 'addData':
layer.open({
type: 2,
--
Gitblit v1.9.1