| WebTM/Properties/PublishProfiles/JFTM.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/WebTM.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrj.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillEdit.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large WebTM/WebTM.csproj
@@ -142,8 +142,6 @@ <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_Employee_Add_Edit_.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_EquipType.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_EquipTypeEdit.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_ClassTimePrj.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Add_Edit_Gy_ClassTimePrj.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_WorkCenter_Add_Edit.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Add_Edit_Gy_MouldType.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\grf\b.grf" /> WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\项ç®\LayUI\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ShowAllFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,9 +6,9 @@ //var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°é ç½® //var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°é ç½® var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°é ç½® //var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨ //var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨ //var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½ //var WEBURL = "http://192.168.1.253:8080/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨å ç½ //var WEBURL = "http://220.189.218.154:8092/API/"; //丸äºåç»´å°æå¡å¨ WebTM/views/index.html
@@ -762,8 +762,6 @@ <dd><a lay-href="åºç¡èµæ/å ¬ç¨åºç¡èµæ/Xt_ORGANIZATIONSList.html">ç»ç»å表</a></dd> <dd><a lay-href="åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_Unit.html">计éåä½å表</a></dd> <dd><a lay-href="åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_Currency.html">è´§å¸å表</a></dd> <dd><a lay-href="åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_ClassTimePrj.html">æ ¸ç®æ¹å¼</a></dd> <dd><a lay-href="åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_ClassTimePrjSub.html">æ ¸ç®è®°å½</a></dd> <dd><a lay-href="åºç¡èµæ/å ¬ç¨åºç¡èµæ/Pay_PeriodInfoSet.html">æ度设置</a></dd> <dd><a lay-href="åºç¡èµæ/éå®åºç¡èµæ/Gy_Customer.html">客æ·å表</a></dd> <dd><a lay-href="åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html">ä¾åºåå表</a></dd> WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_ClassTimePrj.html
File was deleted WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_ClassTimePrj.html
File was deleted WebTM/views/¹¤×ʹÜÀí/ºËË㷽ʽ/Gy_ClassTimePrjSubBillEdit.html
@@ -43,8 +43,9 @@ <div class="layui-col-xs4 layui-inline"> <label class="layui-form-label">æå±ç»</label> <div class="layui-input-inline"> <input type="text" name="hparentName" id="hparentName" class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="hparentid" id="hparentid" class="layui-input" value="" style="float:left;width:150px;"> <input type="text" name="HEntryName" id="HEntryName" readonly class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HEntryID" id="HEntryID" class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HInterID" id="HInterID" value="0"> <button type="button" lay-submit="" class="layui-btn" lay-filter="hparent-BT" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> @@ -67,19 +68,19 @@ <div class="layui-col-xs4 layui-inline"> <label class="layui-form-label">æ»éé¢</label> <div class="layui-input-inline"> <input class="layui-input" name="HSumMoney" lay-verify="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly> <input class="layui-input" name="HSumMoney" lay-verify="HSumMoney" id="HSumMoney" value="0" style="background-color:#efefef4d;" readonly> </div> </div> <div class="layui-col-xs4 layui-inline"> <label class="layui-form-label">æ»åºæ°</label> <div class="layui-input-inline"> <input class="layui-input" name="HSumWorkTimes" lay-verify="HSumWorkTimes" id="HSumWorkTimes" style="background-color:#efefef4d;" readonly> <input class="layui-input" name="HSumWorkTimes" lay-verify="HSumWorkTimes" id="HSumWorkTimes" value="0" style="background-color:#efefef4d;" readonly> </div> </div> <div class="layui-col-xs4 layui-inline"> <label class="layui-form-label">å¹³åå·¥èµ</label> <div class="layui-input-inline"> <input class="layui-input" name="HOldRate" lay-verify="HOldRate" id="HOldRate" style="background-color:#efefef4d;" readonly> <input class="layui-input" name="HOldRate" lay-verify="HOldRate" id="HOldRate" value="0" style="background-color:#efefef4d;" readonly> </div> </div> </div> @@ -87,13 +88,13 @@ <div class="layui-col-xs4 layui-inline"> <label class="layui-form-label">æ¥å¹³åå·¥èµ</label> <div class="layui-input-inline"> <input class="layui-input" name="HDayRate" lay-verify="HDayRate" id="HDayRate" style="background-color:#efefef4d;" readonly> <input class="layui-input" name="HDayRate" lay-verify="HDayRate" id="HDayRate" value="0" style="background-color:#efefef4d;" readonly> </div> </div> <div class="layui-col-xs4 layui-inline"> <label class="layui-form-label">ä¿®æ£å¹³åå·¥èµ</label> <div class="layui-input-inline"> <input class="layui-input" name="HRate" lay-verify="HRate" id="HRate" > <input class="layui-input" name="HRate" lay-verify="HRate" value="0" id="HRate" > </div> </div> @@ -146,15 +147,15 @@ } //å¤ææä½ç±»å if (OperationType == 1) {//æ æºåæ°å¢ $("#HItemID").val(0); $("#HInterID").val(0); } else if (OperationType == 3) {//ç¼è¾ $("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID $("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID //ç¼è¾ç¶ææ¶ï¼æ ¹æ®å ç ï¼è·åä¿¡æ¯å¹¶åå ¥çé¢ RoadBillMain(linterid); } else if (OperationType == 4) {//æµè§ $("#HItemID").val(linterid);// $("#HInterID").val(linterid);// //ç¼è¾ç¶ææ¶ï¼æ ¹æ®å ç ï¼è·åä¿¡æ¯å¹¶åå ¥çé¢ RoadBillMain(linterid); $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå è½½æ°æ®æ¶ä¿åæé®ç¦ç¨ @@ -217,13 +218,11 @@ // $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true); //} form.val("component-form-group", { //formTest å³ class="layui-form" æå¨å ç´ å±æ§ lay-filter="" 对åºçå¼ "HItemID": data.HItemID , "HName": data.HName , "HNumber": data.æåº¦æ ¸ç®è®°å½ä»£ç "HInterID": data.HInterID , "HEntryID": data.HEntryID , "HEntryName": data.æåº¦æ ¸ç®è®°å½å称 , "HYear": data.ä¼è®¡å¹´ä»½ , "HPeriod": data.ä¼è®¡æ份 , "hparentName": data.ç»å称 , "hparentid": data.ç»ä»£ç , "HSumMoney": data.æ»éé¢ , "HSumWorkTimes": data.æ»åºæ° , "HOldRate": data.å¹³åå·¥èµ @@ -258,8 +257,8 @@ if (data.count == 1) { // 说æéªè¯æåäºï¼ layer.msg(data.Message, { icon: 1 }); $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true); //ä¿ååæµè§ //ReRoadBillMain(); var index = parent.layer.getFrameIndex(window.name); //å å¾å°å½åiframeå±çç´¢å¼ parent.layer.close(index); //åæ§è¡å ³é } else { layer.alert(data.Message, { icon: 5 }); @@ -292,8 +291,8 @@ if (checkStatus.data.length === 0) { return layer.msg('请éæ©æ°æ®'); } $("#hparentName").val(checkStatus.data[0].HName); $("#hparentid").val(checkStatus.data[0].HItemID); $("#HEntryName").val(checkStatus.data[0].HName); $("#HEntryID").val(checkStatus.data[0].HItemID); //$("#HDeptNumber").val(checkStatus.data[0].HNumber); layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæ个å±ï¼å¼æ¯ç±layerå é¨å¨æéå¢è®¡ç®ç } WebTM/views/¹¤×ʹÜÀí/ºËË㷽ʽ/Gy_ClassTimePrjSubBillList.html
@@ -45,6 +45,7 @@ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_AddGZD"><i class="layui-icon layui-icon-logout"></i>çæå·¥èµå</button> </div> </script> </form> @@ -103,6 +104,9 @@ break; //éåºæé® case 'get_Exit': Pub_Close(2); break //çæå·¥èµå case 'get_AddGZD': get_AddGZD(); break; }; @@ -144,13 +148,14 @@ , cellMinWidth: 90 , cols: [[ { type: 'checkbox', fixed: 'left' } , { field: 'HItemID', title: 'HItemID', sort: true, hide: true } , { field: 'HParentID', title: 'HParentID', sort: true, hide: true } , { field: 'æåº¦æ ¸ç®è®°å½ä»£ç ', title: 'æåº¦æ ¸ç®è®°å½ä»£ç ', width: 150 } , { field: 'HInterID', title: 'HInterID', sort: true, hide: true } , { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true } //, { field: 'æåº¦æ ¸ç®è®°å½ä»£ç ', title: 'æåº¦æ ¸ç®è®°å½ä»£ç ', width: 150 } //, { field: 'æåº¦æ ¸ç®è®°å½å称', title: 'æåº¦æ ¸ç®è®°å½å称', width: 150 } , { field: 'ä¼è®¡å¹´ä»½', title: 'ä¼è®¡å¹´ä»½',width: 120 } , { field: 'ä¼è®¡æ份', title: 'ä¼è®¡æ份' } , { field: 'ç»ä»£ç ', title: 'ç»ä»£ç ' } , { field: 'ç»å称', title: 'ç»å称', width: 190 } , { field: 'ç»ä»£ç ', title: 'ç»ä»£ç ', width: 150 } , { field: 'ç»å称', title: 'ç»å称', width: 150 } , { field: 'æ»éé¢', title: 'æ»éé¢' } , { field: 'æ»åºæ°', title: 'æ»åºæ°' } , { field: 'å¹³åå·¥èµ', title: 'å¹³åå·¥èµ' } @@ -229,12 +234,14 @@ } //#endregion //#region ç¼è¾ function set_ShowBill() { var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { var HInterID = data[0].HitemID; var HInterID = data[0].HInterID; //if (AllowLoadData(sSubStr) != false) {//é空éªè¯ layer.open({ type: 2 @@ -254,7 +261,7 @@ var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { var ItemID = data[0].HItemID.toString(); var ItemID = data[0].HInterID.toString(); layer.confirm("确认è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) { var wait = layer.load(); //é»è¾å é¤æ¹æ³ @@ -290,7 +297,16 @@ } //#endregion function get_AddGZD() { layer.open({ type: 2 , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡ , area: ['100%', '100%'] , title: 'æ ¸ç®è®°å½-æ°å¢' , shift: 0//å¼¹åºå¨ç» , content: '../æ ¸ç®æ¹å¼/Gy_ClassTimePrjSubBillEdit.html?OperationType=1&linterid=&HSouceBillType=' }) } //#region å·æ° function get_Refresh() { set_ClearQuery();
