From c10e16220622d6fbc17c55893af41f73a4797cbd Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期日, 04 二月 2024 08:58:15 +0800
Subject: [PATCH] 标签样式调整
---
HTML/views/ASNSetting/ArrivalNotice.html | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 3ddf22a..ce15fdb 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -302,14 +302,15 @@
</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.AsnType == "4") && (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;
@@ -890,6 +891,8 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
+ $(".addLabelClass").hide(); //澶嶆牳
+
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -927,6 +930,11 @@
if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
$(function() {
$(".checkClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ $(function() {
+ $(".addLabelClass").show();
});
}
}
@@ -1144,6 +1152,7 @@
//鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(LAY-app-content-list2)', function (obj) {
var data = obj.data;
+ var id = data.Id;
switch(obj.event)
{
case "del" :
@@ -1179,7 +1188,7 @@
title: '鐢熸垚鏍囩',
content: 'LabelPrintSelect.html',
maxmin: true,
- area: ['460px', '460px'],
+ area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
yes: function(index, layero){
var iframeWindow = window['layui-layer-iframe'+ index]
@@ -1190,20 +1199,13 @@
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+"&Reset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrint.html',
+ content: 'LabelPrint.html?'+str,
maxmin: true,
area: ['660px', '660px'],
btn: ['鍙栨秷'],
--
Gitblit v1.8.0