zy-asrs.git - Gitblit

			@@ -91,6 +91,13 @@
			margin-left: 10px;
			margin-bottom: 2px;
			}
			#tips {
			display: inline-block;
			color: #666;
			margin-left: 5px;
			margin-bottom: 5px;
			vertical-align: middle;
			}
			</style>
			</head>
			<body>
			@@ -98,7 +105,7 @@
			<header>
			<div class="layui-input-inline">
			<label class="layui-form-label">条码</label>
			<input class="layui-input" type="text" id="code" placeholder="扫码/输入" autocomplete="off">
			<input class="layui-input" type="text" id="code" placeholder="扫码 / 输入" autocomplete="off">
			</div>
			<div style="margin: 5px 5px">
			<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>提取</button>
			@@ -114,6 +121,7 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">重置</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="comb()" style="margin-left: 20px">组托</button>
			<span id="tips"></span>
			</div>
			</footer>
			</body>
			@@ -161,6 +169,10 @@
			// 添加表格数据
			var matData = [];
			function addTableData(data) {
			if (isEmpty(data.matName)){
			tips("提取失败");
			return;
			}
			let toPush = true;
			for (var j=0;j<matData.length;j++){
			if (data.matNo === matData[j].matNo) {
			@@ -171,6 +183,7 @@
			if (toPush) {
			matData.push(data);
			}
			tips("提取成功");
			tableIns.reload({data: matData});
			}

			@@ -185,30 +198,46 @@
			function comb() {
			let barcode = $('#code').val();
			if (isEmpty(barcode)) {
			layer.msg("请输入托盘条码");
			tips("托盘条码为空", true);
			document.getElementById("code").focus();
			return;
			}
			let combMats = matData;
			if (matData.length === 0) {
			tips("请提取物料", true);
			return;
			}
			$.ajax({
			url: baseUrl+"/mobile/comb/auth",
			headers: {'token': localStorage.getItem('token')},
			data: JSON.stringify({
			barcode: barcode,
			combMats: combMats
			combMats: matData
			}),
			contentType:'application/json;charset=UTF-8',
			method: 'POST',
			asyne: false,
			async: false,
			success: function (res) {
			if (res.code === 200) {

			reset();
			tips("组托成功")
			} else if (res.code === 403) {
			top.location.href = baseUrl + "/pda";
			} else {
			alert(res.msg)
			tips(res.msg)
			}
			}
			})
			}

			/**
			* 提示信息
			* @param msg 提示内容
			* @param warn true：红色字体
			*/
			function tips(msg, warn) {
			let tips = $('#tips');
			tips.html(msg);
			tips.css("color", warn?"red":'#666');
			}
			</script>
			</html>