From 9096f4ff47567b613441a3d239e969514b0b9f76 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 21 八月 2024 10:30:42 +0800
Subject: [PATCH] 修改页面权限显示错误
---
HTML/views/ASNSetting/ArrivalNotice.html | 160 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 122 insertions(+), 38 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index b5b194c..52a48ab 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -62,6 +62,7 @@
<option value="1">姝ｅ湪鎵ц</option>
<option value="2">鎵ц瀹屾垚</option>
<option value="3">璁㈠崟鍏抽棴</option>
+ <option value="4">涓婁紶瀹屾瘯</option>
</select>
</div>
</div>
@@ -91,9 +92,18 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></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>
+ <!-- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
+ <option value="1">闈炴爣浜у搧鍏ュ簱</option> -->
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
@@ -163,25 +173,25 @@
<script type="text/html" id="toolbarDemo1">
{{# function GetBtn1(d){
var html = '';
+ if (d.Status == '0' && d.Origin == '褰曞叆') {
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
+ <i class="layui-icon layui-icon-edit"></i>缂栬緫</a>`;
+ }
switch (d.Status) {
case "0" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
- <i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
- <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>
- <a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs">
- <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>`;
+ html += `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
+ <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
break;
case "1" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>鍏冲崟</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
break;
case "2" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>鍏冲崟</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
break;
case "3" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
break;
default :
break;
@@ -221,10 +231,22 @@
{{# function GetBtn4(d){
var html = ``;
if(d.Type=='0'){
- html = `鏍囧噯浜у搧鍏ュ簱`;
+ html = `鎴愬搧鍏ュ簱`;
} else if(d.Type=='1') {
- html = `闈炴爣浜у搧鍏ュ簱`;
- } else {
+ html = `閲囪喘鍏ュ簱`;
+ } else if(d.Type=='2') {
+ html = `涓棿鍝佸叆搴揱;
+ }else if(d.Type=='3') {
+ html = `閫�璐у叆搴揱;
+ }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;
@@ -256,6 +278,14 @@
}}
{{ GetBtn7(d) }}
</script>
+
+ <script type="text/html" id="templetCheckTime">
+ {{# function GetBtn11(d){
+ return formatDate(d.CheckTime);
+ }
+ }}
+ {{ GetBtn11(d) }}
+ </script>
<!-- #endregion -->
</div>
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -275,15 +305,20 @@
</script>
<script type="text/html" id="toolbarDemoList">
- {{# function GetBtn2(d){
+ {{# function GetBtn2(d){
+ console.log(d);
var html = ``;
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.Status == "0" || d.Status == "1"){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Addlabel">
+ if(d.AsnType =="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>`;
+ }
+ if(d.AsnType == "4"&& (d.Status == "0" || d.Status == "1")){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel2">
+ <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
}
return html;
}
@@ -368,7 +403,7 @@
elem: '#EndTime'
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
});
-
+
var h1 = GetTableTopHeight();
var h2 = GetTableBottomHeight();
@@ -380,16 +415,20 @@
var TotalColsArr = [[
{field: '',title: '搴忓彿',type:'numbers',width: 50,align: 'center',fixed: 'left', "disabled": true},
{field: 'ASNNo',title: '鍏ュ簱鍗曞彿',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},
- {field: 'Status',title: '鎵ц鐘舵��',align: 'center',templet: '#buttonTpl'},
+ {field: 'Status',title: '鎵ц鐘舵��',align: 'center',width: 100,templet: '#buttonTpl'},
{field: 'Origin',title: '鏉ユ簮',align: 'center',width: 80},
+ {field: 'OrderCode',title: '涓婃父鍗曞彿',align: 'center',width: 180},
+
{field: 'CustomerName',title: '瀹㈡埛鍚嶇О',align: 'center'},
- {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',templet: '#templetType'},
- {field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center',templet: '#templetCompleteTime'},
+ {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',width: 100,templet: '#templetType'},
+ {field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center',width: 165,templet: '#templetCompleteTime'},
{field: 'Demo',title: '澶囨敞',align: 'center',width: 180},
{field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 110},
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',templet: '#templetCreateTime'},
+ {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 165,templet: '#templetCreateTime'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 110},
- {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',templet: '#templetUpdateTime'},
+ {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 165,templet: '#templetUpdateTime'},
+ {field: 'CheckUserName',title: '澶嶆牳浜�',align: 'center',width: 110},
+ {field: 'CheckTime',title: '澶嶆牳鏃堕棿',align: 'center',width: 165,templet: '#templetCheckTime'},
{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -612,6 +651,7 @@
{field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,},
{field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150},
{field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
+ {field: 'OrderDetailCode',title: '涓婃父鍗曞彿',align: 'center',width: 180},
{field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140},
{field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140},
{field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140},
@@ -860,6 +900,9 @@
$(".cheXiaoClass").hide();
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
+ $(".checkClass").hide(); //澶嶆牳
+ $(".addLabelClass").hide(); //澶嶆牳
+
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -892,6 +935,16 @@
if (res.data[k].MenuName == "缁存姢鍏ュ簱鍗曞娉�") {
$(function() {
$(".editDemoClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
+ $(function() {
+ $(".checkClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ $(function() {
+ $(".addLabelClass").show();
});
}
}
@@ -1109,6 +1162,7 @@
//鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(LAY-app-content-list2)', function (obj) {
var data = obj.data;
+ var id = data.Id;
switch(obj.event)
{
case "del" :
@@ -1142,9 +1196,9 @@
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html',
+ content: 'LabelPrintSelect.html?Id='+id+'&SupplierLot='+data.SupplierLot,
maxmin: true,
- area: ['460px', '460px'],
+ area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
yes: function(index, layero){
var iframeWindow = window['layui-layer-iframe'+ index]
@@ -1155,20 +1209,50 @@
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- Id: data.Id,
- Reset: field.reset, //閲嶇疆鎵瑰彿
- Level: field.level, //鏍囩绾у埆 1/2绾�
- Type:field.type, //鍏崇郴灞傜骇 鏈�/鏃犲眰绾�
- ArriveQty:field.arriveQty, //鍒拌揣鏁伴噺
- BoxType:field.boxType ,// 绠辨敮绫诲瀷 绠�/鏀�
- Qty:field.qty //绠�/鏀暟閲�
- };
- console.log(param);
+ //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
+
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrint.html',
+ content: 'LabelPrint.html?'+str,
+ maxmin: true,
+ area: ['660px', '660px'],
+ btn: ['鍙栨秷'],
+
+
+ });
+ });
+ submit.trigger('click');
+ }
+
+ });
+
+ break;
+ case "Addlabel2" :
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrintSelect.html?Id='+id+'&Type=4',
+ maxmin: true,
+ area: ['480px', '615px'],
+ btn: ['纭畾','鍙栨秷'],
+ yes: function(index, layero){
+ var iframeWindow = window['layui-layer-iframe'+ index]
+ ,submitID = 'layuiadmin-app-form-edit'
+ ,submit = layero.find('iframe').contents().find('#'+ submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(field);
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrint.html?'+str,
maxmin: true,
area: ['660px', '660px'],
btn: ['鍙栨秷'],
--
Gitblit v1.8.0