前端问题优化

js/demandPlan/child/apply_plan_form.js

@@ -174,7 +174,8 @@ function addFitDatas(data) {
         $.each(newJjDataArr, function (index, item) {
             updateOrAddObject(item.id, item);
         });
-        setTableData(jjDataArr);
+        // setTableData(jjDataArr);
+        goOnAddData();
     } else { // 第一次添加数据
         jjDataArr = JSON.parse(data);
         if (jjDataArr && jjDataArr.length > 0) {
@@ -289,16 +290,63 @@ function delFitType() {
                 }
             }
         }
-        delIdArr.splice(0,delIdArr.length);
         if (jjDataArr.length === 0) {
             $('#no_data_title').removeAttr('style');
             $('#search-info').css({ 'display': 'none' });
             $('#table-box').css({ 'display': 'none' });
         } else {
-            setTableData(jjDataArr);
+            // setTableData(jjDataArr);
+            handleDelTableData(delIdArr);
+        }
+        delIdArr.splice(0,delIdArr.length);
+    });
 }
 
+// 删除表格数据
+function handleDelTableData(delIdArr) {
+    if (delIdArr.length > 0) {
+        $.each(delIdArr, function (index, item) {
+            $('#baseTable tbody tr').each(function () {
+                let id = $(this).attr('id');
+                if (parseInt(id) === item) {
+                    $(this).remove();
+                    return false;
+                }
+            })
+        })
+    }
+    $('#baseTable tbody tr').each(function (index, item) {
+        $(this).find('td').eq(1).html(index + 1);
+    })
+}
+
+// 继续添加数据
+function goOnAddData() {
+    if (jjDataArr.length > 0) {
+        $.each(jjDataArr, function (index, item) {
+            $('#baseTable tbody tr').each(function () {
+                let id = $(this).attr('id');
+                if (parseInt(id) === parseInt(item.id)) {
+                    let times = $(this).find('td').eq(7).find('input[name="times"]').val(),
+                        needNum = $(this).find('td').eq(6).find('input[name="needNum"]').val(),
+                        remarks = $(this).find('td').eq(8).find('input[name="remarks"]').val();
+                    if (!item.times || parseInt(item.times) === 0) {
+                        item.times = times;
+                    }
+                    if (!item.needNum || parseInt(item.needNum) === 0) {
+                        item.needNum = needNum;
+                    }
+                    if (!item.remarks) {
+                        item.remarks = remarks;
+                    }
+                }
+            })
         });
+        setTableData(jjDataArr);
+        $('#baseTable tbody tr').each(function (index, item) {
+            $(this).find('td').eq(1).html(index + 1);
+        })
+    }
 }
 
 // 校验数据

page/accessory/accessory_out_bound_list.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" style="margin-bottom: 0;">

page/accessory/accessory_return_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: 320px;">
                                     <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" style="margin-bottom: 0;">

page/accessory/accessory_scrap_list.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" style="margin-bottom: 0;">

page/accessory/accessory_store_list.html

@@ -23,7 +23,7 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline" style="width: 300px;">
                                     <input type="text" name="proName" 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" style="margin-bottom: 0;">

page/accessory/inventory_count_list.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">

page/basic/fit_type_list.html

@@ -26,7 +26,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>
 
@@ -36,7 +36,7 @@
                                 <button class="layui-btn layui-btn-primary" onclick="queryDtree(2)"><i
                                         class="layui-icon layui-icon-refresh"></i> 重 置</button>
                                 <button class="layui-btn layui-btn-primary" onclick="refreshTreeData()"><i
-                                        class="layui-icon layui-icon-refresh"></i> 刷 新 树</button>
+                                        class="layui-icon layui-icon-refresh"></i> 刷 新 </button>
                                 <button class="layui-btn layui-btn-primary layui-border" dtree-id="fitTypeTree"
                                     dtree-menu="moveDown">全 部 展 开</button>
                                 <button class="layui-btn layui-btn-primary layui-border" dtree-id="fitTypeTree"

page/demandPlan/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">

page/demandPlan/delivery_list.html

@@ -89,7 +89,7 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline">
                                     <select id="status">
-                                        <option value="">请选择状态</option>
+                                        <option value="">请选择发货状态</option>
                                         <option value="0">未发货</option>
                                         <option value="1">部分发货</option>
                                         <option value="2">全部发货</option>