From b6bf5c99a551f042616c184313a9abb9cab1008a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 15:04:18 +0800
Subject: [PATCH] 导入聚乳酸明细时 牌号为161,171,181并且物资类别为改性树脂时指定主体为海正生物，生产车间为一车间
---
src/main/webapp/static/js/locRule/locRule.js | 126 ++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/static/js/locRule/locRule.js b/src/main/webapp/static/js/locRule/locRule.js
index f521632..cc9fa98 100644
--- a/src/main/webapp/static/js/locRule/locRule.js
+++ b/src/main/webapp/static/js/locRule/locRule.js
@@ -1,4 +1,5 @@
var pageCurr;
+var admin;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
@@ -7,7 +8,8 @@
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
- var admin = layui.admin;
+ admin = layui.admin;
+
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -22,29 +24,28 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: ''}
- ,{field: 'matnr', align: 'center',title: ''}
- ,{field: 'specs', align: 'center',title: ''}
- ,{field: 'model', align: 'center',title: ''}
- ,{field: 'cstmr', align: 'center',title: ''}
- ,{field: 'batch', align: 'center',title: ''}
- ,{field: 'other', align: 'center',title: ''}
- ,{field: 'rowBeg', align: 'center',title: ''}
- ,{field: 'rowEnd', align: 'center',title: ''}
- ,{field: 'bayBeg', align: 'center',title: ''}
- ,{field: 'bayEnd', align: 'center',title: ''}
- ,{field: 'levBeg', align: 'center',title: ''}
- ,{field: 'levEnd', align: 'center',title: ''}
- ,{field: 'limit', align: 'center',title: ''}
- ,{field: 'status', align: 'center',title: ''}
- ,{field: 'createBy', align: 'center',title: ''}
- ,{field: 'createTime$', align: 'center',title: ''}
- ,{field: 'updateBy', align: 'center',title: ''}
- ,{field: 'updateTime$', align: 'center',title: ''}
- ,{field: 'memo', align: 'center',title: ''}
- ,{field: 'mixed$', align: 'center',title: '鏄惁鏀寔娣疯浇'}
- ,{field: 'keepGo$', align: 'center',title: '鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵�'}
- ,{field: 'maktx', align: 'center',title: ''}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', hide: false}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true}
+ ,{field: 'cstmr', align: 'center',title: '瀹㈡埛', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide: true}
+ ,{field: 'other', align: 'center',title: '鍏朵粬', hide: true}
+ ,{field: 'rowBeg', align: 'center',title: '寮�濮嬫帓'}
+ ,{field: 'rowEnd', align: 'center',title: '缁撴潫鎺�'}
+ ,{field: 'bayBeg', align: 'center',title: '寮�濮嬪垪'}
+ ,{field: 'bayEnd', align: 'center',title: '缁撴潫鍒�'}
+ ,{field: 'levBeg', align: 'center',title: '寮�濮嬪眰'}
+ ,{field: 'levEnd', align: 'center',title: '缁撴潫灞�'}
+ ,{field: 'limit', align: 'center',title: '涓婇檺', hide: true}
+ ,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
+ ,{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}
+ // ,{field: 'mixed$', align: 'center',title: '娣疯浇'}
+ ,{field: 'keepGo$', align: 'center',title: '缁х画鎼滅储'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
@@ -94,14 +95,14 @@
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=[];
@@ -160,8 +161,8 @@
function showEditModel(mData) {
admin.open({
type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ area: '1000px',
+ title: (mData ? '淇敼' : '娣诲姞') + '搴撳尯瑙勫垯',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender(mData);
@@ -193,6 +194,13 @@
}
});
}
+
+ // 瀵煎叆閿�鍞崟
+ $("#importOrder").click(function () {
+ $("#importExcel").trigger("click");
+ });
+
+
/* 鍒犻櫎 */
function del(ids) {
@@ -239,6 +247,11 @@
function layDateRender(data) {
setTimeout(function () {
layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
elem: '#createTime\\$',
type: 'datetime',
value: data!==undefined?data['createTime\\$']:null
@@ -268,5 +281,48 @@
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
- });
+ });
+}
+
+function uploadExcel(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 + "/locRule/excel/import/auth";
+ var form = new FormData();
+ form.append("file", file);
+ let xhr = new XMLHttpRequest();
+ xhr.open("post", url, true);
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete;
+ xhr.onerror = uploadFailed;
+ xhr.onloadend = function () {
+ layer.closeAll('loading');
+ };
+ // xhr.upload.onprogress = progressFunction;
+ xhr.upload.onloadstart = function(){
+ ot = new Date().getTime();
+ oloaded = 0;
+ };
+ xhr.send(form);
+ }, function(index){
+ });
+}
+function uploadComplete(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload({page: {curr: 1}});
+ } else {
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
}
--
Gitblit v1.9.1