WebTM/WebTM.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm_Sec.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedSaveQuery.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj
@@ -616,6 +616,7 @@ <Content Include="views\æ¨¡æ²»å ·ç®¡ç\æ¨¡æ²»å ·ç®¡ç\Gy_MouldFile_Excel.html" /> <Content Include="views\æ¨¡æ²»å ·ç®¡ç\æ¨¡æ²»å ·ç®¡ç\Sc_MouldMaintainRuleBill_Excel.html" /> <Content Include="views\æ¨¡æ²»å ·ç®¡ç\æ¨¡æ²»å ·ç®¡ç\Sc_MouldMaintainRuleBillList_PDA.html" /> <Content Include="views\ç产管ç\ä¸åæäº§\JIT_DayPlanPlatForm_Sec.html" /> <Content Include="views\ç产管ç\ä¸åæäº§\JIT_DayPlanPlatForm.html" /> <Content Include="views\ç产管ç\ä¸åæäº§\JIT_DayPlanPlatFormImport_SS_Sec.html" /> <Content Include="views\ç产管ç\ä¸åæäº§\JIT_DayPlanPlatFormImport_SS.html" /> @@ -653,11 +654,8 @@ <Content Include="views\ç产管ç\æ¥è®¡ååºç¡èµæ\JIT_NeedMaterPlanConfigBill_Excel.html" /> <Content Include="views\ç产管ç\æ¥è®¡åæ¥è¡¨\JIT_DayPlanPlatFormHistoryNoteReport.html" /> <Content Include="views\ç产管ç\æ¥è®¡åæ¥è¡¨\JIT_FuHeFenXiReportDetail.html" /> <<<<<<< HEAD <Content Include="views\ç产管ç\æ¥è®¡åæ¥è¡¨\ReportMOMaterReadysBillTotalList.html" /> ======= <Content Include="views\ç产管ç\æ¬ æè¿ç®\JIT_MaterialLevelShorAnalysisReport_His.html" /> >>>>>>> 0adef152d8494601c9665fd2d690774c662a02fd <Content Include="views\ç产管ç\æ¬ æè¿ç®\JIT_MaterialLevelShorAnalysis.html" /> <Content Include="views\ç产管ç\æ¬ æè¿ç®\JIT_MaterialLevelShorAnalysisDetailReport.html" /> <Content Include="views\ç产管ç\æ¬ æè¿ç®\JIT_MaterialLevelShorAnalysisReport.html" /> WebTM/WebTM.csproj.user
@@ -1,12 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <<<<<<< HEAD <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> ======= <NameOfLastUsedPublishProfile>D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile> >>>>>>> 0adef152d8494601c9665fd2d690774c662a02fd <ProjectView>ProjectFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® //var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½® var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_EmployeeList.html
@@ -535,7 +535,11 @@ } //æ ¹æ®é¡µé¢çæå¼æ¹å¼ï¼å¤æè¿æ»¤æ¡ä»¶æ¯å¦éè¦è¿è¡é¢å¤çæ·»å addSWhereByOpenType(); if (addSWhereByOpenType()) { sWhere += " order by é¨é¨ä»£ç " } else { sWhere += " order by èå代ç " } get_Display(sWhere); sWhere = "";//è°ç¨æ¥å£åæ¸ ç©ºsWhereç¼å } @@ -1035,12 +1039,14 @@ sWhere += " and ç¦ç¨æ è®° = ''and å®¡æ ¸äºº !='' "; DeptName = decodeURI(DeptName);//对URI è¿è¡è§£ç if (DeptName != "undefined") { sWhere += " and é¨é¨åç§° = '" + DeptName+"' "; sWhere += " and é¨é¨åç§° = '" + DeptName + "' "; } if (typeof (HOrgID) != "undefined") { Organ(HOrgID); } return true; } else { return false; } WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatForm.html
@@ -1760,11 +1760,10 @@ , toolbar: '#toolbarDemo' , title: "è®¡åæ¥è¡¨" , height: 'full-175' , page: true , page: false , cellMinWidth: 90 , cols: [columns] , limit: 100//é»è®¤æ¾ç¤ºå ¨é¨ , limits:[50,100,500,1000] , limit: 5000//é»è®¤æ¾ç¤ºå ¨é¨ , contextmenu: { // è¡¨æ ¼å 容å³é®èåé ç½® body: [ WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatForm_Sec.html
New file Diff too large WebTM/views/Éú²ú¹ÜÀí/ÌáÁϼƻ®/JIT_LiftMaterPlanBillEdit.html
@@ -267,8 +267,8 @@ , "HCloseStatus": false, "HRemoveQty": "", "HSeOrderBillNo": "", "HUnReciveQty": "", "HPOOrderBillDate": "", "HPOOrderBillDeliveryDate": "" , "HPOOrderBillRemark": "", "HPOOrderBillNote": "" }]; //ä¸å¯ç¼è¾å var cancelEditStyleList = new RegExp(/HMaterName/i) ////ä¸å¯ç¼è¾å //var cancelEditStyleList = new RegExp(/HMaterName/i) //#endregion //#region è¿å ¥é¡µé¢å³å è½½ @@ -368,7 +368,7 @@ } DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table, cancelEditStyleList) DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table) //#endregion WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBill.html
@@ -78,7 +78,7 @@ <!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >é¢è§</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ°å¢</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">ä¿®æ¹</button>--> <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">æ°å¢</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">éåº</button> <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">å®¡æ ¸</button> @@ -644,12 +644,6 @@ <input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">建设åä½</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HBuildComp" name="HBuildComp" id="HBuildComp"> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> @@ -827,7 +821,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¢ä¿®å®å·¥æ¶é´</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HAccountDate" lay-verify="HAccountDate" id="HAccountDate"> <input type="datetime-local" step="1" class="layui-input" name="HTaskETime" lay-verify="HTaskETime" id="HTaskETime"> </div> </div> <div class="layui-inline"> @@ -862,6 +856,12 @@ <input type="text" class="layui-input" name="HInfoBackMan" lay-verify="HInfoBackMan" id="HInfoBackMan"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">建设åä½</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HBuildComp" name="HBuildComp" id="HBuildComp"> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> @@ -872,9 +872,9 @@ </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">工费ç»è´¦æ¥æ</label> <label class="layui-form-label" style="width: 85px;">ç»ç®ç»è´¦æ¥æ</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HTaskETime" lay-verify="HTaskETime" id="HTaskETime"> <input type="datetime-local" step="1" class="layui-input" name="HAccountDate" lay-verify="HAccountDate" id="HAccountDate"> </div> </div> <div class="layui-inline"> @@ -1505,7 +1505,14 @@ // å¤±ç¦æ¶è§¦åï¼å æ¬é®çæä½ï¼ $("#HDate").on('blur', function (data) { HDate = $("#HDate").val(); $("#HDate").val(HDate); // è¿è¡å®é å¯ä»¥çç¥ï¼å ä¸ºå¼æªæ¹å //$("#HDate").val(HDate); // è¿è¡å®é å¯ä»¥çç¥ï¼å ä¸ºå¼æªæ¹å //åçæ¶é´ æ¢ä¿®å¼å§æ¶é´ æ¢ä¿®å®å·¥æ¶é´ if ($("#HReceTime").val() == "" && $("#HTaskBTime").val() == "" && $("#HTaskETime").val() == "" ) { $("#HReceTime").val(HDate + "T00:00"); $("#HTaskBTime").val(HDate + "T00:00") $("#HTaskETime").val(HDate + "T00:00") } GetHProjectNumber(0); console.log("å¤±ç¦æ¶å¼ï¼", HDate); }); @@ -1548,6 +1555,15 @@ //#endregion //#region æä½æé®è§¦åäºä»¶ //#region æ°å¢ form.on('submit(set_AddNew)', function (data) { const url = new URL(location.href); url.searchParams.set('OperationType', '1'); // ä¿®æ¹ææ·»å åæ° location.href = url.toString(); }); //#endregion //#region ä¿åæäº¤ form.on('submit(btnSave)', function (data) {//æäº¤ if (AllowLoadData(data)) { @@ -2814,7 +2830,7 @@ } , btn2: function (index, layero) { } , end: function () { if (typeof (TaskData.HItemID) != undefined) { if (typeof (TaskData.HItemID) != "undefined") { $("#HTaskClassID").val(TaskData.HItemID); $("#HTaskClassName").val(TaskData.ä»»å¡ç±»å«åç§°); $("#HTaskClassNumber").val(TaskData.ä»»å¡ç±»å«ä»£ç ); @@ -2856,7 +2872,7 @@ } , btn2: function (index, layero) { } , end: function () { if (typeof (TaskData.HItemID) != undefined) { if (typeof (TaskData.HItemID) != "undefined") { $("#HTaskClassEntryID").val(TaskData.HItemID); $("#HTaskClassEntryName").val(TaskData.ä»»å¡ç±»å«åç§°); //æ´æ°é¡¹ç®ä»£ç WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectTaskNeedCheckQuery.html
@@ -20,6 +20,15 @@ <script src="../../../layuiadmin/HideButton.js"></script> <script src="../../../layuiadmin/SetColumn.js"></script> <style type="text/css"> /* ç¦ç¨ç¶æä¸çè¾å ¥æ¡æ ·å¼ */ input:disabled { background-color: #f0f0f0; /* æµ ç°è² */ color: #888888; /* ç°è² */ } textarea:disabled { background-color: #f0f0f0; /* æµ ç°è² */ color: #888888; /* ç°è² */ } </style> </head> <body> @@ -29,10 +38,22 @@ <div class="layui-card" style=""> <div class="layui-card-body" style="padding:1px"> <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç产车é´</label> <div class="layui-input-block" style="margin-left: 77px;"> <input type="hidden" class="layui-input" lay-filter="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" disabled> <input type="text" class="layui-input" lay-filter="HDeptName" name="HDeptName" id="HDeptName" value="" style="width: 60%;display: inline-block;"> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> </div> </div> <div> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ¥è¯¢</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">éåº</button> </div> <div class="layui-col-xs6"> <div class="layui-tab layui-tab-card" lay-filter="table"> <ul class="layui-tab-title"> @@ -66,7 +87,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">åæ®å·</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly> <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled> <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID"> <input type="hidden" name="HBillSubType" id="HBillSubType" value=""> </div> @@ -74,19 +95,19 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">项ç®ä»£ç </label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" readonly> <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">项ç®åç§°</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly> <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¥æ</label> <div class="layui-input-block" style="margin-left: 120px; width:180px;"> <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 40px;" readonly> <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 40px;" disabled> </div> </div> </div> @@ -94,7 +115,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡å®è£ è´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" readonly> <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" disabled> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckSetupMoney" id="btnCheckSetupMoney" style="float: left; padding: 0 10px;display:none;"> å®¡æ ¸ </button> @@ -103,7 +124,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡éå±è´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" readonly> <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" disabled> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckOtherMoney" id="btnCheckOtherMoney" style="float: left; padding: 0 10px; display: none;"> å®¡æ ¸ </button> @@ -112,7 +133,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡èæ ¸è´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" readonly> <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" disabled> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckExamMoney" id="btnCheckExamMoney" style="float: left; padding: 0 10px; display: none;"> å®¡æ ¸ </button> @@ -121,19 +142,118 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡å·¥è´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" readonly> <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" disabled> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckWorkMoney" id="btnCheckWorkMoney" style="float: left; padding: 0 10px; display: none;"> å®¡æ ¸ </button> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">任塿æè´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskMaterMoney" lay-verify="HTaskMaterMoney" id="HTaskMaterMoney" value="0" readonly> <input type="number" class="layui-input" name="HTaskMaterMoney" lay-verify="HTaskMaterMoney" id="HTaskMaterMoney" value="0" disabled> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡å¤§ç±»<!--<label style="color:red"> * </label>--></label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HTaskClassName" name="HTaskClassName" id="HTaskClassName" style=" width: 120px; float: left; " disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡é¡¹ç®åç±»<!--<label style="color:red"> * </label>--></label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HTaskClassEntryName" name="HTaskClassEntryName" id="HTaskClassEntryName" style="width: 120px; display: inline-block;" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡å°ç¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" name="HTaskAddress" lay-verify="HTaskAddress" id="HTaskAddress" disabled> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">工费ç»è´¦æ¥æ</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HAccountWorkMoneyDate" lay-verify="HAccountWorkMoneyDate" id="HAccountWorkMoneyDate" style="width:150px" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ç»ç®ç»è´¦æ¥æ</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HAccountDate" lay-verify="HAccountDate" id="HAccountDate" style="width:150px" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¯å¦èªæ¥æ°´å ¬å¸ç»è´¦</label> <div class="layui-input-block" style="margin-left: 120px; width: 200px;"> <input type="checkbox" class="layui-input" name="HIsAccount" lay-verify="HIsAccount" id="HIsAccount" title="æ¯" lay-skin="tag" value="true" disabled> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">管å¾</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" name="HPipeDiameter" id="HPipeDiameter" class="layui-input" value="" style="float: left; width: 120px;" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æåæ åµ</label> <div class="layui-input-block" style="margin-left: 120px;"> <!-- è¾å ¥æ¡ --> <input type="text" class="layui-input" name="HBreakStatus" lay-verify="HBreakStatus" id="HBreakStatus" placeholder="" autocomplete="off" style="float: left; width: 120px;" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">åçæ¶é´</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HReceTime" lay-verify="HReceTime" id="HReceTime" style="width:150px" disabled> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¢ä¿®å¼å§æ¶é´</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HTaskBTime" lay-verify="HTaskBTime" id="HTaskBTime" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¢ä¿®å®å·¥æ¶é´</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HTaskETime" lay-verify="HTaskETime" id="HTaskETime" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¢ä¿®è¯¦ç»å 容</label> <div class="layui-input-block" style="margin-left: 120px;"> <textarea type="text" class="layui-input" name="HTaskNote" lay-verify="HTaskNote" id="HTaskNote" style="width: 600px; display: inline-block;" disabled></textarea> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">夿³¨ï¼éå±é¡¹ç®ï¼</label> <div class="layui-input-block" style="margin-left: 120px;"> <textarea type="text" class="layui-input" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark" style="width: 600px; display: inline-block;" disabled></textarea> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">å·¥ä½äººå</label> <div class="layui-input-block" style="margin-left: 120px;"> <textarea type="text" class="layui-input" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp" style="width: 600px; display: inline-block;" disabled></textarea> </div> </div> </div> </div> @@ -142,7 +262,7 @@ <script type="text/html" id="toolbarDemo"> <div class="layui-btn-container" id="toolbarDemo_ButtonSet"> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>å设置</button> </div> </script> </div> @@ -183,7 +303,8 @@ //#region è¿å ¥é¡µé¢æ¢å è½½ //åå§åè¡¨æ ¼ set_InitGrid(); //è·åé»è®¤é¨é¨ GetDefValByUser() get_FastQuery(); //#endregion @@ -230,7 +351,22 @@ }); //#endregion //#region çäº§è½¦é´ form.on('submit(btnHDeptID)', function (data) { btnHDeptID(); }); //#endregion //æ¥è¯¢æé® form.on('submit(btnSearch)', function () { get_FastQuery(); }) //éç½®æé® form.on('submit(btnReSearch)', function () { $("#HDeptID").val(0);//车é´id $("#HDeptName").val("");//车é´åç§° }) //#region éåº form.on('submit(btnEdit)', function (data) { Pub_Close(2); @@ -242,6 +378,8 @@ form.on('submit(btnCheckSetupMoney)', function (data) { set_CheckBill("SetupMoneyCheck"); set_CheckBill("OtherMoneyCheck");//å®¡æ ¸å®è£ éå±è´¹ //æ´æ°ç»ç®ç»è´¦æ¥æãæ¯å¦èªæ¥æ°´å ¬å¸ç»è´¦ set_SaveHAccountDate($("#HInterID").val()); $('#btnCheckSetupMoney').prop('disabled', true).addClass('layui-btn-disabled'); }); form.on('submit(btnCheckOtherMoney)', function (data) { @@ -253,7 +391,9 @@ $('#btnCheckExamMoney').prop('disabled', true).addClass('layui-btn-disabled'); }); form.on('submit(btnCheckWorkMoney)', function (data) { set_CheckBill("WorkMoneyCheck") set_CheckBill("WorkMoneyCheck"); //工费ç»è´¦æ¥æ set_SaveHAccountWorkMoneyDate($("#HInterID").val()); $('#btnCheckWorkMoney').prop('disabled', true).addClass('layui-btn-disabled'); }); //#endregion @@ -322,16 +462,73 @@ //#endregion //#region è¯¥é¡µé¢æææ¹æ³ //ç´æ¥æ§è¡å表çé å è½½æ°æ®å°ç½æ ¼ //å¿«éè¿æ»¤ function get_FastQuery() { var HDept = $("#HDeptID").val(); //åå§è¯æé®ç¹å» sWhere = " '"+addSWhereByOpenType() + "'"; var sWhere = " '" + addSWhereByOpenType() + "'"; if (HDept) { sWhere += "," + HDept } //æ¥è¯¢ get_Display(sWhere); //è°ç¨æ¥å£åæ¸ ç©ºsWhereç¼å sWhere = ""; } //#region éè¿ç»å½ç¨æ·è·åé»è®¤å¼ function GetDefValByUser() { var index = layer.load(); $.ajax({ url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser", type: "GET", async: false, data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] }, success: function (result) { var data = result.data[0]; form.val("formData", { "HDeptID": data.HDeptID, "HDeptName": data.é¨é¨åç§°, }); layer.close(index); } , error: function () { layer.close(index); layer.msg("æ¥å£è¯·æ±å¤±è´¥"); } }) } //#endregion //#region ç产车é´éæ©æé® function btnHDeptID() { layer.open({ type: 2 //ç±»å , skin: 'layui-layer-rim'//å ä¸è¾¹æ¡ , area: ['90%', '90%']//å¤§å° , title: 'é¨é¨å表'//æ é¢ , shift: 2//å¼¹åºå¨ç» , content: ['../../åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_DepartmentList.html?Type=1&HOrgName=' + sessionStorage["Organization"], 'yes'] , btn: ['ç¡®å®', 'åæ¶'] , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè° var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test" if (checkStatus.data.length === 0) { return layer.msg('è¯·éæ©æ°æ®'); } //è·åæ°æ® $("#HDeptID").val(checkStatus.data[0].HItemID); $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°); layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layerå é¨å¨æéå¢è®¡ç®ç } , btn2: function (index, layero) { } , end: function () { get_DisplaySource(); } }) } //#endregion //#region åå§åè¡¨æ ¼ function set_InitGrid() { @@ -360,7 +557,7 @@ , limits: [50, 500, 1000, 2000] , totalRow: true , cellMinWidth: 120 , height: 600 /*, height: 600*/ , cols: [[]] } } @@ -447,6 +644,20 @@ "HTaskOtherMoney": tableMain[0]["HTaskOtherMoney"], "HTaskExamMoney": tableMain[0]["HTaskExamMoney"], "HTaskWorkMoney": tableMain[0]["HTaskWorkMoney"], "HIsAccount": tableMain[0]["HIsAccount"], "HAccountWorkMoneyDate": tableMain[0]["HAccountWorkMoneyDate"], "HAccountDate": tableMain[0]["HAccountDate"], "HTaskClassName": tableMain[0]["HTaskClassName"], "HTaskClassEntryName": tableMain[0]["HTaskClassEntryName"], "HTaskAddress": tableMain[0]["HTaskAddress"], "HBreakStatus": tableMain[0]["HBreakStatus"], "HPipeDiameter": tableMain[0]["HPipeDiameter"], "HReceTime": tableMain[0]["HReceTime"], "HTaskBTime": tableMain[0]["HTaskBTime"], "HTaskETime": tableMain[0]["HTaskETime"], "HTaskNote": tableMain[0]["HTaskNote"], "HTaskWorkEmp": tableMain[0]["HTaskWorkEmp"], "HTaskRemark": tableMain[0]["HTaskRemark"] }); //å®¡æ ¸æé®è®¾ç½® @@ -615,6 +826,62 @@ } //#endregion //#region æ´æ°ç»ç®ç»è´¦æ¥æãæ¯å¦èªæ¥æ°´å ¬å¸ç»è´¦ function set_SaveHAccountDate(HInterID) { var sql = `update PM_ProjectBillMain set HAccountDate = '${$("#HAccountDate").val()}',HIsAccount = ${$("#HIsAccount")[0].checked==true?1:0} where HInterID=${HInterID}` $.ajax({ type: "GET", url: GetWEBURL() + "/CommonModel/commonMethod", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" }, success: function (result) { if (result.count == 1) { //layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // // å¾å°frameç´¢å¼ // var index = layer.getFrameIndex(window.name); // //å ³éå½åframe // layer.close(index); // //ä¿®æ¹ä¸ºååå·æ°çé¢ // get_FastQuery(); //}); } else { layer.alert(result.code + result.Message, { icon: 5 }); } }, error: function (err) { layer.alert("æ¥å£è¯·æ±å¤±è´¥" + err.Message, { icon: 5 }); } }); } //#endregion //#region æ´æ° 工费ç»è´¦æ¥æ function set_SaveHAccountWorkMoneyDate(HInterID) { var sql = `update PM_ProjectBillMain set HAccountWorkMoneyDate = '${$("#HAccountWorkMoneyDate").val()}' where HInterID=${HInterID}` $.ajax({ type: "GET", url: GetWEBURL() + "/CommonModel/commonMethod", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" }, success: function (result) { if (result.count == 1) { //layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // // å¾å°frameç´¢å¼ // var index = layer.getFrameIndex(window.name); // //å ³éå½åframe // layer.close(index); // //ä¿®æ¹ä¸ºååå·æ°çé¢ // get_FastQuery(); //}); } else { layer.alert(result.code + result.Message, { icon: 5 }); } }, error: function (err) { layer.alert("æ¥å£è¯·æ±å¤±è´¥" + err.Message, { icon: 5 }); } }); } //#endregion //#region 夿æ¯ç´æ¥æå¼é¡µé¢è¿æ¯å ¶å®é¡µé¢éè¿éæ©æé®æå¼ï¼å¹¶æ¾ç¤ºç¸åºæ°æ® function addSWhereByOpenType() { //è·ååæ° @@ -624,6 +891,8 @@ //æ ¹æ®éå ¥åæ°éèå¯¹åºæé®åæ¾ç¤ºå if (openType == "SetupMoney") { $('#btnCheckSetupMoney').show(); $('#HAccountDate').prop('disabled', false) $('#HIsAccount').prop('disabled', false) //titleData.push("ä»»å¡å·¥è´¹å®¡æ ¸"); //titleData.push("ä»»å¡èæ ¸è´¹å®¡æ ¸"); //titleData.push("ä»»å¡éå±è´¹å®¡æ ¸"); @@ -639,6 +908,7 @@ //titleData.push("ä»»å¡éå±è´¹å®¡æ ¸"); } else if (openType == "WorkMoney") { $('#btnCheckWorkMoney').show(); $('#HAccountWorkMoneyDate').prop('disabled', false) //titleData.push("ä»»å¡å®è£ è´¹å®¡æ ¸"); //titleData.push("ä»»å¡èæ ¸è´¹å®¡æ ¸"); //titleData.push("ä»»å¡éå±è´¹å®¡æ ¸"); @@ -658,7 +928,11 @@ //以ä¸ä¸ºlayui模å }); function GetHDeptNameValue(obj) //è¿åè½¦é´ { $("#HDeptID").val(obj[0].HItemID);//车é´id $("#HDeptName").val(obj[0].é¨é¨åç§°);//车é´åç§° } function formatDate(date) { var d = new Date(date), month = '' + (d.getMonth() + 1), WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectTaskNeedSaveQuery.html
@@ -20,6 +20,16 @@ <script src="../../../layuiadmin/HideButton.js"></script> <script src="../../../layuiadmin/SetColumn.js"></script> <style type="text/css"> /* ç¦ç¨ç¶æä¸çè¾å ¥æ¡æ ·å¼ */ input:disabled { background-color: #f0f0f0; /* æµ ç°è² */ color: #888888; /* ç°è² */ } textarea:disabled { background-color: #f0f0f0; /* æµ ç°è² */ color: #888888; /* ç°è² */ } </style> </head> <body> @@ -29,10 +39,22 @@ <div class="layui-card" style=""> <div class="layui-card-body" style="padding:1px"> <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç产车é´</label> <div class="layui-input-block" style="margin-left: 77px;"> <input type="hidden" class="layui-input" lay-filter="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" disabled> <input type="text" class="layui-input" lay-filter="HDeptName" name="HDeptName" id="HDeptName" value="" style="width: 60%;display: inline-block;"> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> </div> </div> <div> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ¥è¯¢</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">éåº</button> </div> <div class="layui-col-xs6"> <div class="layui-tab layui-tab-card" lay-filter="table"> <ul class="layui-tab-title"> @@ -65,7 +87,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">åæ®å·</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly> <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled> <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID"> <input type="hidden" name="HBillSubType" id="HBillSubType" value=""> </div> @@ -73,19 +95,19 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">项ç®ä»£ç </label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" readonly> <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">项ç®åç§°</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly> <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¥æ</label> <div class="layui-input-block" style="margin-left: 120px; width:180px;"> <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 40px;" readonly> <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 40px;" disabled> </div> </div> </div> @@ -93,7 +115,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡å®è£ è´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" > <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px"> <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" style="width: 40px; float: left; display: none;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> @@ -105,7 +127,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡éå±è´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" > <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px"> <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" style="width: 40px; float: left; display: none;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> @@ -117,7 +139,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡èæ ¸è´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" > <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px"> <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" style="width: 40px; float: left; display: none;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> @@ -129,7 +151,7 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡å·¥è´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" > <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px"> <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" style="width: 40px; float: left; display: none;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> @@ -138,15 +160,115 @@ </button> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">任塿æè´¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="number" class="layui-input" name="HTaskMaterMoney" lay-verify="HTaskMaterMoney" id="HTaskMaterMoney" value="0" readonly> <input type="number" class="layui-input" name="HTaskMaterMoney" lay-verify="HTaskMaterMoney" id="HTaskMaterMoney" value="0"> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡å¤§ç±»<!--<label style="color:red"> * </label>--></label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HTaskClassName" name="HTaskClassName" id="HTaskClassName" style=" width: 120px; float: left; " disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡é¡¹ç®åç±»<!--<label style="color:red"> * </label>--></label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HTaskClassEntryName" name="HTaskClassEntryName" id="HTaskClassEntryName" style="width: 120px; display: inline-block;" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ä»»å¡å°ç¹</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" name="HTaskAddress" lay-verify="HTaskAddress" id="HTaskAddress" disabled> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">工费ç»è´¦æ¥æ</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HAccountWorkMoneyDate" lay-verify="HAccountWorkMoneyDate" id="HAccountWorkMoneyDate" style="width:150px" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ç»ç®ç»è´¦æ¥æ</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HAccountDate" lay-verify="HAccountDate" id="HAccountDate" style="width:150px" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¯å¦èªæ¥æ°´å ¬å¸ç»è´¦</label> <div class="layui-input-block" style="margin-left: 120px; width: 200px;"> <input type="checkbox" class="layui-input" name="HIsAccount" lay-verify="HIsAccount" id="HIsAccount" title="æ¯" lay-skin="tag" value="true" disabled> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">管å¾</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" name="HPipeDiameter" id="HPipeDiameter" class="layui-input" value="" style="float: left; width: 120px;" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æåæ åµ</label> <div class="layui-input-block" style="margin-left: 120px;"> <!-- è¾å ¥æ¡ --> <input type="text" class="layui-input" name="HBreakStatus" lay-verify="HBreakStatus" id="HBreakStatus" placeholder="" autocomplete="off" style="float: left; width: 120px;" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">åçæ¶é´</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HReceTime" lay-verify="HReceTime" id="HReceTime" style="width:150px" disabled> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¢ä¿®å¼å§æ¶é´</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HTaskBTime" lay-verify="HTaskBTime" id="HTaskBTime" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¢ä¿®å®å·¥æ¶é´</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="datetime-local" step="1" class="layui-input" name="HTaskETime" lay-verify="HTaskETime" id="HTaskETime" disabled> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¢ä¿®è¯¦ç»å 容</label> <div class="layui-input-block" style="margin-left: 120px;"> <textarea type="text" class="layui-input" name="HTaskNote" lay-verify="HTaskNote" id="HTaskNote" style="width: 600px; display: inline-block;" disabled></textarea> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">夿³¨ï¼éå±é¡¹ç®ï¼</label> <div class="layui-input-block" style="margin-left: 120px;"> <textarea type="text" class="layui-input" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark" style="width: 600px; display: inline-block;" disabled></textarea> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">å·¥ä½äººå</label> <div class="layui-input-block" style="margin-left: 120px;"> <textarea type="text" class="layui-input" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp" style="width: 600px; display: inline-block;" disabled></textarea> </div> </div> </div> </div> <div class="layui-tab" lay-filter="tab-POStockInBill" style=" background-color: white"> <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table> @@ -193,7 +315,8 @@ //#region è¿å ¥é¡µé¢æ¢å è½½ //åå§åè¡¨æ ¼ set_InitGrid(); //è·åé»è®¤é¨é¨ GetDefValByUser() get_FastQuery(); //#endregion @@ -237,6 +360,23 @@ //#endregion //#region çäº§è½¦é´ form.on('submit(btnHDeptID)', function (data) { btnHDeptID(); }); //#endregion //æ¥è¯¢æé® form.on('submit(btnSearch)', function () { get_FastQuery(); }) //éç½®æé® form.on('submit(btnReSearch)', function () { $("#HDeptID").val(0);//车é´id $("#HDeptName").val("");//车é´åç§° }) //#region éåº form.on('submit(btnEdit)', function (data) { Pub_Close(2); @@ -248,6 +388,10 @@ form.on('submit(btnSaveSetupMoney)', function (data) { set_SaveBill("SetupMoneySave", $("#HTaskSetupMoney").val() == "" ? 0 : $("#HTaskSetupMoney").val()); set_SaveBill("OtherMoneySave", $("#HTaskOtherMoney").val() == "" ? 0 : $("#HTaskOtherMoney").val());//å®è£ å®¡æ ¸è´¹ä¿å //æ´æ°ä»»å¡ææè´¹ set_SaveHTaskMaterMoney($("#HInterID").val()); //æ´æ°ç»ç®ç»è´¦æ¥æãæ¯å¦èªæ¥æ°´å ¬å¸ç»è´¦ set_SaveHAccountDate($("#HInterID").val()); $('#btnSaveSetupMoney').prop('disabled', true).addClass('layui-btn-disabled'); }); form.on('submit(btnSaveOtherMoney)', function (data) { @@ -260,6 +404,8 @@ }); form.on('submit(btnSaveWorkMoney)', function (data) { set_SaveBill("WorkMoneySave", $("#HTaskWorkMoney").val() == "" ? 0 : $("#HTaskWorkMoney").val()) //工费ç»è´¦æ¥æ set_SaveHAccountWorkMoneyDate($("#HInterID").val()); $('#btnSaveWorkMoney').prop('disabled', true).addClass('layui-btn-disabled'); }); //#endregion @@ -349,13 +495,71 @@ //å¿«éè¿æ»¤ function get_FastQuery() { var HDept = $("#HDeptID").val(); //åå§è¯æé®ç¹å» sWhere = " '" + addSWhereByOpenType() + "'"; var sWhere = " '" + addSWhereByOpenType() + "'"; if (HDept) { sWhere += "," + HDept } //æ¥è¯¢ get_Display(sWhere); //è°ç¨æ¥å£åæ¸ ç©ºsWhereç¼å sWhere = ""; } //#region éè¿ç»å½ç¨æ·è·åé»è®¤å¼ function GetDefValByUser() { var index = layer.load(); $.ajax({ url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser", type: "GET", async: false, data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] }, success: function (result) { var data = result.data[0]; form.val("formData", { "HDeptID": data.HDeptID, "HDeptName": data.é¨é¨åç§°, }); layer.close(index); } , error: function () { layer.close(index); layer.msg("æ¥å£è¯·æ±å¤±è´¥"); } }) } //#endregion //#region ç产车é´éæ©æé® function btnHDeptID() { layer.open({ type: 2 //ç±»å , skin: 'layui-layer-rim'//å ä¸è¾¹æ¡ , area: ['90%', '90%']//å¤§å° , title: 'é¨é¨å表'//æ é¢ , shift: 2//å¼¹åºå¨ç» , content: ['../../åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_DepartmentList.html?Type=1&HOrgName=' + sessionStorage["Organization"], 'yes'] , btn: ['ç¡®å®', 'åæ¶'] , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè° var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test" if (checkStatus.data.length === 0) { return layer.msg('è¯·éæ©æ°æ®'); } //è·åæ°æ® $("#HDeptID").val(checkStatus.data[0].HItemID); $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°); layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layerå é¨å¨æéå¢è®¡ç®ç } , btn2: function (index, layero) { } , end: function () { get_DisplaySource(); } }) } //#endregion //#region åå§åè¡¨æ ¼ function set_InitGrid() { @@ -385,7 +589,7 @@ , limits: [50, 500, 1000, 2000] , totalRow: true , cellMinWidth: 120 , height: 600 /*, height: 600*/ , cols: [[]] } } @@ -472,6 +676,20 @@ "HTaskOtherMoney": tableMain[0]["HTaskOtherMoney"], "HTaskExamMoney": tableMain[0]["HTaskExamMoney"], "HTaskWorkMoney": tableMain[0]["HTaskWorkMoney"], "HTaskClassName": tableMain[0]["HTaskClassName"], "HIsAccount": tableMain[0]["HIsAccount"], "HAccountWorkMoneyDate": tableMain[0]["HAccountWorkMoneyDate"], "HAccountDate": tableMain[0]["HAccountDate"], "HTaskClassEntryName": tableMain[0]["HTaskClassEntryName"], "HTaskAddress": tableMain[0]["HTaskAddress"], "HBreakStatus": tableMain[0]["HBreakStatus"], "HPipeDiameter": tableMain[0]["HPipeDiameter"], "HReceTime": tableMain[0]["HReceTime"], "HTaskBTime": tableMain[0]["HTaskBTime"], "HTaskETime": tableMain[0]["HTaskETime"], "HTaskNote": tableMain[0]["HTaskNote"], "HTaskWorkEmp": tableMain[0]["HTaskWorkEmp"], "HTaskRemark": tableMain[0]["HTaskRemark"] }); //ä¿åæé®è®¾ç½® @@ -578,6 +796,10 @@ data: { "HInterID": HInterID, "Type": type, "user": sessionStorage["HUserName"], "HMoney": HMoney }, success: function (result) { if (result.count == 1) { //if (type =="OtherMoneySave") { // //æ´æ°ä»»å¡ææè´¹ // set_SaveHTaskMaterMoney(HInterID) //} layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // å¾å°frameç´¢å¼ var index = layer.getFrameIndex(window.name); @@ -598,6 +820,89 @@ else { layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¿åï¼'); } } //#endregion //#region åå任塿æè´¹ function set_SaveHTaskMaterMoney(HInterID) { var sql = `update PM_ProjectBillMain set HTaskMaterMoney = ${$("#HTaskMaterMoney").val()} where HInterID=${HInterID}` $.ajax({ type: "GET", url: GetWEBURL() + "/CommonModel/commonMethod", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" }, success: function (result) { if (result.count == 1) { //layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // // å¾å°frameç´¢å¼ // var index = layer.getFrameIndex(window.name); // //å ³éå½åframe // layer.close(index); // //ä¿®æ¹ä¸ºååå·æ°çé¢ // get_FastQuery(); //}); } else { layer.alert(result.code + result.Message, { icon: 5 }); } }, error: function (err) { layer.alert("æ¥å£è¯·æ±å¤±è´¥"+err.Message, { icon: 5 }); } }); } //#endregion //#region æ´æ°ç»ç®ç»è´¦æ¥æãæ¯å¦èªæ¥æ°´å ¬å¸ç»è´¦ function set_SaveHAccountDate(HInterID) { var sql = `update PM_ProjectBillMain set HAccountDate = '${$("#HAccountDate").val()}',HIsAccount = ${$("#HIsAccount")[0].checked == true ? 1 : 0} where HInterID=${HInterID}` $.ajax({ type: "GET", url: GetWEBURL() + "/CommonModel/commonMethod", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" }, success: function (result) { if (result.count == 1) { //layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // // å¾å°frameç´¢å¼ // var index = layer.getFrameIndex(window.name); // //å ³éå½åframe // layer.close(index); // //ä¿®æ¹ä¸ºååå·æ°çé¢ // get_FastQuery(); //}); } else { layer.alert(result.code + result.Message, { icon: 5 }); } }, error: function (err) { layer.alert("æ¥å£è¯·æ±å¤±è´¥" + err.Message, { icon: 5 }); } }); } //#endregion //#region æ´æ° 工费ç»è´¦æ¥æ function set_SaveHAccountWorkMoneyDate(HInterID) { var sql = `update PM_ProjectBillMain set HAccountWorkMoneyDate = '${$("#HAccountWorkMoneyDate").val()}' where HInterID=${HInterID}` $.ajax({ type: "GET", url: GetWEBURL() + "/CommonModel/commonMethod", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" }, success: function (result) { if (result.count == 1) { //layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // // å¾å°frameç´¢å¼ // var index = layer.getFrameIndex(window.name); // //å ³éå½åframe // layer.close(index); // //ä¿®æ¹ä¸ºååå·æ°çé¢ // get_FastQuery(); //}); } else { layer.alert(result.code + result.Message, { icon: 5 }); } }, error: function (err) { layer.alert("æ¥å£è¯·æ±å¤±è´¥" + err.Message, { icon: 5 }); } }); } //#endregion @@ -738,6 +1043,8 @@ $('#btnSaveSetupMoney').show(); $('#btnSearchHTaskSetupMoney').show(); $('#btnSearchHTaskOtherMoney').show(); $('#HAccountDate').prop('disabled', false) $('#HIsAccount').prop('disabled', false) //titleData.push("ä»»å¡å·¥è´¹å®¡æ ¸"); //titleData.push("ä»»å¡èæ ¸è´¹å®¡æ ¸"); //titleData.push("ä»»å¡éå±è´¹å®¡æ ¸"); @@ -756,6 +1063,7 @@ } else if (openType == "WorkMoney") { $('#btnSaveWorkMoney').show(); $('#btnSearchHTaskWorkMoney').show(); $('#HAccountWorkMoneyDate').prop('disabled', false) //titleData.push("ä»»å¡å®è£ è´¹å®¡æ ¸"); //titleData.push("ä»»å¡èæ ¸è´¹å®¡æ ¸"); //titleData.push("ä»»å¡éå±è´¹å®¡æ ¸"); @@ -789,6 +1097,11 @@ return [year, month, day].join('-'); } function GetHDeptNameValue(obj) //è¿åè½¦é´ { $("#HDeptID").val(obj[0].HItemID);//车é´id $("#HDeptName").val(obj[0].é¨é¨åç§°);//车é´åç§° } </script> </body> </html> WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html
@@ -157,7 +157,7 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label">å货人</label> <label class="layui-form-label">é¢æäºº</label> <div class="layui-input-inline"> <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;"> @@ -615,13 +615,14 @@ if (OperationType == 1) { //æ æºåæ°å¢ /* $("#HItemID").val(0);*/ //çæåæ®å·åå ç get_MAXNum(); //æ ¹æ®ç¨æ·è·å对åºèåãé¨é¨ãéå®ä¸»ç®¡ getCzyglByUser(); if (HBillSubType = "ä»»å¡ç±»") { getCzyglByUser2(); } //çæåæ®å·åå ç get_MAXNum(); //åå§åæ¥æãå建人ãå建æ¶é´ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); $("#HMaker").val(sessionStorage["HUserName"]); @@ -1469,6 +1470,24 @@ //#endregion //#endregion //#region æ¥æç¹å»äºä»¶ $(document).ready(function () { // ç¹å»è¾å ¥æ¡æ¶è§¦åï¼ä» é¼ æ ç¹å»çæï¼ $("#HDate").on('click', function (data) { HDate = $("#HDate").val(); console.log("ç¹å»æ¶å¼ï¼", HDate); }); // å¤±ç¦æ¶è§¦åï¼å æ¬é®çæä½ï¼ $("#HDate").on('blur', function (data) { HDate = $("#HDate").val(); //$("#HDate").val(HDate); // è¿è¡å®é å¯ä»¥çç¥ï¼å ä¸ºå¼æªæ¹å get_MAXNum_Task(0); console.log("å¤±ç¦æ¶å¼ï¼", HDate); }); }); //#endregion //#endregion @@ -1497,10 +1516,35 @@ //$("#HBillNo").val(HBillNo); $("#HBillNo").val(d.data[0].HBillNo); $("#HInterID").val(d.data[0].HInterID); if (HBillSubType = "ä»»å¡ç±»") { get_MAXNum_Task(0); } } }); } //#endregion //#region è·åæå¤§åæ®å·_ä»»å¡ç±»ï¼Type为0æ¶åªè·å䏿°å¢æµæ°´å·ï¼ä¸º1æ¶æ°å¢ä¸è·åæµæ°´å·ï¼ function get_MAXNum_Task(Type) { var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${$("#HDate").val()}',0,0,0,${Type},'${$("#HDeptID").val()}'`; $.ajax({ url: GetWEBURL() + '/CommonModel/searchMethod', type: "GET", async: false, data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" }, success: function (data1) { if (data1.count == 1) { $("#HBillNo").val(data1.data[0].HBillNo); } else { layer.alert(data1.code + data1.Message, { icon: 5 }); } }, error: function () { layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 }); } }); } //#endregion //#region è·ååæ°_ä¼ éçJSONæ ¼å¼åæ° function getUrlVars_JSON() { @@ -2772,6 +2816,7 @@ success: function (data) { if (data.count == 1) { // 说æéªè¯æåäºï¼ layer.msg(data.Message, { icon: 1 }); get_MAXNum_Task(1);//è®¾ç½®æµæ°´å·å¢å $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true); if (data.Verify == "Y") //èªå¨å®¡æ ¸ { @@ -3226,7 +3271,7 @@ table.render(option); } var HQty = option.data[rowIndex + i].HQty * 1; //æ°é var HPrice = option.data[rowIndex + i].HPrice * 1; //åä»· var HPrice = checkStatus.data[i].ç»ç®ä»·; //åä»· var HMoney = HQty * HPrice; //éé¢=æ°é*åä»· var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨å计=éé¢+ç¨é¢ @@ -3237,9 +3282,12 @@ option.data[rowIndex + i].è§æ ¼åå· = checkStatus.data[i].è§æ ¼åå·; option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; option.data[rowIndex + i].计éåä½ = checkStatus.data[i].计éåä½åç§°; option.data[rowIndex + i].HPrice = HPrice; option.data[rowIndex + i].HTaxMoney = HTaxMoney; option.data[rowIndex + i].HlineTotal = HlineTotal; option.data[rowIndex + i].HTaxPrice = HTaxPrice; option.data[rowIndex + i].HMoney = HMoney; option.data[rowIndex + i].HTaxRate = HTaxRate*100; } table.render(option); @@ -3253,6 +3301,9 @@ if (typeof (HDataTemp.HItemID) != "undefined") { //éè¿ä¾åºåidè·åç¨ç var HSupID = $("#HSupID").val(); var HTaxRate = 0; //éè¿ä¾åºåidè·åç¨ç var HSupID = $("#HSupID").val(); if (HSupID != 0) { $.ajax({ url: GetWEBURL() + "/Gy_Customer/xg", @@ -3262,41 +3313,32 @@ "HInterID": HSupID }, success: function (d) { var HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01; //æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½ var HQty = obj.data.HQty * 1; //æ°é var HPrice = obj.data.HPrice * 1; //åä»· var HMoney = HQty * HPrice; //éé¢=æ°é*åä»· var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨å计=éé¢+ç¨é¢ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç) obj.update({ //æ´æ°è¡¨æ ¼æ°æ® "HMaterID": HDataTemp.HItemID , "ç©æä»£ç ": HDataTemp.ç©æä»£ç , "ç©æåç§°": HDataTemp.ç©æåç§° , "è§æ ¼åå·": HDataTemp.è§æ ¼åå· , "HUnitID": HDataTemp.HUnitID , "计éåä½": HDataTemp.计éåä½åç§° , "HTaxRate": HTaxRate * 100 , HQty: HQty //æ´æ°HQtyåæ®µï¼HQty , HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice , HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney , HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney , HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal , HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice }) HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01; } }); } else { obj.update({ //æ´æ°è¡¨æ ¼æ°æ® "HMaterID": HDataTemp.HItemID , "ç©æä»£ç ": HDataTemp.ç©æä»£ç , "ç©æåç§°": HDataTemp.ç©æåç§° , "è§æ ¼åå·": HDataTemp.è§æ ¼åå· , "HUnitID": HDataTemp.HUnitID , "计éåä½": HDataTemp.计éåä½åç§° }) } //æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½ var HQty = obj.data.HQty * 1; //æ°é var HPrice = HDataTemp.ç»ç®ä»·; //åä»· var HMoney = HQty * HPrice; //éé¢=æ°é*åä»· var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨å计=éé¢+ç¨é¢ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç) obj.update({ //æ´æ°è¡¨æ ¼æ°æ® "HMaterID": HDataTemp.HItemID , "ç©æä»£ç ": HDataTemp.ç©æä»£ç , "ç©æåç§°": HDataTemp.ç©æåç§° , "è§æ ¼åå·": HDataTemp.è§æ ¼åå· , "HUnitID": HDataTemp.HUnitID , "计éåä½": HDataTemp.计éåä½åç§° , "HTaxRate": HTaxRate * 100 , HQty: HQty //æ´æ°HQtyåæ®µï¼HQty , HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice , HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney , HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney , HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal , HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice }) HDataTemp = {}; } @@ -3534,7 +3576,7 @@ table.render(option); } var HQty = option.data[rowIndex + i].HQty * 1; //æ°é var HPrice = option.data[rowIndex + i].HPrice * 1; //åä»· var HPrice = checkStatus.data[i].ç»ç®ä»·; //åä»· var HMoney = HQty * HPrice; //éé¢=æ°é*åä»· var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨å计=éé¢+ç¨é¢ @@ -3545,10 +3587,12 @@ option.data[rowIndex + i].è§æ ¼åå· = checkStatus.data[i].è§æ ¼åå·; option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; option.data[rowIndex + i].计éåä½ = checkStatus.data[i].计éåä½åç§°; option.data[rowIndex + i].HPrice = HPrice; option.data[rowIndex + i].HTaxMoney = HTaxMoney; option.data[rowIndex + i].HlineTotal = HlineTotal; option.data[rowIndex + i].HTaxPrice = HTaxPrice; option.data[rowIndex + i].HMoney = HMoney; option.data[rowIndex + i].HTaxRate = HTaxRate * 100; } table.render(option); } else { @@ -3561,6 +3605,9 @@ if (typeof (HDataTemp.HItemID) != "undefined") { //éè¿ä¾åºåidè·åç¨ç var HSupID = $("#HSupID").val(); var HTaxRate = 0; //éè¿ä¾åºåidè·åç¨ç var HSupID = $("#HSupID").val(); if (HSupID != 0) { $.ajax({ url: GetWEBURL() + "/Gy_Customer/xg", @@ -3570,43 +3617,45 @@ "HInterID": HSupID }, success: function (d) { var HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01; //æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½ var HQty = obj.data.HQty * 1; //æ°é var HPrice = obj.data.HPrice * 1; //åä»· var HMoney = HQty * HPrice; //éé¢=æ°é*åä»· var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨å计=éé¢+ç¨é¢ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç) obj.update({ //æ´æ°è¡¨æ ¼æ°æ® "HMaterID": HDataTemp.HItemID , "ç©æä»£ç ": HDataTemp.ç©æä»£ç , "ç©æåç§°": HDataTemp.ç©æåç§° , "è§æ ¼åå·": HDataTemp.è§æ ¼åå· , "HUnitID": HDataTemp.HUnitID , "计éåä½": HDataTemp.计éåä½åç§° , "HTaxRate": HTaxRate * 100 , HQty: HQty //æ´æ°HQtyåæ®µï¼HQty , HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice , HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney , HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney , HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal , HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice }) HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01; } }); } else { obj.update({ //æ´æ°è¡¨æ ¼æ°æ® "HMaterID": HDataTemp.HItemID , "ç©æä»£ç ": HDataTemp.ç©æä»£ç , "ç©æåç§°": HDataTemp.ç©æåç§° , "è§æ ¼åå·": HDataTemp.è§æ ¼åå· , "HUnitID": HDataTemp.HUnitID , "计éåä½": HDataTemp.计éåä½åç§° }) } //æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½ var HQty = obj.data.HQty * 1; //æ°é var HPrice = HDataTemp.ç»ç®ä»·; //åä»· var HMoney = HQty * HPrice; //éé¢=æ°é*åä»· var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨å计=éé¢+ç¨é¢ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç) obj.update({ //æ´æ°è¡¨æ ¼æ°æ® "HMaterID": HDataTemp.HItemID , "ç©æä»£ç ": HDataTemp.ç©æä»£ç , "ç©æåç§°": HDataTemp.ç©æåç§° , "è§æ ¼åå·": HDataTemp.è§æ ¼åå· , "HUnitID": HDataTemp.HUnitID , "计éåä½": HDataTemp.计éåä½åç§° , "HTaxRate": HTaxRate * 100 , HQty: HQty //æ´æ°HQtyåæ®µï¼HQty , HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice , HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney , HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney , HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal , HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice }) HDataTemp = {}; } if (option.data.length > 0) { for (var i = 0; i < option.data.length; i++) { if (option.data[i]["HWHID"] == 0 && HWHID != 0) { option.data[i]["HWHID"] = HWHID; option.data[i]["åè´§ä»åº"] = HWHName; } } table.render(option); } } }) WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html
@@ -1751,7 +1751,7 @@ var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { if (data[0].ç¶æ != "å·²å®¡æ ¸") { if (data[0].ç¶æ != "å·²å®¡æ ¸" && !defaintOperationByCompanyName()) { layer.alert("æå°å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 }); return; } @@ -2152,6 +2152,27 @@ //#endregion //#region è·åå ¬å¸åï¼æ ¹æ®å ¬å¸è¿è¡å®å¶åå¼å function defaintOperationByCompanyName() { var result = false; $.ajax({ url: GetWEBURL() + '/Xt_getInfo/getCompanyName', async: false, type: "GET", data: {}, success: function (data1) { if (data1.count == 1) { if (data1.data == "æ°´çµ") { result = true; } } }, error: function (e) { } }); return result; } //#endregion //#endregion //以䏿¯layui模å });