From 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 14 九月 2023 12:46:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/views/priSales/priSales.html | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/priSales/priSales.html b/src/main/webapp/views/priSales/priSales.html
index ea98625..9e567d1 100644
--- a/src/main/webapp/views/priSales/priSales.html
+++ b/src/main/webapp/views/priSales/priSales.html
@@ -9,6 +9,8 @@
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/layui/lay/modules/formDesigner/coolForm.css" />
+ <link rel="stylesheet" href="../../static/css/tree.css" media="all">
<style>
.nav-box {
position: absolute;
@@ -98,14 +100,26 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="priOnline">浜у搧璐圭敤鏄庣粏</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+ {{# 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-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+ {{# } }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="priOnline">浜у搧璐圭敤鏄庣粏</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.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/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/priSales/priSales.js" charset="utf-8"></script>
<!-- 琛ㄥ崟寮圭獥 -->
@@ -115,24 +129,30 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璁㈠崟鍙�: </label>
+ <label class="layui-form-label layui-form-required">鏍镐环鍗曞彿: </label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="id" placeholder="璇疯緭鍏ヨ鍗曞彿" style="display: none" lay-verify="required">
- <input id="orderNum" name="orderNum" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ鍗曞彿" onfocus=this.blur()>
+ <input class="layui-input" name="id" placeholder="璇疯緭鍏ユ牳浠峰崟鍙�" style="display: none" lay-verify="required">
+ <input id="orderNum" name="orderNum" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ牳浠峰崟鍙�" onfocus=this.blur()>
<div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="priOnlineQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="priOnlineQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'),getItemInfo)" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="priOnline2QueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="priOnline2QueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'),getItemInfo)" multiple="multiple">
</select>
</div>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">椤圭洰鍚�: </label>
- <div class="layui-input-block">
- <input class="layui-input" id="planId" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">椤圭洰鍚�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" id="planId" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">-->
+<!-- </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" id="planId" type="text" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.1