From 461b3bf8e289e1c076d805d47f5f1a9b5c195ce8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 24 八月 2021 16:40:03 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/waitMatin/waitMatin.html |   64 ++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index 3695672..fae46cb 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -56,6 +56,49 @@
         </a>
     </span>
 </script>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <form id="editForm" lay-filter="editForm" class="layui-form model-form">
+        <input name="experimentTypeId" type="hidden"/>
+        <div class="layui-form-item">
+            <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
+            <div class="layui-input-block">
+                <input name="experimentTypeName" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+            </div>
+        </div>
+        <div class="layui-form-item" style="position: relative;">
+            <label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
+            <div class="layui-input-block">
+                <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
+            </div>
+            <button class="layui-btn layui-btn-sm icon-btn" id="demoEDeCourseAddBtnComment"
+                    style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
+                <i class="layui-icon">&#xe654;</i>娣诲姞鏄庣粏
+            </button>
+        </div>
+        <div class="layui-form-item text-right">
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+            <button class="layui-btn" lay-filter="eCourseEditSubmit" lay-submit>淇濆瓨</button>
+        </div>
+    </form>
+</script>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="eCourseCouEditDialog">
+    <form id="eCourseCouEditForm" lay-filter="eCourseCouEditForm" class="layui-form model-form">
+        <input name="experimentId" type="hidden"/>
+        <div class="layui-form-item">
+            <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
+            <div class="layui-input-block">
+                <input name="experimentName" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" type="text" class="layui-input" maxlength="20"
+                       lay-verType="tips" lay-verify="required"/>
+            </div>
+        </div>
+        <div class="layui-form-item text-right">
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+            <button class="layui-btn" lay-filter="eCourseCouEditSubmit" lay-submit>淇濆瓨</button>
+        </div>
+    </form>
+</script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -200,14 +243,14 @@
             admin.open({
                 type: 1,
                 title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
-                content: $('#eCourseEditDialog').html(),
+                content: $('#editDialog').html(),
                 area: '700px',
                 success: function (layero, dIndex) {
                     $(layero).children('.layui-layer-content').css('overflow', 'visible');
                     var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
                     var isExpAdd = expTpe ? false : true;
                     // 鍥炴樉鏁版嵁
-                    form.val('eCourseEditForm', expTpe);
+                    form.val('editForm', expTpe);
                     // 琛ㄥ崟鎻愪氦浜嬩欢
                     form.on('submit(eCourseEditSubmit)', function (data) {
                         if (isExpAdd) {
@@ -244,12 +287,9 @@
                         cellMinWidth: 100,
                         cols: [[
                             {type: 'numbers'},
-                            {field: 'experimentName', title: '椤圭洰鍚嶇О', sort: true},
-                            {
-                                field: 'createTime', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
-                                    return util.toDateString(d.createTime);
-                                }
-                            },
+                            {field: 'matNo', title: '鐗╂枡缂栫爜'},
+                            {field: 'matName', title: '鐗╂枡鍚嶇О', width: 160},
+                            {field: 'qty', title: '鏁伴噺'},
                             {align: 'center', title: '鎿嶄綔', toolbar: '#eCourseCouTbBar', minWidth: 120, width: 120}
                         ]],
                         done: function () {
@@ -311,7 +351,7 @@
                         admin.open({
                             type: 1,
                             offset: '150px',
-                            title: (exp ? '淇敼' : '娣诲姞') + '椤圭洰',
+                            title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
                             content: $('#eCourseCouEditDialog').html(),
                             success: function (layero, dIndex) {
                                 $(layero).children('.layui-layer-content').css('overflow', 'visible');
@@ -323,21 +363,21 @@
                                     if (isExpAdd) {  // 鍓嶇澶勭悊娣诲姞銆佷慨鏀�
                                         if (exp) {  // 鍓嶇淇敼
                                             for (var i = 0; i < xxDataList.length; i++) {
-                                                if (xxDataList[i].experimentName == data.field.experimentName && xxDataList[i].experimentId != data.field.experimentId) {
+                                                if (xxDataList[i].experimentName === data.field.experimentName && xxDataList[i].experimentId !== data.field.experimentId) {
                                                     layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
                                                     return false;
                                                 }
                                             }
                                             layer.close(dIndex);
                                             for (var j = 0; j < xxDataList.length; j++) {
-                                                if (xxDataList[j].experimentId == data.field.experimentId) {
+                                                if (xxDataList[j].experimentId === data.field.experimentId) {
                                                     xxDataList[j].experimentName = data.field.experimentName;
                                                 }
                                             }
                                             insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                                         } else {  // 鍓嶇娣诲姞
                                             for (var i = 0; i < xxDataList.length; i++) {
-                                                if (xxDataList[i].experimentName == data.field.experimentName) {
+                                                if (xxDataList[i].experimentName === data.field.experimentName) {
                                                     layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
                                                     return false;
                                                 }

--
Gitblit v1.9.1