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

Junjie

2023-09-14 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4

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

@@ -73,11 +73,22 @@


<script type="text/html" id="operate">
  {{# if (d.settle == 0) { }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">提交</a>
  {{# } }}
  {{# if (d.settle == 1) { }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">审批</a>
  {{# } }}
  {{# if (d.settle == 2) { }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">确认</a>
  {{# } }}
  {{# if (d.settle == 0 || d.settle == 1) { }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</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>
  <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="viewCheck">查看询价</a>
  <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -85,6 +96,7 @@
<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/luckysheet_js/luckyexcel.umd.js"></script>
<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/priOnline2/priOnline.js" charset="utf-8"></script>