From ee4806a4b2ec94ec63b4cb9b58447d9863baebe5 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 27 三月 2025 09:02:41 +0800
Subject: [PATCH] 修改问题
---
HTML/views/ASNSetting/ArrivalNotice.html | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index edec824..d7b6dea 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -73,7 +73,7 @@
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="SkuNo" name="SkuNo" placeholder="鐗╂枡缂栫爜" autocomplete="off"
@@ -86,19 +86,19 @@
<input type="text" id="SkuName" name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off"
class="layui-input">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ </div> -->
+ <!-- <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,24 +113,24 @@
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
- <option value="2">閫�璐у叆搴�</option> -->
+ <option value="2">閫�璐у叆搴�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
+ </div> -->
+ <!-- <div class="layui-inline">
<label class="layui-form-label" style="width: 90px;">涓婃父绯荤粺鍗曞彿</label>
<div class="layui-input-inline">
<input type="text" id="OrderCode" name="OrderCode" placeholder="涓婃父绯荤粺鍗曞彿"
autocomplete="off" class="layui-input">
</div>
- </div>
- <div class="layui-inline">
+ </div> -->
+ <!-- <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">
@@ -322,11 +322,7 @@
if(d.Status == "0"){
html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
- }
- if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
- <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
- }
+ }
return html;
}
@@ -457,8 +453,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 +487,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 +542,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