Merge branch 'master' into wxw

Administrator

2024-02-21 87d55df7b7446d7c4c3532a2dd2e78f72574e34b

 HTML/views/ASNSetting/LabelPrintSelect.html

@@ -32,7 +32,7 @@
            <div class="layui-form-item">
            <label class="layui-form-label">重置批号</label>
            <div class="layui-input-block">
               <select name="reset" id="reset" lay-verify="required">
               <select name="reset" id="reset" lay-filter="reset" lay-verify="required">
                  <option value="1">是</option>
                        <option value="0">否</option>
               </select>
@@ -116,7 +116,16 @@
                    });

               var id = getQueryString('Id');
					
               var asnType = getQueryString('Type');
               console.log(asnType);
               console.log(asnType == 4);
               if(asnType == 4){

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

               var param = {
                  id: parseInt(id),
               };