From 508aac599c24711a3c1f7cfa76d9025c8e73b89f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 25 二月 2023 17:04:05 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 260 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 180 insertions(+), 80 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3e57a88..ad09170 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -10,6 +10,28 @@
var 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({
@@ -20,13 +42,13 @@
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},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', minWidth: 130, width: 130}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
request: {
pageName: 'curr',
@@ -44,6 +66,7 @@
statusCode: 200
},
done: function (res, curr, count) {
+ limit();
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -67,8 +90,12 @@
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') {
+ doModify(data.id, data.orderNo, 4);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -77,7 +104,7 @@
layer.open({
type: 1,
title: false,
- area: '750px',
+ area: '820px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -95,11 +122,13 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
- {field: 'unit', title: '鍗曚綅'},
+ {field: 'workQty', title: '浣滀笟鏁伴噺'},
+ {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
+ // {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
// return util.toDateString(d.createTime);
@@ -136,8 +165,6 @@
// 鏄剧ず琛ㄥ崟寮圭獥
function showEditModel(expTpe) {
- var mlist=null
- var inQtys=[]
admin.open({
type: 1,
title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
@@ -160,29 +187,12 @@
}
let nList = admin.util.deepClone(xxDataList);
for (let xi = 0; xi < nList.length; xi++) {
- // if (nList[xi].inQty > 0 && inQtys[xi] !== nList[xi].anfme) {
- // layer.msg("宸插叆搴撴棤娉曚慨鏀�", {icon: 2})
- // return false;
- // } else if (nList[xi].anfme > 0) {
- // param.push({
- // billNo: data.field.billNo,
- // billType: data.field.billType,
- // matNo: nList[xi].matNo,
- // matName: nList[xi].matName,
- // color: nList[xi].color,
- // size: nList[xi].size,
- // specs: nList[xi].specs,
- // memo: nList[xi].memo,
- // unit: nList[xi].unit,
- // qty: nList[xi].qty,
- // inQty: nList[xi].inQty,
- // })
- // } else if (nList[xi].anfme <= 0){
- // layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
- // return false;
- // }
if (nList[xi].anfme <= 0){
layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+ return false;
+ }
+ if (nList[xi].anfme < nList[xi].workQty){
+ layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
return false;
}
}
@@ -226,20 +236,15 @@
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿'},
+ {field: 'batch', title: '鎵瑰彿', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- // {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
- {field: 'unit', title: '鍗曚綅', width: 80},
+ {field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
+ // {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
done: function (res) {
- mlist= res.data
- for (let i = 0; i < mlist.length; i++) {
- var waitIn=mlist[i]
- inQtys.push(waitIn.qty)
- }
$(layero).find('.layui-table-view').css('margin', '0');
},
size: ''
@@ -270,6 +275,10 @@
if (layEvent === 'edit') {
showEditModel2(data);
} else if (layEvent === 'del') {
+ if(data.workQty > 0){
+ layer.msg("宸插瓨鍦ㄤ綔涓氭暟閲忥紝涓嶈兘鍒犻櫎", {icon: 2});
+ return;
+ }
layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
shade: .1,
skin: 'layui-layer-admin'
@@ -287,35 +296,32 @@
});
// 鏄庣粏鏁版嵁淇敼
table.on('edit(formSSXMTable)', function (obj) {
- if (obj.field === 'memo'){
- for (let i=0;i<xxDataList.length;i++) {
- if (xxDataList[i]["matnr"] === obj.data.matnr && xxDataList[i]["batch"] === obj.data.batch) {
- xxDataList[i]["memo"] = obj.value;
- break;
- }
- }
- } else if (obj.field==='anfme'){
+ let index = obj.tr.attr("data-index");
+ let data = xxDataList[index];
+ if (obj.field === 'anfme'){
let vle = Number(obj.value);
if (isNaN(vle)) {
layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
return false;
} else {
- if (vle > 0) {
- for (let i=0;i<xxDataList.length;i++) {
- if (xxDataList[i]["matnr"] === obj.data.matnr && xxDataList[i]["batch"] === obj.data.batch) {
- xxDataList[i]["anfme"] = vle;
- break;
- }
- }
- } else {
+ if (vle <= 0) {
layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+ // data[obj.field] = 0;
+ // insTbSSXM.reload({data: xxDataList});
+ return false;
+ }
+ if(obj.value < data.workQty){
+ layer.msg("杈撳叆鏁伴噺涓嶈兘灏忎簬浣滀笟涓暟閲�", {icon: 2});
+ // data[obj.field] = 0;
+ // insTbSSXM.reload({data: xxDataList});
return false;
}
}
}
+ data[obj.field] = obj.value;
insTbSSXM.reload({data: xxDataList});
});
- //
+
$('#matAddBtnComment').click(function () {
showEditModel2();
});
@@ -325,41 +331,34 @@
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+"/matCode/covert/"+item.value+"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- async: false,
- success: function (res) {
- if (res.code === 200){
- 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})
- }
+ let selectList = matXmSelect.getValue();
+ for (let i = 0; i<selectList.length; i++) {
+ let item = selectList[i];
+ // 鏌ヨ鐗╂枡璇︽儏
+ $.ajax({
+ url: baseUrl+"/mat/covert/"+item.value+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ 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})
}
- })
- }
+ }
+ })
}
layer.close(dIndex);
return false;
@@ -438,6 +437,107 @@
});
}
+ // 淇敼璁㈠崟鐘舵��
+ function doModify(orderId, orderNo, settle) {
+ layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ layer.load(2);
+ console.log(orderId);
+ console.log(settle);
+ $.ajax({
+ url: baseUrl+"/order/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ id: orderId,
+ orderNo: orderNo,
+ settle: settle
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 浠诲姟杩芥函
+ 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.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
+ },
+ 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'
--
Gitblit v1.9.1