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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

 src/main/webapp/views/priOnline2/priOnline.html

@@ -76,6 +76,31 @@
    <input type="button" onclick="upload()" value="上传"/>
</form>

<div id="myModal"  style="display: none;">
    <div style="padding: 10px">
        <div class="layui-upload">
            <button type="button" class="layui-btn layui-btn-normal" id="data-btn-file2">选择文件</button><input id="data-btn-upload" class="layui-upload-file" type="file" accept="" name="file" multiple="">
            <div class="layui-upload-list" style="max-width: 1000px;">
                <table class="layui-table">
                    <colgroup>
                        <col>
                        <col width="150">
                        <col width="260">
                        <col width="150">
                    </colgroup>
                    <thead>
                    <tr><th>文件名</th>
                        <th>大小</th>
                        <th>上传进度</th>
                        <th>操作</th>
                    </tr></thead>
                    <tbody id="data-btn-file3"></tbody>
                </table>
            </div>
            <button type="button" class="layui-btn" id="testListAction">开始上传</button>
        </div>
    </div>
</div>

<script type="text/html" id="operate">
    {{# if ((d.settle == 0) || (d.settle == 1 && d.settleSize == 4)){ }}
@@ -88,6 +113,7 @@
    {{# if (d.settle == 1 || (d.settle == 2 && d.settleSize == 4)){ }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">回退审批</a>
    {{# } }}
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="uploadLink">附件</a>
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="check">核价</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">编辑</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="upload">上传询价</a>
@@ -115,6 +141,7 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/luckysheet_js/pako.es5.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/luckysheet_js/base64.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/aliyun-oss-sdk.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/priOnline2/priOnline.js" charset="utf-8"></script>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
@@ -140,12 +167,12 @@
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">核价名: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" type="text" name="name" placeholder="核价名" autocomplete="off">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">核价名: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" type="text" name="name" placeholder="核价名" autocomplete="off">-->
<!--                    </div>-->
<!--                </div>-->

                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">模板: </label>