zy-asrs.git - Gitblit

			@@ -61,9 +61,22 @@
			<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">
			<select name="billType" maxlength="20" lay-verType="tips" lay-verify="required">
			<option value="" style="display: none"></option>
			<option value="1">采购入库</option>
			<option value="2">生产入库</option>
			<option value="3">调拨入库</option>
			<option value="4">销售退回入库</option>
			<option value="5">其他入库</option>
			</select>
			</div>
			</div>
			<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"/>
			<input name="billNo" placeholder="输入单据编号" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
			</div>
			</div>
			<div class="layui-form-item" style="position: relative;">
			@@ -71,27 +84,26 @@
			<div class="layui-input-block">
			<table id="formSSXMTable" lay-filter="formSSXMTable"></table>
			</div>
			<button class="layui-btn layui-btn-sm icon-btn" id="demoEDeCourseAddBtnComment"
			<button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
			style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
			<i class="layui-icon"></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>
			<button class="layui-btn" lay-filter="waitMatinEditSubmit" lay-submit>保存</button>
			</div>
			</form>
			</script>
			<!-- 表格操作列 -->
			<script type="text/html" id="formSSXMTableBar">
			<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>-->
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
			</script>
			<!-- 表单弹窗 -->
			<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">
			@@ -247,6 +259,7 @@

			// 显示表单弹窗
			function showEditModel(expTpe) {
			console.log(expTpe)
			admin.open({
			type: 1,
			title: (expTpe ? '修改' : '添加') + '单据',
			@@ -255,14 +268,14 @@
			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;
			var isExpAdd = !expTpe;
			// 回显数据
			form.val('editForm', expTpe);
			// 表单提交事件
			form.on('submit(eCourseEditSubmit)', function (data) {
			form.on('submit(waitMatinEditSubmit)', function (data) {
			if (isExpAdd) {
			if (xxDataList.length <= 0) {
			layer.tips('请添加实验项目', '#demoEDeCourseAddBtnComment', {tips: [1, '#ff4c4c']});
			layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
			return false;
			}
			var nList = admin.util.deepClone(xxDataList);
			@@ -284,7 +297,7 @@
			}, 'json');
			return false;
			});
			//
			// 明细表格
			var xxDataList = [];
			var tbOptions = {
			elem: '#formSSXMTable',
			@@ -296,17 +309,15 @@
			{type: 'numbers'},
			{field: 'matNo', title: '物料编码'},
			{field: 'matName', title: '物料名称', width: 160},
			{field: 'qty', title: '数量'},
			{align: 'center', title: '操作', toolbar: '#eCourseCouTbBar', minWidth: 120, width: 120}
			{field: 'qty', title: '修改数量', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
			{align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
			]],
			done: function () {
			$(layero).find('.layui-table-view').css('margin', '0');
			},
			size: ''
			};
			if (isExpAdd) {

			} else {
			if (!isExpAdd) {
			tbOptions.data = undefined;
			tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
			}
			@@ -323,33 +334,36 @@
			skin: 'layui-layer-admin'
			}, function (i) {
			layer.close(i);
			if (isExpAdd) { // 前端处理删除
			for (var j = 0; j < xxDataList.length; j++) {
			if (xxDataList[j].experimentId === data.experimentId) {
			xxDataList.splice(j, 1);
			}
			for (var j = 0; j < xxDataList.length; j++) {
			if (xxDataList[j].matNo === data.matNo) {
			xxDataList.splice(j, 1);
			}
			insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
			} else { // 后端处理删除
			layer.load(2);
			$.get('../../json/ok.json', {
			experimentId: data.experimentId
			}, function (res) {
			layer.closeAll('loading');
			if (res.code === 200) {
			layer.msg(res.msg, {icon: 1});
			insTb.reload({page: {curr: 1}});
			insTbSSXM.reload({page: {curr: 1}});
			} else {
			layer.msg(res.msg, {icon: 2});
			}
			}, 'json');
			}
			insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
			});
			}
			});
			// 数量修改
			table.on('edit(formSSXMTable)', function (obj) {
			let count = Number(obj.value);
			if (isNaN(count)) {
			layer.msg("请输入数字");
			} else {
			if (count > 0) {
			for (var i=0;i<xxDataList.length;i++){
			if (xxDataList[i]["matNo"] === obj.data.matNo){
			xxDataList[i]["qty"] = count;
			break;
			}
			}
			} else {
			layer.msg("数量必须大于零");
			}
			}
			insTbSSXM.reload({data: xxDataList});
			});
			//
			$('#demoEDeCourseAddBtnComment').click(function () {
			$('#matAddBtnComment').click(function () {
			showEditModel2();
			});

			@@ -377,57 +391,30 @@
			var item = selectList[i];
			if (existMats.indexOf(item.value) === -1) {
			// 查询物料详情


			xxDataList.push({matNo: item.value});
			insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
			$.ajax({
			url: baseUrl+"/matCode/"+item.value+"/auth",
			headers: {'token': localStorage.getItem('token')},
			method: 'GET',
			async: false,
			success: function (res) {
			if (res.code === 200){
			var mat = res.data;
			xxDataList.push({
			matNo: mat.matNo,
			matName: mat.matName,
			qty: 0.0
			});
			insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			}else {
			layer.msg(res.msg, {icon: 2})
			}
			}
			})
			}
			}
			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;
			});
			// 渲染物料选择