Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas

wang..123

2022-03-22 46607139e955ca266e24bd8561bca1f93a650178

 src/main/webapp/views/order/order.html

@@ -131,6 +131,10 @@
          class="layui-badge layui-badge-gray"
          {{# } else if(d.settle === 4){ }}
          class="layui-badge layui-badge-green"
          {{# } else if(d.settle === 11){ }}
          class="layui-badge layui-badge-green"
          {{# } else if(d.settle === 12){ }}
          class="layui-badge layui-badge-blue"
          {{# } else { }}
          class="layui-badge layui-badge-gray"
          {{# } }}
@@ -171,6 +175,7 @@
<script type="text/html" id="docTypeEditDialog">
    <form id="docTypeEditForm" lay-filter="docTypeEditForm" class="layui-form model-form">
        <input name="dictId" type="hidden"/>
        <input name="docClass" value="2" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">类型编码:</label>
            <div class="layui-input-block">
@@ -203,6 +208,7 @@
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="add"><i class="layui-icon">&#xe654;</i>新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
        <button class="layui-btn layui-btn-sm layui-btn" id="btn-wave" lay-event="wave"><i class="layui-icon">&#xe60a;</i>生成波次计划</button>
    </div>
</script>