From d952a84673f12db2403ec735139421b92b1a2591 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 十月 2025 14:00:00 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e46458c..6fd6cab 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -95,7 +95,9 @@
} else if (layEvent === 'del') {
doDel(data.id);
} else if (layEvent === 'complete') {
- doModify(data.id, data.orderNo, 4);
+ doModify(data.id, data.orderNo, 6);
+ } else if (layEvent === 'continueExecution') {
+ doModify99(data.id, data.orderNo, 99);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -124,10 +126,11 @@
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'specs', title: '瑙勬牸'},
{field: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '鏁伴噺'},
- {field: 'workQty', title: '浣滀笟鏁伴噺'},
- {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
+ {field: 'anfme', title: '寰呭畬缁撴暟閲�'},
+ {field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold'},
+ {field: 'workQty', title: '宸蹭笂鎶ユ暟閲�'},
// {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -135,8 +138,7 @@
// }, width: 180
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
- // {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'}
+ // {field: 'color', title: '棰滆壊'}
]],
request: {
pageName: 'curr',
@@ -439,7 +441,45 @@
// 淇敼璁㈠崟鐘舵��
function doModify(orderId, orderNo, settle) {
- layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
+ 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 doModify99(orderId, orderNo, settle) {
+ layer.confirm('纭畾瑕佺户缁墽琛屽悧锛燂紙浼氬皢鏈墽琛屾暟閲忛噸鏂扮敓鎴愭墽琛屽崟鎹級', {
shade: .1,
skin: 'layui-layer-admin'
}, function (i) {
@@ -501,7 +541,7 @@
var traceCharts = echarts.init(document.getElementById('wrkTraceCharts'));
var traceOptions = {
title: {
- text: '瀹屾垚/鎬婚噺', x: 'center', y: '38%',
+ text: '浣滀笟/瀹岀粨/涓婃姤', x: 'center', y: '38%',
textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
subtextStyle: {fontSize: 36, color: '#10B4E8'},
itemGap: 20
@@ -514,7 +554,7 @@
// 璧嬪��
traceCharts.setOption({
title: {
- subtext: res.data.wrkQty+"/"+res.data.totalQty
+ subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
},
series: [
{
--
Gitblit v1.9.1