From 9bfcc2dcdd7496a7a391776a03e7abd946661a2d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 20 七月 2024 16:44:20 +0800
Subject: [PATCH] 根据是否拼箱编写物料分配逻辑
---
HTML/views/ASNSetting/ArrivalNotice.html | 83 ++++++++++++++---------------------------
1 files changed, 28 insertions(+), 55 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 514f969..3d4ae65 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -95,36 +95,20 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <!-- JC23 -->
+ <!--JC26-->
<option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">閲囪喘鍏ュ簱</option>
- <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
- <option value="5">鍏跺畠鍏ュ簱</option>
- <option value="6">浠ｅ偍鍏ュ簱</option>
- <!-- JC24 -->
- <!-- <option value="0">鎴愬搧鍏ュ簱</option>
- <option value="1">閲囪喘鍏ュ簱</option>
- <option value="2">涓棿鍝佸叆搴�</option>-->
- <!-- <option value="3">閫�璐у叆搴�</option> -->
- <!-- <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
- <option value="5">鍏跺畠鍏ュ簱</option>
- <option value="6">浠ｅ偍鍏ュ簱</option>
- <option value="7">瀵勫瓨鍏ュ簱</option> -->
- <!-- JC09 -->
- <!-- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
- <option value="1">闈炴爣浜у搧鍏ュ簱</option> -->
- <!-- JC08 -->
- <!-- <option value="0">鎴愬搧鍏ュ簱</option>
- <option value="1">鍘熸枡鍏ュ簱</option>
- <option value="2">閫�璐у叆搴�</option> -->
+ <option value="2">涓棿鍝佸叆搴�</option>
+ <option value="3">閫�璐у叆搴�</option>
+ <option value="4">浣欐枡閫�鍥炲叆搴�</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 90px;">涓婃父绯荤粺鍗曞彿</label>
+ <label class="layui-form-label">涓嬪彂鍗曞彿</label>
<div class="layui-input-inline">
- <input type="text" id="OrderCode" name="OrderCode" placeholder="涓婃父绯荤粺鍗曞彿" autocomplete="off"
- class="layui-input">
+ <input type="text" id="OrderCode" name="OrderCode" placeholder="涓婃父绯荤粺涓嬪彂鐨勫崟鍙�"
+ autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -152,9 +136,9 @@
<label class="layui-form-label">鎾ら攢鍘熷洜</label>
<div class="layui-input-inline">
<textarea id="Reason" name="Reason" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
-
</div>
</div>
+
<div class="layui-inline">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="LAY-app-contlist-search">
@@ -224,19 +208,16 @@
<script type="text/html" id="buttonTpl">
{{# function GetBtn3(d){
var html = ``;
- if(d.Status=='0'){
- html = `<button class="layui-btn layui-btn-radius layui-btn-xs">绛夊緟鎵ц</button>`;
- } else if(d.Status=='1') {
- html = `<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">姝ｅ湪鎵ц</button>`;
- } else if(d.Status=='2') {
- html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">鎵ц瀹屾瘯</button>`;
- } else if(d.Status=='3') {
- html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">璁㈠崟鍏抽棴</button>`;
- } else if(d.Status=='4') {
- html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">涓婁紶瀹屾瘯</button>`;
- } else {
-
+ switch(d.Status)
+ {
+ case "0" : html = `<button class="layui-btn layui-btn-radius layui-btn-xs">绛夊緟鎵ц</button>`;break;
+ case "1" : html = `<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">姝ｅ湪鎵ц</button>`; break;
+ case "2" : html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">鎵ц瀹屾瘯</button>`; break;
+ case "3" : html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">璁㈠崟鍏抽棴</button>`; break;
+ case "4" : html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">涓婁紶瀹屾瘯</button>`; break;
+ default : break;
}
+
return html;
}
}}
@@ -246,24 +227,16 @@
<script type="text/html" id="templetType">
{{# function GetBtn4(d){
var html = ``;
- if(d.Type=='0'){
- html = `鎴愬搧鍏ュ簱`;
- } else if(d.Type=='1') {
- html = `閲囪喘鍏ュ簱`;
- } else if(d.Type=='2') {
- html = `涓棿鍝佸叆搴揱;
+ switch(d.Type)
+ {
+ case "0" : html = `鎴愬搧鍏ュ簱`;break;
+ case "1" : html = `閲囪喘鍏ュ簱`; break;
+ case "2" : html = `涓棿鍝佸叆搴揱; break;
+ case "3" : html = `閫�璐у叆搴揱; break;
+ case "4" : html = `浣欐枡閫�鍥炲叆搴揱; break;
+ default : break;
}
- else if(d.Type=='4') {
- html = `杞﹂棿浣欐枡閫�鍥炲叆搴揱;
- }else if(d.Type=='5') {
- html = `鍏跺畠鍏ュ簱`;
- }else if(d.Type=='6') {
- html = `浠ｅ偍鍏ュ簱`;
- }else if(d.Type=='7') {
- html = `瀵勫瓨鍏ュ簱`;
- }else {
-
- }
+
return html;
}
}}
@@ -463,9 +436,10 @@
{ field: 'Origin', title: '鏉ユ簮', align: 'center', width: 80 },
{ field: 'CustomerName', title: '瀹㈡埛鍚嶇О', align: 'center' },
{ field: 'Type', title: '鍗曟嵁绫诲瀷', align: 'center', templet: '#templetType' },
- { field: 'OrderCode', title: '涓婃父绯荤粺鍗曞彿', align: 'center', width: 180 },
+ { field: 'OrderCode', title: '涓嬪彂鍗曞彿', align: 'center', width: 180 },
{ field: 'CompleteTime', title: '瀹屾垚鏃堕棿', align: 'center', templet: '#templetCompleteTime' },
{ field: 'Demo', title: '澶囨敞', align: 'center', width: 180 },
+ { field: 'UserName', title: '鍒跺崟浜�', align: 'center', width: 110 },
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 110 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', templet: '#templetCreateTime' },
{ field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 110 },
@@ -512,7 +486,6 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
-
contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
--
Gitblit v1.8.0