Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms

wang..123

2022-03-25 f3ed1f9e98e13b9fb631e2fab851be15b7dde206

 src/main/webapp/views/itemManager/itemManager.html

@@ -34,7 +34,7 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">禁用</button>
<!--        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">禁用</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>
@@ -57,9 +57,9 @@
        <div class="layui-row">
            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">项目编号: </label>
                    <label class="layui-form-label">项目编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="uuid" placeholder="请输入项目编号" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="uuid" placeholder="请输入项目编号">
                    </div>
                </div>
                <div class="layui-form-item">
@@ -71,26 +71,26 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">预计发货日期: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="planinDate" id="planinDate" placeholder="请输入预计发货日期" lay-vertype="tips">
                        <input class="layui-input" name="plandeDate" id="plandeDate" placeholder="请输入预计发货日期" lay-vertype="tips">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">预计安装日期: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="plandeDate" id="plandeDate" placeholder="请输入预计安装日期" lay-vertype="tips">
                        <input class="layui-input" name="planinDate" id="planinDate"  placeholder="请输入预计安装日期" lay-vertype="tips">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">预计运费: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="plandeAmt" placeholder="请输入预计运费">
                        <input class="layui-input" name="plandeAmt" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" placeholder="请输入预计运费">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">预计安装费: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="planinAmt" placeholder="请输入预计安装费">
                        <input class="layui-input"  name="planinAmt" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" placeholder="请输入预计安装费">
                    </div>
                </div>
                <div class="layui-form-item">
@@ -106,9 +106,15 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">预计车辆信息: </label>
                    <label class="layui-form-label">预计车辆大小: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="planCarInfo" placeholder="请输入预计车辆信息">
                        <input class="layui-input" name="planCarInfo" placeholder="请输入预计车辆大小">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">预计车辆数量: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="planCarnumber" onkeyup="value=value.replace(/[^\d]/g,'').replace(/^0{1,}/g,'')" placeholder="请输入预计车辆大小">
                    </div>
                </div>
            </div>
@@ -157,7 +163,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">实际运费: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="realdeAmt" placeholder="请输入实际运费">
                        <input class="layui-input" name="realdeAmt" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" placeholder="请输入实际运费">
                    </div>
                </div>

@@ -170,7 +176,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">实际安装费: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="realinAmt" placeholder="请输入实际安装费" lay-vertype="tips">
                        <input class="layui-input" name="realinAmt" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" placeholder="请输入实际安装费" lay-vertype="tips">
                    </div>
                </div>