From 5199d99e013d9cec6ee3b1051e0236fa2b8cd88f Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Sat, 16 Nov 2024 16:41:18 +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/accessory_store_list.js            |  3 +++
 js/accessory/child/accessory_return_form.js     |  2 +-
 js/accessory/child/accessory_store_edit_form.js | 11 ++++++-----
 js/accessory/child/accessory_store_form.js      | 10 ++++++----
 js/demandPlan/child/apply_plan_form.js          |  4 ++--
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/js/accessory/accessory_store_list.js b/js/accessory/accessory_store_list.js
index cd3ac4d..632f8b5 100644
--- a/js/accessory/accessory_store_list.js
+++ b/js/accessory/accessory_store_list.js
@@ -114,6 +114,9 @@ function initTable() {
                     title: "成本价格（元）",
                     unresize: true,
                     align: "center",
+                    templet: function (d) {
+                        return '¥ ' + d.allPrice;
+                    },
                 },
                 {
                     field: "inputDay",
diff --git a/js/accessory/child/accessory_return_form.js b/js/accessory/child/accessory_return_form.js
index 4e15832..00a60a2 100644
--- a/js/accessory/child/accessory_return_form.js
+++ b/js/accessory/child/accessory_return_form.js
@@ -338,7 +338,7 @@ function setTableData(results) {
 function setFormInput(value, type) {
     let html = '<form class="layui-form layuimini-form"><div class="layui-inline">';
     if (type === 1) { // 本次退回量
-        html += '<input class="layui-input" name="ghNum" onblur="checkValue(this,1)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9" lay-affix="clear">';
+        html += '<input class="layui-input" name="ghNum" onblur="checkValue(this,1)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
     } else if (type === 2) { // 备注
         html += '<input class="layui-input" placeholder="请输入备注" id="remark" name="remark" value="' + setNullValue(value) + '" maxLength="255" lay-affix="clear"></input>';
     }
diff --git a/js/accessory/child/accessory_store_edit_form.js b/js/accessory/child/accessory_store_edit_form.js
index e3b38aa..731de18 100644
--- a/js/accessory/child/accessory_store_edit_form.js
+++ b/js/accessory/child/accessory_store_edit_form.js
@@ -178,9 +178,10 @@ function submitApply(data) {
     if (length === 0) {
         return layer.msg('请上传附件证明', { icon: 7 });
     }
-    // 校验配件入库数量
-    if (list.length === 0) {
-        return layer.msg('未填写配件入库数量', { icon: 7 });
+    for (let i = 0; i < list.length; i++) {
+        if (list[i].partPrice === 0 || list[i].partPrice === '0') {
+            return layer.msg('入库配件明细，第' + (i + 1) + '行，未填写单价', { icon: 7 });
+        }
     }
     data.field.details = list;
     data.field.id = objParam.id;
@@ -324,9 +325,9 @@ function setTableData(results) {
 function setFormInput(value, type) {
     let html = '<form class="layui-form layuimini-form"><div class="layui-inline">';
     if (type === 1) { // 入库量
-        html += '<input class="layui-input" name="num" onblur="checkValue(this,1)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9" lay-affix="clear">';
+        html += '<input class="layui-input" name="num" onblur="checkValue(this,1)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
     } else if (type === 2) { // 单价
-        html += '<input class="layui-input" name="price" onblur="checkValue(this,2)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9" lay-affix="clear">';
+        html += '<input class="layui-input" name="price" onblur="checkValue(this,2)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
     } else if (type === 3) { // 厂家
         html += '<select class="layui-select" name="manufacturer" id="manufacturer" lay-search>' +
             setSelectData(value) +
diff --git a/js/accessory/child/accessory_store_form.js b/js/accessory/child/accessory_store_form.js
index 3902eea..49763c2 100644
--- a/js/accessory/child/accessory_store_form.js
+++ b/js/accessory/child/accessory_store_form.js
@@ -121,9 +121,11 @@ function submitApply(data) {
         return layer.msg('未填写配件入库数量', { icon: 7 });
     }
     for (let i = 0; i < list.length; i++) {
-
         if (list[i].inputNum === 0 || list[i].inputNum === '0') {
-            return layer.msg('入库配件明细，第' + (i + 1) + '行，未填写配件入库数量', { icon: 7 });
+            return layer.msg('入库配件明细，第' + (i + 1) + '行，未填写本次入库量', { icon: 7 });
+        }
+        if (list[i].partPrice === 0 || list[i].partPrice === '0') {
+            return layer.msg('入库配件明细，第' + (i + 1) + '行，未填写单价', { icon: 7 });
         }
     }
     data.field.details = list;
@@ -304,9 +306,9 @@ function setTableData(results) {
 function setFormInput(value, type) {
     let html = '<form class="layui-form layuimini-form"><div class="layui-inline">';
     if (type === 1) { // 入库量
-        html += '<input class="layui-input" name="num" onblur="checkValue(this,1)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9" lay-affix="clear">';
+        html += '<input class="layui-input" name="num" onblur="checkValue(this,1)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
     } else if (type === 2) { // 单价
-        html += '<input class="layui-input" name="price" onblur="checkValue(this,2)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9" lay-affix="clear">';
+        html += '<input class="layui-input" name="price" onblur="checkValue(this,2)" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
     } else if (type === 3) { // 厂家
         html += '<select class="layui-select" name="manufacturer" id="manufacturer" lay-search>' +
             setSelectData(value) +
diff --git a/js/demandPlan/child/apply_plan_form.js b/js/demandPlan/child/apply_plan_form.js
index 6dc46cb..b2f1b72 100644
--- a/js/demandPlan/child/apply_plan_form.js
+++ b/js/demandPlan/child/apply_plan_form.js
@@ -227,9 +227,9 @@ function setTableData(results) {
 function setFormInput(value, type) {
     let html = '<form class="layui-form layuimini-form"><div class="layui-inline">';
     if (type === 1) { // 需用量
-        html += '<input class="layui-input" name="needNum" onblur="checkValue(this,1,\'需用量\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9" lay-affix="clear">';
+        html += '<input class="layui-input" name="needNum" onblur="checkValue(this,1,\'需用量\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
     } else if (type === 2) { // 需用天数
-        html += '<input class="layui-input" name="times" onblur="checkValue(this,2,\'需用天数\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9" lay-affix="clear">';
+        html += '<input class="layui-input" name="times" onblur="checkValue(this,2,\'需用天数\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
     } else if (type === 3) { // 备注
         html += '<input class="layui-input" placeholder="请输入备注" id="remarks" name="remarks" value="' + setNullValue(value) + '" maxLength="255" lay-affix="clear"></input>';
     }