修改系列接口

admin/src/main/resources/static/css/main.css

@@ -478,7 +478,25 @@ a{
 		left: 0;
 	}
 }
+::-webkit-scrollbar {
+	width: 10px; /* 滚动条宽度 */
+	height: 10px;
+}
 
+::-webkit-scrollbar-track {
+	background: #eee;
+	border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb {
+	background: #666;
+	border-radius: 6px;
+	cursor: pointer;
+}
+
+::-webkit-scrollbar-thumb:hover {
+	background: #999;
+}
 /* 页面通用样式 */
 .timo-layout-page{
 	background-color: #eeeeee;

admin/src/main/resources/templates/orders/orderMain/add.html

@@ -21,24 +21,32 @@
         <div class="layui-form-item">
             <label class="layui-form-label">订单服务时长</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="projectionServiceTime"
+                <input class="layui-input" type="text" name="projectionServiceTime" disabled
                        th:value="${orderMain.projectionServiceTime}"/>
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">服务时间</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="serviceTime"
-                       th:value="${orderMain.serviceTime}"/>
-            </div>
-        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">详细地址信息</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="addr" th:value="${orderMain.userServiceAddrInfo.addr}"/>
+                <input class="layui-input" type="text" name="addr" th:value="${orderMain.userServiceAddrInfo.addr}" disabled/>
                 <input type="hidden" name="addrId" th:value="${orderMain.userServiceAddrInfo.id}"/>
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">服务时间</label>
+            <div class="layui-input-inline">
+                <input class="layui-input" id="serviceTime" type="text" name="serviceTime"
+                       th:value="${orderMain.serviceTime}"/>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">服务车辆</label>
+            <div class="layui-input-inline">
+                <select class="timo-search-select" id="carId" name="carId">
+                    <option th:each="c,Car:${cars}" th:value="${c.id}" th:text="${c.carNo}"></option>
+                </select>
+            </div>
+        </div>
         <div class="layui-form-item timo-finally">
             <button class="layui-btn ajax-submit"><i class="fa fa-check-circle"></i> 保存</button>
             <button class="layui-btn btn-secondary close-popup"><i class="fa fa-times-circle"></i> 关闭</button>
@@ -47,4 +55,15 @@
 </div>
 <script th:replace="/common/template :: script"></script>
 </body>
+<script>
+    layui.use(['laydate'], function () {
+        var laydate = layui.laydate;
+        // 渲染
+        laydate.render({
+            elem: '#serviceTime',
+            type: 'datetime',
+            format: 'yyyy-MM-dd HH'
+        });
+    })
+</script>
 </html>

admin/src/main/resources/templates/orders/orderMain/index.html

@@ -76,6 +76,7 @@
                     <th>服务时间</th>
                     <th>订单状态</th>
                     <th>派单状态</th>
+                    <th>派单信息</th>
                     <th>地址信息</th>
                     <th>宠物信息</th>
                     <th>洗护时长</th>
@@ -100,7 +101,7 @@
                            th:attr="data-url=@{'/orders/orderMain/toDispatchPage/'+${item.id}}" data-size="auto"
                            href="#">派单</a>
                         <a th:if="${item.orderStatus == 1}" class="ajax-get" data-msg="您是否确认取消订单" th:href="@{/orders/orderMain/orderCancel(ids=${item.id})}">取消订单</a>
-                        <a class="open-popup" data-title="编辑订单"
+                        <a class="open-popup" data-title="编辑"
                            th:attr="data-url=@{'/orders/orderMain/edit/'+${item.id}}" data-size="auto"
                            href="#">编辑</a>
                         <a th:if="${item.orderStatus == 3 || item.orderStatus == 4}" class="ajax-get" data-msg="您是否确认删除" th:href="@{/orders/orderMain/status/delete(ids=${item.id})}">删除</a>
@@ -111,6 +112,7 @@
                     <td th:text="${item.serviceTime}">服务时间</td>
                     <td th:text="${#dicts.orderStatus(item.orderStatus)}">订单状态</td>
                     <td th:text="${#dicts.dispatchStatus(item.dispatchStatus)}">派单状态</td>
+                    <td th:utext="${item.carInfo}">派单信息</td>
                     <td th:utext="${item.userServiceAddr}">地址信息</td>
                     <td th:utext="${item.petInfos}">宠物信息</td>
                     <td th:text="${item.projectionServiceTime}">洗护时长</td>

admin/src/main/resources/templates/users/pets/index.html

@@ -89,7 +89,9 @@
             var laydate = layui.laydate;
             // 渲染
             laydate.render({
-                elem: '#birthday'
+                elem: '#birthday',
+                type: 'month',
+                format: 'MM'
             });
         })
     </script>