From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/templates/admin/inout/in-check.html | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-check.html b/igds-web/src/main/resources/templates/admin/inout/in-check.html
index 144956c..dbc2da0 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-check.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-check.html
@@ -350,6 +350,8 @@
var companyId = [[${loginUser.companyId}]];
//鍝佺
var listFoodVariety = [[${listFoodVariety}]];
+ //鎬ц川
+ var listFoodType = [[${listFoodType}]];
var startTime = [[${startTime}]];
var endTime = [[${endTime}]];
var foodYear = [[${foodYear}]];
@@ -515,25 +517,19 @@
</div>
</div>
</div>
- <!-- <div class="layui-col-xs4">-->
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label red">绮骞翠唤</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input type="text" name="foodYear" placeholder="璇疯緭鍏�"-->
- <!-- class="layui-input rkbk-search-input bg-date" id="foodYear">-->
-
- <!-- </div>-->
- <!-- </div>-->
- <!-- </div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
+ <label class="layui-form-label red">绮鎬ц川</label>
<div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
+ <select id="foodType" name="foodType" lay-filter="select_foodType">
+ <option value=""></option>
+ <option th:each="dic,dicSet:${listFoodType}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
</div>
</div>
</div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label red">鍖栭獙缁撴灉</label>
@@ -546,6 +542,15 @@
</div>
</div>
</div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs12" style="margin-bottom: 10px">
<div style="padding-left: 50px; color: #2ab5ad;">
<span style="font-weight: bold; margin-right: 10px;">澶囨敞璇存槑锛�1.缁撴灉鍒ゅ畾锛氱郴缁熸牴鎹悇鍖栭獙椤圭粨鏋滃垽瀹氾紝鏈�鍚庡寲楠岀粨鏋滈渶鎵嬪姩閫夋嫨纭锛�2.鏍哥畻瀹氫环锛氭牴鎹寲楠岄」閰嶇疆璁＄畻鐩稿叧澧炴墸浠凤紝鏈�鍚庡崟浠烽渶鎵嬪姩纭銆�</span>
--
Gitblit v1.9.3