MES-WEB-LayUI.git

parent: 3943ce50 | 补丁 | 提交 | ignore whitespace

zgq

2021-08-05 88ba5c2a8a6e66c65cd05d1891fee125a06fff5d

扫码详情

3个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/WMSBarCodeDetailsList.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,12 +1,12 @@
ï»¿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://localhost:8080/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //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/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨
    return WEBURL
}

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/WMSBarCodeDetailsList.html

@@ -88,6 +88,7 @@
                elem: '#mainTable'
                // , url: '/demo/table/user/'
                , toolbar: '#toolbarDemo'
                , height: 'full-1000'
                , data: []
                , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
                , cols: [[
@@ -102,7 +103,7 @@
                    , { field: 'HQtyMust', width: 150, title: 'åºæ¶æ°é' }
                    , { field: 'HBatchNo', width: 150, title: 'æ¹æ¬¡' }
                    , { field: 'HPieceQty', width: 150, title: 'ä»¶æ°' }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
                    , { fixed: 'right', width: 70, title: 'æä½', toolbar: '#barDemo' }
                ]]
                , page: true
            });
@@ -117,7 +118,7 @@
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , height: 'full-1000'
                            , loading: false
                            , done: function (index, res) {


 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html

@@ -375,7 +375,7 @@
                        , { field: 'HMaterID', title: 'ç©æåç ', width: 150, hide: true }
                        , { field: 'HAuxPropID', title: '', width: 150, hide: true }
                        , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 150, hide: true }
                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                    ]]
                    , height: 500
                    , done: function () {
@@ -672,35 +672,6 @@
                }
            });

            //æµè¯æ°æ®begin
            var rowdata = [{
                "æ°é": "", "ä»¶æ°": "", "åºæ¶æ°é": "0", "ç©æä»£ç ": "", "ç©æåç§°": ""
                , "è§æ ¼åå·": "0"
                , "æºåä¸»åç ": "367", "æºåååç ": "false", "æºååå·": "", "æ¹æ¬¡": "", "ç©æåç ": ""
            }];
            var option = {
                elem: '#wl-table'
                , height: 'full-150'
                , cols: [[
                    { type: 'radio', totalRowText: 'åè®¡' }
                    , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
                    , { field: 'ä»¶æ°', title: 'ä»¶æ°', width: 150, totalRow: true }
                    , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                    , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                    , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                    , { field: 'HMaterID', title: 'ç©æåç ', width: 150 }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 90 }
                ]]
                , page: true
            };
            option.data = rowdata;
            table.render(option);
            //æµè¯æ°æ®end

            //æ«æ¡ç 
            $('#HBarCode').on('keydown', function (event) {  //æ«æ¡ç 
@@ -783,6 +754,7 @@
                                        , { field: 'HMaterID', title: 'ç©æåç ', width: 150, hide: true }
                                        , { field: 'HAuxPropID', title: '', width: 150, hide: true }
                                        , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 150, hide: true }
                                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                                    ]]
                                    // , data: [linterid]
                                    // , page: true
@@ -839,6 +811,7 @@
                                        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                                        , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                                        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                                    ]]
                                    // , data: [linterid]
                                    // , page: true
@@ -924,18 +897,15 @@
            //è¡åäºä»¶
            table.on('tool(wl-table)', function (obj) {
                var data = obj.data;
                console.log(data.æºåä¸»åç );
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'edit') {
                    var _obj = obj;
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , area: ['90%', '90%']
                        , title: 'æ«ç è¯¦æåè¡¨'
                        , shade: 0.6 
                        , maxmin: true 
                        , anim: 0
                        , content: ['../../../views/Baseset/åºç¡èµæ/WMSBarCodeDetailsList.html?HInterID=' + data.æºåä¸»åç  + '&HBillType=3789', 'yes']
                        , resize: false
                        , content: ['../../../views/Baseset/åºç¡èµæ/WMSBarCodeDetailsList.html?HInterID=' + data.HSourceInterID + '&HBillType=3789', 'yes']
                        , end: function () {

                        }

			@@ -1,12 +1,12 @@
			ï»¿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://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//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/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨
			return WEBURL
			}

			@@ -88,6 +88,7 @@
			elem: '#mainTable'
			// , url: '/demo/table/user/'
			, toolbar: '#toolbarDemo'
			, height: 'full-1000'
			, data: []
			, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
			, cols: [[
			@@ -102,7 +103,7 @@
			, { field: 'HQtyMust', width: 150, title: 'åºæ¶æ°é' }
			, { field: 'HBatchNo', width: 150, title: 'æ¹æ¬¡' }
			, { field: 'HPieceQty', width: 150, title: 'ä»¶æ°' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			, { fixed: 'right', width: 70, title: 'æä½', toolbar: '#barDemo' }
			]]
			, page: true
			});
			@@ -117,7 +118,7 @@
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, height: 'full-1000'
			, loading: false
			, done: function (index, res) {

			@@ -375,7 +375,7 @@
			, { field: 'HMaterID', title: 'ç©æåç ', width: 150, hide: true }
			, { field: 'HAuxPropID', title: '', width: 150, hide: true }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 150, hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, height: 500
			, done: function () {
			@@ -672,35 +672,6 @@
			}
			});

			//æµè¯æ°æ®begin
			var rowdata = [{
			"æ°é": "", "ä»¶æ°": "", "åºæ¶æ°é": "0", "ç©æä»£ç ": "", "ç©æåç§°": ""
			, "è§æ ¼åå·": "0"
			, "æºåä¸»åç ": "367", "æºåååç ": "false", "æºååå·": "", "æ¹æ¬¡": "", "ç©æåç ": ""
			}];
			var option = {
			elem: '#wl-table'
			, height: 'full-150'
			, cols: [[
			{ type: 'radio', totalRowText: 'åè®¡' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'ä»¶æ°', title: 'ä»¶æ°', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HMaterID', title: 'ç©æåç ', width: 150 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 90 }
			]]
			, page: true
			};
			option.data = rowdata;
			table.render(option);
			//æµè¯æ°æ®end

			//æ«æ¡ç
			$('#HBarCode').on('keydown', function (event) { //æ«æ¡ç
			@@ -783,6 +754,7 @@
			, { field: 'HMaterID', title: 'ç©æåç ', width: 150, hide: true }
			, { field: 'HAuxPropID', title: '', width: 150, hide: true }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 150, hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			// , data: [linterid]
			// , page: true
			@@ -839,6 +811,7 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			// , data: [linterid]
			// , page: true
			@@ -924,18 +897,15 @@
			//è¡åäºä»¶
			table.on('tool(wl-table)', function (obj) {
			var data = obj.data;
			console.log(data.æºåä¸»åç );
			var rowIndex = $(obj.tr).attr("data-index");
			if (obj.event === 'edit') {
			var _obj = obj;
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, area: ['90%', '90%']
			, title: 'æ«ç è¯¦æåè¡¨'
			, shade: 0.6
			, maxmin: true
			, anim: 0
			, content: ['../../../views/Baseset/åºç¡èµæ/WMSBarCodeDetailsList.html?HInterID=' + data.æºåä¸»åç + '&HBillType=3789', 'yes']
			, resize: false
			, content: ['../../../views/Baseset/åºç¡èµæ/WMSBarCodeDetailsList.html?HInterID=' + data.HSourceInterID + '&HBillType=3789', 'yes']
			, end: function () {

			}