From 65fe36ca916e7d34af5a95874b7dad86e49a1391 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 27 八月 2024 17:00:58 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 35 +++++++++--------
src/main/webapp/static/js/order/order.js | 10 ++--
src/main/webapp/views/order/out.html | 34 ++++++++--------
src/main/webapp/static/js/common.js | 2
src/main/webapp/views/order/order.html | 4 +-
5 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index a093e1d..70afe71 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -225,7 +225,7 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '瑙勬牸', sort:false, hide: false}
,{field: 'maktx', align: 'center',title: '鍝佸悕', sort:true, hide: true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵规', hide: true, sort:true}
,{field: 'unit', align: 'center',title: '绠卞彿', hide: false}
,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 532fc96..20b90d0 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -245,10 +245,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: 'batch', title: '绠卞彿'},
+ // {field: 'anfme', title: '鏁伴噺'},
// {field: 'workQty', title: '浣滀笟鏁伴噺'},
// {field: 'unit', title: '鍗曚綅'},
@@ -259,7 +259,7 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '鎺ュご'},
+ // {field: 'specs', title: '鎺ュご'},
{field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'},
{field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'}
]],
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 0efe870..a65b525 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -32,17 +32,18 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '瑙勬牸', width: 160}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '绠卞彿'}
- ,{field: 'specs', align: 'center',title: '鎺ュご'}
+ // ,{field: 'matnr', align: 'center',title: '瑙勬牸', width: 160}
+ // ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+ // ,{field: 'batch', align: 'center',title: '绠卞彿'}
+ // ,{field: 'specs', align: 'center',title: '鎺ュご'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'brand', align: 'center',title: '鍖呰缁勫彿'}
+ ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
+ // ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ // ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ // ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
// ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
// ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
@@ -158,15 +159,15 @@
cols: [[
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
- {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '绠卞彿', align: 'center'},
- {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
- {field: 'specs', title: '鎺ュご', align: 'center'},
- {field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true},
- {field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false},
- {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: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
+ // {field: 'batch', title: '绠卞彿', align: 'center'},
+ // {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
+ // {field: 'specs', title: '鎺ュご', align: 'center'},
+ {field: 'brand', align: 'center',title: '鍖呰缁勫彿', merge: true, hide: false},
+ // {field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false},
+ // {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: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
// {type: 'checkbox', merge: ['locNo']},
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index aa5fc84..5e0a283 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -127,10 +127,10 @@
{{# if (d.settle == 0 || d.settle == 1) { }}
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>
+<!-- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>-->
{{# } }}
{{# if (d.settle == 2) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>
+<!-- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>-->
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
{{# } }}
{{# if (d.settle == 4 && d.tkType=='1') { }}
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 0d7e344..7aceff6 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -95,23 +95,23 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍟嗗搧缂栫爜:</label>
+ <label class="layui-form-label">鍖呰缁勫彿:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="鍟嗗搧缂栫爜"/>
+ <input name="brand" class="layui-input" placeholder="鍖呰缁勫彿"/>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍟嗗搧鍚嶇О:</label>
- <div class="layui-input-inline">
- <input name="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О"/>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">搴忓垪鐮�:</label>
- <div class="layui-input-inline">
- <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">鍟嗗搧鍚嶇О:</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input name="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О"/>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">搴忓垪鐮�:</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-inline">-->
<!-- <label class="layui-form-label">鐘舵��:</label>-->
<!-- <div class="layui-input-inline">-->
@@ -166,9 +166,9 @@
<div class="layui-card-body" style="padding: 10px">
<table id="stoPreTab" lay-filter="stoPreTab"></table>
</div>
- <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">
- 鎵归噺淇敼
- </button>
+<!-- <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">-->
+<!-- 鎵归噺淇敼-->
+<!-- </button>-->
</div>
</script>
--
Gitblit v1.9.1