JC24WMS.git - Gitblit

			@@ -183,11 +183,11 @@
			<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>
			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>
			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" :
			@@ -320,6 +320,10 @@
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel2">
			<i class="layui-icon layui-icon-edit"></i>生成标签</a>`;
			}
			if(d.AsnType == "5"&& (d.Status == "0" \|\| d.Status == "1") && (d.PackagNo != ""\|\| d.PackagNo!=null)){
			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;
			}
			}}
			@@ -415,18 +419,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',templet: '#templetCheckTime'},
			{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)))//将表头数据进行url编码
			@@ -649,6 +655,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},
			@@ -1193,7 +1200,7 @@
			layer.open({
			type: 2,
			title: '生成标签',
			content: 'LabelPrintSelect.html?Id='+id,
			content: 'LabelPrintSelect.html?Id='+id+'&SupplierLot='+data.SupplierLot,
			maxmin: true,
			area: ['480px', '615px'],
			btn: ['确定','取消'],
			@@ -1207,7 +1214,9 @@
			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;
			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,
			@@ -1230,7 +1239,7 @@
			layer.open({
			type: 2,
			title: '生成标签',
			content: 'LabelPrintSelect.html?Id='+id+'&Type=4',
			content: 'LabelPrintSelect.html?Id='+id+'&Type=4'+'&SupplierLot='+data.SupplierLot,
			maxmin: true,
			area: ['480px', '615px'],
			btn: ['确定','取消'],
			@@ -1244,7 +1253,9 @@
			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;
			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,