From 371462edc6b3ee1de97c235d4a019b544badda0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 14 二月 2026 22:09:37 +0800
Subject: [PATCH] AGV工作档界面和逻辑调整
---
src/main/webapp/static/js/task/task.js | 102 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 96 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/task/task.js b/src/main/webapp/static/js/task/task.js
index dcda583..5b3f01c 100644
--- a/src/main/webapp/static/js/task/task.js
+++ b/src/main/webapp/static/js/task/task.js
@@ -1,4 +1,5 @@
var pageCurr;
+var tableIns;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table', 'laydate', 'form', 'admin'], function () {
@@ -9,11 +10,68 @@
var form = layui.form;
var admin = layui.admin;
- // 鏁版嵁娓叉煋
- tableIns = table.render({
+ // AGV浠诲姟绠＄悊锛氬伐浣滅姸鎬佺敤澶氶�夋锛堝嬀閫夊椤癸級锛屼粎鏈〉锛涚敤鍘熺敓 checkbox 涓嶇粡杩� layui 缇庡寲锛屼繚璇佸嬀閫変笌妗嗗唴鏄剧ず濮嬬粓涓�鑷�
+ function updateTaskWrkStsFromCheckbox() {
+ var ids = [], texts = [];
+ $('#taskWrkStsCheckboxWrap input:checkbox:checked').each(function () {
+ var $input = $(this);
+ ids.push($input.val());
+ var text = $input.data('text') || $input.closest('label').clone().children().remove().end().text().trim() || $input.val();
+ texts.push(text);
+ });
+ $('input[name="wrk_sts"]').val(ids.join(','));
+ $('#wrkSts\\$').val(texts.join(', '));
+ }
+
+ $(document).on('change', '#taskWrkStsCheckboxWrap input:checkbox', updateTaskWrkStsFromCheckbox);
+
+ function initWrkStsDropdownThenTable() {
+ $.ajax({
+ url: baseUrl + '/basWrkStatusQueryAgv/auth',
+ headers: {token: localStorage.getItem('token')},
+ data: {condition: ''},
+ method: 'POST',
+ traditional: true,
+ success: function (res) {
+ var $wrap = $('#taskWrkStsCheckboxWrap');
+ $wrap.empty();
+ var defaultIds = {'7': true, '8': true, '9': true};
+ if (res.code === 200 && res.data && res.data.length) {
+ res.data.forEach(function (item) {
+ var id = String(item.id);
+ var text = item.value || id;
+ var checked = defaultIds[id] ? ' checked' : '';
+ $wrap.append(
+ '<label class="task-wrksts-cb-label" style="display: inline-block; margin: 4px 12px 4px 0; cursor: pointer;"><input type="checkbox" value="' + id + '" data-text="' + (text.replace(/"/g, '"')) + '"' + checked + '> ' + text + '</label>'
+ );
+ });
+ updateTaskWrkStsFromCheckbox();
+ }
+
+ // 鐐瑰嚮杈撳叆妗嗗睍寮�/鏀惰捣涓嬫媺锛堜笉璋冪敤 autoShow锛岄伩鍏嶈蛋鍏ㄥ眬閫昏緫锛�
+ $('#wrkSts\\$').off('click').on('click', function () {
+ var $win = $('#taskWrkStsWindow');
+ $win.toggle();
+ });
+
+ var initialWhere = {};
+ $.each($('#search-box [name]').serializeArray(), function () {
+ initialWhere[this.name] = this.value;
+ });
+ renderTaskTable(initialWhere);
+ },
+ error: function () {
+ renderTaskTable({});
+ }
+ });
+ }
+
+ function renderTaskTable(initialWhere) {
+ tableIns = table.render({
elem: '#task',
headers: {token: localStorage.getItem('token')},
url: baseUrl + '/task/list/auth',
+ where: initialWhere,
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -35,8 +93,8 @@
, {field: 'staNo$', align: 'center', title: '鐩爣绔�', width: 120}
, {field: 'locNo', align: 'center', title: '鐩爣搴撲綅', width: 120}
, {field: 'barcode', align: 'center', title: '鏉＄爜', width: 110}
- , {field: 'errorMemo', align: 'center', title: '閿欒鍘熷洜', width: 200}
- , {field: 'errorMemo2', align: 'center', title: '閿欒鍘熷洜2', width: 200, hide: true}
+ , {field: 'errorMemo', align: 'center', title: 'AGV鍥炲鎶ユ枃', width: 200, hide: true}
+ , {field: 'errorMemo2', align: 'center', title: 'AGV鍥炲鎶ユ枃2', width: 200, hide: true}
, {field: 'errorTime$', align: 'center', title: '閿欒鏃堕棿', width: 160, hide: true}
, {field: 'preHave', align: 'center', title: '鍏堝叆鍝�', hide: true}
, {field: 'takeNone', align: 'center', title: '绌烘搷浣�', hide: true}
@@ -66,7 +124,10 @@
pageCurr = curr;
limit();
}
- });
+ });
+ }
+
+ initWrkStsDropdownThenTable();
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(task)', function (obj) {
@@ -225,6 +286,34 @@
}, function () {
});
break;
+ // 鍒犻櫎锛堝崟鏉★級
+ case 'delete':
+ layer.confirm('纭畾瑕佸垹闄よ鏉GV浠诲姟鍚楋紵', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl + "/task/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {'ids[]': [data.id]},
+ traditional: true,
+ 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});
+ }
+ }
+ });
+ });
+ break;
}
});
@@ -278,7 +367,7 @@
$.ajax({
url: baseUrl + "/task/delete/auth",
headers: {'token': localStorage.getItem('token')},
- data: {ids: ids},
+ data: {'ids[]': ids},
method: 'POST',
success: function (res) {
layer.close(loadIndex);
@@ -452,6 +541,7 @@
});
function tableReload(child) {
+ if (!tableIns) return;
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
--
Gitblit v1.9.1