From 2cab7d23cd32fc4a2eb93594139b3d148dfc58a2 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 14 Nov 2024 13:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/accessory/accessory_out_bound_list.js | 48 +++++++++++++-------
page/accessory/accessory_out_bound_list.html | 8 ++--
2 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/js/accessory/accessory_out_bound_list.js b/js/accessory/accessory_out_bound_list.js
index d6fca8e..7825849 100644
--- a/js/accessory/accessory_out_bound_list.js
+++ b/js/accessory/accessory_out_bound_list.js
@@ -7,7 +7,7 @@ layui.use(["form", "table", 'laydate'], function () {
laydate = layui.laydate;
laydate.render({
elem: '#ID-laydate-rangeLinked',
- range: ['#startDate', '#endDate'],
+ range: ['#startDay', '#endDay'],
rangeLinked: true
});
initTable();
@@ -19,8 +19,8 @@ function queryTable(type) {
reloadTable(1);
} else if (type === 2) {
$('#keyWord').val('');
- $('#startDate').val('');
- $('#endDate').val('');
+ $('#startDay').val('');
+ $('#endDay').val('');
layui.form.render();
reloadTable(1);
}
@@ -40,8 +40,8 @@ function reloadTable(pageNum) {
where: {
encryptedData: JSON.stringify({
'keyWord': $('#keyWord').val(),
- 'startDate': $('#startDate').val(),
- 'endDate': $('#endDate').val()
+ 'startDay': $('#startDay').val(),
+ 'endDay': $('#endDay').val()
}),
},
},
@@ -57,12 +57,12 @@ function initTable() {
authorization: sessionStorage.getItem("gz-token"),
},
height: "full-170",
- url: dataUrl + "backstage/partInput/findByPage",
+ url: dataUrl + "backstage/partApply/findByPage",
where: {
encryptedData: JSON.stringify({
'keyWord': $('#keyWord').val(),
- 'startDate': $('#startDate').val(),
- 'endDate': $('#endDate').val()
+ 'startDay': $('#startDay').val(),
+ 'endDay': $('#endDay').val()
}),
},
request: {
@@ -95,35 +95,44 @@ function initTable() {
align: "center",
},
{
- field: "inputUser",
+ field: "devType",
width: '10%',
title: "领用类型",
unresize: true,
align: "center",
+ templet: function (d) {
+ let value = '';
+ if (d.devType === '1') {
+ value = '工器具';
+ } else if (d.devType === '2') {
+ value = '设备';
+ }
+ return '' + value + ''
+ },
},
{
- field: "inputNum",
+ field: "userName",
width: '10%',
title: "领用人",
unresize: true,
align: "center",
},
{
- field: "allPrice",
+ field: "phone",
width: '10%',
title: "联系电话",
unresize: true,
align: "center",
},
{
- field: "inputDay",
+ field: "applyNum",
width: '10%',
title: "领用数量",
unresize: true,
align: "center",
},
{
- field: "inputDay",
+ field: "status",
width: '10%',
title: "状态",
unresize: true,
@@ -147,8 +156,11 @@ function initTable() {
templet: function (d) {
let html = "";
html += "详情";
- html += "|
审核";
- html += "|
出库";
+ if (d.status === '1') { // 待审核
+ html += "|
审核";
+ } else if (d.status === '2') { // 审核通过待出库
+ html += "|
出库";
+ }
return html;
},
},
@@ -169,9 +181,11 @@ function setCheckStatus(status) {
if (status === '1') {
return "●待审核";
} else if (status === '2') {
- return "●审核通过";
+ return "●已通过待出库";
} else if (status === '3') {
- return "●审核驳回";
+ return "●已驳回";
+ } else if (status === '4') {
+ return "●已出库";
}
return "●待审核";
}
diff --git a/page/accessory/accessory_out_bound_list.html b/page/accessory/accessory_out_bound_list.html
index 08029b9..c5496eb 100644
--- a/page/accessory/accessory_out_bound_list.html
+++ b/page/accessory/accessory_out_bound_list.html
@@ -3,7 +3,7 @@
- 配件出库
+ 领料出库
@@ -22,19 +22,19 @@