From f6c0d0ff61808a1a2fe1ecbfc64d80cb228f1365 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 20 五月 2025 20:35:24 +0800
Subject: [PATCH] 批改页面2 问题:后端无法获取HNumber

---
 WebTM/views/基础资料/公用基础资料/Gy_MaterialCorrection.html  |    2 
 WebTM/views/基础资料/公用基础资料/Gy_MaterialCorrection2.html |  335 ++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 194 insertions(+), 143 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
index 785cf5d..017b0d8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
@@ -1249,7 +1249,7 @@
                                 }
                                 else {
                                     layer.alert(data.Message);
-                                    console.log("bobo" + sMainStr);
+                                    console.log("bobo" + dataStr);
                                 }
                                 layer.closeAll("loading");
                             },
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection2.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection2.html"
index 194f9ce..405876d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection2.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection2.html"
@@ -218,17 +218,17 @@
                         </script>
                         <script type="text/html" id="materProperty">
                             <select name="HMaterClsID" id="HMaterClsID" lay-verify="HMaterClsID" lay-filter="materPropertySelect" >
-                                <option value="澶栬喘">澶栬喘</option>
-                                <option value="鑷埗">鑷埗</option>
-                                <option value="濮斿">濮斿</option>
+                                <option value="1">澶栬喘</option>
+                                <option value="2">鑷埗</option>
+                                <option value="0">濮斿</option>
                             </select>
                         </script>
                         <script type="text/html" id="materFormula">
-                                    <select name="HMaterRuleType" id="HMaterRuleType" lay-verify="HMaterRuleType">
-                                        <option value="鍏朵粬">鍏朵粬</option>
-                                        <option value="鏌撴枡">鏌撴枡</option>
-                                        <option value="鍔╁墏">鍔╁墏</option>
-                                    </select>
+                            <select name="HMaterRuleType" id="HMaterRuleType" lay-verify="HMaterRuleType">
+                                <option value="鍏朵粬">鍏朵粬</option>
+                                <option value="鏌撴枡">鏌撴枡</option>
+                                <option value="鍔╁墏">鍔╁墏</option>
+                            </select>
                         </script>
                     </form>
                 </div>
@@ -449,23 +449,18 @@
             // 涓嬫媺妗嗕簨浠�
             form.on('select(materPropertySelect)', function (obj) {
                 let value = obj.value
-                let td = $(obj.elem).closest('td')
-                let field = td.data('field') // 鑾峰彇鍒板垪灞炴��
-                tempData.forEach(item => {
-                    item[field] = value
-                })
-                // 閲嶆柊娓叉煋涓嬫媺妗�
-                table.reload('tempTable', {
-                    data: tempData,
-                    done: function (res, curr, count) {
-                        $.each(res.data, function (index, item) {
-                            var select = $('tr[data-index="' + index + '"] select[name="HMaterClsID"]'); // 鐗╂枡灞炴�у搴旂殑涓嬫媺妗�
-                            select.val(item['鐗╂枡灞炴��']);
-                            form.render('select');
-                        })
-                    }
-                })
+                let curretDate = tempOption.data
 
+
+                curretDate.forEach(item => {
+                    if (item.ColmCols === '鐗╂枡灞炴��') {
+                        item['value'] = value
+                    }
+
+                })
+                // table.reload('tempTable', {
+                //     data: tempOption.data,
+                // })
             })
 
             //#region 鏌ヨ鎸夐挳
@@ -771,8 +766,44 @@
                             col2.push({ title: 'value', field: 'value', width: 120, edit: 'text' })
 
                             tempOption.cols = [col2]
-                            tempOption.data = list2
-                            debugger
+                            tempOption.data = list2.map(item => Object.assign(item, { value: "" }))
+                            tempOption.done = function (res, curr, count) {
+                                let filterReg = new RegExp(/浜簗鏃堕棿|ID|鏍囪|Flag|閫夋嫨|鐗╂枡浠g爜|鐗╂枡鍚嶇О/i) // 闅愯棌鎸囧畾灞炴��
+                                $.each(res.data, function (index, item) {
+                                    if (filterReg.test(item.ColmCols) === true) {
+                                        var tr = $('tr[data-index="' + index + '"] td[data-field="value"]').closest('tr')
+                                        tr.addClass('layui-hide')
+                                    }
+
+                                    // 绛涢�夐渶瑕佸睍绀轰笅鎷夋鐨勯儴鍒嗭紝骞跺皢妯℃澘鎸傝浇鍒版爲涓�
+                                    if (item.ColmCols === '鐗╂枡灞炴��') {
+                                        let selectMaterProperty = $("#materProperty").clone(true, true).html();
+                                        let tr = $('tr[data-index="' + index + '"] div:contains("鐗╂枡灞炴��")').closest('tr');
+                                        let td = tr.find('td[data-field="value"]') // 闇�瑕佸寘鍚笅鎷夋鐨勫鍣�
+                                        td.removeAttr("data-edit")
+                                        td.find('.layui-table-cell').addClass('layui-hide')
+                                        $(td).prepend(selectMaterProperty);
+                                        let select = $('tr[data-index="' + index + '"] select[name="HMaterClsID"]'); // 鐗╂枡灞炴�у搴旂殑涓嬫媺妗�
+                                        if (item['value'] === '') {
+                                            select.val('0');
+                                        } else {
+                                            select.val(item['value']);
+                                        }
+                                        form.render('select')
+                                    }
+
+                                    let eventReg = new RegExp(/璁¢噺鍗曚綅|浠撳簱鍚嶇О|鐗╂枡鍒嗙被|鍩烘湰鍗曚綅浠g爜/) // 闇�瑕佺粦瀹欶7浜嬩欢
+                                    if (eventReg.test(item.ColmCols) === true) {
+                                        let val = item.ColmCols
+                                        let eventName = eventBindCheck(val)
+                                        if (eventName !== null) {
+                                            let td = $('tr[data-index="' + index + '"] td[data-field="value"]')
+                                            td.attr('lay-event', eventName)
+                                        }
+                                    }
+
+                                });
+                            }
 
                             tempIns = table.render(tempOption);
 
@@ -1109,7 +1140,7 @@
                     var checked = $(document.getElementsByClassName('layui-form-checked'))
                     // checked.addClass('row-locked')
 
-                    
+
                     var $checkbox = checked.find('input[type="checkbox"]')
                     $checkbox.addClass('layui-checkbox-disbaled layui-disabled').attr('disabled', true);
 
@@ -1155,43 +1186,57 @@
                         form.render()
                         return; // 瑙嗕负閫�鍑�
                     }
-                    let data = tempOption.data;
-                    let dataMapped = data.map(item => {
+                    let dataObj = {}
+                    let data = tempOption.data.forEach(item => {
+                        let mergeObj = {}
+                        mergeObj[item['ColmCols']] = item['value']
+                        Object.assign(dataObj, mergeObj)
+                    });
+                    let mainTableCache = table.checkStatus('mainTable')
+                    let idStr = '(' + Array.from(mainTableCache.data).map(e => "'" + e.HItemID + "'").join(',') + ')'
 
-                        let mapped = Object.assign(item,
-                            {
-                                HOnceRightRate: item['涓�娆″悎鏍肩巼鏍囧噯鍊�']
-                                , HDivisionID: divisionJudgment(item['浜嬩笟閮�'])
-                                , HNumber: item['鐗╂枡浠g爜']
-                                , HName: item['鐗╂枡鍚嶇О']
-                                , HModel: item['瑙勬牸鍨嬪彿']
-                                , HMaterClsID: materClsJudgment(item['鐗╂枡灞炴��'])
-                                , HRemark: item['澶囨敞']
-                                , HQtyDec: item['鏁伴噺绮惧害']
-                                , HPriceDec: item['鍗曚环绮惧害']
-                                , HMoneyDec: item['閲戦绮惧害']
-                                , HTaxRate: item['榛樿绋庣巼']
-                                , HProfitRate: item['榛樿鍒╂鼎鐜�']
-                                , HTaxCost: item['鍚◣鎴愭湰浠�']
-                                , HFootPrice: item['缁撶畻浠�']
-                                , HWeight: item['鍏嬮噸']
-                                , HColorRemark: item['鏌撹壊瑕佹眰']
-                                , HWidth: item['骞呭']
-                            }
-                        )
+                    let mapped = Object.assign(dataObj,
+                        {
+                            HOnceRightRate: dataObj['涓�娆″悎鏍肩巼鏍囧噯鍊�']
+                            // , HDivisionID: divisionJudgment(dataObj['浜嬩笟閮�'])
+                            , HNumber: dataObj['鐗╂枡浠g爜']
+                            , HName: dataObj['鐗╂枡鍚嶇О']
+                            , HModel: dataObj['瑙勬牸鍨嬪彿']
+                            , HMaterClsID: dataObj['鐗╂枡灞炴��']
+                            , HRemark: dataObj['澶囨敞']
+                            , HQtyDec: dataObj['鏁伴噺绮惧害']
+                            , HPriceDec: dataObj['鍗曚环绮惧害']
+                            , HMoneyDec: dataObj['閲戦绮惧害']
+                            , HTaxRate: dataObj['榛樿绋庣巼']
+                            , HProfitRate: dataObj['榛樿鍒╂鼎鐜�']
+                            , HTaxCost: dataObj['鍚◣鎴愭湰浠�']
+                            , HFootPrice: dataObj['缁撶畻浠�']
+                            , HWeight: dataObj['鍏嬮噸']
+                            , HColorRemark: dataObj['鏌撹壊瑕佹眰']
+                            , HWidth: dataObj['骞呭']
+                        }
+                    )
+                    let chineseReg = new RegExp(/^[\u4e00-\u9fa5\u3000-\u303f\uff00-\uffef]+$/)
+                    $.each(mapped, (key, value) => {
+                        if (value === '' || chineseReg.test(key)) {
+                            delete mapped[key]
+                        }
+                    })
 
-                        if (mapped.HNumber == 0) {
-                            throw "璇疯緭鍏ョ墿鏂欎唬鐮侊紒";
-                        }
-                        if (mapped.HName == 0) {
-                            throw "璇疯緭鍏ョ墿鏂欏悕绉帮紒";
-                        }
-                        if (mapped.HWhID == 0) {
-                            throw "璇烽�夋嫨榛樿浠撳簱锛�";
-                        }
-                        if (mapped.HUnitName == 0) {
-                            throw "璇烽�夋嫨涓昏閲忓崟浣嶏紒";
-                        }
+                    if (mapped.HNumber == 0) {
+                        throw "璇疯緭鍏ョ墿鏂欎唬鐮侊紒";
+                    }
+                    if (mapped.HName == 0) {
+                        throw "璇疯緭鍏ョ墿鏂欏悕绉帮紒";
+                    }
+                    if (mapped.HWhID == 0) {
+                        throw "璇烽�夋嫨榛樿浠撳簱锛�";
+                    }
+                    if (mapped.HUnitName == 0) {
+                        throw "璇烽�夋嫨涓昏閲忓崟浣嶏紒";
+                    }
+                    debugger;
+                    if (mapped.HWeight !== undefined) {
                         let HWeight = mapped.HWeight.toString()
                         if (HWeight.substring(HWeight.length - 1, HWeight.length) == ".") {
                             throw "鍏嬮噸鐨勭粨灏句笉鑳芥槸.锛�"
@@ -1201,6 +1246,8 @@
                                 throw "鍏嬮噸璇疯緭姝g‘鍏ユ暟瀛楋紒"
                             }
                         }
+                    }
+                    if (mapped.HWidth !== undefined) {
                         let HWidth = mapped.HWidth.toString()
                         if (HWidth.substring(HWidth.length - 1, HWidth.length) == ".") {
                             throw "骞呭鐨勭粨灏句笉鑳芥槸.锛�"
@@ -1210,37 +1257,32 @@
                                 throw "骞呭璇疯緭姝g‘鍏ユ暟瀛楋紒"
                             }
                         }
+                    }
+                    let ref2 = /^[0-9]$/
+                    if (mapped.HQtyDec !== undefined && !ref2.test(mapped.HQtyDec)) {
+                        throw "鏁伴噺绮惧害锛岃杈撳叆0-9姝g‘鏁板瓧"
+                    }
+                    if (mapped.HQtyDec !== undefined && !ref2.test(mapped.HPriceDec)) {
+                        throw "鍗曚环绮惧害锛岃杈撳叆0-9姝g‘鏁板瓧"
+                    }
+                    if (mapped.HQtyDec !== undefined && !ref2.test(mapped.HMoneyDec)) {
+                        throw "閲戦绮惧害锛岃杈撳叆0-9姝g‘鏁板瓧"
+                    }
 
-                        let ref2 = /^[0-9]$/
-                        if (!ref2.test(mapped.HQtyDec)) {
-                            throw "鏁伴噺绮惧害锛岃杈撳叆0-9姝g‘鏁板瓧"
-                        }
-                        if (!ref2.test(mapped.HPriceDec)) {
-                            throw "鍗曚环绮惧害锛岃杈撳叆0-9姝g‘鏁板瓧"
-                        }
-                        if (!ref2.test(mapped.HMoneyDec)) {
-                            throw "閲戦绮惧害锛岃杈撳叆0-9姝g‘鏁板瓧"
-                        }
+                    debugger;
 
-
-                        return mapped
-                    })
-
-
-                    let dataStr = JSON.stringify(dataMapped)
+                    let dataStr = JSON.stringify(mapped)
                     $.ajax(
                         {
                             type: "POST",
-                            url: GetWEBURL() + "/Gy_Material/SaveGy_MaterialList_Batch", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            url: GetWEBURL() + "/Gy_Material/SaveGy_MaterialList_Modify", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                             async: true,
-                            data: { "msg": dataStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
+                            data: { "msg": dataStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';'  + idStr },
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                     layer.msg(data.Message, { icon: 1 });
                                     // get_WriteConfigFile();
-                                    tempData = []
-                                    table.reload('tempTable', { data: tempData })
                                     get_DisplayPage(sWhere);
                                 }
                                 else {
@@ -1252,9 +1294,10 @@
                             error: function (err) {
 
                                 layer.alert("閿欒:" + err, { icon: 5 });
-                                console.log("bobo" + sMainStr);
+                                console.log("bobo" + dataStr);
                             }
                         });
+
                 } catch (error) {
                     console.error(error)
                     layer.alert("閿欒" + error, { icon: 5 })
@@ -1704,10 +1747,10 @@
             //浠ヤ笂鏄痩ayui妯″潡
 
             function set_GridCellCheck(obj) {
-                var objCurrent = obj
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (e.key == 'F7') {
-                        let eventName = objCurrent.event
+                        let eventName = obj.event
+
                         if (eventName === 'onHUnitNameKeyDownHandler') {
                             layer.open({
                                 type: 2
@@ -1728,21 +1771,22 @@
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     } else if (checkStatus.data.length === 1) {
-                                        // objCurrent.update({
-                                        //     HUnitName: checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О,
-                                        //     HUnitID: checkStatus.data[0].HItemID,
-                                        //     '璁¢噺鍗曚綅鍚嶇О': checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О,
-                                        //     '璁¢噺鍗曚綅浠g爜': checkStatus.data[0].璁¢噺鍗曚綅浠g爜,
-                                        // })
-
-                                        tempData.forEach(item => {
-                                            item['HUnitName'] = checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
-                                            item['HUnitID'] = checkStatus.data[0].HItemID
-                                            item['璁¢噺鍗曚綅鍚嶇О'] = checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
-                                            item['璁¢噺鍗曚綅浠g爜'] = checkStatus.data[0].璁¢噺鍗曚綅浠g爜
+                                        tempOption.data.forEach(item => {
+                                            if (item.ColmCols === 'HUnitName') {
+                                                item['value'] = checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                            }
+                                            if (item.ColmCols === 'HUnitID') {
+                                                item['value'] = checkStatus.data[0].HItemID
+                                            }
+                                            if (item.ColmCols === '璁¢噺鍗曚綅鍚嶇О') {
+                                                item['value'] = checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                            }
+                                            if (item.ColmCols === '璁¢噺鍗曚綅浠g爜') {
+                                                item['value'] = checkStatus.data[0].璁¢噺鍗曚綅浠g爜
+                                            }
                                         })
                                         table.reload('tempTable', {
-                                            data: tempData
+                                            data: tempOption.data
                                         })
                                     }
 
@@ -1771,23 +1815,28 @@
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     } else if (checkStatus.data.length === 1) {
-                                        // objCurrent.update({
-                                        //     HBASEUNITID: checkStatus.data[0].HItemID,
-                                        //     '鍩烘湰璁¢噺鍗曚綅浠g爜': checkStatus.data[0].璁¢噺鍗曚綅浠g爜,
-                                        // })
-                                        tempData.forEach(item => {
-                                            item['HBASEUNITID'] = checkStatus.data[0].HItemID
-                                            item['鍩烘湰璁¢噺鍗曚綅浠g爜'] = checkStatus.data[0].璁¢噺鍗曚綅浠g爜
-                                            // item['璁¢噺鍗曚綅鍚嶇О']= checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
-                                            // item['璁¢噺鍗曚綅浠g爜']= checkStatus.data[0].璁¢噺鍗曚綅浠g爜
+                                        debugger
+                                        tempOption.data.forEach(item => {
+                                            if (item.ColmCols === 'HBASEUNITID') {
+                                                item['value'] = checkStatus.data[0].HItemID
+                                            }
+                                            if (item.ColmCols === '鍩烘湰璁¢噺鍗曚綅浠g爜') {
+                                                item['value'] = checkStatus.data[0].璁¢噺鍗曚綅浠g爜
+                                            }
+                                            if (item.ColmCols === '鍩烘湰璁¢噺鍗曚綅') {
+                                                item['value'] = checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                            }
                                         })
                                         table.reload('tempTable', {
-                                            data: tempData
+                                            data: tempOption.data
                                         })
+
                                     }
 
                                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
+
+
                                 , btn2: function (index, layero) { }
                             })
                         }
@@ -1811,20 +1860,21 @@
                                     if (checkStatus.data.length !== 1) {
                                         return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
                                     }
-                                    objCurrent.update({
-                                        '浠撳簱鍚嶇О': checkStatus.data[0].浠撳簱鍚嶇О,
-                                        HWhID: checkStatus.data[0].HItemID,
-                                        '浠撳簱浠g爜': checkStatus.data[0].浠撳簱浠g爜
+
+                                    tempOption.data.forEach(item => {
+                                        if (item.ColmCols === '浠撳簱鍚嶇О') {
+                                            item['value'] = checkStatus.data[0].浠撳簱鍚嶇О
+                                        }
+                                        if (item.ColmCols === 'HWhID') {
+                                            item['value'] = checkStatus.data[0].HItemID
+                                        }
+                                        if (item.ColmCols === '浠撳簱浠g爜') {
+                                            item['value'] = checkStatus.data[0].浠撳簱浠g爜
+                                        }
                                     })
 
-                                    tempData.forEach(item => {
-                                        item['浠撳簱鍚嶇О'] = checkStatus.data[0].浠撳簱鍚嶇О
-                                        item['HWhID'] = checkStatus.data[0].HItemID
-                                        item['浠撳簱浠g爜'] = checkStatus.data[0].浠撳簱浠g爜
-                                        // item['璁¢噺鍗曚綅浠g爜']= checkStatus.data[0].璁¢噺鍗曚綅浠g爜
-                                    })
                                     table.reload('tempTable', {
-                                        data: tempData
+                                        data: tempOption.data
                                     })
 
                                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -1852,27 +1902,30 @@
                                     if (checkStatus.data.length != 1) {
                                         return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
                                     }
-                                    objCurrent.update({
-                                        '鐗╂枡鍒嗙被鍚嶇О': checkStatus.data[0].鐗╂枡鍒嗙被鍚嶇О,
-                                        HMaterTypeID: checkStatus.data[0].HItemID,
-                                        '鐗╂枡鍒嗙被浠g爜': checkStatus.data[0].鐗╂枡鍒嗙被浠g爜
+                                    tempOption.data.forEach(item => {
+                                        if (item.ColmCols === '鐗╂枡鍒嗙被鍚嶇О') {
+                                            item['value'] = checkStatus.data[0].鐗╂枡鍒嗙被鍚嶇О
+                                        }
+                                        if (item.ColmCols === 'HMaterTypeID') {
+                                            item['value'] = checkStatus.data[0].HItemID
+                                        }
+                                        if (item.ColmCols === '鐗╂枡鍒嗙被浠g爜') {
+                                            item['value'] = checkStatus.data[0].鐗╂枡鍒嗙被浠g爜
+                                        }
                                     })
 
-                                    tempData.forEach(item => {
-                                        item['鐗╂枡鍒嗙被鍚嶇О'] = checkStatus.data[0].鐗╂枡鍒嗙被鍚嶇О
-                                        item['HMaterTypeID'] = checkStatus.data[0].HItemID
-                                        item['鐗╂枡鍒嗙被浠g爜'] = checkStatus.data[0].鐗╂枡鍒嗙被浠g爜
-                                        // item['璁¢噺鍗曚綅浠g爜']= checkStatus.data[0].璁¢噺鍗曚綅浠g爜
-                                    })
                                     table.reload('tempTable', {
-                                        data: tempData
+                                        data: tempOption.data
                                     })
+
 
                                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
                                 , btn2: function (index, layero) { }
                             })
                         }
+                        obj.event = ''
+                        return false;
                     }
                 })
             }
@@ -1941,21 +1994,19 @@
             return true
         }
 
-        function elementEventBindCheck(element) {
-            const UnitReg = /璁¢噺|Unit/;
-            const WHReg = /浠撳簱|WH/;
-            const MaterReg = /鐗╂枡鍒嗙被|MaterType/;
-            if (element.type === 'checkbox') {
-                return false
-            }
-
-            if (element.field.search(/鍩烘湰璁¢噺鍗曚綅浠g爜|HBASEUNITID/) !== -1) {
+        function eventBindCheck(colName) {
+            const UnitReg = new RegExp(/璁¢噺|Unit/);
+            const WHReg = new RegExp(/浠撳簱|WH/);
+            const MaterReg = new RegExp(/鐗╂枡鍒嗙被|MaterType/);
+            const baseMaterReg = new RegExp(/鍩烘湰璁¢噺鍗曚綅浠g爜|HBASEUNITID|鍩烘湰璁¢噺鍗曚綅/)
+            debugger;
+            if (baseMaterReg.test(colName) === true) {
                 return 'onBasicUnitCodeKeyDownHandler';
-            } else if (element.field.search(UnitReg) !== -1) {
+            } else if (UnitReg.test(colName) === true) {
                 return 'onHUnitNameKeyDownHandler';
-            } else if (element.field.search(WHReg) !== -1) {
+            } else if (WHReg.test(colName) === true) {
                 return 'onWareHouseKeyDownHandler';
-            } else if (element.field.search(MaterReg) !== -1) {
+            } else if (MaterReg.test(colName) === true) {
                 return 'onMaterialClassKeyDownHandler';
             } else {
                 return null

--
Gitblit v1.9.1