From 88ba5c2a8a6e66c65cd05d1891fee125a06fff5d Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 05 八月 2021 17:07:31 +0800
Subject: [PATCH] 扫码详情
---
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 42 ++++++------------------------------------
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
WebTM/views/Baseset/基础资料/WMSBarCodeDetailsList.html | 5 +++--
3 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 2014932..b71b61c 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://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
}
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/WMSBarCodeDetailsList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/WMSBarCodeDetailsList.html"
index 3133728..249e74d 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/WMSBarCodeDetailsList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/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) {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 775e421..018814e 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/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 () {
}
--
Gitblit v1.9.1