Merge branch 'yyk'

yuyou_x

2024-02-04 009e869b09a63efbc5e58e22f88ad0ed2a315e2b

 HTML/views/BaseSetting/MaterialsForm.html

@@ -64,7 +64,7 @@
                     <option value="1">包材</option>
                     <option value="2">成品</option>
                     <option value="3">耗材</option>
                     <option value="4">半成品</option>
                     <option value="4">中间品</option>
                  </select>
               </div>
            </div>
@@ -89,9 +89,9 @@
               </div>
            </div>
            <div class="layui-inline">
               <label class="layui-form-label">规格</label>
               <label class="layui-form-label">规格/型号</label>
               <div class="layui-input-block" style="width: 182px;">
                  <input type="text" name="Standard" placeholder="请输入规格" lay-verify="" autocomplete="off" class="layui-input">
                  <input type="text" name="Standard" placeholder="请输入规格/型号" lay-verify="" autocomplete="off" class="layui-input">
               </div>
            </div>
            </div>
@@ -123,7 +123,7 @@
                     <option value=""></option>
                     <option value="0">常温</option>
                     <option value="1">低温</option>
                     <option value="3">干燥通风</option>
                     <!-- <option value="3">干燥通风</option> -->
                  </select>
               </div>
            </div>