From 395a761c6a2df625180f98b25341298f20122ac0 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 25 六月 2025 13:23:47 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/BaseSetting/MaterialsForm.html | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index a2ee30a..3c61be9 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -93,22 +93,22 @@
</div>
</div>
<div class="layui-inline" id="IsControlledshow">
- <label class="layui-form-label">鏄惁鍙楁帶</label>
+ <label class="layui-form-label">鏄惁璇烽獙</label>
<div class="layui-input-block" style="width: 182px;">
<select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
<!-- <option value=""></option> -->
- <option value="0">鍙楁帶</option>
- <option value="1">闈炲彈鎺�</option>
+ <option value="0">鏄�</option>
+ <option value="1">鍚�</option>
</select>
</div>
</div>
<div class="layui-inline" id="IsInspectshow">
- <label class="layui-form-label">鏄惁鍏嶆</label>
+ <label class="layui-form-label">鏄惁鍙楁帶</label>
<div class="layui-input-block" style="width: 182px;">
<select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
<!-- <option value=""></option> -->
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
+ <option value="0">鏄�</option>
+ <option value="1">鍚�</option>
</select>
</div>
</div>
@@ -124,10 +124,9 @@
<!-- 鍗曚綅 -->
<div class="layui-inline">
<label class="layui-form-label">鍗曚綅</label>
- <div class="layui-input-block" style="width: 182px;">
- <select name="UnitNo" id="UnitNo" lay-verify="" lay-search>
- <option value=""></option>
- </select>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="UnitNo" id="UnitNo" placeholder="璇疯緭鍏ュ崟浣�" lay-verify="" autocomplete="off"
+ class="layui-input">
</div>
</div>
<!-- 鍖呰 -->
@@ -276,26 +275,26 @@
});
- var sel1 = false;
- //鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
- synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
- {
- for (var i = 0; i < res.data.length; i++) {
- $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
- }
- form.render('select');
- sel1 = true;
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { sel1 = true; });
- }
+ var sel1 = true;
+ // //鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
+ // synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
+ // if (res.code == 0) //鎴愬姛
+ // {
+ // for (var i = 0; i < res.data.length; i++) {
+ // $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
+ // }
+ // form.render('select');
+ // sel1 = true;
+ // }
+ // else //涓嶆垚鍔�
+ // {
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () { sel1 = true; });
+ // }
- });
+ // });
var sel2 = false;
//鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
@@ -352,7 +351,7 @@
$("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected", "selected"); // 鏄惁鍙楁帶
$("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 鏄惁鍏嶆
$("#IsPasteCode option[value='" + res.data.IsPasteCode + "']").attr("selected", "selected"); // 鏄惁璐存爣
- $("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected", "selected");// 鍗曚綅
+ $("input[name='UnitNo']").val(res.data.UnitNo);
$("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 鍖呰
// $("#PackagNo").attr("disabled", "disabled")
$("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 瀛樺偍鐜
--
Gitblit v1.8.0