From 09211d189468e0901180c4dde8340d5487657ccb Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期四, 31 七月 2025 10:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/webapp/static/js/order/order.js | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 5a265f1..320f168 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -4,7 +4,7 @@
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
-}).use(['layer', 'form', 'table','upload', 'util', 'admin', 'xmSelect', 'laydate', 'tableMerge', 'notice'], function () {
+}).use(['layer', 'form', 'table','upload','element', 'util', 'admin', 'xmSelect', 'laydate', 'tableMerge', 'notice'], function () {
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
@@ -17,6 +17,7 @@
var laytpl = layui.laytpl;
var tableMerge = layui.tableMerge;
var notice = layui.notice;
+ var element = layui.element;
// 娓叉煋鎼滅储妯℃澘
$.ajax({
@@ -54,7 +55,8 @@
{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},
+ {field: 'cstmrName', align: 'center',title: '瀹㈡埛鍚嶇О'},
+ {field: 'memo', align: 'center',title: '澶囨敞'},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 240}
]],
request: {
@@ -90,7 +92,7 @@
var uploadListIns = upload.render({
elem: '#data-btn-file2'
,elemList: $('#data-btn-file3') //鍒楄〃鍏冪礌瀵硅薄
- ,url: '/order/insert/labelUp/file/auth'
+ ,url: baseUrl+'/order/insert/labelUp/file/auth'
,accept: 'file'
,multiple: true
,number: 10
@@ -98,9 +100,6 @@
,bindAction: '#testListAction'
,choose: function(obj){
// 璧嬪��
- console.log(obj)
- console.log(obj.data)
- console.log($('.layui-layer-title').text())
this.data.orderId=$('.layui-layer-title').text()
var that = this;
var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
@@ -112,7 +111,7 @@
,'<td><div class="layui-progress" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
,'<td>'
,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>'
- ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ // ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
,'</td>'
,'</tr>'].join(''));
@@ -177,13 +176,14 @@
// 鎵撳紑寮圭獥
// 鏋勫缓甯﹀弬鏁扮殑鍐呭
layer.open({
+ area: '1020px',
type: 1,
title: '涓婁紶鏂囦欢-'+data.id,
content: $('#myModal')
});
// 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
$.ajax({
- url: '/order/view/labelUp/file/auth',
+ url: baseUrl+'/order/view/labelUp/file/auth',
data:{
orderId:data.id
},
@@ -201,7 +201,7 @@
+ '<td><div class="layui-progress" lay-filter="progress-demo-' + index + '"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
+ '<td>'
+ '<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>'
- + '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ // + '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ '</td>';
// 灏唗r鍏冪礌娣诲姞鍒扮洰鏍噒able涓�
@@ -246,10 +246,10 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '绠卞彿'},
- {field: 'anfme', title: '鏈ㄧ涓摐绠旀暟閲�'},
+ {field: 'brand', title: '鍖呰缁勫彿', width: 160},
+ // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'supp', title: '瀹㈡埛鍚嶇О'},
+ {field: 'memo', title: '澶囨敞'},
// {field: 'workQty', title: '浣滀笟鏁伴噺'},
// {field: 'unit', title: '鍗曚綅'},
@@ -260,9 +260,13 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'},
- {field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'}
+ // {field: 'specs', title: '鎺ュご'},
+ {field: 'qty$', title: '鍑哄簱鐘舵��', style: 'font-weight: bold'},
+ {field: 'specs', title: '婧愬簱浣�', style: 'font-weight: bold'},
+ {field: 'model', title: '鐩爣搴撲綅', style: 'font-weight: bold'},
+ {field: 'beBatch', title: '璺ㄥ贩閬�', style: 'font-weight: bold'},
+ {field: 'danger$', title: '绉诲簱鐘舵��', style: 'font-weight: bold'},
+ {field: 'inspect$', title: '澶囪揣鐘舵��', style: 'font-weight: bold'}
]],
request: {
pageName: 'curr',
@@ -360,10 +364,10 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'matnr', title: '瑙勬牸', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '绠卞彿', edit: true},
- {field: 'specs', title: '瑙勬牸'},
+ {field: 'specs', title: '鎺ュご'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
@@ -710,12 +714,13 @@
{field: 'title', title: '鍟嗗搧', align: 'center', width: 350},
// {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'batch', title: '绠卞彿', align: 'center'},
- {field: 'model', title: '鎵规', align: 'center'},
- {field: 'specs', title: '瑙勬牸', align: 'center'},
- {field: 'brand', title: '鏈ㄧ绫诲瀷', align: 'center'},
+ {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
+ {field: 'specs', title: '鎺ュご', align: 'center'},
+ // {field: 'brand', title: '鏈ㄧ绫诲瀷', align: 'center'},
+ {field: 'brand$', title: '鏈ㄧ绫诲瀷', align: 'center'},
{field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'},
- {field: 'anfme', title: '鏈ㄧ涓摐绠旀暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
- {field: 'count', title: '鏈ㄧ涓摐绠旀暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'count', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'tkType$', title: 'TK鏍囪', align: 'center', width: 100},
// {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
--
Gitblit v1.9.1