From cff0c053baeb229a6c7a7794c061c179111e0b7f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 31 八月 2023 10:46:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/views/reimburseOnline/reimburseOnline.html | 347 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 180 insertions(+), 167 deletions(-)
diff --git a/src/main/webapp/views/reimburseOnline/reimburseOnline.html b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
index fcf5559..ac87da2 100644
--- a/src/main/webapp/views/reimburseOnline/reimburseOnline.html
+++ b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
@@ -1,67 +1,71 @@
<!DOCTYPE html>
<html lang="en">
<head>
- <meta charset="utf-8">
- <title></title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <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/css/tree.css" media="all">
- <link rel="stylesheet" href="../../static/layui/lay/modules/formDesigner/coolForm.css" />
- <style>
- .nav-box {
- position: absolute;
- top: 1px;
- left: 5px;
- }
- .nav-box-item {
- display: inline-block;
- vertical-align: middle;
- margin-right: 5px;
- }
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <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/css/tree.css" media="all">
+ <link rel="stylesheet" href="../../static/layui/lay/modules/formDesigner/coolForm.css"/>
+ <style>
+ .nav-box {
+ position: absolute;
+ top: 1px;
+ left: 5px;
+ }
- </style>
+ .nav-box-item {
+ display: inline-block;
+ vertical-align: middle;
+ margin-right: 5px;
+ }
+
+ </style>
</head>
<body>
<div class="layui-fluid">
- <div class="layui-card">
- <div class="layui-card-body">
- <div id="search-box" class="layui-form toolbar" style="display: flex;justify-content: flex-end;position: relative">
- <div class="nav-box">
- <div class="nav-box-item">
- <i class="layui-icon" style="color: #1890ff;font-weight: bold"></i>
- </div>
- <div class="nav-box-item">
- <button id="organization" style="border: none;padding-right: 35px;" class="layui-btn layui-btn-primary icon-btn">
- 鏈煡
- </button>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off" style="border-color: #e1e1e1">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div id="search-box" class="layui-form toolbar"
+ style="display: flex;justify-content: flex-end;position: relative">
+ <div class="nav-box">
+ <div class="nav-box-item">
+ <i class="layui-icon" style="color: #1890ff;font-weight: bold"></i>
+ </div>
+ <div class="nav-box-item">
+ <button id="organization" style="border: none;padding-right: 35px;"
+ class="layui-btn layui-btn-primary icon-btn">
+ 鏈煡
+ </button>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"
+ style="border-color: #e1e1e1">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn layui-btn-sm" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ </div>
+ </div>
</div>
- </div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn layui-btn-sm" lay-filter="search" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- </div>
+ <table class="layui-hide" id="reimburseOnline" lay-filter="reimburseOnline"></table>
</div>
- </div>
- <table class="layui-hide" id="reimburseOnline" lay-filter="reimburseOnline"></table>
</div>
- </div>
</div>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
- <span class="layui-text">
+ <span class="layui-text">
<a href="javascript:;" lay-event="look">
<i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鎶ラ攢鏄庣粏
</a>
@@ -69,31 +73,31 @@
</script>
<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" lay-event="addBlank">鐢宠鎶ラ攢</button>
-<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="deleteData">鍒犻櫎</button>-->
- </div>
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" lay-event="addBlank">鐢宠鎶ラ攢</button>
+ <!-- <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="deleteData">鍒犻櫎</button>-->
+ </div>
</script>
-<form id="uploadFile" enctype="multipart/form-data" style="display: none;" >
- <input type="file" name="file" id="uploadQuote">
- <input type="button" onclick="upload()" value="涓婁紶"/>
+<form id="uploadFile" enctype="multipart/form-data" style="display: none;">
+ <input type="file" name="file" id="uploadQuote">
+ <input type="button" onclick="upload()" value="涓婁紶"/>
</form>
<script type="text/html" id="operate">
- {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4 || d.settle == 5) { }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">瀹℃壒</a>
- {{# } }}
- {{# if (d.settle == 0) { }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">鎻愪氦</a>
- {{# } }}
-<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</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>
+ {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4 || d.settle == 5) { }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">瀹℃壒</a>
+ {{# } }}
+ {{# if (d.settle == 0) { }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">鎻愪氦</a>
+ {{# } }}
+ <!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</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>
@@ -137,125 +141,134 @@
<!--</script>-->
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
- <form id="editForm" lay-filter="editForm" class="layui-form model-form">
- <input name="id" type="hidden"/>
- <div class="layui-form-item">
- <label class="layui-form-label">椤圭洰鍚�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none">
- <input id="planId$" name="planId" 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="planQueryNameBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="planQueryNameBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
+ <form id="editForm" lay-filter="editForm" class="layui-form model-form">
+ <input name="id" type="hidden"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label">椤圭洰鍚�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none">
+ <input id="planId$" name="planId" 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="planQueryNameBydirector"
+ onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="planQueryNameBydirectorSelect"
+ onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
</div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鎶ラ攢绫诲瀷: </label>
- <div class="layui-input-inline">
- <select class="layui-input" name="templateName" lay-vertype="tips" lay-verify="required">
- <option style="display: none"></option>
- <option value="椤圭洰鏈畬鎴�">椤圭洰鏈畬鎴�</option>
- <option value="椤圭洰宸插畬鎴愬湪璐ㄤ繚鏈熷唴">椤圭洰宸插畬鎴愬湪璐ㄤ繚鏈熷唴</option>
- <option value="闈為」鐩瀷鎶ラ攢">闈為」鐩瀷鎶ラ攢</option>
- <option value="鍏跺畠">鍏跺畠</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鏄惁鍐茶处: </label>
- <div class="layui-input-inline">
- <select class="layui-input" name="checkData" lay-vertype="tips" lay-verify="required">
- <option style="display: none"></option>
- <option value="鍚�">鍚�</option>
- <option value="鏄�">鏄�</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item" style="position: relative;">
- <label class="layui-form-label">鎶ラ攢鏄庣粏锛�</label>
- <div class="layui-input-block">
- <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
- </div>
- <button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
- style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
- <i class="layui-icon"></i>娣诲姞鏄庣粏
- </button>
- </div>
- <div class="layui-form-item text-right">
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button>
- </div>
- </form>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鎶ラ攢绫诲瀷: </label>
+ <div class="layui-input-inline">
+ <select class="layui-input" name="templateName" lay-vertype="tips" lay-verify="required">
+ <option style="display: none"></option>
+ <option value="椤圭洰鏈畬鎴�">椤圭洰鏈畬鎴�</option>
+ <option value="椤圭洰宸插畬鎴愬湪璐ㄤ繚鏈熷唴">椤圭洰宸插畬鎴愬湪璐ㄤ繚鏈熷唴</option>
+ <option value="闈為」鐩瀷鎶ラ攢">闈為」鐩瀷鎶ラ攢</option>
+ <option value="鍏跺畠">鍏跺畠</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鏄惁鍐茶处: </label>
+ <div class="layui-input-inline">
+ <select class="layui-input" name="checkData" lay-vertype="tips" lay-verify="required">
+ <option style="display: none"></option>
+ <option value="鍚�">鍚�</option>
+ <option value="鏄�">鏄�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item" style="position: relative;">
+ <label class="layui-form-label">鎶ラ攢鏄庣粏锛�</label>
+ <div class="layui-input-block">
+ <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
+ </div>
+ <button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
+ style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
+ <i class="layui-icon"></i>娣诲姞鏄庣粏
+ </button>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="formSSXMTableBar">
- <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="matEditDialog">
- <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
- <input name="experimentId" type="hidden"/>
+ <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
+ <input name="experimentId" type="hidden"/>
- <div class="layui-form-item" style="float: left">
- <label class="layui-form-label">璐圭敤绫诲瀷 - 澶氶��</label>
- <div class="layui-input-block">
- <div id="reimburseCostTypes" name="reimburseCostTypes">
+ <div class="layui-form-item" style="float: left">
+ <label class="layui-form-label">璐圭敤绫诲瀷 - 澶氶��</label>
+ <div class="layui-input-block">
+ <div id="reimburseCostTypes" name="reimburseCostTypes">
+ </div>
+ </div>
</div>
- </div>
- </div>
- <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
- </div>
+ <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
- </form>
+ </form>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editStatus">
- <div id="editStatusDetail" lay-filter="editStatusDetail" class="layui-form admin-form model-form">
- <input name="id" type="hidden">
- <div class="layui-row">
- <div class="layui-col-md12">
+ <div id="editStatusDetail" lay-filter="editStatusDetail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐘舵��: </label>
- <div class="layui-input-block">
- <select name="status" lay-vertype="tips" lay-verify="required">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="1">宸插畬鎴�</option>
- <option value="0">鏈畬鎴�</option>
- </select>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status" lay-vertype="tips" lay-verify="required">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">宸插畬鎴�</option>
+ <option value="0">鏈畬鎴�</option>
+ </select>
+ </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" name="templateName" 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" name="title" placeholder="璇疯緭鍏ヨ〃鏍兼爣棰�" autocomplete="off"
+ lay-verify="required">
+ </div>
+ </div>
+
+ </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" name="templateName" placeholder="璇疯緭鍏ユā鏉垮悕" autocomplete="off" lay-verify="required">
- </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
-
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">琛ㄦ牸鏍囬: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="title" placeholder="璇疯緭鍏ヨ〃鏍兼爣棰�" autocomplete="off" lay-verify="required">
- </div>
- </div>
-
- </div>
</div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
- </div>
+</script>
+
+<script type="text/html" id="occupation">
+ <input name="input-occupation" placeholder="璇疯緭鍏�" autocomplete="off">
</script>
</body>
</html>
--
Gitblit v1.9.1