Merge branch 'wxw'

wxw

14 小时以前 f3a9a3ad429d86028c884e3476dc0badcd8da966

 HTML/views/ASNSetting/LabelPrintSelect.html

@@ -122,20 +122,20 @@
                    });

               var id = getQueryString('Id');
               var SupplierLot=getQueryString('SupplierLot');//供货批次
               $('#SupplierLot').val(SupplierLot);
               if(SupplierLot!='' && SupplierLot!=null &&SupplierLot!=undefined){
                  $('#SupplierLot').attr('readonly', 'readonly');
               }
               // var SupplierLot=getQueryString('SupplierLot');//供货批次
               // $('#SupplierLot').val(SupplierLot);
               // if(SupplierLot!='' && SupplierLot!=null &&SupplierLot!=undefined){
               //    $('#SupplierLot').attr('readonly', 'readonly');
               // }
               var asnType = getQueryString('Type');
               console.log(asnType);
               console.log(asnType == 4);
               if(asnType == 4){
               // console.log(asnType == 4);
               // if(asnType == 4){

                  $("#reset option[value='0']").attr("selected","selected"); //性别
                  $("#reset").attr("disabled","disabled"); 
                  form.render('select');
               }
               //    $("#reset option[value='0']").attr("selected","selected"); //性别
               //    $("#reset").attr("disabled","disabled"); 
               //    form.render('select');
               // }

               var param = {
                  id: parseInt(id),
@@ -143,7 +143,11 @@
                
               synData(IP + "/BllAsn/GetAsnDetailQtyList", param , 'get', function (res) {
                  if (res.code == 0) { //成功  
                     $("#arriveQty").val(res.data);
                     $("#arriveQty").val(res.data.Qty);
                     $("#productionTime").val(res.data.ProductionTime);
                     $("#expirationTime").val(res.data.ExpirationTime);
                     $("#storeTime").val(res.data.StoreTime);
                     $("#SupplierLot").val(res.data.SupplierLot);
                  } else { //不成功
                     layer.msg(res.msg, {
                        icon: 2,