From 7e88876cd6c68e963ec0560f4e329e5dad483d9c Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 28 十一月 2025 16:58:16 +0800
Subject: [PATCH] 增加casno等7个字段
---
HTML/views/BaseSetting/MaterialsForm.html | 336 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 230 insertions(+), 106 deletions(-)
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index a2ee30a..8ba6674 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -10,10 +10,11 @@
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<style>
- .EditColor{
+ .EditColor {
border-color: #ed7878;
}
- .layui-form-label{
+
+ .layui-form-label {
width: 70px;
}
</style>
@@ -27,13 +28,13 @@
<label class="layui-form-label">鐗╂枡鍙� <strong style="color: red;font-size: 18px;">*</strong></label>
<div class="layui-input-block" style="width: 182px;">
<input type="text" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" lay-verify="required" autocomplete="off"
- class="layui-input" >
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡绫诲埆 <strong style="color: red;font-size: 18px;">*</strong></label>
<div class="layui-input-block " style="width: 182px;">
- <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search >
+ <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search>
<option value=""></option>
</select>
</div>
@@ -93,22 +94,24 @@
</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>
+ <div class="layui-form-item">
<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>
@@ -125,9 +128,8 @@
<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>
+ <input type="text" name="UnitNo" id="UnitNo" placeholder="璇疯緭鍏ュ崟浣�" lay-verify="" autocomplete="off"
+ class="layui-input">
</div>
</div>
<!-- 鍖呰 -->
@@ -171,9 +173,10 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 70px;">鎷嗗寘鏁堟湡(澶�)</label>
<div class="layui-input-block" style="width: 182px;">
- <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="UnpackWarranty" placeholder="璇疯緭鍏ユ媶鍖呮晥鏈�" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="UnpackWarranty"
+ placeholder="璇疯緭鍏ユ媶鍖呮晥鏈�" lay-verify="" autocomplete="off" class="layui-input">
</div>
- </div>
+ </div>
<!-- <div class="layui-inline">
<label class="layui-form-label">鐞嗚鍗曚环</label>
<div class="layui-input-block" style="width: 182px;">
@@ -198,7 +201,71 @@
</div>
</div>
</div>
-
+
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">CAS鍙�</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="CasNo" id="CasNo" placeholder="璇疯緭鍏AS鍙�" lay-verify="" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁鎵规绠＄悊</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <select name="IsLotManage" id="IsLotManage" lay-verify="" lay-verify="" lay-search>
+ <!-- <option value=""></option> -->
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐣欐牱鏃堕棿</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="LeaveTime" id="LeaveTime" placeholder="璇疯緭鍏ョ暀鏍锋椂闂�" lay-verify=""
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">娑蹭綋鐗╂枡闂偣</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="LiquidFlashPoint" id="LiquidFlashPoint" placeholder="璇疯緭鍏ユ恫浣撶墿鏂欓棯鐐�"
+ lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗遍櫓璐т綅淇℃伅</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="DangerLocatInfo" id="DangerLocatInfo" placeholder="璇疯緭鍏ュ嵄闄╄揣浣嶄俊鎭�" lay-verify=""
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐏伀鏂瑰紡</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="OutFireMethod" id="OutFireMethod" placeholder="璇疯緭鍏ョ伃鐏柟寮�" lay-verify=""
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡绂佸繉</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="MaterialTaboo" id="MaterialTaboo" placeholder="璇疯緭鍏ョ墿鏂欑蹇�" lay-verify=""
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
@@ -224,10 +291,17 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'layer'], function () {
+ }).use(['index', 'form', 'layer', 'laydate'], function () {
var $ = layui.$,
form = layui.form,
layer = layui.layer;
+ laydate = layui.laydate;
+
+
+ laydate.render({
+ elem: '#LeaveTime',
+ format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
// var sel3 = false;
// //鑾峰彇绫诲埆淇℃伅 CategoryNo
@@ -276,108 +350,158 @@
});
- 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; });
+ // }
- });
+ // });
+
+ getPackagList();
var sel2 = false;
- //鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
- synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
- {
- for (var i = 0; i < res.data.length; i++) {
- $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
+ function getPackagList() {
+ var packagList = [];
+
+ let shouldContinue = true;
+ let index = 1;
+ while (shouldContinue) {
+ synData(IP + "/Basis/GetPackagList?page=" + index, {}, 'get', function (res, status, error) {
+ if (res.code == 0) {
+ if (res.data.length > 0) {
+ packagList.push(res.data);
+ index++;
+ } else {
+ shouldContinue = false;
+ }
+ } else {
+ shouldContinue = false;
+ }
+ });
+ }
+ if (packagList.length > 0) {
+ for (var i = 0; i < packagList.length; i++) {
+ var itemList = packagList[i];
+ for (var j = 0; j < itemList.length; j++) {
+ $("#PackagNo").append('<option value =' + itemList[j].PackagNo + '>' + itemList[j].PackagName + '</option>');
+ }
}
form.render('select');
sel2 = true;
}
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { sel2 = true; });
+
+ var id = getQueryString('id');
+ if (!id) {
+ id = 0;
+ $("#AuditStatusNo").attr("disabled", "true")
}
+ else {
+ if (sel1 && sel2 && sel3) {
+ var param = {
+ UserId: id,
+ };
+ synData(IP + "/Basis/GetMateById?Id= " + getQueryString('id') + "", {}, 'get', function (res) {
+ if (res.code == 0) //鎴愬姛
+ {
+ // console.log(res.data.CategoryNo)
+ //瀹℃壒鐘舵�佺紪杈戞樉绀�
+ if (res.data.AuditStatusNo != "") {
+ //$('#Auditishow').show();
+ // $('#IsControlledshow').show();
+ // $('#IsInspectshow').show();
+ }
+ //鐗╂枡鍙�
+ if (res.data.SkuNo != "") {
+ $("input[name='SkuNo']").attr("disabled", "disabled")
+ }
+ //椤甸潰璧嬪��
+ $("input[name='SkuNo']").val(res.data.SkuNo); // 鐗╂枡鍙�
+ $("input[name='SkuName']").val(res.data.SkuName); // 鐗╂枡鍚嶇О
+ $("input[name='Standard']").val(res.data.Standard); // 瑙勬牸
+ $("#AuditStatusNo option[value='" + res.data.AuditStatusNo + "']").attr("selected", "selected"); // 瀹℃牳鐘舵��
+ $("#Type option[value='" + res.data.Type + "']").attr("selected", "selected"); // 绫诲瀷
+ $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected", "selected"); // 绫诲埆
+ // $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
+ $("#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"); // 鏄惁璐存爣
+ $("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"); // 瀛樺偍鐜
+ $("input[name='Weight']").val(res.data.Weight); // 鐞嗚閲嶉噺
+ $("input[name='Warranty']").val(res.data.Warranty); // 淇濊川鏈�
+ $("input[name='UnpackWarranty']").val(res.data.UnpackWarranty); // 淇濊川鏈�
+ $("input[name='Price']").val(res.data.Price); // 鐞嗚鍗曚环
+ $("input[name='AdventTime']").val(res.data.AdventTime); // 涓存湡
+ $("input[name='LowInventory']").val(res.data.LowInventory); // 浣庡簱瀛�
- });
+ //CAS鍙�
+ $("input[name='CasNo']").val(res.data.CasNo);
+ //鏄惁鎵规绠＄悊
+ $("#IsLotManage option[value='" + res.data.IsLotManage + "']").attr("selected", "selected");
+ //鐣欐牱鏃堕棿
+ $("input[name='LeaveTime']").val(res.data.LeaveTime);
+ //娑蹭綋鐗╂枡闂偣
+ $("input[name='LiquidFlashPoint']").val(res.data.LiquidFlashPoint);
+ //鍗遍櫓璐т綅淇℃伅
+ $("input[name='DangerLocatInfo']").val(res.data.DangerLocatInfo);
+ //鐏伀鏂瑰紡
+ $("input[name='OutFireMethod']").val(res.data.OutFireMethod);
+ //鐗╂枡绂佸繉
+ $("input[name='MaterialTaboo']").val(res.data.MaterialTaboo);
- var id = getQueryString('id');
- if (!id) {
- id = 0;
- $("#AuditStatusNo").attr("disabled", "true")
- }
- else {
- if (sel1 && sel2 && sel3) {
- var param = {
- UserId: id,
- };
- synData(IP + "/Basis/GetMateById?Id= " + getQueryString('id') + "", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
- {
- // console.log(res.data.CategoryNo)
- //瀹℃壒鐘舵�佺紪杈戞樉绀�
- if (res.data.AuditStatusNo != "") {
- //$('#Auditishow').show();
- // $('#IsControlledshow').show();
- // $('#IsInspectshow').show();
+ $("textarea[name='Demo']").val(res.data.Demo); //澶囨敞
+ form.render();
+ form.render('select');
}
- //鐗╂枡鍙�
- if (res.data.SkuNo != "") {
- $("input[name='SkuNo']").attr("disabled", "disabled")
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
}
- //椤甸潰璧嬪��
- $("input[name='SkuNo']").val(res.data.SkuNo); // 鐗╂枡鍙�
- $("input[name='SkuName']").val(res.data.SkuName); // 鐗╂枡鍚嶇О
- $("input[name='Standard']").val(res.data.Standard); // 瑙勬牸
- $("#AuditStatusNo option[value='" + res.data.AuditStatusNo + "']").attr("selected", "selected"); // 瀹℃牳鐘舵��
- $("#Type option[value='" + res.data.Type + "']").attr("selected", "selected"); // 绫诲瀷
- $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected", "selected"); // 绫诲埆
- // $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
- $("#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");// 鍗曚綅
- $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 鍖呰
- // $("#PackagNo").attr("disabled", "disabled")
- $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 瀛樺偍鐜
- $("input[name='Weight']").val(res.data.Weight); // 鐞嗚閲嶉噺
- $("input[name='Warranty']").val(res.data.Warranty); // 淇濊川鏈�
- $("input[name='UnpackWarranty']").val(res.data.UnpackWarranty); // 淇濊川鏈�
- $("input[name='Price']").val(res.data.Price); // 鐞嗚鍗曚环
- $("input[name='AdventTime']").val(res.data.AdventTime); // 涓存湡
- $("input[name='LowInventory']").val(res.data.LowInventory); // 浣庡簱瀛�
- $("textarea[name='Demo']").val(res.data.Demo); //澶囨敞
- form.render();
- form.render('select');
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
+ });
+ }
+
}
-
+ form.render('select');
}
- form.render('select');
+ //鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
+ // synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
+ // if (res.code == 0) //鎴愬姛
+ // {
+ // for (var i = 0; i < res.data.length; i++) {
+ // $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
+ // }
+ // form.render('select');
+ // sel2 = true;
+ // }
+ // else //涓嶆垚鍔�
+ // {
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () { sel2 = true; });
+ // }
+
+ // });
+
+
});
//鑾峰彇娴忚鍣ㄥ弬鏁�
--
Gitblit v1.8.0