From 5d5794c14050ee9eb228f884a8f0a5f1d0de27df Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 九月 2023 10:58:40 +0800
Subject: [PATCH] #审核
---
src/main/webapp/views/orderCheck/orderCheck.html | 42 ++++
src/main/webapp/static/js/orderCheck/orderCheck.js | 475 +++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 482 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js
index 2e16943..beb46bf 100644
--- a/src/main/webapp/static/js/orderCheck/orderCheck.js
+++ b/src/main/webapp/static/js/orderCheck/orderCheck.js
@@ -102,6 +102,8 @@
btnPrint(data.id, data.orderNo, 4);
} else if (layEvent === 'manPrint') {
addPakOut(data.orderNo);
+ }else if (layEvent === 'examine') {
+ examine(data);
}else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -170,14 +172,14 @@
printExcel(data);
}
});
- //鍗曟嵁鏄庣粏琛� 瀹℃牳鎸夐挳
- table.on('tool(lookSSXMTable)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'examine') {
- examine(data);
- }
- })
+ // //鍗曟嵁鏄庣粏琛� 瀹℃牳鎸夐挳
+ // table.on('tool(lookSSXMTable)', function (obj) {
+ // var data = obj.data;
+ // var layEvent = obj.event;
+ // if (layEvent === 'examine') {
+ // examine(data);
+ // }
+ // })
function showWrkTrace(orderId) {
console.log(orderId);
@@ -733,31 +735,31 @@
})
}
- function examine(data){
- console.log(data)
- layer.confirm('璇风‘瀹氱湡瀹炴暟閲忎互鍙婂樊寮傛暟閲�!', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- $.ajax({
- url: baseUrl + "/orderCheck/mxamine",
- headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
- data: JSON.stringify(data),
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200){
- layer.msg(res.msg);
- }else {
- layer.msg(res.msg);
- }
- }
- });
-
-
- });
- }
+ // function examine(data){
+ // console.log(data)
+ // layer.confirm('璇风‘瀹氱湡瀹炴暟閲忎互鍙婂樊寮傛暟閲�!', {
+ // shade: .1,
+ // skin: 'layui-layer-admin'
+ // }, function (i) {
+ // $.ajax({
+ // url: baseUrl + "/orderCheck/mxamine",
+ // headers: {'token': localStorage.getItem('token')},
+ // contentType:'application/json;charset=UTF-8',
+ // data: JSON.stringify(data),
+ // method: 'POST',
+ // async: false,
+ // success: function (res) {
+ // if (res.code === 200){
+ // layer.msg(res.msg);
+ // }else {
+ // layer.msg(res.msg);
+ // }
+ // }
+ // });
+ //
+ //
+ // });
+ // }
// 椤甸潰淇敼
table.on('edit(lookSSXMTable)', function (obj) {
@@ -777,4 +779,411 @@
}
+ function examine(expTpe) {
+ admin.open({
+ type: 1,
+ title: (expTpe ? '淇敼' : '娣诲姞') + '鐩樼偣鍗�',
+ content: $('#editDialog2').html(),
+ area: '1300px',
+ success: function (layero, dIndex) {
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ var isExpAdd = !expTpe;
+ // 鍥炴樉鏁版嵁
+ form.val('editForm', expTpe);
+ if (expTpe) {
+ $('#orderNo').attr("disabled", "disabled");
+ }
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(orderEditSubmit)', function (data) {
+ // 缁勮鏁版嵁
+ if (xxDataList.length <= 0) {
+ layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
+ return false;
+ }
+ if (data.field.orderNo == "" || data.field.orderNo == null) {
+ layer.tips('璇疯緭鍏ョ洏鐐瑰崟缂栧彿', '#orderNo', {tips: [1, '#ff4c4c']});
+ return false;
+ }
+ let nList = admin.util.deepClone(xxDataList);
+ // for (let xi = 0; xi < nList.length; xi++) {
+ // if (nList[xi].anfme <= 0){
+ // layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+ // return false;
+ // }
+ // if (nList[xi].anfme < nList[xi].workQty){
+ // layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
+ // return false;
+ // }
+ // }
+ layer.load(2);
+ console.log(data);
+ $.ajax({
+ url: baseUrl+"/orderCheck/form/" + (isExpAdd?"add":"modify") + "/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ orderId: Number(data.field.id),
+ docType: Number(data.field.docType),
+ orderNo: data.field.orderNo,
+ orderDetlList: nList
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ layer.close(dIndex);
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ // 鏄庣粏琛ㄦ牸
+ var xxDataList = [];
+ var tbOptions = {
+ elem: '#formSSXMTable2',
+ headers: {token: localStorage.getItem('token')},
+ data: xxDataList,
+ page: true,
+ height: '350px;',
+ cellMinWidth: 100,
+ cols: [[
+ {type: 'numbers'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'locNo', title: '搴撲綅鍙�'},
+ {field: 'anfme', title: '搴撳瓨鏁伴噺'},
+ {field: 'realAnfme', title: '鐪熷疄鏁伴噺'},
+ {field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
+ {field: 'type$', title: '鐘舵��'},
+
+ {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBarr', minWidth: 80, width: 80, fixed: 'right'}
+ ]],
+ done: function (res) {
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ };
+
+
+ if (!isExpAdd) {
+
+ $.ajax({
+ url: baseUrl+"/orderCheck/detl/all/auth?orderNo=" + expTpe.orderNo,
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ console.log(res.data);
+ xxDataList = res.data;
+ tbOptions.data = xxDataList;
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+ 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') {
+ if(data.workQty > 0){
+ layer.msg("宸插瓨鍦ㄤ綔涓氭暟閲忥紝涓嶈兘鍒犻櫎", {icon: 2});
+ return;
+ }
+ layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ for (var j = 0; j < xxDataList.length; j++) {
+ if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) {
+ xxDataList.splice(j, 1);
+ break;
+ }
+ }
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ });
+ }
+ });
+ // 鏄庣粏鏁版嵁淇敼
+ table.on('edit(formSSXMTable)', function (obj) {
+ let index = obj.tr.attr("data-index");
+ let data = xxDataList[index];
+ if (obj.field === 'anfme'){
+ let vle = Number(obj.value);
+ if (isNaN(vle)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+ return false;
+ } else {
+ if (vle <= 0) {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+ // data[obj.field] = 0;
+ // insTbSSXM.reload({data: xxDataList});
+ return false;
+ }
+ if(obj.value < data.workQty){
+ layer.msg("杈撳叆鏁伴噺涓嶈兘灏忎簬浣滀笟涓暟閲�", {icon: 2});
+ // data[obj.field] = 0;
+ // insTbSSXM.reload({data: xxDataList});
+ return false;
+ }
+ }
+ }
+ data[obj.field] = obj.value;
+ insTbSSXM.reload({data: xxDataList});
+ });
+
+ $('#matAddBtnComment').click(function () {
+ showEditModel2();
+ });
+
+ // 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
+ function showEditModel2(exp) {
+ var checkType = $("#checkType option:selected").val();
+ var tp = '';
+ if (checkType == 'locno'){
+ tp = 2;
+ }
+ if (checkType == 'matnr'){
+ tp = 3;
+ }
+ if (checkType == 'owner'){
+ tp = 4;
+ }
+
+
+ admin.open({
+ type: 1,
+ offset: '150px',
+ area: '680px',
+ title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
+ content: $('#matEditDialog'+tp).html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉鏁版嵁
+ form.val('matEditForm', exp);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(matEditSubmit)', function (data) {
+ var prec = $("#selectPerc option:selected").val();
+ var selectList;
+ if (tp == 2){
+ prec = $("#selectPerc2 option:selected").val();
+ selectList = matXmSelect2.getValue();
+ console.log(selectList);
+ for (let i = 0; i<selectList.length; i++) {
+ selectList[i].children="";
+ }
+ }
+ if (tp == 3){
+ prec = $("#selectPerc3 option:selected").val();
+ selectList = matXmSelect.getValue();
+ console.log(selectList);
+ for (let i = 0; i<selectList.length; i++) {
+ selectList[i].children="";
+ }
+ }
+ if (tp == 4){
+ prec = $("#selectPerc4 option:selected").val();
+ selectList = matXmSelect3.getValue();
+ console.log(selectList);
+ for (let i = 0; i<selectList.length; i++) {
+ selectList[i].children="";
+ }
+ }
+ var json = {
+ prec:prec,
+ data:{
+ }
+ }
+
+ json.data = selectList;
+ console.log(json);
+
+ if ( tp == 3 || tp == ''){
+ $.ajax({
+ url: baseUrl+"/orderCheck/create/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(json),
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ xxDataList = []
+ if (res.code === 200){
+ for (var i =0;i<res.data.length;i++){
+ xxDataList.push(res.data[i]);
+ console.log(xxDataList);
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ }
+
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }else if (tp == 2){
+ $.ajax({
+ url: baseUrl+"/orderCheck/create/loc/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(json),
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ for (var i =0;i<res.data.length;i++){
+ xxDataList.push(res.data[i]);
+ console.log(xxDataList);
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ }
+
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }else if (tp == 4){
+ $.ajax({
+ url: baseUrl+"/orderCheck/create/owner/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(json),
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ for (var i =0;i<res.data.length;i++){
+ xxDataList.push(res.data[i]);
+ console.log(xxDataList);
+ 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);
+ return false;
+ });
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect = xmSelect.render({
+ el: '#mat3',
+ style: {
+ width: '340px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.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});
+ }
+ }
+ });
+ }
+ })
+
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect2 = xmSelect.render({
+ el: '#mat2',
+ style: {
+ width: '340px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/orderCheck/all/get/loc",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect3 = xmSelect.render({
+ el: '#mat4',
+ style: {
+ width: '340px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/orderCheck/all/get/owner",
+ headers: {'token': localStorage.getItem('token')},
+ 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');
+ }
+ });
+ }
+
+ }
+ });
+ }
+
+
+
});
diff --git a/src/main/webapp/views/orderCheck/orderCheck.html b/src/main/webapp/views/orderCheck/orderCheck.html
index 7414f39..c61eea3 100644
--- a/src/main/webapp/views/orderCheck/orderCheck.html
+++ b/src/main/webapp/views/orderCheck/orderCheck.html
@@ -93,8 +93,8 @@
</div>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint">鎵撳嵃</a>
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="printExcel">瀵煎嚭Excel</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="examine">瀹℃牳</a>
+
{{# if (d.settle == 0 || d.settle == 1) { }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
@@ -184,6 +184,44 @@
</form>
</script>
+<script type="text/html" id="editDialog2">
+ <form id="editForm2" lay-filter="editForm" class="layui-form model-form">
+ <input name="id" type="hidden"/>
+ <div class="layui-form-item">
+
+
+
+ <div class="layui-form-item" style="position: relative;">
+ <label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
+ <div class="layui-input-block">
+ <table id="formSSXMTable2" lay-filter="formSSXMTable2"></table>
+ </div>
+
+ </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="orderEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
+</script>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="formSSXMTableBar">
{{# if (d.settle == 0 || d.settle == 1) { }}
--
Gitblit v1.9.1