JC24WMS.git - Gitblit

			@@ -155,7 +155,6 @@
			<option value="1">1</option>
			<option value="2">2</option>
			<option value="3">3</option>
			<option value="4">4</option>
			</select>
			</div>
			</div>
			@@ -169,7 +168,25 @@
			<option value="044">044</option>
			<option value="051">051</option>
			<option value="059">059</option>
			<option value="440">440</option>
			<option value="443">443</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-inline" id="divFinish" style="display: none; padding-top: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">账号</label>
			<div class="layui-input-inline" style="width: 220px;">
			<input type="text" id="admin" name="admin" placeholder="账号" autocomplete="off"
			class="layui-input">
			</div>
			</div>
			<div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
			<label class="layui-form-label">密码</label>
			<div class="layui-input-inline" style="width: 220px;">
			<input type="password" id="password" name="password" placeholder="密码" autocomplete="off"
			class="layui-input">
			</div>
			</div>
			</div>
			@@ -356,7 +373,7 @@
			<i class="layui-icon layui-icon-delete"></i>取消分配
			</a>`;
			}
			if( d.Status == '2' \|\| d.Status == '3'){
			if( d.Status == '1' \|\|d.Status == '2' \|\| d.Status == '3'\|\| (d.Status == '4' && d.Type == "1")){
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="outKu">
			<i class="layui-icon layui-icon-ok"></i>出库
			</a>`;
			@@ -977,27 +994,77 @@
			}
			});
			}else if(obj.event === 'check'){//复核
			// 代码区域
			layer.confirm('确定复核此单据吗？', function(index) {
			var param = {
			Id:data.Id,
			};
			sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
			if (res.code == 0) { //成功
			layer.msg(res.msg, {
			icon: 1,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () {
			refreshTable();
			doing = true

			layer.open({
			type: 1,
			title: '复核确认',
			content: $('#divFinish'),
			maxmin: true,
			area: ['350px','215px'],
			btn: ['确定', '取消'],
			yes: function(index, layero) {
			var pa = $('#PickingArea').val();
			console.log(pa)
			if (isChongFu== true) {
			isChongFu= false;

			if($('#admin').val()==''){
			layer.msg("请输入账号", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			isChongFu= true;
			return;
			}
			if($("#password").val() == '')
			{
			layer.msg("请输入密码", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			isChongFu= true;
			return;
			}

			var param = {
			Id:data.Id,
			UserNo:$('#admin').val(),
			Password:$('#password').val(),
			};
			console.log(param);
			sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
			if (res.code == 0) { //成功
			layer.msg(res.msg, {
			icon: 1,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () {
			refreshTable();
			$('#admin').val("");
			$('#password').val("");
			isChongFu = true
			});
			} else { //不成功
			layer.msg(res.msg, {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () {
			isChongFu = true ;
			$('#admin').val("");
			$('#password').val("")
			});
			}
			layer.close(index);
			});
			} else { //不成功
			layer.msg(res.msg, {


			}else{
			layer.msg("请勿重复点击", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () { doing = true });
			});
			}
			});

			}
			});
			}
			});
			@@ -1034,6 +1101,7 @@
			return;
			}
			}
			if(isNeedUnpack == 1){
			console.log($("#PickingArea").val())
			if($("#PickingArea").val() == '')
			{
			@@ -1043,7 +1111,7 @@
			});
			isChongFu= true;
			return;
			}
			}}
			var param = {
			soNo: soNo,
			unstackingMode:$('#UnstackWay').val(),