From 01de3538d0a011e0902ff0058a7213f4aff50cfa Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Sat, 16 Nov 2024 12:39:55 +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

---
 js/accessory/child/pro_count_detail.js |  2 +-
 js/accessory/pro_count_list.js         | 14 +++++++-------
 page/accessory/pro_count_list.html     |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/accessory/child/pro_count_detail.js b/js/accessory/child/pro_count_detail.js
index 58e19f7..5861f5b 100644
--- a/js/accessory/child/pro_count_detail.js
+++ b/js/accessory/child/pro_count_detail.js
@@ -376,6 +376,6 @@ function setProStatus(status) {
     } else if (status === '2') {
         return "<span style='color:#999;margin:0 5px 0 5px;font-size:16px;'>●</span>完工";
     } else {
-        return '';
+        return '/';
     }
 }
\ No newline at end of file
diff --git a/js/accessory/pro_count_list.js b/js/accessory/pro_count_list.js
index 82b82be..201c41d 100644
--- a/js/accessory/pro_count_list.js
+++ b/js/accessory/pro_count_list.js
@@ -13,7 +13,7 @@ function queryTable(type) {
         reloadTable(1);
     } else if (type === 2) {
         $('#proName').val('');
-        $('#proStatus').val('');
+        // $('#proStatus').val('');
         layui.form.render();
         reloadTable(1);
     }
@@ -33,7 +33,7 @@ function reloadTable(pageNum) {
         where: {
             encryptedData: JSON.stringify({
                 'proName': $('#proName').val(),
-                'proStatus': $('#proStatus').val()
+                // 'proStatus': $('#proStatus').val()
             }),
         },
     },
@@ -53,7 +53,7 @@ function initTable() {
         where: {
             encryptedData: JSON.stringify({
                 'proName': $('#proName').val(),
-                'proStatus': $('#proStatus').val()
+                // 'proStatus': $('#proStatus').val()
             }),
         },
         request: {
@@ -128,7 +128,7 @@ function initTable() {
                 {
                     field: "remark",
                     width: '15%',
-                    title: "领用/使用/退回配件数量",
+                    title: "领用数量",
                     unresize: true,
                     align: "center",
                     templet: function (d) {
@@ -139,7 +139,7 @@ function initTable() {
                 {
                     field: "remark",
                     width: '15%',
-                    title: "领用/使用/退回配件金额",
+                    title: "领用金额",
                     unresize: true,
                     align: "center",
                     templet: function (d) {
@@ -173,7 +173,7 @@ function initTable() {
 function exportExcel() {
     let params = {
         'proName': $('#proName').val(),
-        'proStatus': $('#proStatus').val()
+        // 'proStatus': $('#proStatus').val()
     }
     let url = dataUrl + "backstage/statistic/exportProListPage";
     exportExcelUtil(url, '工程统计', JSON.stringify(params));
@@ -191,6 +191,6 @@ function setProStatus(status) {
     } else if (status === '2') {
         return "<span style='color:#999;margin:0 5px 0 5px;font-size:16px;'>●</span>完工";
     } else {
-        return '';
+        return '/';
     }
 }
\ No newline at end of file
diff --git a/page/accessory/pro_count_list.html b/page/accessory/pro_count_list.html
index 355d2ce..4364968 100644
--- a/page/accessory/pro_count_list.html
+++ b/page/accessory/pro_count_list.html
@@ -26,13 +26,13 @@
                                         class="layui-input" lay-affix="clear" placeholder="输入工程名称" maxlength="30">
                                 </div>
                             </div>
-                            <div class="layui-inline" style="width: 200px;">
+                            <!-- <div class="layui-inline" style="width: 200px;">
                                 <select class="layui-select">
                                     <option value="">请选择</option>
                                     <option value="1">在建</option>
                                     <option value="2">完工</option>
                                 </select>
-                            </div>
+                            </div> -->
                             <div class="layui-inline">
                                 <button class="layui-btn layui-bg-blue" onclick="queryTable(1)"><i
                                         class="layui-icon"></i> 搜 索</button>