From 7f04f17507063dbd922055bf5dcd1190da686071 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 18 十二月 2025 14:27:46 +0800
Subject: [PATCH] #客户+部门
---
src/main/webapp/views/orderPakin/order.html | 164 ++++++++++++++++++++++++++++++------------------------
1 files changed, 92 insertions(+), 72 deletions(-)
diff --git a/src/main/webapp/views/orderPakin/order.html b/src/main/webapp/views/orderPakin/order.html
index c6945d0..d01938c 100644
--- a/src/main/webapp/views/orderPakin/order.html
+++ b/src/main/webapp/views/orderPakin/order.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
<meta charset="utf-8">
<title></title>
@@ -25,77 +26,84 @@
.layui-timeline:first-child .layui-timeline-item {
margin-top: 30px;
}
+
.btn-add {
display: none;
}
+
.btn-edit {
display: none;
}
+
.btn-complete {
display: none;
}
+
.btn-delete {
display: none;
}
</style>
</head>
+
<body>
-<!-- 姝ｆ枃寮�濮� -->
-<div class="layui-fluid">
- <div class="layui-card">
- <div class="layui-card-body">
- <!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
- <div class="layui-form toolbar">
- <div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline mr0">
- <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
+ <!-- 姝ｆ枃寮�濮� -->
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
+ <div class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline mr0">
+ <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿" />
+ </div>
</div>
- </div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text"
+ placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <select name="doc_type" id="docType-query">
- </select>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="doc_type" id="docType-query">
+ </select>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <select name="settle">
- <option value="">閫夋嫨鐘舵��</option>
- <option value="1">寰呭鐞�</option>
- <option value="2">浣滀笟涓�</option>
- <option value="4">宸插畬鎴�</option>
- <option value="6">涓婃姤瀹屾垚</option>
- </select>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="settle">
+ <option value="">閫夋嫨鐘舵��</option>
+ <option value="1">寰呭鐞�</option>
+ <option value="2">浣滀笟涓�</option>
+ <option value="4">宸插畬鎴�</option>
+ <option value="6">涓婃姤瀹屾垚</option>
+ </select>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞
- </button>
+ <div class="layui-inline">
+ <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i
+ class="layui-icon"></i>娣诲姞
+ </button>
+ </div>
</div>
</div>
+ <table id="order" lay-filter="order"></table>
</div>
- <table id="order" lay-filter="order"></table>
+ </div>
+ <div class="layui-card">
+ <div class="layui-card-body">
+ 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
+ <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
+ </div>
</div>
</div>
- <div class="layui-card">
- <div class="layui-card-body">
- 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
- <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
- </div>
- </div>
-</div>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="operate">
+ <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+ <script type="text/html" id="operate">
{{# if (d.settle == 0 || d.settle == 1) { }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
@@ -104,15 +112,15 @@
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
{{# } }}
</script>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="tbLook">
+ <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+ <script type="text/html" id="tbLook">
<span class="layui-text">
<a href="javascript:;" lay-event="look">
<i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鍗曟嵁鏄庣粏
</a>
</span>
</script>
-<script type="text/html" id="orderNoTpl">
+ <script type="text/html" id="orderNoTpl">
{{d.orderNo}}
{{# if(d.settle > 1 && d.settle !== 3){ }}
@@ -120,10 +128,10 @@
<i class="layui-icon layui-icon-about wrk-trace" lay-tips="鏌ョ湅浠诲姟杩芥函" lay-direction="2" lay-offset="-10px,0px" lay-event="wrkTrace"></i>
</script>
-<!--<script type="text/html" id="settleTpl">-->
-<!-- <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>-->
-<!--</script>-->
-<script type="text/html" id="settleTpl">
+ <!--<script type="text/html" id="settleTpl">-->
+ <!-- <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>-->
+ <!--</script>-->
+ <script type="text/html" id="settleTpl">
<span name="settle"
{{# if( d.settle === 1){ }}
class="layui-badge layui-badge-red"
@@ -140,8 +148,8 @@
{{# } }}
>{{d.settle$}}</span>
</script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
+ <!-- 琛ㄥ崟寮圭獥 -->
+ <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">
@@ -163,6 +171,19 @@
<!-- lay-verify="required"-->
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹㈡埛锛�</label>
+ <div class="layui-input-block">
+ <input id="cstmr" name="cstmr" type="hidden" />
+ <div id="cstmrSelect" ></div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓氬姟鏃堕棿锛�</label>
+ <div class="layui-input-block">
+ <input id="orderTime" name="orderTime" placeholder="閫夋嫨涓氬姟鏃堕棿" type="text" class="layui-input" autocomplete="off" lay-verType="tips" />
+ </div>
+ </div>
<div class="layui-form-item" style="position: relative;">
<label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
<div class="layui-input-block">
@@ -179,13 +200,13 @@
</div>
</form>
</script>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="formSSXMTableBar">
+ <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+ <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>
-</script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="matEditDialog">
+ </script>
+ <!-- 琛ㄥ崟寮圭獥 -->
+ <script type="text/html" id="matEditDialog">
<form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
<input name="experimentId" type="hidden"/>
<div class="layui-form-item" style="float: left">
@@ -201,8 +222,8 @@
</div>
</form>
</script>
-<!-- 璁㈠崟浠诲姟杩芥函 -->
-<script id="wrkTraceDialog" type="text/html" style="position: relative">
+ <!-- 璁㈠崟浠诲姟杩芥函 -->
+ <script id="wrkTraceDialog" type="text/html" style="position: relative">
<div style="position: absolute; top: 0; left: 0;">
<div class="layui-card" style="overflow: hidden;">
<div class="layui-card-header" style="text-align: center;width: 80%;font-weight: inherit;font-size: 18px">{{ d.orderNo }}</div>
@@ -301,15 +322,15 @@
</script>
-<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/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/echarts/echarts.min.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/orderPakin/order.js" charset="utf-8"></script>
+ <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/layui/layui.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/echarts/echarts.min.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/orderPakin/order.js" charset="utf-8"></script>
-<script type="text/template" id="docTypeTpl">
+ <script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
{{#each records}}
<option value="{{docId}}">{{docName}}</option>
@@ -317,5 +338,4 @@
</script>
</body>
-</html>
-
+</html>
\ No newline at end of file
--
Gitblit v1.9.1