From 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期五, 27 八月 2021 09:46:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs
---
src/main/webapp/views/waitMatin/waitMatin.html | 161 ++++++++++++++++++++++++-----------------------------
1 files changed, 74 insertions(+), 87 deletions(-)
diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index 94c44af..1c4b9c7 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -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;
});
// 娓叉煋鐗╂枡閫夋嫨
--
Gitblit v1.9.1