From 3dc9e3d10652f96ff3684e8a16e4054cf3b538e8 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 21 Jan 2025 15:21:21 +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

---
 .../child/add_back_material.js                |  2 +-
 .../child/check_appraise_form.js              |  4 +--
 .../child/framework_contract_edit_form.js     |  2 +-
 js/aq_basic/child/framework_contract_form.js  |  2 +-
 .../child/apply_plan_edit_form.js             |  2 +-
 js/aq_demand_plan/child/apply_plan_form.js    |  2 +-
 .../child/send_out_edit_form_table.js         |  4 +--
 .../child/send_out_form_table.js              |  4 +--
 .../child/inventory_add_take_stock.js         |  2 +-
 .../child/choose_plan_code_list.js            |  7 ++--
 .../child/add_back_material.html              |  6 +++-
 .../child/check_appraise_form.html            |  6 +++-
 .../child/framework_contract_edit_form.html   |  6 +++-
 .../child/framework_contract_form.html        | 34 +++++++++++--------
 .../child/send_out_edit_form.html             |  6 +++-
 page/aq_demand_plan/child/send_out_form.html  |  6 +++-
 .../child/inventory_add_take_stock.html       |  6 +++-
 page/aq_settlement/child/payment_form.html    |  6 +++-
 18 files changed, 72 insertions(+), 35 deletions(-)

diff --git a/js/aq_back_material/child/add_back_material.js b/js/aq_back_material/child/add_back_material.js
index 74a8d04..df9558b 100644
--- a/js/aq_back_material/child/add_back_material.js
+++ b/js/aq_back_material/child/add_back_material.js
@@ -424,7 +424,7 @@ function checkValue(that, type) {
             $(that).parents('td').next().html(0);
             $(that).parents('td').next().next().html(0);
             let list = getBaseTableData();
-            return layer.msg('本次退回量输入不合法，最大输入6位数，且为正整数，请重新输入!', { icon: 5 });
+            return layer.msg('本次退回量输入有误，最大输入6位数，且为正整数，请重新输入!', { icon: 5 });
         }
     }
 }
diff --git a/js/aq_back_material/child/check_appraise_form.js b/js/aq_back_material/child/check_appraise_form.js
index e993d79..c373bf8 100644
--- a/js/aq_back_material/child/check_appraise_form.js
+++ b/js/aq_back_material/child/check_appraise_form.js
@@ -215,7 +215,7 @@ function checkValue(that, type) {
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
             $(that).val(0);
-            return layer.msg('可继续使用量输入不合法，请重新输入!', { icon: 5 })
+            return layer.msg('可继续使用量输入有误，请重新输入!', { icon: 5 })
         } else if (value && parseInt(value) > parseInt(backNum)) {
             $(that).val(0);
             return layer.msg('可继续使用量不能超过退回待检量，请重新输入!', { icon: 5 })
@@ -224,7 +224,7 @@ function checkValue(that, type) {
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
             $(that).val(0);
-            return layer.msg('待报废量输入不合法，请重新输入!', { icon: 5 })
+            return layer.msg('待报废量输入有误，请重新输入!', { icon: 5 })
         } else if (value && parseInt(value) > parseInt(backNum)) {
             $(that).val(0);
             return layer.msg('待报废量不能超过退回待检量，请重新输入!', { icon: 5 })
diff --git a/js/aq_basic/child/framework_contract_edit_form.js b/js/aq_basic/child/framework_contract_edit_form.js
index ccd347c..798918f 100644
--- a/js/aq_basic/child/framework_contract_edit_form.js
+++ b/js/aq_basic/child/framework_contract_edit_form.js
@@ -1019,7 +1019,7 @@ function checkValue(that, type) {
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
             $(that).val(0);
-            return layer.msg('数量输入不合法，请重新输入!', { icon: 5 })
+            return layer.msg('数量输入有误，请重新输入!', { icon: 5 })
 
         }
     } else if (type === 2) { // 单价
diff --git a/js/aq_basic/child/framework_contract_form.js b/js/aq_basic/child/framework_contract_form.js
index 999981e..1328fe4 100644
--- a/js/aq_basic/child/framework_contract_form.js
+++ b/js/aq_basic/child/framework_contract_form.js
@@ -838,7 +838,7 @@ function checkValue(that, type) {
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
             $(that).val(0);
-            return layer.msg('数量输入不合法，请重新输入!', { icon: 5 })
+            return layer.msg('数量输入有误，请重新输入!', { icon: 5 })
 
         }
     } else if (type === 2) { // 单价
diff --git a/js/aq_demand_plan/child/apply_plan_edit_form.js b/js/aq_demand_plan/child/apply_plan_edit_form.js
index 1d09ded..1d22d10 100644
--- a/js/aq_demand_plan/child/apply_plan_edit_form.js
+++ b/js/aq_demand_plan/child/apply_plan_edit_form.js
@@ -399,7 +399,7 @@ function checkValue(that, type, name) {
     if (type === 1 || type === 2) { // 需用量 / 需用天数
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
-            layer.msg('' + name + '输入不合法，请重新输入!', { icon: 5 })
+            layer.msg('' + name + '输入有误，请重新输入!', { icon: 5 })
             $(that).val(0);
         }
     }
diff --git a/js/aq_demand_plan/child/apply_plan_form.js b/js/aq_demand_plan/child/apply_plan_form.js
index 2c9f3b5..17b90b1 100644
--- a/js/aq_demand_plan/child/apply_plan_form.js
+++ b/js/aq_demand_plan/child/apply_plan_form.js
@@ -307,7 +307,7 @@ function checkValue(that, type, name) {
     if (type === 1 || type === 2) { // 需用量 / 需用天数
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
-            layer.msg('' + name + '输入不合法，请重新输入!', { icon: 5 })
+            layer.msg('' + name + '输入有误，请重新输入!', { icon: 5 })
             $(that).val(0);
         }
     }
diff --git a/js/aq_demand_plan/child/send_out_edit_form_table.js b/js/aq_demand_plan/child/send_out_edit_form_table.js
index ea2e336..864d522 100644
--- a/js/aq_demand_plan/child/send_out_edit_form_table.js
+++ b/js/aq_demand_plan/child/send_out_edit_form_table.js
@@ -90,7 +90,7 @@ function checkValue(that, type) {
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
             $(that).val(0);
-            return layer.msg('采购量输入不合法，请重新输入!', { icon: 5 })
+            return layer.msg('采购量输入有误，请重新输入!', { icon: 5 })
         }
         if (value) {
             // 采购量不能大于需要量
@@ -104,7 +104,7 @@ function checkValue(that, type) {
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
             $(that).val(0);
-            return layer.msg('利库量输入不合法，请重新输入!', { icon: 5 })
+            return layer.msg('利库量输入有误，请重新输入!', { icon: 5 })
         }
         if (value) {
             // 新的利库量与库存量校验
diff --git a/js/aq_demand_plan/child/send_out_form_table.js b/js/aq_demand_plan/child/send_out_form_table.js
index 77d03cd..25a74ee 100644
--- a/js/aq_demand_plan/child/send_out_form_table.js
+++ b/js/aq_demand_plan/child/send_out_form_table.js
@@ -72,7 +72,7 @@ function checkValue(that, type) {
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
             $(that).val(0);
-            return layer.msg('采购量输入不合法，请重新输入!', { icon: 5 })
+            return layer.msg('采购量输入有误，请重新输入!', { icon: 5 })
         }
         if (value) {
             // 采购量不能大于需要量
@@ -86,7 +86,7 @@ function checkValue(that, type) {
         const regex = /^(0|[1-9]\d{0,6})$/;
         if (!regex.test(value) && value) {
             $(that).val(0);
-            return layer.msg('利库量输入不合法，请重新输入!', { icon: 5 })
+            return layer.msg('利库量输入有误，请重新输入!', { icon: 5 })
         }
         if (value) {
             // 利库量与库存量校验
diff --git a/js/aq_inventory/child/inventory_add_take_stock.js b/js/aq_inventory/child/inventory_add_take_stock.js
index 56de076..13d3a62 100644
--- a/js/aq_inventory/child/inventory_add_take_stock.js
+++ b/js/aq_inventory/child/inventory_add_take_stock.js
@@ -436,7 +436,7 @@ function checkValue(that, type) {
             $(that).parents('td').next().next().html(0);
             let list = getBaseTableData();
             setNumAndPrice(list);
-            return layer.msg('本次盘点量输入不合法，最大输入6位数，且为正整数，请重新输入!', { icon: 5 });
+            return layer.msg('本次盘点量输入有误，最大输入6位数，且为正整数，请重新输入!', { icon: 5 });
         } else if (value) {
             let storageNum = $(that).parents('td').prev().html(); // 库存量
             let inventoryProfit = 0, inventoryDeficit = 0; // 盘盈量、盘亏量
diff --git a/js/aq_settlement/child/choose_plan_code_list.js b/js/aq_settlement/child/choose_plan_code_list.js
index 99538c5..866d86c 100644
--- a/js/aq_settlement/child/choose_plan_code_list.js
+++ b/js/aq_settlement/child/choose_plan_code_list.js
@@ -122,7 +122,7 @@ function initTable() {
                 },
                 {
                     field: "proName",
-                    width: '15%',
+                    width: '13%',
                     title: "工程名称",
                     unresize: true,
                     align: "center",
@@ -130,7 +130,7 @@ function initTable() {
                 },
                 {
                     field: "planCode",
-                    width: '10%',
+                    width: '12%',
                     title: "需求计划编号",
                     unresize: true,
                     align: "center",
@@ -159,6 +159,9 @@ function initTable() {
                     unresize: true,
                     align: "center",
                     sort:true,
+                    templet: function (d) {
+                        return '<span>￥ '+(d.money ? d.money : 0)+'</span>'
+                    }
                 },
                 {
                     field: "manager",
diff --git a/page/aq_back_material/child/add_back_material.html b/page/aq_back_material/child/add_back_material.html
index 769de93..c2f1c2e 100644
--- a/page/aq_back_material/child/add_back_material.html
+++ b/page/aq_back_material/child/add_back_material.html
@@ -68,7 +68,11 @@
                     <div id="test2" style="margin-left: 10px;">
                         <img src="../../../images/add.png">
                     </div>
-                    <p style="color: red;">（最多上传5个附件）</p>
+                    <div class="layout" style="flex-direction: column;margin-left: 2px;">
+                        <p style="color: red;">提示：最多上传5个附件</p>
+                        <p style="color: red;">支持格式:jpg、png、jpeg</p>
+                        <p style="color: red;">doc、docx、pdf、xlsx、xls</p>
+                    </div>
                 </blockquote>
             </div>
             <div class="title layout">
diff --git a/page/aq_back_material/child/check_appraise_form.html b/page/aq_back_material/child/check_appraise_form.html
index 4447ee1..9585c4c 100644
--- a/page/aq_back_material/child/check_appraise_form.html
+++ b/page/aq_back_material/child/check_appraise_form.html
@@ -51,7 +51,11 @@
                     <div id="test2" style="margin-left: 10px;">
                         <img src="../../../images/add.png">
                     </div>
-                    <p style="color: red;">（最多上传5个附件）</p>
+                    <div class="layout" style="flex-direction: column;margin-left: 2px;">
+                        <p style="color: red;">提示：最多上传5个附件</p>
+                        <p style="color: red;">支持格式:jpg、png、jpeg</p>
+                        <p style="color: red;">doc、docx、pdf、xlsx、xls</p>
+                    </div>
                 </blockquote>
             </div>
             <div class="table-box" table-responsive id="table-box">
diff --git a/page/aq_basic/child/framework_contract_edit_form.html b/page/aq_basic/child/framework_contract_edit_form.html
index 74a7bd4..7ae1945 100644
--- a/page/aq_basic/child/framework_contract_edit_form.html
+++ b/page/aq_basic/child/framework_contract_edit_form.html
@@ -90,7 +90,11 @@
                     <div id="test2" style="margin-left: 10px;">
                         <img src="../../../images/add.png">
                     </div>
-                    <p style="color: red;">（最多上传5个附件）</p>
+                    <div class="layout" style="flex-direction: column;margin-left: 2px;">
+                        <p style="color: red;">提示：最多上传5个附件</p>
+                        <p style="color: red;">支持格式:jpg、png、jpeg</p>
+                        <p style="color: red;">doc、docx、pdf、xlsx、xls</p>
+                    </div>
                 </blockquote>
             </div>
             <div class="layui-tab layui-tab-brief" lay-filter="demo-filter-tab">
diff --git a/page/aq_basic/child/framework_contract_form.html b/page/aq_basic/child/framework_contract_form.html
index 6c3537f..e03c5f7 100644
--- a/page/aq_basic/child/framework_contract_form.html
+++ b/page/aq_basic/child/framework_contract_form.html
@@ -23,15 +23,15 @@
                     <div class="layui-inline">
                         <label class="layui-form-label required" style="width: 100px !important;">合同编号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" name="code" id="code" autocomplete="off"
-                                lay-verify="required" maxlength="30" lay-affix="clear">
+                            <input class="layui-input" name="code" id="code" autocomplete="off" lay-verify="required"
+                                maxlength="30" lay-affix="clear">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label required" style="width: 110px !important;">合同名称</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" name="name" id="name" autocomplete="off"
-                                lay-verify="required" maxlength="30" lay-affix="clear">
+                            <input class="layui-input" name="name" id="name" autocomplete="off" lay-verify="required"
+                                maxlength="30" lay-affix="clear">
                         </div>
                     </div>
                 </div>
@@ -40,13 +40,13 @@
                         <label class="layui-form-label required" style="width: 100px;">合同日期</label>
                         <div class="layui-inline" id="ID-laydate-rangeLinked">
                             <div class="layui-input-inline" style="width: 137px;">
-                                <input type="text" autocomplete="off" id="startTime" name="startTime" lay-verify="required" class="layui-input" readonly
-                                    placeholder="开始日期">
+                                <input type="text" autocomplete="off" id="startTime" name="startTime"
+                                    lay-verify="required" class="layui-input" readonly placeholder="开始日期">
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 137px;">
-                                <input type="text" autocomplete="off" id="endTime" name="endTime" lay-verify="required" class="layui-input" readonly
-                                    placeholder="结束日期">
+                                <input type="text" autocomplete="off" id="endTime" name="endTime" lay-verify="required"
+                                    class="layui-input" readonly placeholder="结束日期">
                             </div>
                         </div>
                     </div>
@@ -62,15 +62,16 @@
                     <div class="layui-inline">
                         <label class="layui-form-label required" style="width: 100px !important;">厂家</label>
                         <div class="layui-input-inline">
-                            <select class="layui-select" name="supplier" id="supplier" lay-search lay-filter="supplier" lay-verify="required">
+                            <select class="layui-select" name="supplier" id="supplier" lay-search lay-filter="supplier"
+                                lay-verify="required">
                             </select>
                         </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label required" style="width: 110px !important;">合同占比(%)</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" name="ratio" autocomplete="off"
-                                lay-verify="required|ratio" maxlength="30" lay-affix="clear">
+                            <input class="layui-input" name="ratio" autocomplete="off" lay-verify="required|ratio"
+                                maxlength="30" lay-affix="clear">
                         </div>
                     </div>
                 </div>
@@ -89,7 +90,11 @@
                     <div id="test2" style="margin-left: 10px;">
                         <img src="../../../images/add.png">
                     </div>
-                    <p style="color: red;">（最多上传5个附件）</p>
+                    <div class="layout" style="flex-direction: column;margin-left: 2px;">
+                        <p style="color: red;">提示：最多上传5个附件</p>
+                        <p style="color: red;">支持格式:jpg、png、jpeg</p>
+                        <p style="color: red;">doc、docx、pdf、xlsx、xls</p>
+                    </div>
                 </blockquote>
             </div>
             <div class="layui-tab layui-tab-brief" lay-filter="demo-filter-tab">
@@ -160,12 +165,13 @@
                         </div>
                     </div>
                     <div class="layui-tab-item">
-                        <div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab2" id="demo-filter-tab2">
+                        <div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab2"
+                            id="demo-filter-tab2">
                             <ul class="layui-tab-title" id="layui-tab-title">
                             </ul>
                             <div class="layui-tab-content" id="layui-tab-content">
                             </div>
-                          </div>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/page/aq_demand_plan/child/send_out_edit_form.html b/page/aq_demand_plan/child/send_out_edit_form.html
index ef94709..3efb315 100644
--- a/page/aq_demand_plan/child/send_out_edit_form.html
+++ b/page/aq_demand_plan/child/send_out_edit_form.html
@@ -77,7 +77,11 @@
                     <div id="test2" style="margin-left: 10px;">
                         <img src="../../../images/add.png">
                     </div>
-                    <p style="color: red;">（最多上传5个附件）</p>
+                    <div class="layout" style="flex-direction: column;margin-left: 2px;">
+                        <p style="color: red;">提示：最多上传5个附件</p>
+                        <p style="color: red;">支持格式:jpg、png、jpeg</p>
+                        <p style="color: red;">doc、docx、pdf、xlsx、xls</p>
+                    </div>
                 </blockquote>
             </div>
             <div class="title layout">
diff --git a/page/aq_demand_plan/child/send_out_form.html b/page/aq_demand_plan/child/send_out_form.html
index 3c056f7..37b0335 100644
--- a/page/aq_demand_plan/child/send_out_form.html
+++ b/page/aq_demand_plan/child/send_out_form.html
@@ -77,7 +77,11 @@
                     <div id="test2" style="margin-left: 10px;">
                         <img src="../../../images/add.png">
                     </div>
-                    <p style="color: red;">（最多上传5个附件）</p>
+                    <div class="layout" style="flex-direction: column;margin-left: 2px;">
+                        <p style="color: red;">提示：最多上传5个附件</p>
+                        <p style="color: red;">支持格式:jpg、png、jpeg</p>
+                        <p style="color: red;">doc、docx、pdf、xlsx、xls</p>
+                    </div>
                 </blockquote>
             </div>
             <div class="title layout">
diff --git a/page/aq_inventory/child/inventory_add_take_stock.html b/page/aq_inventory/child/inventory_add_take_stock.html
index d365f61..36d38da 100644
--- a/page/aq_inventory/child/inventory_add_take_stock.html
+++ b/page/aq_inventory/child/inventory_add_take_stock.html
@@ -55,7 +55,11 @@
                     <div id="test2" style="margin-left: 10px;">
                         <img src="../../../images/add.png">
                     </div>
-                    <p style="color: red;">（最多上传5个附件）</p>
+                    <div class="layout" style="flex-direction: column;margin-left: 2px;">
+                        <p style="color: red;">提示：最多上传5个附件</p>
+                        <p style="color: red;">支持格式:jpg、png、jpeg</p>
+                        <p style="color: red;">doc、docx、pdf、xlsx、xls</p>
+                    </div>
                 </blockquote>
             </div>
             <div class="title layout">
diff --git a/page/aq_settlement/child/payment_form.html b/page/aq_settlement/child/payment_form.html
index 1156c07..b08b96c 100644
--- a/page/aq_settlement/child/payment_form.html
+++ b/page/aq_settlement/child/payment_form.html
@@ -66,7 +66,11 @@
                     <div id="test2" style="margin-left: 10px;">
                         <img src="../../../images/add.png">
                     </div>
-                    <p style="color: red;">（最多上传5个附件）</p>
+                    <div class="layout" style="flex-direction: column;margin-left: 2px;">
+                        <p style="color: red;">提示：最多上传5个附件</p>
+                        <p style="color: red;">支持格式:jpg、png、jpeg</p>
+                        <p style="color: red;">doc、docx、pdf、xlsx、xls</p>
+                    </div>
                 </blockquote>
             </div>
             <div class="title layout">