From adc03660c3592d4d87076c4fefcbb86280610c4a Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 25 八月 2021 13:29:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs
---
src/main/webapp/views/waitMatin/waitMatin.html | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index c26506e..7d38c6a 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -93,7 +93,7 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label">鐗╂枡</label>
+ <label class="layui-form-label">鐗╂枡 - 澶氶��</label>
<div class="layui-input-block">
<div id="mat" name="mat">
</div>
@@ -415,16 +415,12 @@
// 娓叉煋鐗╂枡閫夋嫨
var matXmSelect = xmSelect.render({
el: '#mat',
- radio: true,
+ // radio: true,
autoRow: true,
toolbar: { show: true },
filterable: true,
remoteSearch: true,
remoteMethod: function(val, cb, show){
- //杩欓噷濡傛灉val涓虹┖, 鍒欎笉瑙﹀彂鎼滅储
- // if(!val){
- // return cb([]);
- // }
$.ajax({
url: baseUrl+"/mat/all/get/kv",
headers: {'token': localStorage.getItem('token')},
--
Gitblit v1.9.1