Merge branch 'master' into Liudl

bklLiudl

2024-10-19 fe41831b0e9057a16aef1e82048105aee671bbda

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -145,7 +145,22 @@
                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                  </button>
               </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="text" id="password" name="password" placeholder="密码" autocomplete="off"
                        class="layui-input">
                     </div>
                  </div>
               </div>
               <!-- 维护备注弹框 -->
               <div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
                  <label class="layui-form-label">备注</label>
@@ -728,12 +743,43 @@

                  break;
               case "check" :
                  // 代码区域
                  layer.confirm('确定复核此单据吗？', function(index) { 	
                     // 代码区域
                  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 (doing== true) {
                           doing= false;
									
                           if($('#admin').val()==''){
                              layer.msg("请输入账号", {
                                 icon: 2,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
                              });
                              doing= true;
                              return;
                           }
                           if($("#password").val() == '')
                           {
                              layer.msg("请输入密码", {
                                 icon: 2,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
                              });
                              doing= true;
                              return;
                           }
									
                     var param = {
                        Id:data.Id,
                              UserNo:$('#admin').val(),
                              Password:$('#password').val(),
                     };
                           console.log(param);
                     sendData(IP + "/UpApi/FinishAsn", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                           layer.msg(res.msg, {
@@ -741,15 +787,32 @@
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           }, function () {
                              refreshTable();
                                    $('#admin').val("");
                                    $('#password').val("");
                              doing = true
                           });
                        } else { //不成功
                           layer.msg(res.msg, {
                              icon: 2,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           }, function () { doing = true });
                        }
                                 }, function () { 
                                    doing = true ;
                                    $('#admin').val("");
                                    $('#password').val("")
                     });
                              }
                              layer.close(index);
                           });
									
									
                        }else{
                           layer.msg("请勿重复点击", {
                              icon: 2,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           });
                        }
								
                     }
                  });
                  
                  break;