From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/js/order/order.js | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 82180e2..0903332 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -44,7 +44,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'defNumber', align: 'center', title: '鎿嶄綔绯荤粺鍙�', hide: false, width: 120},
+ {field: 'defNumber', align: 'center', title: '鎿嶄綔绯荤粺鍙�', hide: false, width: 100},
{field: '鎿嶄綔鍗曟嵁', align: 'center', title: '鎿嶄綔鍗曟嵁', hide: true},
{field: '鎿嶄綔绫诲瀷', align: 'center', title: '鎿嶄綔绫诲瀷', hide: true},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
@@ -53,16 +53,17 @@
//{field: 'defNumber', align: 'center', title: '涓氬姟绫诲瀷'},
//{field: 'postFee', align: 'center', title: '鎬绘暟閲�', minWidth: 130, width: 130},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
+ {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'},
+ //{field: 'shipCode', align: 'center',title: '鍒跺崟浜�'},
+ {field: 'createBy$', title: '鍒涘缓浜�'},
{field: 'createTime$', title: '鍒涘缓鏃堕棿'},
- {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: false},
- {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
+ {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 140, width: 140},
{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},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 160}
]],
request: {
pageName: 'curr',
@@ -102,6 +103,10 @@
$("#importOrder").click(function () {
$("#importExcel").trigger("click");
});
+ // 瀵煎叆鍗婃垚鍝�
+ $("#importBcpOrder").click(function () {
+ $("#importBcpExcel").trigger("click");
+ });
$("#orderCheckBtn").click(function () {
$("#importExcel2").trigger("click");
@@ -129,8 +134,8 @@
layer.open({
type: 1,
title: false,
- area: '1460px',
- offset: [top + 'px', (left - 900 + $a.outerWidth()) + 'px'],
+ area: '1100px',
+ offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
fixed: false,
@@ -147,9 +152,9 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- //{field: 'batch', title: '鎵瑰彿'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 140},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
+ {field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
// {field: 'unit', title: '鍗曚綅'},
@@ -164,9 +169,10 @@
{field: 'unit', title: '璁￠噺鍗曚綅'},
//{field: 'manu', title: '琛屽彿'},
{field: 'threeCode', title: '閿�鍞崟鍙�'},
- {field: 'deadTime', title: '鑷敱椤�'},
+ //{field: 'deadTime', title: '鑷敱椤�'},
{field: 'processSts$', title: '宸ュ簭'},
- {field: 'specs', title: '瑙勬牸'},
+ //{field: 'specs', title: '瑙勬牸'},
+ {field: 'reportQty', title: '涓婃姤鏁伴噺'},
//{field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
]],
request: {
@@ -666,6 +672,34 @@
}, function(index){
});
}
+
+function upload3(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/import3/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) {
--
Gitblit v1.9.1