From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/templates/admin/inout/in-handle.html | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-handle.html b/igds-web/src/main/resources/templates/admin/inout/in-handle.html
index 5c6c098..f123de1 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-handle.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-handle.html
@@ -166,7 +166,7 @@
</span>
<p>婊¤溅绉伴噸</p>
</li>
- <li id="progress-hand" class="">
+ <li id="progress-hand" class="active">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-xiehuo.png}"/>
</span>
@@ -310,7 +310,7 @@
<label class="layui-form-label color-red">瑁呭嵏浠撳簱</label>
<div class="layui-input-block">
<select name="depotId" id="depotId" lay-filter="select_depotId">
- <option value="">涓嶅彲缂栬緫</option>
+ <option value="">璇烽�夋嫨</option>
<option th:each="depot,depotSet:${listDepot}"
th:value="${depot.id}" th:text="${depot.name}"></option>
</select>
@@ -520,6 +520,7 @@
var bizType = [[${bizType}]];
//userId
var userId = [[${loginUser.username}]];
+ var curUser = [[${loginUser.cname}]];
//鍑哄叆搴撶被鍨�
var type = [[${type}]];
var companyId = [[${loginUser.companyId}]];
--
Gitblit v1.9.3