From a30551a5bda6746ff65efb40deb5aa6e5b373a92 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 29 七月 2021 16:59:31 +0800
Subject: [PATCH] 1

---
 WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html |    4 ++--
 WebTM/views/Baseset/基础资料/Gy_MaterialList.html         |    6 +++---
 WebTM/layuiadmin/Scripts/webConfig.js                 |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7980c71..e8bcf45 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,7 +1,7 @@
 锘縡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/";   //棰滄檽鍐涙湰鍦伴厤缃�
@@ -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
 }
 
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
index d868d9c..f2742c0 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
@@ -71,9 +71,9 @@
             function RoadQuery(Where) {
                 var Value = Where;
                 if (Value == null) {
-                    Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + sessionStorage["Organization"];
+                    Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"];
                 } else {
-                    Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + sessionStorage["Organization"] + " and ( HNumber like '%" + Where + "%' or HName like '%" + Where + "%' ) "
+                    Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " and ( HNumber like '%" + Where + "%' or HName like '%" + Where + "%' ) "
                 }
                 var index = layer.load();
                 $.ajax({
@@ -81,7 +81,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
                     url: GetWEBURL() + "/Web/GetMaterialList_Json",
                     async: true,
-                    data: { "Material": Value },
+                    data: { "sWhere": Value },
                     //data: { "Value": Value },
                     success: function (result) {
                         ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index aae1074..0ff43b2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -145,6 +145,8 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            
+        //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -152,8 +154,6 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
-
-        //#region 鍏敤鍙橀噺
             var option;
             var sBillType = "3711";
             var TabRow = {

--
Gitblit v1.9.1