From 5df7ca3fcc8667b25973d0efe607600d69930be9 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 19:53:27 +0800
Subject: [PATCH] 1

---
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user           |   20 ++++++++++----------
 WebTM/views/IpadIndex.html                                  |    1 -
 WebTM/layuiadmin/Scripts/webConfig.js                       |    4 ++--
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html |   10 +++++-----
 WebTM/views/index.html                                      |    2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 571970f..dbd70ab 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -633,7 +633,7 @@
       <publishTime>03/23/2021 14:14:38</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig.js">
-      <publishTime>07/21/2021 16:15:18</publishTime>
+      <publishTime>07/21/2021 19:39:52</publishTime>
     </File>
     <File Include="layuiadmin/style/admin.css">
       <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1080,13 +1080,13 @@
       <publishTime>07/12/2021 15:38:26</publishTime>
     </File>
     <File Include="views/index.html">
-      <publishTime>07/20/2021 19:42:04</publishTime>
+      <publishTime>07/21/2021 19:41:41</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
       <publishTime>07/16/2021 17:40:57</publishTime>
     </File>
     <File Include="views/IpadIndex.html">
-      <publishTime>07/20/2021 17:07:50</publishTime>
+      <publishTime>07/21/2021 19:43:38</publishTime>
     </File>
     <File Include="views/PublicPage/CheckItemType.html">
       <publishTime>06/15/2021 16:41:12</publishTime>
@@ -1575,7 +1575,7 @@
       <publishTime>07/13/2021 17:09:13</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
-      <publishTime>07/19/2021 20:14:20</publishTime>
+      <publishTime>07/21/2021 18:21:09</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapOutBillList.html">
       <publishTime>07/13/2021 17:09:13</publishTime>
@@ -1677,7 +1677,7 @@
       <publishTime>07/13/2021 17:09:13</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
-      <publishTime>07/19/2021 20:14:20</publishTime>
+      <publishTime>07/21/2021 18:21:09</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapOutBillList.html">
       <publishTime>07/13/2021 17:09:13</publishTime>
@@ -1866,7 +1866,7 @@
       <publishTime>07/20/2021 17:07:50</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html">
-      <publishTime>07/20/2021 17:07:50</publishTime>
+      <publishTime>07/21/2021 18:31:44</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBind.html">
       <publishTime>07/19/2021 15:36:50</publishTime>
@@ -2082,7 +2082,7 @@
       <publishTime>07/19/2021 08:17:34</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
-      <publishTime>07/20/2021 22:33:39</publishTime>
+      <publishTime>07/21/2021 19:51:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
       <publishTime>05/24/2021 10:08:23</publishTime>
@@ -2166,7 +2166,7 @@
       <publishTime>05/24/2021 10:08:23</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
-      <publishTime>07/20/2021 22:33:39</publishTime>
+      <publishTime>07/21/2021 19:51:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
       <publishTime>05/24/2021 10:08:23</publishTime>
@@ -2229,13 +2229,13 @@
       <publishTime>07/19/2021 16:04:47</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
-      <publishTime>07/21/2021 14:30:51</publishTime>
+      <publishTime>07/21/2021 18:17:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
       <publishTime>07/19/2021 16:04:47</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
-      <publishTime>07/21/2021 14:30:51</publishTime>
+      <publishTime>07/21/2021 18:17:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
       <publishTime>03/23/2021 14:14:38</publishTime>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7818b9f..7980c71 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,12 +1,12 @@
 锘縡unction 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/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
-    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
+    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
     //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/";   //鏅轰簯鏈嶅姟鍣�
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index bc8b189..b9269e7 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -743,7 +743,6 @@
                 , content: ['璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType, 'yes']
                 , resize: false
                 , cancel: function () {
-                    btnIs();
                 }
                 , end: function () {
                     get_FastQuery(table, option);
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index a4f902d..412b5d8 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -321,7 +321,7 @@
                                 <dd>
                                     <a>鎶ュ伐绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="IpadIndex.html">鎶ュ伐骞冲彴</a></dd>
+                                        <dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>
                                         <dd><a lay-href="">鎶ユ鐢宠n</a></dd>
                                     </dl>
                                 </dd>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 52f1867..96ce174 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -452,17 +452,17 @@
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
-                            $("#HProcExchBillNo").val(data.宸ュ簭娴佽浆鍗″彿);
+                            $("#HProcExchBillNo").val(data.HProcExchBillNo);
                             $("#HProcExchInterID").val(data.HProcExchInterID);
                             $("#HProcExchEntryID").val(data.HProcExchEntryID);
-                            $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
-                            $("#HICMOBillNo").val(data.浠诲姟鍗�);
+                            $("#HProcExchQty").val(data.HProcExchQty);
+                            $("#HICMOBillNo").val(data.HICMOBillNo);
                             $("#HICMOInterID").val(data.HICMOInterID);
                             $("#HICMOQty").val(data.HICMOQty);
-                            $("#HSourceName").val(data.鐢熶骇璧勬簮);
+                            $("#HSourceName").val(data.HSourceName);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
-                            $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HMainSourceBillNo").val("");
                             $("#HMainSourceBillType").val(data.HBillType);
                             $("#HMainSourceInterID").val(data.HInterID);
                         } else {

--
Gitblit v1.9.1