| WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_MaoJian.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@ <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html
@@ -2267,7 +2267,7 @@ layer.open({ type: 1, // page å±ç±»å area: ['500px', '500px'], area: ['500px', 'auto'], title: 'ä»·æ ¼ä¿¡æ¯', shade: 0.6, // é®ç½©éæåº¦ shadeClose: true, // ç¹å»é®ç½©åºåï¼å ³éå¼¹å± WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillEdit_MaoJian.html
@@ -71,6 +71,8 @@ id="HBillNo" readonly="readonly" autocomplete="off"> <input id="HInterID" name="HInterID" type="hidden" /> <input id="HMaker" name="HMaker" type="hidden" /><!--å¶å人--> <input id="HMainSourceBillType" name="HMainSourceBillType" type="hidden" value="æ¯å°" /> </div> </div> <div class="layui-inline"> @@ -135,8 +137,7 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label">客æ·<label style="color:red"> * </label></label> <label class="layui-form-label">客æ·</label> <div class="layui-input-inline"> <input class="layui-input" name="HCusName" lay-verify="HCusName" id="HCusName" readonly="readonly" autocomplete="off"> @@ -901,13 +902,14 @@ for (var i = 0; i < option.data.length; i++) { var HMaterRuleType = option.data[i].HMaterRuleType; var HMaterRuleExternType = option.data[i].HMaterRuleExternType; if (HMaterRuleType == "ææ") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight); } else if (HMaterRuleType == "å©å") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001); } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); } else if (HMaterRuleExternType == 'æ¯å°') { // if (HMaterRuleType == "ææ") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight); // } else if (HMaterRuleType == "å©å") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001); // } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); // } else if (HMaterRuleExternType == 'æ¯å°') { if (HMaterRuleExternType == 'æ¯å°') { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); } } @@ -925,13 +927,14 @@ for (var i = 0; i < option.data.length; i++) { var HMaterRuleType = option.data[i].HMaterRuleType; var HMaterRuleExternType = option.data[i].HMaterRuleExternType; if (HMaterRuleType == "ææ") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight); } else if (HMaterRuleType == "å©å") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001); } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); } else if (HMaterRuleExternType == 'æ¯å°') { //if (HMaterRuleType == "ææ") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight); //} else if (HMaterRuleType == "å©å") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001); //} else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); //} else if (HMaterRuleExternType == 'æ¯å°') { if (HMaterRuleExternType == 'æ¯å°') { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); } } @@ -1136,13 +1139,14 @@ var HMaterRuleType = obj.data.HMaterRuleType; var HMaterRuleExternType = obj.data.HMaterRuleExternType; if (HMaterRuleType == "ææ") { HQty = dealDoubleToFixed(HRate * HWeight); } else if (HMaterRuleType == "å©å") { HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001); } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { HQty = dealDoubleToFixed(HRate * HWeight * 0.001); } else if (HMaterRuleExternType == 'æ¯å°') { // if (HMaterRuleType == "ææ") { // HQty = dealDoubleToFixed(HRate * HWeight); // } else if (HMaterRuleType == "å©å") { // HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001); // } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { // HQty = dealDoubleToFixed(HRate * HWeight * 0.001); // } else if (HMaterRuleExternType == 'æ¯å°') { if (HMaterRuleExternType == 'æ¯å°') { HQty = dealDoubleToFixed(HRate * HWeight * 0.001); } //åæ¥æ´æ°è¡¨æ ¼åç¼å对åºçå¼ @@ -1333,8 +1337,8 @@ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true } , { field: 'HMaterCode', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 } , { field: 'HMaterName', title: 'ç©æåç§°', width: 100 } , { field: 'HMaterRuleType', title: 'ç©æå ¬å¼', width: 100 } , { field: 'HMaterRuleExternType', title: 'ç©æå ¬å¼2', width: 100 } //, { field: 'HMaterRuleType', title: 'ç©æå ¬å¼', width: 100, type: 'hidden' } , { field: 'HMaterRuleExternType', title: 'ç©æå ¬å¼', width: 100 } , { field: 'HMaterSpec', title: 'è§æ ¼åå·', width: 100 } , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true } , { field: 'HUnitCode', title: '计éåä½ä»£ç ', edit: 'text', event: 'HUnitCode', width: 100, hide: true } @@ -1739,16 +1743,16 @@ //æ ¹æ®ç©æç ç©æå ¬å¼ è®¡ç® éé var HWeight = $("#HWeight").val(); var HWaterQty = $("#HWaterQty").val(); if (option.data[rowIndex + i].HMaterRuleType == "ææ") { option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight); } else if (option.data[rowIndex + i].HMaterRuleType == "å©å") { option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001); } else if (option.data[rowIndex + i].HMaterRuleType == "å©åï¼æå¸ç®ï¼") { option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001); } else if (option.data[rowIndex + i].HMaterRuleExternType == "æ¯å°") { // if (option.data[rowIndex + i].HMaterRuleType == "ææ") { // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight); // } else if (option.data[rowIndex + i].HMaterRuleType == "å©å") { // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001); // } else if (option.data[rowIndex + i].HMaterRuleType == "å©åï¼æå¸ç®ï¼") { // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001); // } else if (option.data[rowIndex + i].HMaterRuleExternType == "æ¯å°") { if (option.data[rowIndex + i].HMaterRuleExternType == "æ¯å°") { option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001); } debugger } table.render(option); layer.closeAll(); WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillEdit_YangMao.html
@@ -71,6 +71,7 @@ id="HBillNo" readonly="readonly" autocomplete="off"> <input id="HInterID" name="HInterID" type="hidden" /> <input id="HMaker" name="HMaker" type="hidden" /><!--å¶å人--> <input id="HMainSourceBillType" name="HMainSourceBillType" type="hidden" value="ç¾æ¯æè²"/> </div> </div> <div class="layui-inline"> @@ -139,8 +140,7 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label">客æ·<label style="color:red"> * </label></label> <label class="layui-form-label">客æ·</label> <div class="layui-input-inline"> <input class="layui-input" name="HCusName" lay-verify="HCusName" id="HCusName" readonly="readonly" autocomplete="off"> @@ -178,7 +178,7 @@ <input type="text" name="HWeight" id="HWeight" class="layui-input" value=""style="float: left; width: 150px;"> <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchWeight" style="width:40px;"> lay-filter="btnSearchWeight" id="btnSearchWeight" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> @@ -663,7 +663,7 @@ if (checkStatus.data.length !== 1) { return layer.msg('è¯·éæ©ä¸æ¡æ°æ®'); } $("#HWeight").val(checkStatus.data[0]['å é']) $("#HWeight").val(checkStatus.data[0]['å é']).trigger('change'); layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layerå é¨å¨æéå¢è®¡ç®ç @@ -744,7 +744,6 @@ if (checkStatus.data.length !== 1) { return layer.msg('è¯·éæ©ä¸æ¡æ°æ®'); } debugger $("#HMaterID").val(checkStatus.data[0]['HItemID']) $("#HMaterName").val(checkStatus.data[0]['ç©æåç§°']) $("#HModel").val(checkStatus.data[0]['è§æ ¼åå·']) @@ -994,13 +993,14 @@ for (var i = 0; i < option.data.length; i++) { var HMaterRuleType = option.data[i].HMaterRuleType; var HMaterRuleExternType = option.data[i].HMaterRuleExternType; if (HMaterRuleType == "ææ") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight); } else if (HMaterRuleType == "å©å") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001); } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); } else if (HMaterRuleExternType == 'ç¾æ¯') { // if (HMaterRuleType == "ææ") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight); // } else if (HMaterRuleType == "å©å") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001); // } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); // } else if (HMaterRuleExternType == 'ç¾æ¯') { if (HMaterRuleExternType == 'ç¾æ¯') { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); } } @@ -1018,13 +1018,14 @@ for (var i = 0; i < option.data.length; i++) { var HMaterRuleType = option.data[i].HMaterRuleType; var HMaterRuleExternType = option.data[i].HMaterRuleExternType; if (HMaterRuleType == "ææ") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight); } else if (HMaterRuleType == "å©å") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001); } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); } else if (HMaterRuleExternType == 'ç¾æ¯') { // if (HMaterRuleType == "ææ") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight); // } else if (HMaterRuleType == "å©å") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001); // } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); // } else if (HMaterRuleExternType == 'ç¾æ¯') { if (HMaterRuleExternType == 'ç¾æ¯') { option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001); } } @@ -1228,13 +1229,14 @@ var HQty = 0; var HMaterRuleType = obj.data.HMaterRuleType; var HMaterRuleExternType = obj.data.HMaterRuleExternType; if (HMaterRuleType == "ææ") { HQty = dealDoubleToFixed(HRate * HWeight); } else if (HMaterRuleType == "å©å") { HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001); } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { HQty = dealDoubleToFixed(HRate * HWeight * 0.001); } else if (HMaterRuleExternType == 'ç¾æ¯') { // if (HMaterRuleType == "ææ") { // HQty = dealDoubleToFixed(HRate * HWeight); // } else if (HMaterRuleType == "å©å") { // HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001); // } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") { // HQty = dealDoubleToFixed(HRate * HWeight * 0.001); // } else if (HMaterRuleExternType == 'ç¾æ¯') { if (HMaterRuleExternType == 'ç¾æ¯') { HQty = dealDoubleToFixed(HRate * HWeight * 0.001); } //åæ¥æ´æ°è¡¨æ ¼åç¼å对åºçå¼ @@ -1425,8 +1427,8 @@ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true } , { field: 'HMaterCode', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 } , { field: 'HMaterName', title: 'ç©æåç§°', width: 100 } , { field: 'HMaterRuleType', title: 'ç©æå ¬å¼', width: 100 } , { field: 'HMaterRuleExternType', title: 'ç©æå ¬å¼2', width: 100 } // , { field: 'HMaterRuleType', title: 'ç©æå ¬å¼', width: 100 } , { field: 'HMaterRuleExternType', title: 'ç©æå ¬å¼', width: 100 } , { field: 'HMaterSpec', title: 'è§æ ¼åå·', width: 100 } , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true } , { field: 'HUnitCode', title: '计éåä½ä»£ç ', edit: 'text', event: 'HUnitCode', width: 100, hide: true } @@ -1832,13 +1834,14 @@ //æ ¹æ®ç©æç ç©æå ¬å¼ è®¡ç® éé var HWeight = $("#HWeight").val(); var HWaterQty = $("#HWaterQty").val(); if (option.data[rowIndex + i].HMaterRuleType == "ææ") { option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight); } else if (option.data[rowIndex + i].HMaterRuleType == "å©å") { option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001); } else if (option.data[rowIndex + i].HMaterRuleType == "å©åï¼æå¸ç®ï¼") { option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001); } else if (option.data[rowIndex + i].HMaterRuleExternType == "ç¾æ¯") { // if (option.data[rowIndex + i].HMaterRuleType == "ææ") { // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight); // } else if (option.data[rowIndex + i].HMaterRuleType == "å©å") { // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001); // } else if (option.data[rowIndex + i].HMaterRuleType == "å©åï¼æå¸ç®ï¼") { // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001); // } else if (option.data[rowIndex + i].HMaterRuleExternType == "ç¾æ¯") { if (option.data[rowIndex + i].HMaterRuleExternType == "ç¾æ¯") { option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001); } } WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillList.html
@@ -269,6 +269,20 @@ </div> </div> <script> function getUrlVars() { var vars = [], hash; var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); for (var i = 0; i < hashes.length; i++) { hash = hashes[i].split('='); vars.push(hash[0]); vars[hash[0]] = hash[1]; } return vars; } var params = getUrlVars(); var subType = decodeURIComponent(params['subType']) // åºååæ®ç±»å console.log("subType: ", subType) layui.config({ base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾ }).extend({ @@ -298,7 +312,7 @@ //éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType); //#endregion var titleData = ["åæ®ID", "hsubid", "HDeptID", "ææµäººå ç ", "客æ·å ç ", "主产åå ç ", "HMaterID", "HUnitID", "ä»»å¡åå ç ", "ä»»å¡ååå ç ", "å·¥åºæµè½¬å¡å ç ", "å·¥åºæµè½¬å¡åå ç ", 'HMaterRuleExternType'];//ä¸éè¦æ¾ç¤ºçåæ®µ 坿©å± var titleData = ["åæ®ID", "hsubid", "HDeptID", "ææµäººå ç ", "客æ·å ç ", "主产åå ç ", "HMaterID", "HUnitID", "ä»»å¡åå ç ", "ä»»å¡ååå ç ", "å·¥åºæµè½¬å¡å ç ", "å·¥åºæµè½¬å¡åå ç ", 'HMaterRuleExternType', 'HMainSourceBillType'];//ä¸éè¦æ¾ç¤ºçåæ®µ 坿©å± //#region ãè¿æ»¤æ¹æ¡ã //è¿æ»¤æ¡ä»¶çclassç±» @@ -792,10 +806,10 @@ if (obj.event == 'åæ®å·') { //æ£æ¥ obj.event æ¯å¦çäºå符串 'åæ®å·'ã妿çäºï¼åæ§è¡ifå¾ªç¯ var linterid = data.hmainid.toString(); //声æåélinterid 为 data.hmainid var content = '../颿åºåº/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' if (data.HMaterRuleExternType) { if (data.HMaterRuleExternType == 'ç¾æ¯') { if (subType) { if (subType == 'ç¾æ¯æè²') { content = '../颿åºåº/Kf_MateOutBillEdit_YangMao.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' } else if (data.HMaterRuleExternType == 'æ¯å°') { } else if (subType == 'æ¯å°') { content = '../颿åºåº/Kf_MateOutBillEdit_MaoJian.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' } } @@ -831,6 +845,9 @@ } if (HEndDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'"; } if(subType) { sWhere += " and HMainSourceBillType = N'" + subType + "'"; // æ ¹æ®éå ¥åæ®ç±»åçä¸åçéä¸åçåæ® } $.ajax({ url: GetWEBURL() + '/Kf_MateOutBill/GetMateOutBillList', @@ -913,6 +930,15 @@ //#region æ°å¢ function set_AddNew() { debugger var content = '../颿åºåº/Kf_MateOutBillLEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1' if(subType) { if(subType == 'ç¾æ¯æè²'){ content = '../颿åºåº/Kf_MateOutBillEdit_YangMao.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1' }else if(subType == 'æ¯å°') { content = '../颿åºåº/Kf_MateOutBillEdit_MaoJian.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1' } } layer.open({ type: 2, skin: 'layui-layer-rim', //å ä¸è¾¹æ¡ @@ -921,7 +947,7 @@ shift: 2, area: ['100%', '100%'], maxmin: true, content: '../颿åºåº/Kf_MateOutBillLEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1', content: content, end: function () { //å·æ°é¡µé¢, /*get_FastQuery(table, option);*/ @@ -939,13 +965,12 @@ var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { debugger var linterid = data[0].hmainid.toString(); var content = '../颿åºåº/Kf_MateOutBillLEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1' if (data[0].HMaterRuleExternType) { if (data[0].HMaterRuleExternType == 'ç¾æ¯') { if (subType) { if (subType == 'ç¾æ¯æè²') { content = '../颿åºåº/Kf_MateOutBillEdit_YangMao.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1' } else if (data[0].HMaterRuleExternType == 'æ¯å°') { } else if (subType == 'æ¯å°') { content = '../颿åºåº/Kf_MateOutBillEdit_MaoJian.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1' } } @@ -969,7 +994,7 @@ } }) } else { layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼'); layer.msg('è¯·éæ©ä¸è¡æ°æ®å¤å¶ï¼'); } } //#endregion @@ -981,10 +1006,10 @@ if (checkStatus.data.length === 1) { var linterid = data[0].hmainid.toString(); var content = '../颿åºåº/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' if (data[0].HMaterRuleExternType) { if (data[0].HMaterRuleExternType == 'ç¾æ¯') { if (subType) { if (subType == 'ç¾æ¯æè²') { content = '../颿åºåº/Kf_MateOutBillEdit_YangMao.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' } else if (data[0].HMaterRuleExternType == 'æ¯å°') { } else if (subType == 'æ¯å°') { content = '../颿åºåº/Kf_MateOutBillEdit_MaoJian.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' } }