From e1d796d16c697f8a88c9591a7e213a1b9c100452 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sat, 16 Nov 2024 13:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/public.css | 4 + js/accessory/child/accessory_return_detail.js | 38 +++++----- js/accessory/child/pro_count_detail.js | 74 +++++++------------ page/accessory/accessory_scrap_list.html | 4 +- .../child/accessory_return_detail.html | 8 +- page/accessory/child/pro_count_detail.html | 29 +++----- 6 files changed, 65 insertions(+), 92 deletions(-) diff --git a/css/public.css b/css/public.css index f4cf9e6..974e853 100644 --- a/css/public.css +++ b/css/public.css @@ -143,6 +143,10 @@ body { float: right !important; } +#layui-table-page2 { + float: right !important; +} + .layui-laypage .layui-laypage-curr .layui-laypage-em { background-color: #1890FF; } diff --git a/js/accessory/child/accessory_return_detail.js b/js/accessory/child/accessory_return_detail.js index dc60915..e29e1a1 100644 --- a/js/accessory/child/accessory_return_detail.js +++ b/js/accessory/child/accessory_return_detail.js @@ -4,20 +4,22 @@ let pageNum = 1; function setParams(params) { objParam = JSON.parse(params); + console.log(objParam); + $('#code').html(objParam.code); - $('#titleName').html(objParam.inputDay + '配件退料入库记录'); + $('#titleName').html(objParam.backDay + '配件退料入库记录'); layui.use(["form", "table", 'upload', 'layer'], function () { form = layui.form; table = layui.table; upload = layui.upload; layer = layui.layer; - getInputDetails(); + getInfoDetails(); initTable(); }); } // 获取配件退料入库记录详情 -function getInputDetails() { +function getInfoDetails() { let params = { encryptedData: JSON.stringify({ 'id': objParam.id @@ -37,10 +39,9 @@ function getInputDetails() { // 基本数据表格赋值 function setTableData(obj) { $('#codeValue').html(obj.code + '查看概述'); - $('#inputNum').html(obj.inputNum); - $('#allPrice').html(obj.allPrice); - $('#inputUser').html(obj.inputUser); - $('#inputDay').html(obj.inputDay); + $('#backNum').html(obj.backNum); + $('#userName').html(obj.userName); + $('#backDay').html(obj.backDay); $('#remark').html(obj.remark); setFileTable(obj.fileList); } @@ -54,7 +55,7 @@ function setFileTable(fileList) { $.each(fileList, function (index, item) { html += '' + '' + handleFileType(item.fileName) + item.fileName + '' + - '' + (item.suffix.replace('.', '')) + '' + + '' + item.type + '' + '' + item.createName + '' + '' + item.createTime + '' + '预览' + @@ -89,9 +90,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); } @@ -110,9 +111,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 }), }, @@ -209,7 +210,6 @@ function initTable() { page: true, done: function (res, curr, count) { pageNum = tableIns.config.page.curr; - element.render(); table.resize("currentTableId"); }, }); @@ -225,21 +225,21 @@ function exportExcel() { 'id': objParam.id } let url = dataUrl + "backstage/partBack/exportDetail"; - exportExcelUtil(url, '配件入库明细', JSON.stringify(params)); + exportExcelUtil(url, '配件退回明细', JSON.stringify(params)); } // 查看概述 function viewGs(obj) { layer.open({ type: 1, shade: false, // 不显示遮罩 - content: '
' + obj.info + '
', - title: '

' + obj.inputDay + '入库概述:

', + content: '
' + obj.infoMsg + '
', + title: '

' + obj.backDay + '退料入库概述:

', btn: ['复制文字', '关闭'], area: ['60%', '50%'], move: false, btnAlign: 'c', // 按钮居中显示 btn1: function () { - exeCommandCopyText(obj.info); + exeCommandCopyText(obj.infoMsg); }, btn2: function () { layer.close(); diff --git a/js/accessory/child/pro_count_detail.js b/js/accessory/child/pro_count_detail.js index 5861f5b..c7c8b2d 100644 --- a/js/accessory/child/pro_count_detail.js +++ b/js/accessory/child/pro_count_detail.js @@ -88,7 +88,7 @@ function initFileTable() { cols: [ [ { - width: '10%', + width: '9.9%', title: "序号", align: "center", templet: function (d) { @@ -97,7 +97,7 @@ function initFileTable() { }, { field: "fileName", - width: '20%', + width: '30%', title: "文件名", unresize: true, align: "center", @@ -115,7 +115,7 @@ function initFileTable() { { field: "createName", title: "上传人员", - width: '20%', + width: '10%', unresize: true, align: "center", templet: function (d) { @@ -160,9 +160,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); } @@ -181,9 +181,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(), 'proId': objParam.proId }), }, @@ -203,9 +203,9 @@ function initTable() { url: dataUrl + "backstage/statistic/getProDetailsPage", where: { encryptedData: JSON.stringify({ - 'type': $('#type').val(), - 'name': $('#name').val(), - 'model': $('#model').val(), + 'partType': $('#partType').val(), + 'partName': $('#partName').val(), + 'partModel': $('#partModel').val(), 'proId': objParam.proId }), }, @@ -224,7 +224,7 @@ function initTable() { cols: [ [ { - width: '7.9%', + width: '9.9%', title: "序号", align: "center", templet: function (d) { @@ -233,14 +233,14 @@ function initTable() { }, { field: "partType", - width: '12%', + width: '15%', title: "配件类型", unresize: true, align: "center", }, { field: "partName", - width: '12%', + width: '15%', title: "配件名称", unresize: true, align: "center", @@ -248,56 +248,36 @@ function initTable() { { field: "partModel", title: "规格型号", - width: '12%', + width: '15%', unresize: true, align: "center", }, { field: "partUnit", title: "单位", - width: '8%', + width: '10%', unresize: true, align: "center", }, + { - field: "inputNum", - title: "使用量", - width: '8%', - unresize: true, - align: "center", - }, - { - field: "partPrice", - width: '8%', - title: "金额（元）", - unresize: true, - align: "center", - }, - { - field: "vendName", - width: '8%', + field: "applyNum", + width: '10%', title: "领用量", unresize: true, align: "center", }, { - field: "vendName", - width: '8%', + field: "money", + width: '10%', title: "金额（元）", unresize: true, align: "center", }, { field: "remark", - title: "退回量", - width: '8%', - align: "center", - unresize: true, - }, - { - field: "remark", - title: "金额（元）", - width: '8%', + title: "备注", + width: '15%', align: "center", unresize: true, }, @@ -317,9 +297,9 @@ function initTable() { // 导出 function exportExcel() { let params = { - 'type': $('#type').val(), - 'name': $('#name').val(), - 'module': $('#module').val(), + 'partType': $('#partType').val(), + 'partName': $('#partName').val(), + 'partModel': $('#partModel').val(), 'proId': objParam.proId, } let url = dataUrl + "backstage/statistic/exportProDetailsPage"; diff --git a/page/accessory/accessory_scrap_list.html b/page/accessory/accessory_scrap_list.html index 4d2b42d..79525d0 100644 --- a/page/accessory/accessory_scrap_list.html +++ b/page/accessory/accessory_scrap_list.html @@ -44,8 +44,8 @@ class="layui-icon"> 搜 索 - + diff --git a/page/accessory/child/accessory_return_detail.html b/page/accessory/child/accessory_return_detail.html index 9c3b284..a9f705b 100644 --- a/page/accessory/child/accessory_return_detail.html +++ b/page/accessory/child/accessory_return_detail.html @@ -4,7 +4,7 @@ - 配件入库记录 + 配件退回记录 @@ -60,9 +60,9 @@ - - - + + + 备注 diff --git a/page/accessory/child/pro_count_detail.html b/page/accessory/child/pro_count_detail.html index d34c0c7..b19dcd1 100644 --- a/page/accessory/child/pro_count_detail.html +++ b/page/accessory/child/pro_count_detail.html @@ -55,18 +55,18 @@ 领用数量 领用成本价格（元） - 退回数量 + - + @@ -76,19 +76,8 @@ ▋

附件文档

-
-
-
-
- +
+
@@ -105,20 +94,20 @@
-
-
-