JC24WMS.git - Gitblit

			@@ -100,6 +100,7 @@
			<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> -->
			@@ -241,6 +242,8 @@
			html = `其它入库`;
			}else if(d.Type=='6') {
			html = `代储入库`;
			}else if(d.Type=='7') {
			html = `寄存入库`;
			}else {

			}
			@@ -307,9 +310,13 @@
			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.Status == "0" \|\| d.Status == "1")){
			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;
			}
			@@ -394,7 +401,7 @@
			elem: '#EndTime'
			, format: 'yyyy-MM-dd' //可任意组合
			});


			var h1 = GetTableTopHeight();
			var h2 = GetTableBottomHeight();

			@@ -1184,7 +1191,7 @@
			layer.open({
			type: 2,
			title: '生成标签',
			content: 'LabelPrintSelect.html',
			content: 'LabelPrintSelect.html?Id='+id,
			maxmin: true,
			area: ['480px', '615px'],
			btn: ['确定','取消'],
			@@ -1198,7 +1205,44 @@
			console.log(field);
			//提交 Ajax 成功后，静态更新表格中的数据
			//"&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;
			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: ['取消'],


			});
			});
			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,