From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/webapp/static/js/order/order.js | 221 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 181 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 50bf6cb..86868e3 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -1,4 +1,6 @@
var insTbCount = 0;
+var admin;
+var insTb
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () {
@@ -7,12 +9,34 @@
var form = layui.form;
var table = layui.table;
var util = layui.util;
- var admin = layui.admin;
+ admin = layui.admin;
var xmSelect = layui.xmSelect;
var layDate = layui.laydate;
+ var laytpl = layui.laytpl;
+
+ // 娓叉煋鎼滅储妯℃澘
+ $.ajax({
+ url: baseUrl+"/docType/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ limit: 9999
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ let template = Handlebars.compile($('#docTypeTpl').html());
+ $('#docType-query').html(template(res.data));
+ layui.form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
// 娓叉煋琛ㄦ牸
- var insTb = table.render({
+ insTb = table.render({
elem: '#order',
url: baseUrl+'/order/head/page/auth',
headers: {token: localStorage.getItem('token')},
@@ -20,7 +44,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', sort: true},
+ {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
@@ -62,12 +86,19 @@
showEditModel();
});
+ // 瀵煎叆閿�鍞崟
+ $("#importOrder").click(function () {
+ $("#importExcel").trigger("click");
+ });
+
// 宸ュ叿鏉＄偣鍑讳簨浠�
table.on('tool(order)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'edit') {
showEditModel(data);
+ } else if (layEvent === 'wrkTrace') {
+ showWrkTrace(data.id);
} else if (layEvent === 'del') {
doDel(data.id);
} else if (layEvent === 'complete') {
@@ -98,12 +129,13 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜'},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '鏁伴噺'},
- {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
- {field: 'unit', title: '鍗曚綅'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 280},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
+ // {field: 'batch', title: '鎵瑰彿'},
+ {field: 'specs', title: '瑙勬牸', width: 180},
+ {field: 'anfme', title: '鏁伴噺', width: 70},
+ {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold', width: 90}
+ // {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
// return util.toDateString(d.createTime);
@@ -111,7 +143,6 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'}
]],
request: {
pageName: 'curr',
@@ -205,13 +236,14 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 280},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
+ // {field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'specs', title: '瑙勬牸', width: 180},
+ {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 100},
+ {field: 'sum', title: '搴撳瓨鏁伴噺', style: 'color: red;font-weight: bold', minWidth: 110, width: 100},
// {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
- {field: 'unit', title: '鍗曚綅', width: 80},
+ // {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
@@ -290,41 +322,43 @@
admin.open({
type: 1,
offset: '150px',
- area: '480px',
+ area: '680px',
title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
content: $('#matEditDialog').html(),
success: function (layero, dIndex) {
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
// 鍥炴樉鏁版嵁
form.val('matEditForm', exp);
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(matEditSubmit)', function (data) {
- var existMats = [];
- xxDataList.forEach(function(elem) {
- existMats.push(elem.matNo);
- });
- var selectList = matXmSelect.getValue();
- for (var i = 0; i<selectList.length; i++) {
- var item = selectList[i];
- if (existMats.indexOf(item.value) === -1) {
- // 鏌ヨ鐗╂枡璇︽儏
- $.ajax({
- url: baseUrl+"/mat/covert/"+item.value+"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- async: false,
- success: function (res) {
- if (res.code === 200){
+ let selectList = matXmSelect.getValue();
+ for (let i = 0; i<selectList.length; i++) {
+ let item = selectList[i];
+ // 鏌ヨ鐗╂枡璇︽儏
+ $.ajax({
+ url: baseUrl+"/mat/covert/"+btoa(item.value)+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var bige=true;
+ for (var j = 0; j < xxDataList.length; j++) {
+ if (xxDataList[j].matnr === res.data.matnr && xxDataList[j].batch === res.data.batch) {
+ bige=false;
+ break;
+ }
+ }
+ if (bige){
xxDataList.push(res.data);
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2})
}
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
}
- })
- }
+ }
+ })
}
layer.close(dIndex);
return false;
@@ -440,9 +474,116 @@
});
}
+ // 浠诲姟杩芥函
+ function showWrkTrace(orderId) {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ $.ajax({
+ url: baseUrl+"/order/wrk/trace/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ orderId: orderId
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ laytpl(wrkTraceDialog.innerHTML).render(res.data, function (html) {
+ admin.open({
+ type: 1,
+ title: '浠诲姟杩芥函',
+ area: ['800px', '450px'],
+ shadeClose: true,
+ content: html,
+ success: function (layero, dIndex) {
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ /** 缁熻鍥捐〃 */
+ var traceCharts = echarts.init(document.getElementById('wrkTraceCharts'));
+ var traceOptions = {
+ title: {
+ text: '浣滀笟/鎬婚噺', x: 'center', y: '38%',
+ textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
+ subtextStyle: {fontSize: 36, color: '#10B4E8'},
+ itemGap: 20
+ },
+ color: ['#10B4E8', '#E0E0E0', '#FF0000'],
+ tooltip: {trigger: 'item'},
+ series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
+ };
+ traceCharts.setOption(traceOptions);
+ // 璧嬪��
+ traceCharts.setOption({
+ title: {
+ subtext: res.data.wrkQty+"/"+res.data.totalQty
+ },
+ series: [
+ {
+ data: [
+ {name: '宸蹭綔涓�', value: res.data.wrkQty},
+ {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.lackQty},
+ {name: '搴撳瓨涓嶈冻', value: res.data.lackQty},
+ ]
+ }
+ ]
+ });
+ }
+ });
+ });
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+
+
layDate.render({
elem: '.layui-laydate-range'
,type: 'datetime'
,range: true
});
});
+
+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 + "/order/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