diff --git a/js/accessory/accessory_out_bound_list.js b/js/accessory/accessory_out_bound_list.js index 2a983a8..57f5952 100644 --- a/js/accessory/accessory_out_bound_list.js +++ b/js/accessory/accessory_out_bound_list.js @@ -141,9 +141,19 @@ function initTable() { return setCheckStatus(d.status); }, }, + { + field: "createTime", + width: '10%', + title: "出库时间", + unresize: true, + align: "center", + templet: function (d) { + return d.createTime.substring(0, 10); + }, + }, { field: "remark", - width: '20%', + width: '10%', title: "备注", unresize: true, align: "center", diff --git a/js/accessory/child/accessory_out_bound_detail.js b/js/accessory/child/accessory_out_bound_detail.js index 4ab3dd2..fd5d299 100644 --- a/js/accessory/child/accessory_out_bound_detail.js +++ b/js/accessory/child/accessory_out_bound_detail.js @@ -107,10 +107,8 @@ function submitApply() { id: objParam.id } formData.append('params', JSON.stringify(obj)); - console.log(JSON.stringify(data.field)); let loadingMsg = layer.msg('正在提交保存,请稍等...', { icon: 16, shade: 0.01, time: '0' }); - console.log(JSON.stringify(data.field)); - let url = dataUrl + 'backstage/partInput/addInputData'; + let url = dataUrl + 'backstage/partApply/partOutInfo'; ajaxRequestByUploadFile(url, formData, function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); }, function (result) { @@ -152,10 +150,10 @@ function getPartDetails() { $('#codeValue').html(obj.code + '查看概述'); $('#type').html(obj.type === '0' ? '设备' : '工器具'); $('#applyNum').html(obj.applyNum); - $('#lyUrl').html(''); - $('#zdUrl').html(''); - $('#ckUrl').html(''); - $('#shUrl').html(''); + $('#lyUrl').html(''); + $('#zdUrl').html(''); + $('#ckUrl').html(''); + $('#shUrl').html(''); setFileTable(obj.fileList); if (objParam.type === '0') { // 设备 let html = ''; @@ -213,9 +211,9 @@ function queryTable(type) { if (type === 1) { reloadTable(1); } else if (type === 2) { - $('#type').val(''); - $('#name').val(''); - $('#model').val(''); + $('#partType').val(''); + $('#partName').val(''); + $('#partModel').val(''); layui.form.render(); reloadTable(1); } @@ -234,9 +232,9 @@ function reloadTable(pageNum) { }, where: { encryptedData: JSON.stringify({ - 'type': $('#type').val(), - 'name': $('#name').val(), - 'model': $('#model').val(), + 'partType': $('#partType').val(), + 'partName': $('#partName').val(), + 'partModel': $('#partModel').val(), 'id': objParam.id }), }, @@ -253,12 +251,12 @@ function initTable() { authorization: sessionStorage.getItem("gz-token"), }, height: "full", - url: dataUrl + "backstage/partInput/getInputDetailListByPage", + url: dataUrl + "backstage/partApply/getPartDetailsList", where: { encryptedData: JSON.stringify({ - 'type': $('#type').val(), - 'name': $('#name').val(), - 'model': $('#model').val(), + 'partType': $('#partType').val(), + 'partName': $('#partName').val(), + 'partModel': $('#partModel').val(), 'id': objParam.id }), }, @@ -313,23 +311,23 @@ function initTable() { align: "center", }, { - field: "inputNum", - title: "入库量", + field: "applyNum", + title: "数量", width: '10%', unresize: true, align: "center", }, { - field: "partPrice", + field: "price", width: '10%', title: "单价(元)", unresize: true, align: "center", }, { - field: "vendName", + field: "money", width: '15%', - title: "配件厂家", + title: "金额", unresize: true, align: "center", }, @@ -356,14 +354,13 @@ function initTable() { // 导出 function exportExcel() { let params = { - 'name': $('#name').val(), - 'module': $('#module').val(), - 'proId': objParam.proId, - 'id': id, - 'curryDay': time + 'partType': $('#partType').val(), + 'partName': $('#partName').val(), + 'partModel': $('#partModel').val(), + 'id': objParam.id } - let url = dataUrl + "backstage/export/exportPcList"; - exportExcelUtil(url, '发货详情-批次-' + time, JSON.stringify(params)); + let url = dataUrl + "backstage/partApply/exportDetail"; + exportExcelUtil(url, '领料出库', JSON.stringify(params)); } // 打印 diff --git a/js/accessory/child/audit_form.js b/js/accessory/child/audit_form.js index e3428da..1de3ee5 100644 --- a/js/accessory/child/audit_form.js +++ b/js/accessory/child/audit_form.js @@ -39,6 +39,8 @@ function submitApply(data) { if (objParam.checkType === '1') { // 出库审核 url = dataUrl + 'backstage/partApply/auditData'; data.field.id = idParam; + data.field.status = data.field.auditStatus; + data.field.remark = data.field.auditRemarks; } else if (objParam.checkType === '2') { // 需求计划审核 url = dataUrl + 'backstage/planAudit/planAudit'; data.field.id = idParam; @@ -56,7 +58,7 @@ function submitApply(data) { $('.save').removeClass("layui-btn-disabled").attr("disabled", false); $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); if (result.code === 200) { - parent.layer.msg(result.msg, { icon: 1 }); + top.layer.msg(result.msg, { icon: 1 }); closePage(1); } else { layer.msg(result.msg, { icon: 2 }); diff --git a/page/accessory/child/accessory_out_bound_detail.html b/page/accessory/child/accessory_out_bound_detail.html index 871e69e..a9c6b3f 100644 --- a/page/accessory/child/accessory_out_bound_detail.html +++ b/page/accessory/child/accessory_out_bound_detail.html @@ -127,21 +127,21 @@
-
-
-