From 6004efd6f95e26c718325675adcac6149c21b392 Mon Sep 17 00:00:00 2001
From: zwl <zwl123456>
Date: 星期四, 11 九月 2025 15:19:11 +0800
Subject: [PATCH] U8订单对接完成(需正式账套)
---
src/main/webapp/static/js/orderDetl/orderDetl.js | 266 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 197 insertions(+), 69 deletions(-)
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index caef270..7b9fe3e 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -9,6 +9,27 @@
var form = layui.form;
var admin = layui.admin;
+ // 娓叉煋鎼滅储妯℃澘
+ $.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})
+ }
+ }
+ })
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#orderDetl',
@@ -22,30 +43,31 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栫爜',sort:true, width: 160}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜',sort:true, width: 160}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О',sort:true, width: 160}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '鍨嬪彿'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
- ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
- ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
- ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
- ,{field: 'count', align: 'center',title: '鏁伴噺'}
- ,{field: 'weight', align: 'center',title: '閲嶉噺'}
+ ,{field: 'qty', align: 'center',title: '瀹屾垚鏁伴噺'}
+ // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'batch', align: 'center',title: '鐗规畩璇存槑'}
+ // ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'danger$', align: 'center',title: '璁㈠崟绫诲瀷'}
+ ,{field: 'anfme$', align: 'center', title: '璁㈠崟鐘舵��', templet: '#settleTpl', minWidth: 120, width: 160},
+ // ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
+ // ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
+ // ,{field: 'count', align: 'center',title: '鏁伴噺'}
+ // ,{field: 'weight', align: 'center',title: '閲嶉噺'}
+ // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ // {field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ {field: 'workQty', align: 'center',title: '宸ヤ綔鏁伴噺'}
+ // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿',width:200}
+ ,{field: 'inspect$', align: 'center',title: '鏄惁涓婃姤'}
+ ,{field: 'units', 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: '澶囨敞'}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
]],
request: {
pageName: 'curr',
@@ -93,14 +115,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=[];
@@ -146,56 +168,49 @@
table.on('tool(orderDetl)', function(obj){
var data = obj.data;
switch (obj.event) {
- case 'edit':
- showEditModel(data);
+ case 'manualReporting':
+ manualReporting([data.id]);
break;
case "del":
del([data.id]);
break;
+ case "enable":
+ enable([data.id]);
+ break;
}
});
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- layDateRender(mData);
- form.val('detail', mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/orderDetl/"+(mData?'update':'add')+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- if (res.code === 200){
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- return false;
- });
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
+ /* 鎵嬪姩涓婃姤 */
+ function manualReporting(ids) {
+ layer.confirm('纭畾瑕佹墜鍔ㄤ笂鎶ラ�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/orderDetl/manualReporting/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
});
}
/* 鍒犻櫎 */
function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ layer.confirm('纭畾瑕佸叧闂�変腑鏁版嵁鍚楋紵', {
skin: 'layui-layer-admin',
shade: .1
}, function (i) {
@@ -221,6 +236,89 @@
});
}
+ /* 鍚敤 */
+ function enable(ids) {
+ layer.confirm('纭畾瑕佸惎鐢ㄩ�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/orderDetl/enable/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#ymd\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#wrkDate\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnStrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnEndTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#plcStrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnPosTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#refIotime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#errorTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#logErrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
// 鎼滅储
form.on('submit(search)', function (data) {
pageCurr = 1;
@@ -233,6 +331,30 @@
clearFormVal($('#search-box'));
tableReload(false);
});
+ // 寮傚父
+ form.on('submit(abnormal)', function (data) {
+ pageCurr = 1;
+ tableReload(true);
+ // console.log("abnormal");
+ // $.ajax({
+ // url: baseUrl+"/orderDetl/abnormal",
+ // headers: {'token': localStorage.getItem('token')},
+ // method: 'GET',
+ // success: function (res) {
+ // layer.close(loadIndex);
+ // if (res.code === 200){
+ // layer.msg(res.msg, {icon: 1});
+ // tableReload();
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // } else {
+ // layer.msg(res.msg, {icon: 2});
+ // }
+ // }
+ // })
+
+ });
+
// 鏃堕棿閫夋嫨鍣�
function layDateRender(data) {
@@ -264,8 +386,14 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+ // if(child){
+ // searchData["abnormal"] = 1;
+ // }else {
+ // searchData["abnormal"] = 0;
+ // }
+
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
- });
+ });
}
--
Gitblit v1.9.1