From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/views/waitMatin/waitMatin.html | 114 +++++++++++++++++++++++---------------------------------
1 files changed, 47 insertions(+), 67 deletions(-)
diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index 092c137..7d38c6a 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -83,8 +83,8 @@
</form>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="matEditDialog">
- <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
+<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>-->
@@ -101,7 +101,7 @@
</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="matEditSubmit" lay-submit>淇濆瓨</button>
+ <button class="layui-btn" lay-filter="eCourseCouEditSubmit" lay-submit>淇濆瓨</button>
</div>
</form>
</script>
@@ -358,84 +358,64 @@
admin.open({
type: 1,
offset: '150px',
- area: '480px',
title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
- content: $('#matEditDialog').html(),
+ content: $('#eCourseCouEditDialog').html(),
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var url = exp ? '../../json/ok.json' : '../../json/ok.json';
// 鍥炴樉鏁版嵁
- form.val('matEditForm', exp);
+ form.val('eCourseCouEditForm', exp);
// 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(matEditSubmit)', function (data) {
- var existMats = [];
- xxDataList.forEach(function(elem) {
- existMats.push(elem.matNo);
- });
- var selectList = matXmSelect.getValue();
- for (var i = 0; i<selectList.length; i++) {
- var item = selectList[i];
- if (existMats.indexOf(item.value) === -1) {
- // 鏌ヨ鐗╂枡璇︽儏
-
-
- xxDataList.push({matNo: item.value});
+ form.on('submit(eCourseCouEditSubmit)', function (data) {
+ 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) {
+ layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
+ return false;
+ }
+ }
+ layer.close(dIndex);
+ for (var j = 0; j < xxDataList.length; j++) {
+ 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) {
+ layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
+ return false;
+ }
+ }
+ layer.close(dIndex);
+ data.field.experimentId = new Date().getTime();
+ xxDataList.push(data.field);
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
}
+ } else { // 鍚庣澶勭悊娣诲姞淇敼
+ layer.load(2);
+ if (!exp) {
+ data.field.experimentTypeId = expTpe.experimentTypeId;
+ }
+ $.get(url, {json: JSON.stringify(data.field)}, function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200) {
+ layer.close(dIndex);
+ insTbSSXM.reload({page: {curr: 1}});
+ layer.msg(res.msg, {icon: 1});
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }, 'json');
}
- layer.close(dIndex);
-
- // 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) {
- // layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
- // return false;
- // }
- // }
- // layer.close(dIndex);
- // for (var j = 0; j < xxDataList.length; j++) {
- // 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) {
- // layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
- // return false;
- // }
- // }
- // layer.close(dIndex);
- // data.field.experimentId = new Date().getTime();
- // xxDataList.push(data.field);
- // insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- // }
- // } else { // 鍚庣澶勭悊娣诲姞淇敼
- // layer.load(2);
- // if (!exp) {
- // data.field.experimentTypeId = expTpe.experimentTypeId;
- // }
- // $.get(url, {json: JSON.stringify(data.field)}, function (res) {
- // layer.closeAll('loading');
- // if (res.code === 200) {
- // layer.close(dIndex);
- // insTbSSXM.reload({page: {curr: 1}});
- // layer.msg(res.msg, {icon: 1});
- // } else {
- // layer.msg(res.msg, {icon: 2});
- // }
- // }, 'json');
- // }
return false;
});
// 娓叉煋鐗╂枡閫夋嫨
var matXmSelect = xmSelect.render({
el: '#mat',
- style: {
- width: '340px',
- },
+ // radio: true,
autoRow: true,
toolbar: { show: true },
filterable: true,
--
Gitblit v1.9.1