diff --git a/api/init.json b/api/init.json
index e701223..0cbdcae 100644
--- a/api/init.json
+++ b/api/init.json
@@ -4,7 +4,7 @@
"href": "page/welcome-1.html?t=1"
},
"logoInfo": {
- "title": "LAYUI MINI",
+ "title": "黔送固定资产",
"image": "images/logo.png",
"href": ""
},
diff --git a/js/accessory/accessory_scrap_list.js b/js/accessory/accessory_scrap_list.js
index 49b55d6..4af9946 100644
--- a/js/accessory/accessory_scrap_list.js
+++ b/js/accessory/accessory_scrap_list.js
@@ -57,7 +57,7 @@ function initTable() {
authorization: sessionStorage.getItem("gz-token"),
},
height: "full-170",
- url: dataUrl + "backstage/partInput/findByPage",
+ url: dataUrl + "backstage/partScrap/findByPage",
where: {
encryptedData: JSON.stringify({
'keyWord': $('#keyWord').val(),
@@ -95,21 +95,21 @@ function initTable() {
align: "center",
},
{
- field: "inputUser",
+ field: "userName",
width: '15%',
title: "报废人",
unresize: true,
align: "center",
},
{
- field: "inputNum",
+ field: "bfNum",
width: '15%',
title: "报废数量",
unresize: true,
align: "center",
},
{
- field: "allPrice",
+ field: "scrapDay",
width: '15%',
title: "报废时间",
unresize: true,
@@ -145,18 +145,6 @@ function initTable() {
});
}
-//审核状态
-function setCheckStatus(status) {
- if (status === '1') {
- return "●待审核";
- } else if (status === '2') {
- return "●审核通过";
- } else if (status === '3') {
- return "●审核驳回";
- }
- return "●待审核";
-}
-
// 导出
function exportExcel() {
let params = {
diff --git a/js/accessory/inventory_count_list.js b/js/accessory/inventory_count_list.js
index e73a337..90374dc 100644
--- a/js/accessory/inventory_count_list.js
+++ b/js/accessory/inventory_count_list.js
@@ -57,7 +57,7 @@ function initTable() {
authorization: sessionStorage.getItem("gz-token"),
},
height: "full-170",
- url: dataUrl + "backstage/partInput/findByPage",
+ url: dataUrl + "backstage/partCheck/findByPage",
where: {
encryptedData: JSON.stringify({
'keyWord': $('#keyWord').val(),
@@ -95,7 +95,7 @@ function initTable() {
align: "center",
},
{
- field: "inputUser",
+ field: "userName",
width: '15%',
title: "盘点人",
unresize: true,
@@ -107,6 +107,9 @@ function initTable() {
title: "盘点起止时间",
unresize: true,
align: "center",
+ templet: function (d) {
+ return ''+d.startTime+' ~ '+d.endTime+'';
+ },
},
{
field: "allPrice",
@@ -115,7 +118,7 @@ function initTable() {
unresize: true,
align: "center",
templet: function (d) {
- return setInventory(100,200);
+ return setInventory(d.addNum,d.subNum);
},
},
{
@@ -150,7 +153,7 @@ function initTable() {
// 设置盘点数量变化
function setInventory(value, value2) {
- if (value === 0 || value2 === 0) {
+ if (value === 0 && value2 === 0) {
return '0';
}else if (value > 0 && value2 > 0) {
return '盘盈:' + value + '
盘亏:' + value2 + '';
diff --git a/page/accessory/inventory_count_list.html b/page/accessory/inventory_count_list.html
index 54f8d3b..07ba9ec 100644
--- a/page/accessory/inventory_count_list.html
+++ b/page/accessory/inventory_count_list.html
@@ -45,7 +45,7 @@
+ class="layui-icon layui-icon-file"> 库 存 盘 点