From 8052446ab6048c36c35bef045ba556d67366d47e Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 21 Jan 2025 15:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/aq_settlement/payment_list.js                       | 4 +++-
 page/aq_back_material/back_material_list.html          | 4 ++--
 page/aq_back_material/child/back_material_details.html | 2 +-
 page/aq_basic/framework_contract_list.html             | 2 +-
 page/aq_basic/type_list.html                           | 8 ++++----
 page/aq_demand_plan/apply_plan_audit_list.html         | 4 ++--
 page/aq_demand_plan/apply_plan_list.html               | 4 ++--
 page/aq_inventory/inventory_take_stock.html            | 2 +-
 page/system/audit_user_set_list.html                   | 2 +-
 page/system/bid_pro_list.html                          | 2 +-
 10 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/js/aq_settlement/payment_list.js b/js/aq_settlement/payment_list.js
index b7c1ead..8c61cec 100644
--- a/js/aq_settlement/payment_list.js
+++ b/js/aq_settlement/payment_list.js
@@ -108,8 +108,10 @@ function initTable() {
                     templet: function (d) {
                         if(d.status === '已生效'){
                             return "<span style='color:#19BE6B;margin:0 5px 0 5px;font-size:16px'>●</span>生效中";
-                        }else if(d.status === '未生效'){
+                        }else if(d.status === '已失效'){
                             return "<span style='color:#FF9900;margin:0 5px 0 5px;font-size:16px'>●</span>已失效";
+                        }else{
+                            return "<span style='color:#FF9900;margin:0 5px 0 5px;font-size:16px'>●</span>"+d.status+"";  
                         }
                     },
                 },
diff --git a/page/aq_back_material/back_material_list.html b/page/aq_back_material/back_material_list.html
index 53ed11d..2d77dd7 100644
--- a/page/aq_back_material/back_material_list.html
+++ b/page/aq_back_material/back_material_list.html
@@ -21,9 +21,9 @@
                     <form class="layui-form layui-form-pane" action="#" onsubmit="return false;">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <div class="layui-input-inline" style="width: 300px;">
+                                <div class="layui-input-inline" style="width: 350px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="输入关键字" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="输入关键字（工程名称/退料单编号/退料人）" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline" id="ID-laydate-rangeLinked">
diff --git a/page/aq_back_material/child/back_material_details.html b/page/aq_back_material/child/back_material_details.html
index 7210c9c..e54765f 100644
--- a/page/aq_back_material/child/back_material_details.html
+++ b/page/aq_back_material/child/back_material_details.html
@@ -64,7 +64,7 @@
                     <tr>
                         <th>退料编号（系统自动生成）</th>
                         <th>退料数量</th>
-                        <th>经办人人</th>
+                        <th>经办人</th>
                         <th>经办人联系方式</th>
                         <th>退回日期</th>
                     </tr>
diff --git a/page/aq_basic/framework_contract_list.html b/page/aq_basic/framework_contract_list.html
index 26efc6d..6c4358a 100644
--- a/page/aq_basic/framework_contract_list.html
+++ b/page/aq_basic/framework_contract_list.html
@@ -49,7 +49,7 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline" style="width: 300px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="输入关键字" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="输入关键字（合同编号/合同名称/厂家）" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline">
diff --git a/page/aq_basic/type_list.html b/page/aq_basic/type_list.html
index bb63bd0..fcb99d8 100644
--- a/page/aq_basic/type_list.html
+++ b/page/aq_basic/type_list.html
@@ -24,9 +24,9 @@
                     <form class="layui-form layui-form-pane" action="#" onsubmit="return false;">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <div class="layui-input-inline" style="width: 200px;">
+                                <div class="layui-input-inline" style="width: 320px;">
                                     <input type="text" name="treeKeyWord" id="treeKeyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="输入关键字" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="输入关键字(类型/名称/规格)" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline">
@@ -44,13 +44,13 @@
                                     dtree-menu="moveUp">全部折叠</button> -->
                             </div>
                             <div class="layui-inline">
-                                <div class="layui-input-inline" style="width: 200px;">
+                                <div class="layui-input-inline" style="width: 250px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
                                         class="layui-input" lay-affix="clear" placeholder="输入类型/名称/规格" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline">
-                                <div class="layui-input-inline" style="width: 200px;">
+                                <div class="layui-input-inline" style="width: 250px;">
                                     <select class="layui-select" id="isActive">
                                         <option value="">请选择状态</option>
                                         <option value="0">启用状态</option>
diff --git a/page/aq_demand_plan/apply_plan_audit_list.html b/page/aq_demand_plan/apply_plan_audit_list.html
index 127dac9..d67561a 100644
--- a/page/aq_demand_plan/apply_plan_audit_list.html
+++ b/page/aq_demand_plan/apply_plan_audit_list.html
@@ -51,9 +51,9 @@
                         <input type="text" value="1" id="auditStatus" name="auditStatus" hidden>
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <div class="layui-input-inline" style="width: 300px;">
+                                <div class="layui-input-inline" style="width: 370px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="输入关键字" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="输入关键字（计划单号/工程名称/项目部分/提交人）" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline">
diff --git a/page/aq_demand_plan/apply_plan_list.html b/page/aq_demand_plan/apply_plan_list.html
index 3925317..f8095f0 100644
--- a/page/aq_demand_plan/apply_plan_list.html
+++ b/page/aq_demand_plan/apply_plan_list.html
@@ -21,9 +21,9 @@
                     <form class="layui-form layui-form-pane" action="#" onsubmit="return false;">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <div class="layui-input-inline" style="width: 300px;">
+                                <div class="layui-input-inline" style="width: 310px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="输入关键字" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="输入关键字（计划编号/工程名称/申请人）" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline">
diff --git a/page/aq_inventory/inventory_take_stock.html b/page/aq_inventory/inventory_take_stock.html
index e199c0f..9721e59 100644
--- a/page/aq_inventory/inventory_take_stock.html
+++ b/page/aq_inventory/inventory_take_stock.html
@@ -23,7 +23,7 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline" style="width: 300px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="输入关键字" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="输入关键字（盘点编号）" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline">
diff --git a/page/system/audit_user_set_list.html b/page/system/audit_user_set_list.html
index ec07d93..7c4b546 100644
--- a/page/system/audit_user_set_list.html
+++ b/page/system/audit_user_set_list.html
@@ -23,7 +23,7 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline" style="width: 250px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="搜索关键字" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="搜索关键字（模板编号）" maxlength="30">
                                 </div>
                             </div>
 
diff --git a/page/system/bid_pro_list.html b/page/system/bid_pro_list.html
index 3ad8598..0d95dad 100644
--- a/page/system/bid_pro_list.html
+++ b/page/system/bid_pro_list.html
@@ -23,7 +23,7 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline" style="width: 250px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="搜索关键字" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="搜索关键字（分公司/标段工程）" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline">