From 25314b5ee613c48e7db31138d7fcb8abc4c536be Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 14 一月 2024 20:15:05 +0800
Subject: [PATCH] # 功能完善
---
src/main/webapp/static/js/pla/plaDetl.js | 222 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 169 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 1962af6..2bae082 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -6,65 +6,88 @@
var data = [];
var checkStatus = [];
var dataCheck = [];
+var admin;
function getCol() {
var cols = [
{field: 'id', title: 'id', align: 'center',hide:true}
,{type: 'checkbox'}
- ,{field: 'pakinTime', title: '鍏ュ簱鏃堕棿', align: 'center'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
- ,{field: 'packageNo', align: 'center',title: '鍖呭彿'}
- ,{field: 'brand', align: 'center',title: '鐗屽彿'}
- ,{field: 'weight', align: 'center',title: '閲嶉噺锛圞G锛�', hide:true}
- ,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿', hide:true}
- ,{field: 'line', align: 'center',title: '鐢熶骇绾�', hide:true}
- ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷'}
- ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷'}
- ,{field: 'filmWrap', align: 'center',title: '缂犺啘', edit: true}
- ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛坓/10min锛�'}
- ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛堚剝锛�'}
- ,{field: 'vadf1', align: 'center',title: '鎸ュ彂浠�1锛�%锛�', hide:true}
- ,{field: 'vadf2', align: 'center',title: '鎸ュ彂浠�2锛�%锛�', hide:true}
- ,{field: 'yellowness', align: 'center',title: '榛勫害', hide:true}
- ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紙0-100%锛�', hide:true}
- ,{field: 'water', align: 'center',title: '姘村垎锛坧pm锛�', hide:true}
- ,{field: 'l', align: 'center',title: 'l鍊�', edit: true, hide:true}
- ,{field: 'a', align: 'center',title: 'a鍊�', edit: true, hide:true}
- ,{field: 'b', align: 'center',title: 'b鍊�', edit: true, hide:true}
- ,{field: 'fillIn', align: 'center',title: '濉厖(%)', edit: true}
- ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��', hide:true}
- ,{field: 'problem', align: 'center',title: '璐ㄩ噺闂', hide:true}
- ,{field: 'stash', align: 'center',title: '浠撳簱', edit:true}
- ,{field: 'locNo', align: 'center',title: '搴撲綅', edit:true}
- ,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�', edit:true}
- ,{field: 'status', align: 'center',title: '鐘舵��', edit:true}
- ,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook'}
- ,{field: 'orderNo', align: 'center',title: '鍗曞彿', edit:true}
- ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', edit:true}
- ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', edit:true}
- ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', edit:true}
- ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', edit:true}
- ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', edit:true}
- ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', edit:true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', edit:true}
+ ,{field: 'pakinTime$', title: '鍏ュ簱鏃堕棿', align: 'center'}
+ ,{field: 'owner', align: 'center',title: '涓讳綋',edit:true}
+ ,{field: 'type', align: 'center',title: '鐗╄祫绫诲埆',hide:true,edit:true}
+ ,{field: 'proOrderNo', align: 'center',title: '鍗曞彿',hide:true,edit:true}
+ ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide:true,edit:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',edit:true}
+ ,{field: 'packageNo', align: 'center',title: '鍖呭彿',edit:true}
+ ,{field: 'brand', align: 'center',title: '鐗屽彿',edit:true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺锛圞G锛�',edit:true}
+ ,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿',hide:true,edit:true}
+ ,{field: 'line', align: 'center',title: '鐢熶骇绾�',hide:true,edit:true}
+ ,{field: 'proDate', align: 'center',title: '鐢熶骇鏃ユ湡',edit:true}
+ ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷',edit:true}
+ ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷',edit:true}
+ ,{field: 'filmWrap', align: 'center',title: '缂犺啘',edit:true}
+ ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛坓/10min锛�',edit:true}
+ ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛堚剝锛�',edit:true}
+ ,{field: 'vadf1', align: 'center',title: '鎸ュ彂浠�1锛�%锛�', hide:true,edit:true}
+ ,{field: 'vadf2', align: 'center',title: '鎸ュ彂浠�2锛�%锛�', hide:true,edit:true}
+ ,{field: 'yellowness', align: 'center',title: '榛勫害',edit:true}
+ ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紙0-100%锛�',edit:true}
+ ,{field: 'water', align: 'center',title: '姘村垎锛坧pm锛�', hide:true,edit:true}
+ ,{field: 'l', align: 'center',title: 'l鍊�', hide:true,edit:true}
+ ,{field: 'a', align: 'center',title: 'a鍊�', hide:true,edit:true}
+ ,{field: 'b', align: 'center',title: 'b鍊�', hide:true,edit:true}
+ ,{field: 'fillIn', align: 'center',title: '濉厖(%)',hide:true,edit:true}
+ ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��',edit:true}
+ ,{field: 'problem', align: 'center',title: '澶囨敞',edit:true}
+ ,{field: 'stash', align: 'center',title: '浠撳簱',edit:true}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅',edit:true}
+ ,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�',edit:true}
+ ,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true}
+ ,{field: 'status', align: 'center',title: '鐘舵��', templet: setState ,edit:true}
+ ,{align: 'center', title: '娴佽浆鏄庣粏', toolbar: '#tbLook'}
+ ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
+ ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
+ ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
+ ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
+ ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
+ ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
+ ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
];
return cols;
}
+function setState(data){
+ if(data.status === "寰呭叆搴�"){
+ return "<span style='color: orange'>寰呭叆搴�</span>"
+ }else if(data.status === "宸插叆搴�"){
+ return "<span style='color: blue'>宸插叆搴�</span>"
+ }else if(data.status === "寰呭嚭搴�"){
+ return "<span style='color: red'>寰呭嚭搴�</span>"
+ }else if(data.status === "閮ㄥ垎鍑哄簱"){
+ return "<span style='color: black'>閮ㄥ垎鍑哄簱</span>"
+ }else if(data.status === "鍏ㄩ儴鍑哄簱"){
+ return "<span style='color: gray'>鍏ㄩ儴鍑哄簱</span>"
+ }
+}
+
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function() {
+}).extend({
+ dropdown: 'dropdown/dropdown',
+}).use(['table','laydate', 'form', 'admin', 'dropdown'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
- var admin = layui.admin;
+ admin = layui.admin;
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#plaDetl',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/pla/list/auth?step=3',
+ url: baseUrl+'/pla/list/auth?step=2',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -119,7 +142,7 @@
type: 1,
title: false,
area: '1200px',
- offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
+ offset: ['600px', (left - 1200 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
fixed: false,
@@ -168,6 +191,41 @@
});
}
});
+
+ }
+ })
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(plaDetl)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id)
+ switch(obj.event) {
+ case 'updateData':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾淇敼'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ 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;
}
})
@@ -259,7 +317,6 @@
layer.msg("鏈夋湭濉啓瀛楁");
return;
}
- data[i].step = 3;
dataSave.push(data[i]);
}else {
dataOld.push(data[i]);
@@ -371,13 +428,22 @@
$(document).on('click','#sellout', function () {
- let data = table.cache.plaDetl;
- let dataSave = [];
- let dataOld = [];
+ var data = table.cache.plaDetl;
+ var dataSave = [];
+ var dataOld = [];
+ var brand;
+
for(var i=0; i<data.length; i++){
if(data[i].LAY_CHECKED){
- if(data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"){
- layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱锛岃閲嶆柊閫夋嫨");
+ if(data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"|| data[i].weightAnfme <= data[i].qtyAnfme){
+ layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱鎴栬�呮病鏈夊墿浣欏彲鍑洪噸閲忥紝璇烽噸鏂伴�夋嫨");
+ return;
+ }
+
+ brand = brand ? brand : data[i].brand;
+
+ if( brand != data[i].brand){
+ layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁澶氱鐗屽彿锛岃閲嶆柊閫夋嫨");
return;
}
dataSave.push(data[i]);
@@ -391,20 +457,16 @@
layer.msg("鏈嬀閫夛紝璇峰厛鍕鹃�夐渶瑕佹洿鏀圭殑搴撳瓨");
return;
}
- if(dataSave.length > 1){
- layer.msg("璇峰嬀閫変竴鏉″簱瀛樻槑缁�");
- return;
- }
layer.open({
type: 2,
- title: '鍗栧嚭',
+ title: '鍑哄簱',
maxmin: true,
area: ['800px', top.detailHeight],
shadeClose: false,
content: 'sellout.html',
success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ //layer.getChildFrame('#data-detail-submit-edit', index).hide();
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
@@ -449,7 +511,7 @@
shadeClose: false,
content: 'pickup.html',
success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ //layer.getChildFrame('#data-detail-submit-edit', index).hide();
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
@@ -483,4 +545,58 @@
parent.layer.closeAll();
});
+// excel瀵煎叆妯℃澘涓嬭浇
+function excelMouldDownload(){
+ layer.load(1, {shade: [0.1,'#fff']});
+ location.href = baseUrl + "/pla/excel/import/mould";
+ layer.closeAll('loading');
+}
+
+// excel瀵煎叆
+function importExcel() {
+ $("#importExcel").trigger("click");
+}
+function upload(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/pla/excel/import/auth";
+ var form = new FormData();
+ form.append("file", file);
+ xhr = new XMLHttpRequest();
+ xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete; //璇锋眰瀹屾垚
+ xhr.onerror = uploadFailed; //璇锋眰澶辫触
+ xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
+ layer.closeAll('loading');
+ $("#importExcel").val("");
+ };
+ // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
+ xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
+ ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
+ oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
+ };
+ xhr.send(form);
+ }, function(index){
+ $("#importExcel").val("");
+ });
+}
+function uploadComplete(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ loadTree("");
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ layer.msg(res.msg, {icon: 2});
+}
+
--
Gitblit v1.9.1