Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs

admin

2021-08-27 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b

 src/main/webapp/views/matCode/matCode_detail.html

@@ -24,12 +24,12 @@
            </div>
        -->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>产品代号：</label>
            <label class="layui-form-label"><span class="not-null">*</span>产品编码：</label>
            <div class="layui-input-inline">
                <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" lay-verify="required" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">条　　码：</label>
            <div class="layui-input-inline">
                <input id="barcode" class="layui-input" type="text">
@@ -66,7 +66,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%">
            <label class="layui-form-label">：</label>
            <label class="layui-form-label">单重：</label>
            <div class="layui-input-inline">
                <input id="weight" class="layui-input" type="text" lay-verify="number" >
            </div>