WebTM/Properties/PublishProfiles/JFTM.pubxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/WebTM.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/销售管理/销售合同/Add_Edit_Xs_ContractBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/销售管理/销售合同/Xs_ContractBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> <LastUsedPlatform>Any CPU</LastUsedPlatform> <PublishProvider>FileSystem</PublishProvider> <PublishUrl>D:\ç½ç«åå¸\æºäºMESWMS\LAYUI</PublishUrl> <PublishUrl>G:\issWeb\ç½ç«åå¸\LAYUI</PublishUrl> <WebPublishMethod>FileSystem</WebPublishMethod> <SiteUrlToLaunchAfterPublish /> </PropertyGroup> WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large WebTM/WebTM.csproj
@@ -391,12 +391,16 @@ <Content Include="views\车é´ç®¡ç\é²ééªè¯\Qc_PreventErrMouldCheckBill.html" /> <Content Include="views\车é´ç®¡ç\é²ééªè¯\Qc_PreventErrMouldCheckBillList.html" /> <Content Include="views\车é´ç®¡ç\æ¥è¡¨åæ\Kf_PressurizedWaterNoOutReport.html" /> <Content Include="views\éè´ç®¡ç\éè´åå\Add_Edit_Cg_ContractBillList.html" /> <Content Include="views\éè´ç®¡ç\éè´åå\Cg_ContractBillList.html" /> <Content Include="views\éè´ç®¡ç\éè´æ¥è¡¨\Cg_POOrderReceiveDaySumReport.html" /> <Content Include="views\éè´ç®¡ç\éè´æ¥è¡¨\Cg_POOrderReceiveSumReport.html" /> <Content Include="views\éè´ç®¡ç\éè´æ¥è¡¨\Cg_POOrderBillSumReport.html" /> <Content Include="views\éè´ç®¡ç\éè´æ¥è¡¨\Cg_POInStockBillSumReport.html" /> <Content Include="views\éè´ç®¡ç\éè´æ¥è¡¨\Cg_POMaterialPriceReport.html" /> <Content Include="views\éè´ç®¡ç\éè´æ¥è¡¨\Cg_POOrderBillProcessSumReport.html" /> <Content Include="views\éå®ç®¡ç\éå®åå\Add_Edit_Xs_ContractBillList.html" /> <Content Include="views\éå®ç®¡ç\éå®åå\Xs_ContractBillList.html" /> <Content Include="views\项ç®ç®¡ç\åºç¡å»ºæ¨¡\Add_Edit_Gy_TaskClass.html" /> <Content Include="views\项ç®ç®¡ç\åºç¡å»ºæ¨¡\Add_Edit_Gy_ProjectClass.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Add_Edit_Gy_ColorClass.html" /> @@ -1449,7 +1453,6 @@ <Content Include="views\æ¨¡æ²»å ·ç®¡ç\å¨å ·ç¹æ£è§ç¨å\Sc_MouldDotCheckRuleBillList.html" /> <Content Include="views\æ¨¡æ²»å ·ç®¡ç\å¨å ·ç»´ä¿®æ´¾å·¥å\Sc_MouldRepairSendWorkBillEdit.html" /> <Content Include="views\æ¨¡æ²»å ·ç®¡ç\å¨å ·ç»´ä¿®æ´¾å·¥å\Sc_MouldRepairSendWorkBillList.html" /> <Content Include="views\æ¨¡æ²»å ·ç®¡ç\æ¨¡å ·å¤çåºåºå\Sc_MouldScrapOutBill_PDA.html" /> <Content Include="views\æ¨¡æ²»å ·ç®¡ç\æ¨¡å ·å¯¿å½è°æ´å\Sc_MouldLifeChangeBill_PDA.html" /> <Content Include="views\æ¨¡æ²»å ·ç®¡ç\æ¨¡å ·æ¹å¶å ¥åºå\Sc_MouldRepairInBill_PDA.html" /> <Content Include="views\æ¨¡æ²»å ·ç®¡ç\æ¨¡å ·æ¹å¶åºåºå\Sc_MouldRepairOutBill_PDA.html" /> @@ -2483,6 +2486,7 @@ <Folder Include="Files\" /> <Folder Include="views\ä»å管ç\è°æ¨åæ ¸å¯¹\" /> <Folder Include="views\ä»å管ç\è°æ¨åç¨½æ ¸\" /> <Folder Include="views\æ¨¡æ²»å ·ç®¡ç\æ¨¡å ·å¤çåºåºå\" /> </ItemGroup> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@ <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,8 +8,8 @@ //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost:81/API/"; //ç彬æ¬å°é ç½® /*var WEBURL = "http://localhost:8083/API/"; //éé¯éæ¬å°é ç½®*/ //var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½® /*var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½®*/ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°é ç½® //var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°é ç½®(å®ç) //var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html
@@ -410,6 +410,8 @@ break; }; }); //è¡¨æ ¼ç¹å»äºä»¶ //鿰忥æé® form.on('submit(btnResCnz)', function (data) { @@ -421,6 +423,31 @@ set_ClearQuery(); }); table.on('tool(mainTable)' , function (obj) { var data = obj.data; console.log(data); if (obj.event == 'åæ®å·') { var linterid = data.hmainid.toString(); //if (AllowLoadData(sSubStr) != false) {//é空éªè¯ layer.open({ type: 2 , area: ['100%', '100%'] , title: 'ç¼è¾' + HPageTitle , closeBtn: 1 , shade: 0.6 //é®ç½©éæåº¦ , maxmin: true //å è®¸å ¨å±æå°å , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯ , content: './Cg_POOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' , resize: false, end: function () { get_FastQuery(table, option); } , cancel: function () { //$(".layui-btn").removeClass("layui-btn-disabled"); } }) } }); //è·åç»ç» function Organ() { //è·åç»å½é¡µç»ç»å @@ -504,7 +531,7 @@ $('#HEndDate').prop('disabled', false); } }); //#endregion //#region æ¤é¡µé¢æææ¹æ³ function set_ClearBill() { @@ -553,7 +580,7 @@ { type: 'checkbox', fixed: 'left', totalRowText: 'å计' } ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true } , { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" } , { field: 'åæ®å·', title: 'åæ®å·', width: 150} , { field: 'åæ®å·', title: 'åæ®å·', width: 150, } , { field: 'ç¶æ', title: 'ç¶æ', width: 100, sort: true } , { field: 'HBillType', title: 'HBillType', hide: true, sort: true } , { field: 'è¡ç¶æ', title: 'è¡ç¶æ', width: 125, sort: true } @@ -660,6 +687,7 @@ // m["width"] = colWidth[x]; // }); //} } //å è½½ç½æ ¼ function get_Display(sWhere) { @@ -670,7 +698,7 @@ data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]}, success: function (data1) { if (data1.count == 1) { var data = []; var data = [];//ååæ®µæ°æ® var col = []; var totalArray = ["æ°é", "å ³èæ°é", "æªå ³èæ°é", "æå°æ¡ç æ°é", "æªæå°æ¡ç æ°é","宿¶æ°é","éé¢"]; //ç»ç©ºçæ°ç»èµå¼ @@ -684,9 +712,11 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå } else if ($.inArray(data[i].name, totalArray) > -1) { else if ($.inArray(data[i].name, totalArray) > -1) { //计ç®å col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 }); } else { } else if (data[i].name == 'åæ®å·') { col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event:'åæ®å·' }); }else { switch (data[i].Type) { //int case 'DateTime': WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛºÏͬ/Add_Edit_Xs_ContractBillList.html
@@ -1081,8 +1081,7 @@ } }) } //è´§å¸(TODO æbugå¨å¼¹åºæ¡æåºä»¥åç¡®å®ï¼éä¸å ç´ è¿æ¯åæ¥ä½ç½®çï¼éè¦å¨è´§å¸èµæä¸è®¡éåä½èµæä¸è®¾ç½®æåºä»£ç å¦ç©æé¡µé¢ï¼) //TODO ä¸è´§å¸å计éåä½å页é¢éè¦è®¾ç½®åå»äºä»¶ //è´§å¸ if (obj.event == "HCurID") { layer.open({ type: 2//å¼¹çªç±»å WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛºÏͬ/Xs_ContractBillList.html
@@ -572,7 +572,7 @@ //é»è¾å 餿¹æ³ layer.confirm("确认è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) { if (data[0].å®¡æ ¸äºº == null || data[0].å®¡æ ¸äºº == '' ) { if (data[0].ç¶æ == "å建" ) { $.ajax({ type: "GET", url: GetWEBURL() + "/Xs_ContractBill/DeltetXs_ContractBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å