From c2c8ac0b04c005ae9e238ebae794a53678a82679 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 13 八月 2024 13:47:24 +0800
Subject: [PATCH] 页面调整
---
src/main/webapp/static/js/report/workCountOut.js | 1 +
src/main/webapp/views/pda/stockIn.html | 3 ++-
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2 +-
src/main/webapp/static/js/saas/locDetl.js | 2 +-
src/main/webapp/views/pda/comb.html | 3 ++-
src/main/webapp/static/js/wrkMast/wrkMast.js | 1 +
src/main/webapp/static/js/stoMan/stoQue.js | 1 +
src/main/webapp/static/js/orderDetl/orderDetl.js | 2 +-
src/main/webapp/views/matTurn/turnOverQuery.html | 1 +
src/main/webapp/static/js/order/out.js | 2 +-
src/main/webapp/views/pda/stockOut.html | 1 +
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 1 +
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 1 +
src/main/webapp/static/js/report/workCountIn.js | 1 +
src/main/resources/application.yml | 3 +++
15 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 25f0b29..41805fa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -112,3 +112,6 @@
url: jdbc:sqlserver://192.168.1.147:1800;databasename=XDLinkLK
username: XGMLK
password: xunda0413
+# url: jdbc:sqlserver://192.168.4.138:1433;databasename=XDLinkLK2
+# username: sa
+# password: sa@123
diff --git a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index bff82e3..c608cb8 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -365,6 +365,7 @@
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 686640d..384055e 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -361,6 +361,7 @@
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index ff281b0..6291317 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -9,7 +9,7 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
//,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '閰嶇疆'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 5a849ec..a76fdb8 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -41,7 +41,7 @@
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index caef270..9e3583c 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -29,7 +29,7 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index 0edc32b..a26b526 100644
--- a/src/main/webapp/static/js/report/workCountIn.js
+++ b/src/main/webapp/static/js/report/workCountIn.js
@@ -4,6 +4,7 @@
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index 6534f00..fa4124d 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -4,6 +4,7 @@
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 9bd259e..923c1c7 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -9,7 +9,7 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
,{field: 'specs', align: 'center',title: '閰嶇疆' , hide: true}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 14ad105..883f0c3 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -209,6 +209,7 @@
// ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index ac747ca..181419e 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -572,6 +572,7 @@
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/views/matTurn/turnOverQuery.html b/src/main/webapp/views/matTurn/turnOverQuery.html
index 2ad1a5a..d3bb665 100644
--- a/src/main/webapp/views/matTurn/turnOverQuery.html
+++ b/src/main/webapp/views/matTurn/turnOverQuery.html
@@ -87,6 +87,7 @@
{type: 'checkbox'},
{field: 'matnr', align: 'center', title: '鍝佸彿'}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
];
}
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 4739ffb..d13a022 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -56,7 +56,8 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
- {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'},
+ {field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
]],
done: function (res, curr, count) {
}
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 9384793..e1957e5 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -121,7 +121,8 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
- {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'},
+ {field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 54cd9c7..1fc7dfc 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -132,6 +132,7 @@
{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
{field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
+ {field: 'model', align: 'center',title: '浜у搧浠ｇ爜', event: 'detail'},
{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'}
]],
done: function (res, curr, count) {
--
Gitblit v1.9.1