From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/webapp/views/waitMatin/waitMatin.html | 441 ++++++------------------------------------------------
1 files changed, 54 insertions(+), 387 deletions(-)
diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index c26506e..1c79663 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -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>
@@ -25,21 +25,43 @@
<div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label w-auto">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-inline mr0">
- <input name="experimentTypeName" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
+ <input name="bill_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
</div>
</div>
<div class="layui-inline">
- <button class="layui-btn icon-btn" lay-filter="eCourseTbSearch" lay-submit>
+ <div class="layui-input-inline mr0">
+ <select name="bill_type" placeholder="璇烽�夋嫨鍗曟嵁绫诲瀷">
+ <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-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn icon-btn" lay-filter="waitMatinSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button id="eCourseAddBtn" class="layui-btn icon-btn"><i class="layui-icon"></i>娣诲姞
+ <button id="waitMatinAddBtn" class="layui-btn icon-btn"><i class="layui-icon"></i>娣诲姞
</button>
</div>
</div>
</div>
<table id="waitMatin" lay-filter="waitMatin"></table>
+ </div>
+ </div>
+ <div class="layui-card">
+ <div class="layui-card-body">
+ 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
+ <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
</div>
</div>
</div>
@@ -61,9 +83,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 id="billNo" 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,29 +106,28 @@
<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="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>
+ <label class="layui-form-label">鐗╂枡 - 澶氶��</label>
<div class="layui-input-block">
<div id="mat" name="mat">
</div>
@@ -101,7 +135,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>
@@ -110,374 +144,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<!--<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>-->
-<script>
- var pageCurr;
- layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
- }).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect'], function () {
- var $ = layui.jquery;
- var layer = layui.layer;
- var form = layui.form;
- var table = layui.table;
- var util = layui.util;
- var admin = layui.admin;
- var xmSelect = layui.xmSelect;
-
- // 娓叉煋琛ㄦ牸
- var insTb = table.render({
- elem: '#waitMatin',
- url: baseUrl+'/waitMatin/head/page/auth',
- headers: {token: localStorage.getItem('token')},
- page: true,
- cellMinWidth: 100,
- cols: [[
- {type: 'numbers'},
- {field: 'billNo', title: '鍗曟嵁缂栧彿', sort: true},
- {field: 'billType$', align: 'center', title: '绫诲瀷', minWidth: 140, width: 140},
- // {align: 'center', title: '鏄熸湡', templet: '#eCourseTbWeek', minWidth: 350, width: 350},
- {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 140, width: 140},
- {
- field: 'appeTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- return util.toDateString(d.createTime);
- }, width: 180
- },
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', minWidth: 130, width: 130}
- ]],
- request: {
- pageName: 'curr',
- pageSize: 'limit'
- },
- parseData: function (res) {
- return {
- 'code': res.code,
- 'msg': res.msg,
- 'count': res.data.total,
- 'data': res.data.records
- }
- },
- response: {
- statusCode: 200
- },
- done: function (res) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- }
- });
-
- // 鎼滅储
- form.on('submit(eCourseTbSearch)', function (data) {
- insTb.reload({where: data.field, page: {curr: 1}});
- });
-
- // 娣诲姞
- $("#eCourseAddBtn").click(function () {
- showEditModel();
- });
-
- // 宸ュ叿鏉＄偣鍑讳簨浠�
- table.on('tool(waitMatin)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'edit') {
- showEditModel(data);
- } else if (layEvent === 'del') {
- doDel(data.experimentTypeId);
- } else if (layEvent === 'look') {
- var $a = $(obj.tr).find('a[lay-event="look"]');
- var offset = $a.offset();
- var top = offset.top;
- var left = offset.left;
- layer.open({
- type: 1,
- title: false,
- area: '630px',
- offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
- shade: .01,
- shadeClose: true,
- fixed: false,
- content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
- success: function (layero) {
- table.render({
- elem: '#lookSSXMTable',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/waitMatin/list/auth',
- where: {
- bill_no: data.billNo
- },
- page: true,
- cellMinWidth: 100,
- cols: [[
- {type: 'numbers'},
- {field: 'matNo', title: '鐗╂枡缂栫爜'},
- {field: 'matName', title: '鐗╂枡鍚嶇О', width: 160},
- {field: 'qty', title: '鏁伴噺'},
- {
- field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- return util.toDateString(d.createTime);
- }, width: 180
- }
- ]],
- request: {
- pageName: 'curr',
- pageSize: 'limit'
- },
- parseData: function (res) {
- return {
- 'code': res.code,
- 'msg': res.msg,
- 'count': res.data.total,
- 'data': res.data.records
- }
- },
- response: {
- statusCode: 200
- },
- done: function () {
- $(layero).find('.layui-table-view').css('margin', '0');
- },
- size: ''
- });
- }
- });
- }
- });
-
- // 鏄剧ず琛ㄥ崟寮圭獥
- function showEditModel(expTpe) {
- admin.open({
- type: 1,
- title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
- 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('editForm', expTpe);
- // 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(eCourseEditSubmit)', function (data) {
- if (isExpAdd) {
- if (xxDataList.length <= 0) {
- layer.tips('璇锋坊鍔犲疄楠岄」鐩�', '#demoEDeCourseAddBtnComment', {tips: [1, '#ff4c4c']});
- return false;
- }
- var nList = admin.util.deepClone(xxDataList);
- for (var xi = 0; xi < nList.length; xi++) {
- nList[xi].experimentId = undefined;
- }
- data.field.expListJson = JSON.stringify(nList);
- }
- layer.load(2);
- $.get(url, data.field, function (res) {
- layer.closeAll('loading');
- if (res.code === 200) {
- layer.close(dIndex);
- insTb.reload({page: {curr: 1}});
- layer.msg(res.msg, {icon: 1});
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }, 'json');
- return false;
- });
- //
- var xxDataList = [];
- var tbOptions = {
- elem: '#formSSXMTable',
- data: xxDataList,
- page: true,
- height: '350px;',
- cellMinWidth: 100,
- cols: [[
- {type: 'numbers'},
- {field: 'matNo', title: '鐗╂枡缂栫爜'},
- {field: 'matName', title: '鐗╂枡鍚嶇О', width: 160},
- {field: 'qty', title: '鏁伴噺'},
- {align: 'center', title: '鎿嶄綔', toolbar: '#eCourseCouTbBar', minWidth: 120, width: 120}
- ]],
- done: function () {
- $(layero).find('.layui-table-view').css('margin', '0');
- },
- size: ''
- };
- if (isExpAdd) {
-
- } else {
- tbOptions.data = undefined;
- tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
- }
- var insTbSSXM = table.render(tbOptions);
- // 宸ュ叿鏉＄偣鍑讳簨浠�
- table.on('tool(formSSXMTable)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'edit') {
- showEditModel2(data);
- } else if (layEvent === 'del') {
- layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
- shade: .1,
- 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);
- }
- }
- 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');
- }
- });
- }
- });
- //
- $('#demoEDeCourseAddBtnComment').click(function () {
- showEditModel2();
- });
-
- // 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
- function showEditModel2(exp) {
- admin.open({
- type: 1,
- offset: '150px',
- title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
- 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('eCourseCouEditForm', 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);
- 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,
- autoRow: true,
- toolbar: { show: true },
- filterable: true,
- remoteSearch: true,
- remoteMethod: function(val, cb, show){
- //杩欓噷濡傛灉val涓虹┖, 鍒欎笉瑙﹀彂鎼滅储
- // if(!val){
- // return cb([]);
- // }
- $.ajax({
- url: baseUrl+"/mat/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- })
- // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
-
- }
- });
- }
-
- // 鍒犻櫎
- function doDel(experimentTypeId) {
- layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- layer.close(i);
- layer.load(2);
- $.post('../../json/ok.json', {
- experimentTypeId: experimentTypeId
- }, function (res) {
- layer.closeAll('loading');
- if (res.code === 200) {
- layer.msg(res.msg, {icon: 1});
- insTb.reload({page: {curr: 1}});
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }, 'json');
- });
- }
-
- });
-</script>
+<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>
</body>
</html>
--
Gitblit v1.9.1