From 1b13c69e4e2bb00bea4e90232a78715d49f1e24f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 13:38:14 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/order/order.html |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 591658d..101cce5 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -8,7 +8,7 @@
     <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/cool.css" media="all">
     <!--    <link rel="stylesheet" href="../../static/css/common.css" media="all">-->
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
@@ -31,7 +31,7 @@
                     </div>
                     <div class="layui-inline" style="width: 300px">
                         <div class="layui-input-inline">
-                            <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -66,18 +66,35 @@
         </a>
     </span>
 </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">
-    <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>
+    <span name="settle"
+          {{# if( d.settle === 1){ }}
+          class="layui-badge layui-badge-red"
+          {{# }else if(d.settle === 2){ }}
+          class="layui-badge layui-badge-green"
+          {{# }else if(d.settle === 3){ }}
+          class="layui-badge layui-badge-gray"
+          {{# }else if(d.settle === 4){ }}
+          class="layui-badge layui-badge-blue"
+          {{# }else if(d.settle === 5){ }}
+          class="layui-badge layui-badge-gray"
+          {{# }else if(d.settle === 6){ }}
+          class="layui-badge layui-badge-gray"
+          {{# } }}
+    >{{d.settle$}}</span>
 </script>
 <!-- 琛ㄥ崟寮圭獥 -->
 <script type="text/html" id="editDialog">
     <form id="editForm" lay-filter="editForm" class="layui-form model-form">
-        <input name="experimentTypeId" type="hidden"/>
+        <input name="id" type="hidden"/>
         <div class="layui-form-item">
-            <label class="layui-form-label">鍗曟嵁绫诲瀷: </label>
+            <label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label>
             <div class="layui-input-block cool-auto-complete">
                 <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
-                <input id="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur()>
+                <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
                 <div class="cool-auto-complete-window">
                     <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                     <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -88,7 +105,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
             <div class="layui-input-block">
-                <input id="billNo" name="billNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+                <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
             </div>
         </div>
         <div class="layui-form-item" style="position: relative;">
@@ -103,7 +120,7 @@
         </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="waitMatinEditSubmit" lay-submit>淇濆瓨</button>
+            <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button>
         </div>
     </form>
 </script>

--
Gitblit v1.9.1