From 0a5f299058d96a1fac518483f4efa4cf560d881c Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 14 Nov 2024 16:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/init.json                            |  2 +-
 js/accessory/accessory_scrap_list.js     | 20 ++++----------------
 js/accessory/inventory_count_list.js     | 11 +++++++----
 page/accessory/inventory_count_list.html |  2 +-
 4 files changed, 13 insertions(+), 22 deletions(-)

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 "<span style='color:#FF9900;margin:0 5px 0 5px;font-size:16px'>●</span>待审核";
-    } else if (status === '2') {
-        return "<span style='color:#19BE6B;margin:0 5px 0 5px;font-size:16px;'>●</span>审核通过";
-    } else if (status === '3') {
-        return "<span style='color:#F56C6C;margin:0 5px 0 5px;font-size:16px'>●</span>审核驳回";
-    }
-    return "<span style='color:#FF9900;margin:0 5px 0 5px;font-size:16px'>●</span>待审核";
-}
-
 // 导出
 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 '<span>'+d.startTime+'</span> ~ <span>'+d.endTime+'</span>';
+                    },
                 },
                 {
                     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 '<span style="color:#409EFF">0</span>';
     }else if (value > 0 && value2 > 0) {
         return '<span style="color:#19BE6B">盘盈：' + value + '</span><br><span style="color:#f56c6c">盘亏：' + value2 + '</span>';
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 @@
                                 <button class="layui-btn layui-btn-primary" onclick="queryTable(2)"><i
                                         class="layui-icon layui-icon-refresh"></i> 重 置</button>
                                 <button class="layui-btn layui-bg-blue" onclick="inventoryCount({})"><i
-                                        class="layui-icon layui-icon-file"></i> 配 件 入 库</button>
+                                        class="layui-icon layui-icon-file"></i> 库 存 盘 点</button>
                                 <button class="layui-btn layui-btn-primary" onclick="exportExcel()"><i
                                         class="layui-icon layui-icon-download-circle"></i> 导 出</button>
                             </div>