From 842c9a82b6a9d8d80d370cbf6dedbd2302ba5fab Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 24 六月 2024 16:58:34 +0800
Subject: [PATCH] 统计报表-托盘明细增加添加托盘库存明细功能；修改问题
---
HTML/views/ASNSetting/ArrivalNotice.html | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index edec824..8922c66 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -87,18 +87,18 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <!-- <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-inline">
- <select name="Type" id="Type" lay-filter="Type" lay-search>
+ <select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <!-- JC23 -->
- <option value="0">鎴愬搧鍏ュ簱</option>
+ JC23 -->
+ <!--<option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">閲囪喘鍏ュ簱</option>
<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
<option value="5">鍏跺畠鍏ュ簱</option>
<option value="6">浠ｅ偍鍏ュ簱</option>
- <!-- JC24 -->
+ JC24 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">閲囪喘鍏ュ簱</option>
<option value="2">涓棿鍝佸叆搴�</option>-->
@@ -113,10 +113,10 @@
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
- <option value="2">閫�璐у叆搴�</option> -->
+ <option value="2">閫�璐у叆搴�</option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label" style="width: 90px;">涓婃父绯荤粺鍗曞彿</label>
<div class="layui-input-inline">
@@ -124,13 +124,13 @@
autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">瀹㈡埛鍚嶇О</label>
<div class="layui-input-inline">
<input type="text" id="CustomerName" name="CustomerName" placeholder="瀹㈡埛鍚嶇О" autocomplete="off"
class="layui-input">
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
@@ -309,11 +309,11 @@
</div>
<!-- #endregion -->
- <script type="text/html" id="toolbarDemo">
+ <!-- <script type="text/html" id="toolbarDemo">
<button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" lay-event="add" >
<i class="layui-icon"></i>娣诲姞
</button>
- </script>
+ </script> -->
<script type="text/html" id="toolbarDemoList">
{{# function GetBtn2(d){
@@ -457,8 +457,8 @@
{field: 'ASNNo',title: '鍏ュ簱鍗曞彿',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},
{field: 'Status',title: '鎵ц鐘舵��',align: 'center',templet: '#buttonTpl'},
{field: 'Origin',title: '鏉ユ簮',align: 'center',width: 80},
- {field: 'CustomerName',title: '瀹㈡埛鍚嶇О',align: 'center'},
- {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',templet: '#templetType'},
+ //{field: 'CustomerName',title: '瀹㈡埛鍚嶇О',align: 'center'},
+ // {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',templet: '#templetType'},
{field: 'OrderCode',title: '涓婃父绯荤粺鍗曞彿',align: 'center',width: 180},
{field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center',templet: '#templetCompleteTime'},
{field: 'Demo',title: '澶囨敞',align: 'center',width: 180},
@@ -491,10 +491,10 @@
}
var param = {
ASNNo: $("#ASNNo").val(),
- Type: $("#Type").val(),
+ Type: '',
Status: $("#Status").val(),
OrderCode:$("#OrderCode").val(),
- CustomerName: $("#CustomerName").val(),
+ CustomerName: '',
LotNo: $("#LotNo").val(),
SkuNo: $("#SkuNo").val(),
SkuName: $("#SkuName").val(),
@@ -546,18 +546,18 @@
{field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center', width: 160,templet: '#templetCompleteTime2'},
{field: 'IsSampling',title: '鏄惁鍙栨牱',align: 'center',width: 90,templet: '#templetIsSampling'},
{field: 'InspectStatus',title: '璐ㄦ鐘舵��',align: 'center',width: 90,templet: '#templetInspectStatus'},
- {field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 90},
+ //{field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 90},
// {field: 'Price',title: '鍗曚环',align: 'center',width: 65},
// {field: 'Money',title: '閲戦',align: 'center',width: 65},
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 120},
- {field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,},
- {field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150},
- {field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
- {field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140},
- {field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140},
- {field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140},
- {field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',width: 140},
- {field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'},
+ // {field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,},
+ // {field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150},
+ // {field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
+ // {field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140},
+ // {field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140},
+ // {field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140},
+ // {field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',width: 140},
+ // {field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'},
{field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 100},
{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160,templet: '#templetCreateTime2'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 150,},
--
Gitblit v1.8.0