zy-asrs.git - Gitblit

			@@ -8,8 +8,8 @@
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
			<!-- <link rel="stylesheet" href="../../static/css/cool.css" media="all">-->
			<!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">-->
			<!-- <link rel="stylesheet" href="../../static/css/cool.css" media="all">-->
			<!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">-->
			<!--[if lt IE 9]>
			<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
			<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
			@@ -83,15 +83,15 @@
			</form>
			</script>
			<!-- 表单弹窗 -->
			<script type="text/html" id="eCourseCouEditDialog">
			<form id="eCourseCouEditForm" lay-filter="eCourseCouEditForm" class="layui-form model-form">
			<script type="text/html" id="matEditDialog">
			<form id="matEditForm" lay-filter="matEditForm" 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">-->
			<!-- <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">
			<label class="layui-form-label">物料 - 多选</label>
			<div class="layui-input-block">
			@@ -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="eCourseCouEditSubmit" lay-submit>保存</button>
			<button class="layui-btn" lay-filter="matEditSubmit" lay-submit>保存</button>
			</div>
			</form>
			</script>
			@@ -358,64 +358,84 @@
			admin.open({
			type: 1,
			offset: '150px',
			area: '480px',
			title: (exp ? '修改' : '添加') + '明细',
			content: $('#eCourseCouEditDialog').html(),
			content: $('#matEditDialog').html(),
			success: function (layero, dIndex) {
			$(layero).children('.layui-layer-content').css('overflow', 'visible');
			var url = exp ? '../../json/ok.json' : '../../json/ok.json';
			// 回显数据
			form.val('eCourseCouEditForm', exp);
			form.val('matEditForm', exp);
			// 表单提交事件
			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);
			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});
			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',
			// radio: true,
			style: {
			width: '340px',
			},
			autoRow: true,
			toolbar: { show: true },
			filterable: true,