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

zjj

2023-12-27 d814bde01eb91d1544b718463cd31317726bbf6b

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

@@ -84,15 +84,22 @@
        </div>
    </div>
</div>
<div id="box" style="display: block"></div>
<!-- 表格操作列 -->
<script type="text/html" id="operate">
    {{# if (d.settle == 1 || d.settle == 2) { }}
    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="printExcel">导出Excel</a>
    {{# if (d.settle == 0 || d.settle == 1) { }}
        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
        {{# if (d.settle == 2) { }}
            <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">完结</a>
        {{# } }}
        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">删除</a>
    {{# } }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">删除</a>
    {{# if (d.settle == 2) { }}
    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">完结</a>
    {{# } }}

<!--    {{# if ((d.settle == 0 || d.settle == 1) && (d.docType == 1 || d.docType == 11 || d.docType == 14 || d.docType == 17 || d.docType == 18)) { }}-->
<!--    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="manPrint">生成拣货单</a>-->
<!--    {{# } }}-->
    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint">打印</a>
</script>
<!-- 表格操作列 -->
<script type="text/html" id="tbLook">
@@ -186,10 +193,12 @@

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/decimal.js" charset="utf-8"></script>

<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>
@@ -197,6 +206,171 @@
    <option value="{{docId}}">{{docName}}</option>
    {{/each}}
</script>

<script type="text/template" id="templatePreview3" class="template-qrcode">
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
        <thead></thead>
        <tbody style="font-weight: bold">
        <tr style="height: 30px;">
            <td align="center" scope="col" colspan="1">商品</td>
            <td align="lift" colspan="4" style="padding-left: 8px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
            <td align="center" scope="col" colspan="3" rowspan="3">
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
            </td>
        </tr>
        <tr style="height: 30px">
            <td align="center" scope="col" colspan="1">料号</td>
            <!--            overflow:hidden; 溢出隐藏 white-space:nowrap; text-overflow:ellipsis;-->
            <!--             word-break : break-all;  超出自动换行-->
            <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matnr}}</td>
        </tr>
        <tr style="height: 30px">
            <td align="center" scope="col" colspan="1">日期</td>
            <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.createTime$}}</td>
        </tr>
        <tr style="height: 30px">
            <td align="center" scope="col" colspan="1">牌号</td>
            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.brand}}</td>
            <td align="center" scope="col" colspan="1">批号</td>
            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.batch}}</td>
        </tr>
        <tr style="height: 30px">
            <td align="center" scope="col" colspan="1">数量</td>
            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.anfme}}</td>
            <td align="center" scope="col" colspan="1">状态</td>
            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.status$}}</td>
        </tr>


        </tbody>
    </table>
    <div style="height: 20px">

    </div>
    {{/each}}
</script>


<!-- 模板引擎 -->
<!-- 模板4 -->
<script type="text/template" id="templatePreview4" class="template-qrcode">

    <div style="width: 100%;border-bottom: #0C0C0C solid 2px;margin-bottom: 20px;">
        <div style="height: 60px;text-align: center;line-height: 60px;font-size: 30px;">单据</div>
<!--        <div style="height: 90px;text-align: center;line-height: 90px;">-->
<!--            <img class="template-code template-qrcode" src="{{barcodeUrl}}" width="300">-->
<!--        </div>-->
<!--        <div style="height: 50px;text-align: center;font-size: 25px;">{{docNum}}</div>-->
        <div style="height: 40px;text-align: left;line-height: 40px;font-size: 20px;">单据号码：{{docNum}}</div>
        <div style="height: 40px;text-align: left;line-height: 40px;font-size: 20px;">总数量：{{anfmeSum}}</div>
    </div>
    <table width="100%" style="border:0;border-bottom:#0C0C0C solid 2px; margin-bottom:20px;padding:0;overflow: hidden;font-size: xx-small;table-layout: fixed;">
             <tr style="height: 25px;font-size: 15px;">
                 <td align="left" scope="col" colspan="1" style="width: 150px;">
                     料号
                 </td>
                 <td align="left" scope="col" colspan="1" style="width: 80px;">
                     商品名
                 </td>
                 <td align="left" scope="col" colspan="1" style="width: 80px;">
                     数量
                 </td>
                 <td align="left" scope="col" colspan="1" style="width: 80px;">
                    完成数量
                 </td>
                 <td align="center" scope="col" colspan="1">
                    二维码
                 </td>
             </tr>
        {{#each data}}
        <tr style="height: 85px;font-size: 15px;">
            <td align="left" scope="col" colspan="1" style="width: 100px;">
                {{this.matnr}}
            </td>
            <td align="left" scope="col" colspan="1" style="width: 80px;">
                {{this.maktx}}
            </td>
            <td align="left" scope="col" colspan="1" style="width: 80px;">
                {{this.anfme}}
            </td>
            <td align="left" scope="col" colspan="1" style="width: 80px;">
                {{this.qty}}
            </td>
            <td align="center" scope="col" colspan="1" rowspan="1">
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80px">
            </td>
        </tr>
        {{/each}}
    </table>
                <!--    {{#each data}}-->
<!--    <table width="100%" style="border:0;border-bottom:#0C0C0C solid 2px; margin-bottom:20px;padding:0;overflow: hidden;font-size: xx-small;table-layout: fixed;">-->
<!--        <tr style="height: 25px;font-size: 15px;">-->
<!--            <td align="left" scope="col" colspan="1" style="width: 100px;">-->
<!--                料号:-->
<!--            </td>-->
<!--            <td>-->
<!--                {{this.matnr}}-->
<!--            </td>-->
<!--            <td align="left" scope="col" colspan="1" rowspan="4">-->
<!--                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="100px">-->
<!--            </td>-->
<!--        </tr>-->
<!--        <tr style="height: 25px;font-size: 15px;">-->
<!--            <td align="left" scope="col" colspan="1" style="width: 100px;">-->
<!--                商品名:-->
<!--            </td>-->
<!--            <td>-->
<!--                {{this.maktx}}-->
<!--            </td>-->
<!--        </tr>-->
<!--        <tr style="height: 25px; font-size: 15px;">-->
<!--            <td align="left" scope="col" colspan="1" style="width: 100px;">-->
<!--                拣货数量:-->
<!--            </td>-->
<!--            <td>-->
<!--                {{this.anfme}}-->
<!--            </td>-->
<!--        </tr>-->
<!--        <tr style="height: 30px; font-size: 15px;">-->
<!--            <td align="left" scope="col" colspan="1" style="width: 100px;">-->
<!--                完成数量:-->
<!--            </td>-->
<!--            <td align="left" scope="col" colspan="1">-->
<!--                {{this.qty}}-->
<!--            </td>-->
<!--        </tr>-->
<!--    </table>-->
<!--    {{/each}}-->
</script>


<script type="text/html" id="payment">
    <select id="select-primary" style="width: 100%" class="layui-border select-primary" lay-ignore >
        <option value="1"
                {{# if( d.payment === 1){ }}
                selected = "selected"
                {{# } }}
        >仓储</option>
        <option value="0"
                {{# if( d.payment === 0){ }}
                selected = "selected"
                {{# } }}
        >代采</option>

    </select>
</script>


<!--<script type="text/html" id="payment">-->
<!--    {{#  var cityList = d.cityList || ["北京","上海","广州","城市-1"]; }}-->
<!--    <select name="payment" class="layui-border select-demo-primary" lay-ignore>-->
<!--        <option value="">原生 select 框</option>-->
<!--        {{#  layui.each(cityList, function(i, v){ }}-->
<!--        <option value="{{= v }}" {{= v === d.city ? 'selected' : '' }}>{{= v }}</option>-->
<!--        {{#  }); }}-->
<!--    </select>-->
<!--</script>-->
</body>

</html>