From 7c1af4c63e66754f0868c1a501f4895f9cbc9213 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 15 十一月 2024 09:29:12 +0800
Subject: [PATCH] 双单位
---
src/main/webapp/static/js/orderLog/order.js | 362 ++-------------------------------------------------
1 files changed, 19 insertions(+), 343 deletions(-)
diff --git a/src/main/webapp/static/js/orderLog/order.js b/src/main/webapp/static/js/orderLog/order.js
index 112eb9e..c154d9d 100644
--- a/src/main/webapp/static/js/orderLog/order.js
+++ b/src/main/webapp/static/js/orderLog/order.js
@@ -44,22 +44,24 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
+ {field: 'defNumber', align: 'center', title: '鎿嶄綔绯荤粺鍙�', hide: false, width: 120},
+ {field: '鎿嶄綔鍗曟嵁', align: 'center', title: '鎿嶄綔鍗曟嵁', hide: true},
+ {field: '鎿嶄綔绫诲瀷', align: 'center', title: '鎿嶄綔绫诲瀷', hide: true},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'itemName', align: 'center', title: '鏍哥畻涓讳綋'},
+ //{field: 'itemName', align: 'center', title: '鏍哥畻涓讳綋'},
{field: 'docType$', align: 'center', title: '鍗曟嵁绫诲瀷'},
- {field: 'defNumber', align: 'center', title: '涓氬姟绫诲瀷'},
+ //{field: 'defNumber', align: 'center', title: '涓氬姟绫诲瀷'},
//{field: 'postFee', align: 'center', title: '鎬绘暟閲�', minWidth: 130, width: 130},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'createTime$', title: '鍒涘缓鏃堕棿'},
+ {field: 'createTime$', title: '鍒涘缓鏃堕棿', hide: true},
+ {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'},
+ {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: false},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡', hide: true},
{field: 'cstmrName', align: 'center',title: '渚涘簲鍟�/瀹㈡埛缂栫爜', hide: true},
{field: 'tel', align: 'center',title: '浠撳簱', hide: true},
{field: 'operMemb', align: 'center',title: '鍑哄叆搴撶被鍒�', hide: true},
{field: 'salesman', align: 'center',title: '閮ㄩ棬', hide: true},
- {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: true},
- //{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
request: {
pageName: 'curr',
@@ -139,9 +141,9 @@
page: true,
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ //{type: 'numbers'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 140},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
@@ -153,12 +155,15 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸鍨嬪彿'},
+ //{field: 'specs', title: '瑙勬牸鍨嬪彿'},
{field: 'unit', title: '璁￠噺鍗曚綅'},
- {field: 'manu', title: '琛屽彿'},
- {field: 'threeCode', title: '閿�鍞鍗曞彿'},
- {field: 'deadTime', title: '閿�鍞鍗曡鍙�'},
- {field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
+ //{field: 'manu', title: '琛屽彿'},
+ {field: 'threeCode', title: '閿�鍞崟鍙�'},
+ //{field: 'deadTime', title: '鑷敱椤�'},
+ {field: 'processSts$', title: '宸ュ簭'},
+ //{field: 'specs', title: '瑙勬牸'},
+ {field: 'reportQty', title: '涓婃姤鏁伴噺'},
+ //{field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
]],
request: {
pageName: 'curr',
@@ -185,336 +190,7 @@
}
});
- // 鏄剧ず琛ㄥ崟寮圭獥
- function showEditModel(expTpe) {
- admin.open({
- type: 1,
- title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
- content: $('#editDialog').html(),
- area: '1300px',
- success: function (layero, dIndex) {
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- var isExpAdd = !expTpe;
- // 鍥炴樉鏁版嵁
- form.val('editForm', expTpe);
- if (expTpe) {
- $('#orderNo').attr("disabled", "disabled");
- }
- // 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(orderEditSubmit)', function (data) {
- // 缁勮鏁版嵁
- if (xxDataList.length <= 0) {
- layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
- return false;
- }
- let nList = admin.util.deepClone(xxDataList);
- for (let xi = 0; xi < nList.length; xi++) {
- if (nList[xi].anfme <= 0){
- layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
- return false;
- }
- }
- layer.load(2);
- $.ajax({
- url: baseUrl+"/orderLog/form/" + (isExpAdd?"add":"modify") + "/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- orderId: Number(data.field.id),
- docType: Number(data.field.docType),
- orderNo: data.field.orderNo,
- orderDetlList: nList
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll('loading');
- if (res.code === 200){
- layer.close(dIndex);
- $(".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});
- }
- }
- })
- return false;
- });
- // 鏄庣粏琛ㄦ牸
- var xxDataList = [];
- var tbOptions = {
- elem: '#formSSXMTable',
- headers: {token: localStorage.getItem('token')},
- data: xxDataList,
- page: true,
- height: '350px;',
- 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: 'threeCode', title: '閿�鍞鍗曞彿(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'deadTime', 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: 'memo', title: '澶囨敞' , edit: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
- ]],
- done: function (res) {
- $(layero).find('.layui-table-view').css('margin', '0');
- },
- size: ''
- };
- if (!isExpAdd) {
- $.ajax({
- url: baseUrl+"/orderLog/detl/all/auth?orderId=" + expTpe.id,
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- async: false,
- success: function (res) {
- if (res.code === 200){
- xxDataList = res.data;
- tbOptions.data = xxDataList;
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- })
- }
- var insTbSSXM = table.render(tbOptions);
- // 宸ュ叿鏉＄偣鍑讳簨浠�
- table.on('tool(formSSXMTable)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'edit') {
- showEditModel2(data);
- } else if (layEvent === 'del') {
- layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- layer.close(i);
- for (var j = 0; j < xxDataList.length; j++) {
- if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) {
- xxDataList.splice(j, 1);
- break;
- }
- }
- insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- });
- }
- });
- // 鏄庣粏鏁版嵁淇敼
- table.on('edit(formSSXMTable)', function (obj) {
- 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) {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
- return false;
- }
- }
- }
- data[obj.field] = obj.value;
- insTbSSXM.reload({data: xxDataList});
- });
- $('#matAddBtnComment').click(function () {
- showEditModel2();
- });
-
- // 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
- function showEditModel2(exp) {
- admin.open({
- type: 1,
- offset: '150px',
- area: '680px',
- title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
- content: $('#matEditDialog').html(),
- success: function (layero, dIndex) {
- // 鍥炴樉鏁版嵁
- form.val('matEditForm', exp);
- // 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(matEditSubmit)', function (data) {
- 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;
- });
- // 娓叉煋鐗╂枡閫夋嫨
- var matXmSelect = xmSelect.render({
- el: '#mat',
- style: {
- width: '340px',
- },
- autoRow: true,
- toolbar: { show: true },
- filterable: true,
- remoteSearch: true,
- remoteMethod: function(val, cb, show){
- $.ajax({
- url: baseUrl+"/mat/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- })
- // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
-
- }
- });
- }
-
- // 鍒犻櫎鍗曟嵁
- function doDel(orderId) {
- layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- layer.close(i);
- layer.load(2);
- $.ajax({
- url: baseUrl+"/orderLog/delete/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- orderId: orderId
- },
- 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 doReport(orderId) {
- layer.confirm('纭畾瑕佷笂浼犲崟鎹悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- layer.close(i);
- layer.load(2);
- $.ajax({
- url: baseUrl+"/orderLog/report/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- orderId: orderId
- },
- 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 doModify(orderId, 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+"/orderLog/update/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- id: orderId,
- 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) {
--
Gitblit v1.9.1