MES-WEB-LayUI.git

parent: 3d02bc55 | 补丁 | 提交 | show whitespace

2021-07-19 5f7870fca094b4bee99e4a8408fc720645ac18db

委外领料扫码

4个文件已修改

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -15,10 +15,10 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>07/15/2021 15:22:36</publishTime>
      <publishTime>07/15/2021 21:28:20</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>07/15/2021 15:22:36</publishTime>
      <publishTime>07/15/2021 21:28:20</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>05/10/2021 09:25:59</publishTime>
@@ -630,7 +630,7 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>07/14/2021 16:00:40</publishTime>
      <publishTime>07/15/2021 21:28:19</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>05/10/2021 09:25:59</publishTime>
@@ -1065,10 +1065,10 @@
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>07/14/2021 20:10:46</publishTime>
      <publishTime>07/15/2021 20:50:03</publishTime>
    </File>
    <File Include="views/index_Mobile.html">
      <publishTime>07/14/2021 10:12:32</publishTime>
      <publishTime>07/15/2021 21:18:20</publishTime>
    </File>
    <File Include="views/IpadIndex.html">
      <publishTime>07/14/2021 10:12:32</publishTime>
@@ -1560,7 +1560,7 @@
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldScrapInBillList.html">
      <publishTime>07/14/2021 21:30:44</publishTime>
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldScrapOutBillList.html">
      <publishTime>07/14/2021 10:12:32</publishTime>
@@ -1581,7 +1581,7 @@
      <publishTime>07/02/2021 08:44:26</publishTime>
    </File>
    <File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldScrapInBillList.html">
      <publishTime>07/14/2021 21:06:33</publishTime>
      <publishTime>07/15/2021 20:50:03</publishTime>
    </File>
    <File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldScrapInBill_PDA.html">
      <publishTime>07/02/2021 08:44:26</publishTime>
@@ -1662,7 +1662,7 @@
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldScrapInBillList.html">
      <publishTime>07/14/2021 21:30:44</publishTime>
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldScrapOutBillList.html">
      <publishTime>07/14/2021 10:12:32</publishTime>
@@ -1683,7 +1683,7 @@
      <publishTime>07/02/2021 08:44:26</publishTime>
    </File>
    <File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldScrapInBillList.html">
      <publishTime>07/14/2021 21:06:33</publishTime>
      <publishTime>07/15/2021 20:50:03</publishTime>
    </File>
    <File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldScrapOutBillList.html">
      <publishTime>07/02/2021 08:44:26</publishTime>
@@ -2292,7 +2292,7 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="views/é¢æåè´§/å§å¤åºåº/Kf_EntrustOutBill_Fast.html">
      <publishTime>05/10/2021 09:25:59</publishTime>
      <publishTime>07/15/2021 21:24:18</publishTime>
    </File>
    <File Include="views/é¢æåè´§/å§å¤åºåº/Kf_EntrustOutBill_FastList.html">
      <publishTime>05/10/2021 09:25:59</publishTime>
@@ -2367,7 +2367,7 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="views/éªæ¶å¥åº/å¶ä»å¥åº/Kf_OtherInBill_Fast.html">
      <publishTime>07/15/2021 17:48:37</publishTime>
      <publishTime>07/15/2021 20:49:39</publishTime>
    </File>
    <File Include="views/éªæ¶å¥åº/å¶ä»å¥åº/Kf_OtherInBill_FastList.html">
      <publishTime>05/10/2021 09:25:59</publishTime>
@@ -2406,13 +2406,13 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="views/éªæ¶å¥åº/å§å¤å¥åº/Kf_EntrustInBill_Fast.html">
      <publishTime>07/15/2021 17:49:46</publishTime>
      <publishTime>07/16/2021 16:58:55</publishTime>
    </File>
    <File Include="views/éªæ¶å¥åº/å§å¤å¥åº/Kf_EntrustInBill_FastList.html">
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/15/2021 15:22:44</publishTime>
      <publishTime>07/15/2021 21:28:24</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,7 +1,7 @@
ï»¿function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //åå¬å®¤æå¡å¨
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //chæ¬å°
    var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    //var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    //var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//çæ°¸æ³¢æ¬å°éç½®ï¼è¯·å¿æ´æ¹
     //var WEBURL = "http://101.37.171.70/API/";   //å¬å¸æå¡å¨
    //var WEBURL = "http://localhost:8080/API/";   //é¢æåæ¬å°éç½®
@@ -10,7 +10,7 @@
    //var WEBURL = "http://10.1.4.154/API/";   //æ±ä¸°å®¢æ·
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨
    //var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨
    var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨
    return WEBURL
}


 WebTM/views/ÁìÁÏ·¢»õ/Î¯Íâ³ö¿â/Kf_EntrustOutBill_Fast.html

@@ -198,7 +198,7 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/timeFormat/timeFormat.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
    layui.config({
        base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾

 WebTM/views/ÑéÊÕÈë¿â/Î¯ÍâÈë¿â/Kf_EntrustInBill_Fast.html

@@ -236,7 +236,7 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/timeFormat/timeFormat.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
@@ -291,8 +291,7 @@
            var lSourceBillType = params[params[2]];  //ä»åæ®è·å æºåç±»å
        
            //å è½½è¡¨å¤´
            function  RoadBillMain(linterid)
            {
            function RoadBillMain(linterid) {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetPonderationBill",
                    type: "GET",
@@ -314,8 +313,7 @@
            }

            //å è½½è¡¨ä½
            function RoadBillSub(linterid)
            {
            function RoadBillSub(linterid) {
                table.render({
                    elem: '#wl-table'
                    , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'

			@@ -15,10 +15,10 @@
			<publishTime>05/10/2021 09:25:59</publishTime>
			</File>
			<File Include="bin/WebTM.dll">
			<publishTime>07/15/2021 15:22:36</publishTime>
			<publishTime>07/15/2021 21:28:20</publishTime>
			</File>
			<File Include="bin/WebTM.pdb">
			<publishTime>07/15/2021 15:22:36</publishTime>
			<publishTime>07/15/2021 21:28:20</publishTime>
			</File>
			<File Include="layuiadmin/config.js">
			<publishTime>05/10/2021 09:25:59</publishTime>
			@@ -630,7 +630,7 @@
			<publishTime>05/10/2021 09:25:59</publishTime>
			</File>
			<File Include="layuiadmin/Scripts/webConfig.js">
			<publishTime>07/14/2021 16:00:40</publishTime>
			<publishTime>07/15/2021 21:28:19</publishTime>
			</File>
			<File Include="layuiadmin/style/admin.css">
			<publishTime>05/10/2021 09:25:59</publishTime>
			@@ -1065,10 +1065,10 @@
			<publishTime>07/14/2021 10:12:32</publishTime>
			</File>
			<File Include="views/index.html">
			<publishTime>07/14/2021 20:10:46</publishTime>
			<publishTime>07/15/2021 20:50:03</publishTime>
			</File>
			<File Include="views/index_Mobile.html">
			<publishTime>07/14/2021 10:12:32</publishTime>
			<publishTime>07/15/2021 21:18:20</publishTime>
			</File>
			<File Include="views/IpadIndex.html">
			<publishTime>07/14/2021 10:12:32</publishTime>
			@@ -1560,7 +1560,7 @@
			<publishTime>07/14/2021 10:12:32</publishTime>
			</File>
			<File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldScrapInBillList.html">
			<publishTime>07/14/2021 21:30:44</publishTime>
			<publishTime>07/14/2021 10:12:32</publishTime>
			</File>
			<File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldScrapOutBillList.html">
			<publishTime>07/14/2021 10:12:32</publishTime>
			@@ -1581,7 +1581,7 @@
			<publishTime>07/02/2021 08:44:26</publishTime>
			</File>
			<File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldScrapInBillList.html">
			<publishTime>07/14/2021 21:06:33</publishTime>
			<publishTime>07/15/2021 20:50:03</publishTime>
			</File>
			<File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldScrapInBill_PDA.html">
			<publishTime>07/02/2021 08:44:26</publishTime>
			@@ -1662,7 +1662,7 @@
			<publishTime>07/14/2021 10:12:32</publishTime>
			</File>
			<File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldScrapInBillList.html">
			<publishTime>07/14/2021 21:30:44</publishTime>
			<publishTime>07/14/2021 10:12:32</publishTime>
			</File>
			<File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldScrapOutBillList.html">
			<publishTime>07/14/2021 10:12:32</publishTime>
			@@ -1683,7 +1683,7 @@
			<publishTime>07/02/2021 08:44:26</publishTime>
			</File>
			<File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldScrapInBillList.html">
			<publishTime>07/14/2021 21:06:33</publishTime>
			<publishTime>07/15/2021 20:50:03</publishTime>
			</File>
			<File Include="views/æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldScrapOutBillList.html">
			<publishTime>07/02/2021 08:44:26</publishTime>
			@@ -2292,7 +2292,7 @@
			<publishTime>05/10/2021 09:25:59</publishTime>
			</File>
			<File Include="views/é¢æåè´§/å§å¤åºåº/Kf_EntrustOutBill_Fast.html">
			<publishTime>05/10/2021 09:25:59</publishTime>
			<publishTime>07/15/2021 21:24:18</publishTime>
			</File>
			<File Include="views/é¢æåè´§/å§å¤åºåº/Kf_EntrustOutBill_FastList.html">
			<publishTime>05/10/2021 09:25:59</publishTime>
			@@ -2367,7 +2367,7 @@
			<publishTime>05/10/2021 09:25:59</publishTime>
			</File>
			<File Include="views/éªæ¶å¥åº/å¶ä»å¥åº/Kf_OtherInBill_Fast.html">
			<publishTime>07/15/2021 17:48:37</publishTime>
			<publishTime>07/15/2021 20:49:39</publishTime>
			</File>
			<File Include="views/éªæ¶å¥åº/å¶ä»å¥åº/Kf_OtherInBill_FastList.html">
			<publishTime>05/10/2021 09:25:59</publishTime>
			@@ -2406,13 +2406,13 @@
			<publishTime>05/10/2021 09:25:59</publishTime>
			</File>
			<File Include="views/éªæ¶å¥åº/å§å¤å¥åº/Kf_EntrustInBill_Fast.html">
			<publishTime>07/15/2021 17:49:46</publishTime>
			<publishTime>07/16/2021 16:58:55</publishTime>
			</File>
			<File Include="views/éªæ¶å¥åº/å§å¤å¥åº/Kf_EntrustInBill_FastList.html">
			<publishTime>05/10/2021 09:25:59</publishTime>
			</File>
			<File Include="Web.config">
			<publishTime>07/15/2021 15:22:44</publishTime>
			<publishTime>07/15/2021 21:28:24</publishTime>
			</File>
			</ItemGroup>
			</Project>

			@@ -1,7 +1,7 @@
			ï»¿function GetWEBURL() {
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°
			var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//çæ°¸æ³¢æ¬å°éç½®ï¼è¯·å¿æ´æ¹
			//var WEBURL = "http://101.37.171.70/API/"; //å¬å¸æå¡å¨
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			@@ -10,7 +10,7 @@
			//var WEBURL = "http://10.1.4.154/API/"; //æ±ä¸°å®¢æ·
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨
			var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨
			return WEBURL
			}

			@@ -198,7 +198,7 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/timeFormat/timeFormat.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾

			@@ -236,7 +236,7 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/timeFormat/timeFormat.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -291,8 +291,7 @@
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å

			//å è½½è¡¨å¤´
			function RoadBillMain(linterid)
			{
			function RoadBillMain(linterid) {
			$.ajax({
			url: GetWEBURL() + "/Web/GetPonderationBill",
			type: "GET",
			@@ -314,8 +313,7 @@
			}

			//å è½½è¡¨ä½
			function RoadBillSub(linterid)
			{
			function RoadBillSub(linterid) {
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'