From d842fb603597a5db23c4359081a4e564ce716892 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期一, 17 十一月 2025 11:41:31 +0800
Subject: [PATCH] 更新前端页面
---
项目代码/WMS/WMSClient/src/extension/inbound/proDeliverBackOrderDetail.js | 10
项目代码/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue | 99 +
项目代码/WMS/WMSClient/src/views/inbound/purchaseOrder.vue | 285 ---
.gitignore | 7
项目代码/WMS/WMSClient/src/views/inbound/mesProInOrderInfo.vue | 238 +++
项目代码/WMS/WMSClient/src/views/inbound/proDeliverBackOrderDetail.vue | 236 +++
项目代码/WMS/WMSClient/src/extension/basic/apiInfo.js | 19
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/ApiInfoCotroller.cs | 20
项目代码/WMS/WMSClient/src/extension/outbound/proDeliveryOrder.js | 10
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/CustomerController.cs | 20
项目代码/WMS/WMSClient/src/views/inbound/returnBSTOrder.vue | 167 ++
项目代码/WMS/WMSClient/src/extension/inbound/returnBSTOrder.js | 10
项目代码/WMS/WMSClient/src/views/basic/apiInfo.vue | 147 ++
项目代码/WMS/WMSClient/src/views/outbound/proDeliveryOrderDetail.vue | 195 ++
项目代码/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue | 439 +++---
项目代码/WMS/WMSClient/src/views/inbound/returnBSTOrderDetail.vue | 214 +++
项目代码/WMS/WMSClient/src/extension/inbound/proDeliverBackOrder.js | 10
项目代码/WMS/WMSClient/src/views/inbound/proDeliverBackOrder.vue | 199 ++
项目代码/WMS/WMSClient/src/views/inbound/inboundOrder.vue | 247 ---
项目代码/WMS/WMSClient/src/views/outbound/outBSTPickInfo.vue | 187 ++
项目代码/WMS/WMSClient/src/extension/inbound/returnBSTOrderDetail.js | 10
项目代码/WMS/WMSClient/src/views/basic/makeCenterInfo.vue | 147 ++
项目代码/WMS/WMSClient/src/extension/inbound/mesProInOrderInfo.js | 16
项目代码/WMS/WMSClient/src/views/outbound/proDeliveryOrder.vue | 169 ++
项目代码/WMS/WMSClient/src/extension/basic/makeCenterInfo.js | 19
项目资料/操作手册/龙利得WMS系统操作说明书.doc | 0
项目代码/WMS/WMSClient/src/views/basic/supplierInfo.vue | 137 -
/dev/null | 392 -----
项目代码/WMS/WMSClient/src/extension/outbound/outBSTPickInfo.js | 10
项目代码/WMS/WMSClient/src/views/basic/customerInfo.vue | 148 +-
项目代码/WMS/WMSClient/src/views/inbound/purchaseOrderDetail.vue | 264 ++
项目代码/WMS/WMSClient/src/extension/outbound/proDeliveryOrderDetail.js | 10
项目代码/WMS/WMSClient/src/router/viewGird.js | 50
项目代码/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json | 28
项目代码/WMS/WMSClient/public/webconfig.js | 4
项目代码/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json | 62
36 files changed, 2,870 insertions(+), 1,355 deletions(-)
diff --git a/.gitignore b/.gitignore
index 90c6879..e2e9959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -271,3 +271,10 @@
/椤圭洰浠ｇ爜/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.441.19478/CodeChunks.db-wal
/椤圭洰浠ｇ爜/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.441.19478/SemanticSymbols.db-shm
/椤圭洰浠ｇ爜/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.441.19478/SemanticSymbols.db-wal
+/椤圭洰浠ｇ爜/WCS/WCSServices/.vs/WIDESEAWCS_Server/CopilotIndices
+/椤圭洰浠ｇ爜/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices
+/椤圭洰浠ｇ爜/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17
+/椤圭洰浠ｇ爜/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17
+/椤圭洰浠ｇ爜/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17
+/椤圭洰浠ｇ爜/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17
+/椤圭洰浠ｇ爜/WMS/WMSServices/.vs
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/public/webconfig.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/public/webconfig.js"
index 908713e..4f1a4a8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/public/webconfig.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/public/webconfig.js"
@@ -1,5 +1,5 @@
window.webConfig = {
- "webApiBaseUrl": "http://192.168.35.3:9283/",
- // "webApiBaseUrl": "http://127.0.0.1:9293/",
+ //"webApiBaseUrl": "http://192.168.35.3:9283/",
+ "webApiBaseUrl": "http://127.0.0.1:9293/",
"webApiProduction":"http://192.168.35.3:9283/"
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/basic/apiInfo.js"
similarity index 69%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/basic/apiInfo.js"
index 24e1d94..8b85be7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/basic/apiInfo.js"
@@ -1,4 +1,3 @@
-
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
let extension = {
@@ -16,7 +15,19 @@
buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
+ onInit() { //妗嗘灦鍒濆鍖栭厤缃墠锛�
+ //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
+ // this.buttons.unshift({ //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
+ // name: '鎸夐挳', //鎸夐挳鍚嶇О
+ // icon: 'el-icon-document', //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
+ // type: 'primary', //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
+ // onClick: function () {
+ // this.$Message.success('鐐瑰嚮浜嗘寜閽�');
+ // }
+ // });
+
+ //绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
+ // this.boxOptions.labelWidth = 150;
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
@@ -51,6 +62,10 @@
//(3)this.editFormFields.瀛楁='xxx';
//濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
//鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ let isAdd = this.currentAction == 'Add'
+ if (isAdd) {
+ this.editFormFields.aGVStationCode = 'PNT_'
+ }
}
}
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/basic/makeCenterInfo.js"
similarity index 69%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/basic/makeCenterInfo.js"
index 24e1d94..8b85be7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/basic/makeCenterInfo.js"
@@ -1,4 +1,3 @@
-
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
let extension = {
@@ -16,7 +15,19 @@
buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
+ onInit() { //妗嗘灦鍒濆鍖栭厤缃墠锛�
+ //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
+ // this.buttons.unshift({ //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
+ // name: '鎸夐挳', //鎸夐挳鍚嶇О
+ // icon: 'el-icon-document', //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
+ // type: 'primary', //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
+ // onClick: function () {
+ // this.$Message.success('鐐瑰嚮浜嗘寜閽�');
+ // }
+ // });
+
+ //绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
+ // this.boxOptions.labelWidth = 150;
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
@@ -51,6 +62,10 @@
//(3)this.editFormFields.瀛楁='xxx';
//濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
//鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ let isAdd = this.currentAction == 'Add'
+ if (isAdd) {
+ this.editFormFields.aGVStationCode = 'PNT_'
+ }
}
}
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrderInfo.js"
similarity index 83%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrderInfo.js"
index 24e1d94..9892472 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrderInfo.js"
@@ -24,13 +24,19 @@
//this.detailOptions.columns.forEach(column=>{ });
},
searchBefore(param) {
- //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
- //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
- return true;
+ //鐣岄潰鏌ヨ鍓�,纭繚杩斿洖鏈夋晥鍙傛暟
+ if (!param) {
+ param = { wheres: [] };
+ }
+ //鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+ return param;
},
searchAfter(result) {
- //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
- return true;
+ //鏌ヨ鍚庯紝纭繚姝ｇ‘澶勭悊杩斿洖缁撴灉
+ if (result && result.data && Array.isArray(result.data)) {
+ return result.data;
+ }
+ return result;
},
addBefore(formData) {
//鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/proDeliverBackOrder.js"
similarity index 84%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/proDeliverBackOrder.js"
index 24e1d94..2e7a2f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/proDeliverBackOrder.js"
@@ -19,6 +19,16 @@
onInit() {
},
onInited() {
+ this.detailOptions.summary = true;
+ this.detailOptions.columns.forEach(x => {
+ if (x.field == 'orderQuantity') {
+ x.summary = true;
+ //璁＄畻骞冲潎鍊�
+ // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
+ //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
+ // x.numberLength = 4;
+ }
+ });
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/proDeliverBackOrderDetail.js"
similarity index 84%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/proDeliverBackOrderDetail.js"
index 24e1d94..2e7a2f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/proDeliverBackOrderDetail.js"
@@ -19,6 +19,16 @@
onInit() {
},
onInited() {
+ this.detailOptions.summary = true;
+ this.detailOptions.columns.forEach(x => {
+ if (x.field == 'orderQuantity') {
+ x.summary = true;
+ //璁＄畻骞冲潎鍊�
+ // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
+ //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
+ // x.numberLength = 4;
+ }
+ });
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/returnBSTOrder.js"
similarity index 84%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/returnBSTOrder.js"
index 24e1d94..2e7a2f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/returnBSTOrder.js"
@@ -19,6 +19,16 @@
onInit() {
},
onInited() {
+ this.detailOptions.summary = true;
+ this.detailOptions.columns.forEach(x => {
+ if (x.field == 'orderQuantity') {
+ x.summary = true;
+ //璁＄畻骞冲潎鍊�
+ // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
+ //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
+ // x.numberLength = 4;
+ }
+ });
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/returnBSTOrderDetail.js"
similarity index 84%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/returnBSTOrderDetail.js"
index 24e1d94..2e7a2f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/returnBSTOrderDetail.js"
@@ -19,6 +19,16 @@
onInit() {
},
onInited() {
+ this.detailOptions.summary = true;
+ this.detailOptions.columns.forEach(x => {
+ if (x.field == 'orderQuantity') {
+ x.summary = true;
+ //璁＄畻骞冲潎鍊�
+ // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
+ //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
+ // x.numberLength = 4;
+ }
+ });
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/outBSTPickInfo.js"
similarity index 83%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/outBSTPickInfo.js"
index 24e1d94..2e7a2f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/outBSTPickInfo.js"
@@ -19,6 +19,16 @@
onInit() {
},
onInited() {
+ this.detailOptions.summary = true;
+ this.detailOptions.columns.forEach(x => {
+ if (x.field == 'orderQuantity') {
+ x.summary = true;
+ //璁＄畻骞冲潎鍊�
+ // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
+ //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
+ // x.numberLength = 4;
+ }
+ });
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/proDeliveryOrder.js"
similarity index 84%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/proDeliveryOrder.js"
index 24e1d94..2e7a2f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/proDeliveryOrder.js"
@@ -19,6 +19,16 @@
onInit() {
},
onInited() {
+ this.detailOptions.summary = true;
+ this.detailOptions.columns.forEach(x => {
+ if (x.field == 'orderQuantity') {
+ x.summary = true;
+ //璁＄畻骞冲潎鍊�
+ // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
+ //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
+ // x.numberLength = 4;
+ }
+ });
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/proDeliveryOrderDetail.js"
similarity index 83%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/proDeliveryOrderDetail.js"
index 24e1d94..2e7a2f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/inbound/mesProInOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/proDeliveryOrderDetail.js"
@@ -19,6 +19,16 @@
onInit() {
},
onInited() {
+ this.detailOptions.summary = true;
+ this.detailOptions.columns.forEach(x => {
+ if (x.field == 'orderQuantity') {
+ x.summary = true;
+ //璁＄畻骞冲潎鍊�
+ // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
+ //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
+ // x.numberLength = 4;
+ }
+ });
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
index a9374a5..5ba5355 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
@@ -70,6 +70,14 @@
name: 'inboundOrderDetail',
component: () => import('@/views/inbound/inboundOrderDetail.vue')
}, {
+ path: '/proDeliverBackOrder',
+ name: 'ProDeliverBackOrder',
+ component: () => import('@/views/inbound/proDeliverBackOrder.vue')
+ }, {
+ path: '/proDeliverBackOrderDetail',
+ name: 'ProDeliverBackOrderDetail',
+ component: () => import('@/views/inbound/proDeliverBackOrderDetail.vue')
+ },{
path: '/outBSTOrder',
name: 'outBSTOrder',
component: () => import('@/views/outbound/outBSTOrder.vue')
@@ -77,13 +85,19 @@
path: '/outBSTOrderDetail',
name: 'outBSTOrderDetail',
component: () => import('@/views/outbound/outBSTOrderDetail.vue')
- },
- {
+ }, {
path: '/outStockLockInfo',
name: 'outStockLockInfo',
component: () => import('@/views/outbound/outStockLockInfo.vue')
- },
- {
+ },{
+ path: '/proDeliveryOrder',
+ name: 'ProDeliveryOrder',
+ component: () => import('@/views/outbound/proDeliveryOrder.vue')
+ },{
+ path: '/proDeliveryOrderDetail',
+ name: 'ProDeliveryOrderDetail',
+ component: () => import('@/views/outbound/proDeliveryOrderDetail.vue')
+ },{
path: '/materielnfoStatistics',
name: 'materielnfoStatistics',
component: () => import('@/views/stock/materielnfoStatistics.vue')
@@ -202,9 +216,9 @@
component: () => import('@/views/stock/proStockInfoDetail_Hty.vue')
},
{
- path: '/mesProInOrder',
- name: 'mesProInOrder',
- component: () => import('@/views/inbound/mesProInOrder.vue')
+ path: '/mesProInOrderInfo',
+ name: 'mesProInOrderInfo',
+ component: () => import('@/views/inbound/mesProInOrderInfo.vue')
},
{
path: '/mesProInOrderDetail',
@@ -232,6 +246,16 @@
component: () => import('@/views/basic/agvStationInfo.vue')
},
{
+ path: '/apiInfo',
+ name: 'apiInfo',
+ component: () => import('@/views/basic/apiInfo.vue')
+ },
+ {
+ path: '/makeCenterInfo',
+ name: 'makeCenterInfo',
+ component: () => import('@/views/basic/makeCenterInfo.vue')
+ },
+ {
path: '/outSGOrder',
name: 'outSGOrder',
component: () => import('@/views/outbound/outSGOrder.vue')
@@ -239,6 +263,18 @@
path: '/purchaseBSTOrder',
name: 'purchaseBSTOrder',
component: () => import('@/views/inbound/purchaseBSTOrder.vue')
+ },{
+ path: '/outBSTPickInfo',
+ name: 'outBSTPickInfo',
+ component: () => import('@/views/outbound/outBSTPickInfo.vue')
+ },{
+ path: '/returnBSTOrder',
+ name: 'returnBSTOrder',
+ component: () => import('@/views/inbound/returnBSTOrder.vue')
+ },{
+ path: '/returnBSTOrderDetail',
+ name: 'returnBSTOrderDetail',
+ component: () => import('@/views/inbound/returnBSTOrderDetail.vue')
}
]
export default viewgird
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/apiInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/apiInfo.vue"
new file mode 100644
index 0000000..fbc0840
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/apiInfo.vue"
@@ -0,0 +1,147 @@
+
+<template>
+ <view-grid
+ ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend"
+ >
+ </view-grid>
+</template>
+ <script>
+import extend from "@/extension/basic/apiInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鎺ュ彛淇℃伅",
+ name: "apiInfo",
+ url: "/ApiInfo/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ apiCode: "",
+ apiName: "",
+ enable: "",
+ createDate: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鎺ュ彛缂栧彿", field: "apiCode", type: "like" },
+ { title: "鎺ュ彛鍚嶇О", field: "apiName", type: "like" },
+ { title: "鐘舵��", field: "enable", type: "select", dataKey: "enableEnum", data: [] },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "apiCode",
+ title: "鎺ュ彛缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "apiName",
+ title: "鎺ュ彛鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "apiAddress",
+ title: "鎺ュ彛鍦板潃",
+ type: "string",
+ width: 300,
+ align: "left",
+ },
+ {
+ field: "enable",
+ title: "鐘舵��",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind:{key:"enableEnum",data: [] },
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ hidden:true
+ },
+
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
+
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/customerInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/customerInfo.vue"
index 4768e46..8573477 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/customerInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/customerInfo.vue"
@@ -5,79 +5,83 @@
*涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_CustomerInfo.js姝ゅ缂栧啓
-->
<template>
- <view-grid ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend">
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
<script>
- import extend from "@/extension/basic/customerInfo.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '瀹㈡埛淇℃伅',
- name: 'customerInfo',
- url: "/CustomerInfo/",
- sortName: "id"
- });
- const editFormFields = ref({
- outRule: ""
- });
- const editFormOptions = ref([[
- {
- title: "鍑哄叆搴撹鍒�",
- required: true,
- field: "outRule",
- type: "select",
- dataKey: "customerOutRuleEnum",
- data: [],
- },]
- ]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([
- [
- {title:"瀹㈡埛缂栫爜", field:"code", type:"like"},
- {title:"瀹㈡埛鍚嶇О", field:"name", type:"like"},
- {title:"瀹㈡埛鍏ㄧО", field : "nickName", type:"like"},
- {title:"鐘舵��", field:"state",type:"select",dataKey:"",data:[{key:1, value:"鍚敤"},{key:0, value:"绂佺敤"}]}
- ]
- ]);
- const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'code',title:'瀹㈡埛缂栫爜',type:'string',width:110,align:'left'},
- {field:'outRule',title:'鍑哄叆搴撹鍒�',type:'string',width:130,align:'left',bind: { key: "customerOutRuleEnum", data: [] } },
- {field:'name',title:'瀹㈡埛鍚嶇О',type:'string',width:110,align:'left'},
- {field:'nickName',title:'瀹㈡埛鍏ㄧО',type:'string',width:120,align:'left'},
- {field:'state',title:'鐘舵��',type:'bool',width:110,require:true,align:'left',bind: { key: "enableEnum", data: [] }},
- {field:'creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left'},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left'}]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "#detailTable",
- columns: [],
- sortName: "",
- key: ""
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
+import extend from "@/extension/basic/customerInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '瀹㈡埛淇℃伅',
+ name: 'customerInfo',
+ url: "/CustomerInfo/",
+ sortName: "id"
+ });
+ const editFormFields = ref({
+ outRule: ""
+ });
+ const editFormOptions = ref([[
+ {
+ title: "鍑哄叆搴撹鍒�",
+ required: true,
+ field: "outRule",
+ type: "select",
+ dataKey: "customerOutRuleEnum",
+ data: [],
+ },]
+ ]);
+ const searchFormFields = ref({
+ customerCode: "",
+ customerName: "",
+ shortName: "",
+ state: "",
+ createDate: ""
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "瀹㈡埛缂栫爜", field: "customerCode", type: "like" },
+ { title: "瀹㈡埛鍏ㄧО", field: "name", type: "like" },
+ { title: "瀹㈡埛绠�绉�", field: "shortName", type: "like" },
+ { title: "鐘舵��", field: "status", type: "select", dataKey: "enableEnum", data: [] },
+ ],
+ [
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ]
+ ]);
+ const columns = ref([
+ { field: 'id', title: '涓婚敭', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
+ { field: 'customerCode', title: '瀹㈡埛缂栫爜', type: 'string', width: 110, align: 'left' },
+ { field: 'customerName', title: '瀹㈡埛鍏ㄧО', type: 'string', width: 120, align: 'left' },
+ { field: 'shortName', title: '瀹㈡埛绠�绉�', type: 'string', width: 110, align: 'left' },
+ { field: 'status', title: '鐘舵��', type: 'bool', width: 110, require: true, align: 'left', bind: { key: "enableEnum", data: [] } },
+ { field: 'outRule', title: '鍑哄簱瑙勫垯', type: 'string', width: 130, align: 'left', bind: { key: "customerOutRuleEnum", data: [] } },
+ { field: 'creater', title: '鍒涘缓鑰�', type: 'string', width: 110, require: true, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', width: 150, require: true, align: 'left' },
+ { field: 'modifier', title: '淇敼浜�', type: 'string', width: 100, align: 'left' },
+ { field: 'modifyDate', title: '淇敼鏃ユ湡', type: 'datetime', width: 150, align: 'left' }]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/makeCenterInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/makeCenterInfo.vue"
new file mode 100644
index 0000000..e18aa6f
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/makeCenterInfo.vue"
@@ -0,0 +1,147 @@
+
+<template>
+ <view-grid
+ ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend"
+ >
+ </view-grid>
+</template>
+ <script>
+import extend from "@/extension/basic/makeCenterInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鍔犲伐涓績淇℃伅",
+ name: "makeCenterInfo",
+ url: "/MakeCenterInfo/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鍔犲伐涓績缂栫爜", field: "makeCode", type: "string" },
+ { title: "鍔犲伐涓績鍚嶇О", field: "makeName", type: "string" },
+ { title: "鍔犲伐鍖哄煙", field: "makeArea", type: "string" },
+ { title: "鐘舵��", field: "enable", type: "select", dataKey: "enableEnum", data: [] },
+ ],
+ [
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "makeCode",
+ title: "鍔犲伐涓績缂栫爜",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "makeName",
+ title: "鍔犲伐涓績鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "makeArea",
+ title: "鍔犲伐鍖哄煙",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "status",
+ title: "鐘舵��",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind:{key:"enableEnum",data: [] },
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ hidden:true
+ },
+
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
+
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/supplierInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/supplierInfo.vue"
index 402798a..66a162c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/supplierInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/supplierInfo.vue"
@@ -5,78 +5,73 @@
*涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_SupplierInfo.js姝ゅ缂栧啓
-->
<template>
- <view-grid ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend">
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
<script>
- import extend from "@/extension/basic/supplierInfo.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '渚涘簲鍟嗕俊鎭�',
- name: 'supplierInfo',
- url: "/SupplierInfo/",
- sortName: "id"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([
- [
- {title:"渚涘簲鍟嗙紪鐮�", field:"supplierCode", type:"like"},
- {title:"渚涘簲鍟嗗悕绉�", field:"supplierName", type:"like"},
- {title:"渚涘簲鍟嗙畝绉�", field:"supplierShortName", type:"like"}
- ],
- [
- {title:"搴撳瓨缁勭粐", field:"invOrgId", type:"like"},
- {title:"鐘舵��", field:"status",type:"select",dataKey:"status",data:[]},
- ]
- ]);
- const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'supplierCode',title:'渚涘簲鍟嗙紪鐮�',type:'string',width:110,align:'left',sort:true},
- {field:'supplierName',title:'渚涘簲鍟嗗悕绉�',type:'string',width:180,align:'left'},
- {field:'supplierShortName',title:'渚涘簲鍟嗙畝绉�',type:'string',width:110,align:'left'},
- {field:'contacts',title:'鑱旂郴浜�',type:'string',width:110,align:'left'},
- {field:'contactNumber',title:'鑱旂郴鐢佃瘽',type:'string',width:110,align:'left'},
- {field:'contactAddress',title:'鑱旂郴鍦板潃',type:'string',width:180,align:'left'},
- {field:'email',title:'鐢靛瓙閭',type:'string',width:110,align:'left'},
- {field:'description',title:'鎻忚堪',type:'string',width:180,align:'left',hidden:true},
- {field:'invOrgId',title:'搴撳瓨缁勭粐',type:'string',width:110,align:'left'},
- {field:'status',title:'鐘舵��',type:'int',width:110,require:true,align:'left',bind: { key: "status", data: [] },},
- {field:'creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left',hidden:true},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true,hidden:true}]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "#detailTable",
- columns: [],
- sortName: "",
- key: ""
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
+import extend from "@/extension/basic/supplierInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '渚涘簲鍟嗕俊鎭�',
+ name: 'supplierInfo',
+ url: "/SupplierInfo/",
+ sortName: "id"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([
+ [
+ { title: "渚涘簲鍟嗙紪鐮�", field: "supplierCode", type: "like" },
+ { title: "渚涘簲鍟嗗悕绉�", field: "supplierName", type: "like" },
+ { title: "渚涘簲鍟嗙畝绉�", field: "supplierShortName", type: "like" }
+ ],
+ [
+ { title: "搴撳瓨缁勭粐", field: "invOrgId", type: "like" },
+ { title: "鐘舵��", field: "status", type: "select", dataKey: "status", data: [] },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" }
+ ]
+ ]);
+ const columns = ref([{ field: 'id', title: '涓婚敭', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
+ { field: 'supplierCode', title: '渚涘簲鍟嗙紪鐮�', type: 'string', width: 110, align: 'left', sort: true },
+ { field: 'supplierName', title: '渚涘簲鍟嗗悕绉�', type: 'string', width: 180, align: 'left' },
+ { field: 'supplierShortName', title: '渚涘簲鍟嗙畝绉�', type: 'string', width: 110, align: 'left' },
+ { field: 'contacts', title: '鑱旂郴浜�', type: 'string', width: 110, align: 'left' },
+ { field: 'contactNumber', title: '鑱旂郴鐢佃瘽', type: 'string', width: 110, align: 'left' },
+ { field: 'contactAddress', title: '鑱旂郴鍦板潃', type: 'string', width: 180, align: 'left' },
+ { field: 'email', title: '鐢靛瓙閭', type: 'string', width: 110, align: 'left' },
+ { field: 'description', title: '鎻忚堪', type: 'string', width: 180, align: 'left', hidden: true },
+ { field: 'invOrgId', title: '搴撳瓨缁勭粐', type: 'string', width: 110, align: 'left' },
+ { field: 'status', title: '鐘舵��', type: 'int', width: 110, require: true, align: 'left', bind: { key: "status", data: [] }, },
+ { field: 'creater', title: '鍒涘缓鑰�', type: 'string', width: 110, require: true, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', width: 150, require: true, align: 'left', sort: true },
+ { field: 'modifier', title: '淇敼浜�', type: 'string', width: 100, align: 'left', hidden: true },
+ { field: 'modifyDate', title: '淇敼鏃ユ湡', type: 'datetime', width: 150, align: 'left', sort: true, hidden: true }]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrder.vue"
index 0e1d17a..b6bc973 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrder.vue"
@@ -1,19 +1,10 @@
-
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
- <script>
+<script>
import extend from "@/extension/inbound/inboundOrder.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -21,84 +12,36 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "鍏ュ簱鍗�",
+ cnName: "鏂板巶鍏ュ簱鍗�",
name: "inboundOrder",
url: "/InboundOrder/",
sortName: "id",
});
const editFormFields = ref({
- orderType: "",
- inboundOrderNo: "",
- upperOrderNo: "",
- remark: "",
+
});
const editFormOptions = ref([
- [
- {
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- field: "inboundOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- },
- {
- title: "涓婃父鍗曟嵁缂栧彿",
- field: "upperOrderNo",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "remark",
- type: "textarea",
- },
- ],
+
]);
const searchFormFields = ref({
+ warehouseId: "",
inboundOrderNo: "",
upperOrderNo: "",
orderType: "",
orderStatus: "",
- createType: "",
- creater: "",
createDate: "",
});
const searchFormOptions = ref([
[
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
{ title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "inboundState",
- data: [],
- },
+ { title: "鍗曟嵁绫诲瀷", field: "orderType", type: "select", dataKey: "inOrderTypeEnum", data: [], },
],
[
- {
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
- type: "select",
- dataKey: "createType",
- data: [],
- },
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+ { title: "鐘舵��", field: "orderStatus", type: "select", dataKey: "inboundState", data: [], },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
- ],
+ ]
]);
const columns = ref([
{
@@ -112,12 +55,19 @@
align: "left",
},
{
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind: { key: "warehouses", data: [] }
+ },
+ {
field: "inboundOrderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
- width: 120,
+ width: 200,
align: "left",
- link: true,
},
{
field: "upperOrderNo",
@@ -127,23 +77,15 @@
align: "left",
},
{
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
field: "orderType",
title: "鍗曟嵁绫诲瀷",
type: "string",
width: 150,
align: "left",
- bind: { key: "inOrderType", data: [] },
+ bind: { key: "inOrderTypeEnum", data: [] },
},
{
- field: "orderStatus",
+ field: "inboundOrderStatus",
title: "鍗曟嵁鐘舵��",
type: "decimal",
width: 90,
@@ -151,12 +93,11 @@
bind: { key: "inboundState", data: [] },
},
{
- field: "createType",
- title: "鍒涘缓鏂瑰紡",
+ field: "remark",
+ title: "澶囨敞",
type: "string",
- width: 120,
+ width: 150,
align: "left",
- bind: { key: "createType", data: [] },
},
{
field: "creater",
@@ -186,138 +127,13 @@
width: 160,
align: "left",
},
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
]);
const detail = ref({
cnName: "鍏ュ簱鍗曟槑缁�",
- table: "InboundOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "select",
- width: 150,
- align: "left",
- edit: { type: "" },
- required: true,
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "select",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "decimal",
- width: 90,
- align: "left",
- edit: { type: "" },
- required: true,
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "decimal",
- width: 90,
- align: "left",
- edit: { type: "number" },
- required: true,
- },
- {
- field: "receiptQuantity",
- title: "缁勭洏鏁伴噺",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "overInQuantity",
- title: "涓婃灦鏁伴噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- bind: { key: "orderDetailStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ],
- sortName: "id",
- key: "id",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
});
return {
table,
@@ -331,5 +147,4 @@
};
},
});
-</script>
-
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue"
index 5046820..16acdf8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue"
@@ -1,221 +1,220 @@
-
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
- </view-grid>
- </template>
- <script>
- import extend from "@/extension/inbound/inboundOrderDetail.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍏ュ簱鍗曟槑缁�",
- name: "inboundOrderDetail",
- url: "/InboundOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "璁惧缂栧彿",
- required: true,
- field: "deviceCode",
- type: "string",
- },
- {
- title: "璁惧鍚嶇О",
- required: true,
- field: "deviceName",
- type: "string",
- },
- {
- title: "璁惧绫诲瀷",
- required: true,
- field: "deviceType",
- type: "string",
- },
- {
- title: "璁惧鐘舵��",
- required: true,
- field: "deviceStatus",
- type: "string",
- },
- ],
- [
- { title: "璁惧IP", required: true, field: "deviceIp", type: "string" },
- {
- title: "璁惧绔彛",
- required: true,
- field: "devicePort",
- type: "string",
- },
- {
- title: "PLC绫诲瀷",
- required: true,
- field: "devicePlcType",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "deviceRemark",
- type: "string",
- },
- ],
- ]);
- const searchFormFields = ref({
- deviceCode: "",
- deviceType: "",
- deviceStatus: "",
- });
- const searchFormOptions = ref([
- [
- { title: "璁惧缂栧彿", field: "deviceCode" },
- { title: "璁惧绫诲瀷", field: "deviceType" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "receiptQuantity",
- title: "缁勭洏鏁伴噺",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "overInQuantity",
- title: "涓婃灦鏁伴噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/inbound/inboundOrderDetail.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鏂板巶鍏ュ簱鍗曟槑缁�",
+ name: "inboundOrderDetail",
+ url: "/InboundOrderDetail/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ orderId: "",
+ detailId: "",
+ barCode: "",
+ materielCode: "",
+ materielName: "",
+ batchNo: "",
+ orderDetailStatus: "",
+ createDate: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鍏ュ簱鍗�", field: "orderId", type: "like" },
+ { title: "涓婃父鏄庣粏Id", field: "detailId", type: "like" },
+ { title: "鐗╂枡鏉＄爜", field: "barCode", type: "like" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+ ],
+ [
+ { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
+ { title: "鐗╂枡鎵规", field: "batchNo", type: "like" },
+ { title: "鐘舵��", field: "orderDetailStatus", type: "select", dataKey: "inboundState", data: [], },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime", },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "orderId",
+ title: "鍏ュ簱鍗�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "detailId",
+ title: "涓婃父鏄庣粏Id",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "barCode",
+ title: "鐗╂枡鏉＄爜",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialLot",
+ title: "鐗╂枡鎵规",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "materialWide",
+ title: "骞呭",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "materialThick",
+ title: "鍗峰緞",
+ type: "int",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "materialWeight",
+ title: "閲嶉噺",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "materialSpec",
+ title: "瑙勬牸",
+ type: "string",
+ width: 180,
+ align: "left",
+ },
+ {
+ field: "orderQuantity",
+ title: "鍗曟嵁鏁伴噺",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "bindQuantity",
+ title: "缁勭洏鏁伴噺",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "inQuantity",
+ title: "宸插叆搴撴暟閲�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "orderDetailStatus",
+ title: "鏄庣粏鐘舵��",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesProInOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesProInOrder.vue"
deleted file mode 100644
index e389f02..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesProInOrder.vue"
+++ /dev/null
@@ -1,392 +0,0 @@
-
-<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
- </view-grid>
-</template>
- <script>
-import extend from "@/extension/inbound/mesProInOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍏ュ簱鍗�",
- name: "mesProInOrder",
- url: "/mesProInOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
- remark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "淇℃伅澶囨敞",
- field: "remark",
- type: "textarea",
- },
- ],
- ]);
- const searchFormFields = ref({
- inboundOrderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createType: "",
- creater: "",
- createDate: "",
- upErpStatus:"",
- warehouseId:"",
- });
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "proInOrderNo", type: "like" },
- // { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- // {
- // title: "鍗曟嵁绫诲瀷",
- // field: "orderType",
- // type: "select",
- // dataKey: "inOrderType",
- // data: [],
- // },
- { title: "鑳舵鐮�", field: "batchNo", type: "like" },
- {
- title: "鍗曟嵁鐘舵��",
- field: "mesProStatus",
- type: "select",
- dataKey: "inboundState",
- data: [],
- },
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: [],
- required: true,
- },
- ],
- [
- {
- title: "涓婁紶ERP鐘舵��",
- field: "upErpStatus",
- type: "select",
- dataKey: "enable",
- data: [],
- },
- {
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
- type: "select",
- dataKey: "createType",
- data: [],
- },
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
- field: "proInOrderNo",
- title: "鍏ュ簱鍗曟嵁缂栧彿",
- type: "string",
- width: 120,
- align: "left",
- link: true,
- },
- {
- field: "batchNo",
- title: "鑳舵鐮�",
- type: "string",
- width: 120,
- align: "left",
- },
-
- {
- field: "mesProStatus",
- title: "鍏ュ簱鍗曠姸鎬�",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "unPackStock",
- title: "鏄惁鎷嗙鍏ュ簱",
- type: "decimal",
- width: 90,
- align: "left",
- hidden:true
- },
- {
- field: "workCenter",
- title: "宸ヤ綔涓績",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "createType",
- title: "鍒涘缓鏂瑰紡",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "createType", data: [] },
- },
- {
- field: "upErpStatus",
- title: "涓婁紶ERP鐘舵��",
- type: "string",
- width: 90,
- align: "left",
- bind:{key:"enable",data:[]}
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- hidden:true
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden: true,
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true,
- },
- {
- field: "remark",
- title: "淇℃伅澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "mesProInOrderDetail",
- columns: [
- // {
- // field: "id",
- // title: "Id",
- // type: "int",
- // width: 90,
- // hidden: true,
- // readonly: true,
- // require: true,
- // align: "left",
- // },
- // {
- // field: "orderId",
- // title: "鍏ュ簱鍗曚富閿�",
- // type: "string",
- // width: 90,
- // align: "left",
- // },
- {
- field: "bagNo",
- title: "鍐呭寘鍙�",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "productCode",
- title: "浜у搧缂栫爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "overInQuantity",
- title: "涓婃灦鏁伴噺",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "productVersion",
- title: "鐗堟湰",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "setQty",
- title: "鍖呰SET鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "okpcsqty",
- title: "鍚堟牸PCS鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "dateCode",
- title: "鍛ㄦ湡",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "xQty",
- title: "X鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "xSite",
- title: "X浣�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "weight",
- title: "鍐呭寘閲嶉噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "packingDate",
- title: "鍖呰鏃堕棿",
- type: "datetime",
- width: 200,
- align: "left",
- },
- {
- field: "lotNumber",
- title: "鎵规鍙�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "erpOrder",
- title: "ERP宸ュ崟",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "moNumber",
- title: "鍒堕�犺鍗�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "saleOrder",
- title: "閿�鍞鍗�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden: true,
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true,
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesProInOrderInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesProInOrderInfo.vue"
new file mode 100644
index 0000000..dee121d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesProInOrderInfo.vue"
@@ -0,0 +1,238 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/inbound/mesProInOrderInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "MES鎴愬搧/鍗婃垚鍝佸崟",
+ name: "mesProInOrderInfo",
+ url: "/MesProInOrderInfo/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ warehouseId:"",
+ productOrderNo:"",
+ mESProOrderType:"",
+ mESProOrderStatus:"",
+ materialCode:"",
+ materialLot:"",
+ proPackCode:"",
+ createDate:"",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [], },
+ { title: "鐢熶骇璁㈠崟缂栫爜", field: "productOrderNo", type: "like" },
+ { title: "璁㈠崟绫诲瀷", field: "mESProOrderType", type: "select", dataKey: "inOrderTypeEnum", data: [], },
+ { title: "鍗曟嵁鐘舵��", field: "mESProInStatus", type: "select", dataKey: "inboundState", data: [], },
+ ],
+ [
+ { title: "鐗╂枡缂栧彿", field: "materialCode", type: "like" },
+ { title: "鐗╂枡鎵规", field: "materialLot", type: "like" },
+ { title: "绾哥鐗╂枡缂栫爜", field: "proPackCode", type: "like" },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind: { key: "warehouses", data: [] }
+ },
+ {
+ field: "productOrderNo",
+ title: "鐢熶骇璁㈠崟缂栫爜",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "processNum",
+ title: "宸ュ簭搴忓彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "mesProOrderType",
+ title: "璁㈠崟绫诲瀷",
+ type: "select",
+ width: 150,
+ align: "left",
+ bind: { key: "inOrderTypeEnum", data: [] },
+ },
+ {
+ field: "processNum",
+ title: "娲惧崟宸ュ崟缂栫爜",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "materialCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialLot",
+ title: "鐗╂枡鎵规",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "gradeCode",
+ title: "鐗╂枡绛夌骇",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "proQuantity",
+ title: "鐗╂枡鏁伴噺",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "barCode",
+ title: "鐗╂枡鏉＄爜",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "thickness",
+ title: "鍗峰緞",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "wide",
+ title: "骞呭",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "weight",
+ title: "閲嶉噺",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "proPackCode",
+ title: "鎴愬搧鍖呮潗绾哥鐗╂枡缂栫爜",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "length",
+ title: "绠遍暱",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "width",
+ title: "绠卞",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "height",
+ title: "绠遍珮",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "mesProInStatus",
+ title: "鍗曟嵁鐘舵��",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ bind: { key: "inboundState", data: [] },
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "鍏ュ簱鍗曟槑缁�",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/proDeliverBackOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/proDeliverBackOrder.vue"
new file mode 100644
index 0000000..5a52c67
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/proDeliverBackOrder.vue"
@@ -0,0 +1,199 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/inbound/proDeliverBackOrder.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鎴愬搧閿�鍞��璐у叆搴撳崟",
+ name: "proDeliverBackOrder",
+ url: "/ProDeliverBackOrder/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+ [
+ {
+ title: "浠撳簱",
+ required: true,
+ field: "warehouseId",
+ type: "string",
+ },
+ {
+ title: "WMS鍗曟嵁缂栧彿",
+ required: true,
+ field: "deliveryBackInCode",
+ type: "string",
+ },
+ {
+ title: "鎴愬搧閿�鍞��璐у崟鍙�",
+ required: true,
+ field: "deliveryBackCode",
+ type: "string",
+ },
+ {
+ title: "璁㈠崟绫诲瀷",
+ required: true,
+ field: "orderType",
+ type: "string",
+ },
+ {
+ title: "鎿嶄綔鍛樺伐",
+ required: true,
+ field: "employeeName",
+ type: "string",
+ },
+ {
+ title: "鐘舵��",
+ required: true,
+ field: "deliveryBackStatus",
+ type: "decimal",
+ },
+ {
+ title: "澶囨敞",
+ required: false,
+ field: "remark",
+ type: "string",
+ },
+ ],
+ ]);
+ const searchFormFields = ref({
+ warehouseId: "",
+ deliveryBackInCode: "",
+ deliveryBackCode: "",
+ orderType: "",
+ employeeName: "",
+ deliveryBackStatus: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
+ { title: "WMS鍗曞彿", field: "deliveryBackInCode", type: "like" },
+ { title: "鎴愬搧鍗曞彿", field: "deliveryBackCode", type: "like" },
+ { title: "璁㈠崟绫诲瀷", field: "orderType", type: "select", dataKey: "inOrderTypeEnum", data: [] },
+ ],
+ [
+ { title: "鎿嶄綔鍛樺伐", field: "employeeName", type: "like" },
+ { title: "鐘舵��", field: "deliveryBackStatus", type: "select", dataKey: "inboundState", data: [] },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 70,
+ align: "left",
+ },
+ {
+ field: "deliveryBackInCode",
+ title: "WMS鍗曞彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "deliveryBackCode",
+ title: "鎴愬搧鍗曞彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "orderType",
+ title: "璁㈠崟绫诲瀷",
+ type: "select",
+ width: 150,
+ align: "left",
+ bind: { key: "inOrderTypeEnum", data: [] },
+ },
+ {
+ field: "employeeName",
+ title: "鎿嶄綔鍛樺伐",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "deliveryBackStatus",
+ title: "鐘舵��",
+ type: "select",
+ width: 90,
+ align: "left",
+ bind: { key: "inboundState", data: [] },
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/proDeliverBackOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/proDeliverBackOrderDetail.vue"
new file mode 100644
index 0000000..3c27e48
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/proDeliverBackOrderDetail.vue"
@@ -0,0 +1,236 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/inbound/proDeliverBackOrderDetail.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鎴愬搧閿�鍞��璐у叆搴撳崟鏄庣粏",
+ name: "proDeliverBackOrderDetail",
+ url: "/ProDeliverBackOrderDetail/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+ [
+ {
+ title: "澶磋〃",
+ required: true,
+ field: "deliverBackId",
+ type: "string",
+ },
+ {
+ title: "閿�鍞嚭搴撳彂璐у崟鍙�",
+ required: true,
+ field: "deliverCode",
+ type: "string",
+ },
+ {
+ title: "閿�鍞崟鍙�",
+ required: true,
+ field: "saleOrderNo",
+ type: "string",
+ },
+ {
+ title: "鐗╂枡鏉＄爜",
+ required: true,
+ field: "barCode",
+ type: "string",
+ },
+ {
+ title: "鐗╂枡缂栧彿",
+ required: true,
+ field: "materialCode",
+ type: "string",
+ },
+ {
+ title: "鐗╂枡鍚嶇О",
+ required: true,
+ field: "materialName",
+ type: "string",
+ },
+ ],
+ ]);
+ const searchFormFields = ref({
+ deliverBackId: "",
+ deliverCode: "",
+ saleOrderNo: "",
+ barCode: "",
+ materialCode: "",
+ materialName: "",
+ materialLot: "",
+ quantity: "",
+ customer: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "澶磋〃", field: "deliverBackId", type: "like" },
+ { title: "鍑哄簱鍗曞彿", field: "deliverCode", type: "like" },
+ { title: "閿�鍞崟鍙�", field: "saleOrderNo", type: "like" },
+ { title: "鐗╂枡鏉＄爜", field: "barCode", type: "like" },
+ ],
+ [
+ { title: "鐗╂枡缂栧彿", field: "materialCode", type: "like" },
+ { title: "鐗╂枡鍚嶇О", field: "materialName", type: "like" },
+ { title: "鐗╂枡鎵规", field: "materialLot", type: "like" },
+ { title: "瀹㈡埛缂栧彿", field: "customer", type: "like" },
+ ],
+ [
+ { title: "鐘舵��", field: "deliverBackDetailStatus", type: "select", dataKey: "inboundState", data: [] },
+ { title:"鍒涘缓鏃堕棿", field:"createDate", type:"datetime" },
+ ]
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "deliverBackId",
+ title: "澶磋〃",
+ type: "string",
+ width: 70,
+ align: "left",
+ },
+ {
+ field: "deliverCode",
+ title: "鍑哄簱鍗曞彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "saleOrderNo",
+ title: "閿�鍞崟鍙�",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "barCode",
+ title: "鐗╂枡鏉＄爜",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialLot",
+ title: "鐗╂枡鎵规",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "quantity",
+ title: "鏁伴噺",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "customer",
+ title: "瀹㈡埛缂栧彿",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "backInboundQty",
+ title: "宸插叆搴撴暟閲�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "deliverBackDetailStatus",
+ title: "鐘舵��",
+ type: "string",
+ width: 120,
+ align: "left",
+ bind: { key: "inboundState", data: [] },
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/purchaseOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/purchaseOrder.vue"
index 5d3a627..0e91bd6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/purchaseOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/purchaseOrder.vue"
@@ -1,19 +1,10 @@
-
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
- <script>
+<script>
import extend from "@/extension/inbound/purchaseOrder.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -21,67 +12,64 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "閲囪喘鍗�",
+ cnName: "浜屾湡閲囪喘鍗�",
name: "purchaseOrder",
url: "/PurchaseOrder/",
sortName: "id",
});
const editFormFields = ref({
- // orderType: "",
- // inboundOrderNo: "",
- // upperOrderNo: "",
- // remark: "",
+ orderType: "",
+ inboundOrderNo: "",
+ upperOrderNo: "",
+ remark: "",
});
const editFormOptions = ref([
- // [
- // {
- // title: "鍗曟嵁绫诲瀷",
- // required: true,
- // field: "orderType",
- // type: "select",
- // dataKey: "inOrderType",
- // data: [],
- // },
- // {
- // field: "inboundOrderNo",
- // title: "鍗曟嵁缂栧彿",
- // type: "string",
- // },
- // {
- // title: "涓婃父鍗曟嵁缂栧彿",
- // field: "upperOrderNo",
- // type: "string",
- // },
- // {
- // title: "澶囨敞",
- // field: "remark",
- // type: "textarea",
- // },
- // ],
+ [
+ {
+ title: "鍗曟嵁绫诲瀷",
+ required: true,
+ field: "orderType",
+ type: "select",
+ dataKey: "inOrderType",
+ data: [],
+ },
+ {
+ field: "inboundOrderNo",
+ title: "鍗曟嵁缂栧彿",
+ type: "string",
+ },
+ {
+ title: "涓婃父鍗曟嵁缂栧彿",
+ field: "upperOrderNo",
+ type: "string",
+ },
+ {
+ title: "澶囨敞",
+ field: "remark",
+ type: "textarea",
+ },
+ ],
]);
const searchFormFields = ref({
- purchaseOrderNo: "",
- purchaseOrderType: "",
- purchaseOrderStatus: "",
+ inboundOrderNo: "",
+ upperOrderNo: "",
+ orderType: "",
+ orderStatus: "",
+ createType: "",
+ creater: "",
+ createDate: "",
});
const searchFormOptions = ref([
[
- { title: "閲囪喘鍗曞彿", field: "purchaseOrderNo", type: "like" },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "purchaseOrderType",
- type: "select",
- dataKey: "purchaseType",
- data: [],
- },
- {
- title: "鍗曟嵁鐘舵��",
- field: "purchaseOrderStatus",
- type: "select",
- dataKey: "purchaseOrderStatus",
- data: [],
- },
- ]
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [], },
+ { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
+ { title: "涓婃父鍗曞彿", field: "upperOrderNo", type: "like" },
+ { title: "鐘舵��", field: "orderStatus", type: "select", dataKey: "inboundState", data: [], },
+ ],
+ [
+ {title: "鍒涘缓鏃堕棿",field: "createDate",type: "datetime",},
+ ],
+
]);
const columns = ref([
{
@@ -95,49 +83,47 @@
align: "left",
},
{
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
+ },
+ {
field: "purchaseOrderNo",
title: "閲囪喘鍗曞彿",
type: "string",
width: 150,
align: "left",
- link: true,
},
- {
- field: "purchaseOrderType",
- title: "鍗曟嵁绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "", data: [{key:'S',value:"鏍囧噯鍏ュ簱"},{key:'V',value:"瀵勫敭琛ョ粰鍏ュ簱"}] },
- },
-
{
field: "supplierCode",
title: "渚涘簲鍟嗙紪鍙�",
type: "string",
- width: 120,
+ width: 150,
align: "left",
},
{
field: "orderQuantity",
title: "閲囪喘鏁伴噺",
- type: "decimal",
+ type: "int",
width: 90,
align: "left",
},
{
field: "purchaseOrderStatus",
- title: "閲囪喘鍗曠姸鎬�",
+ title: "鐘舵��",
type: "string",
width: 90,
align: "left",
- bind: { key: "purchaseOrderStatus", data: [] },
+ bind: { key: "inboundState", data: [] },
},
{
- field: "orderDate",
- title: "涓嬪崟鏃ユ湡",
+ field: "remark",
+ title: "澶囨敞",
type: "string",
- width: 160,
+ width: 200,
align: "left",
},
{
@@ -153,7 +139,6 @@
type: "datetime",
width: 160,
align: "left",
-
},
{
field: "modifier",
@@ -178,140 +163,9 @@
},
]);
const detail = ref({
- cnName: "閲囪喘鍗曟槑缁�",
- table: "InboundOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "purchaseOrderId",
- title: "閲囪喘鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "rowNo",
- title: "琛屽彿",
- type: "string",
- width: 150,
- align: "left"
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "select",
- width: 150,
- align: "left",
- edit: { type: "" },
- required: true,
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 100,
- align: "left"
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "select",
- type: "string",
- width: 100,
- align: "left",
- },
- // {
- // field: "batchNo",
- // title: "鎵规鍙�",
- // type: "decimal",
- // width: 90,
- // align: "left",
- // edit: { type: "" },
- // required: true,
- // },
- {
- field: "purchaseDetailQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "decimal",
- width: 100,
- align: "left",
- },
- {
- field:"purchaseDetailReceiveQty",
- title: "宸叉敹鏁伴噺",
- type: "decimal",
- width: 100,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "purchaseDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- bind: { key: "purchaseOrderStatus", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ],
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
sortName: "id",
key: "id",
});
@@ -327,5 +181,4 @@
};
},
});
-</script>
-
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/purchaseOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/purchaseOrderDetail.vue"
index 6161c3a..cf30905 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/purchaseOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/purchaseOrderDetail.vue"
@@ -1,67 +1,205 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_PurchaseOrderDetail.js姝ゅ缂栧啓
- -->
<template>
- <view-grid ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend">
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
<script>
- import extend from "@/extension/inbound/purchaseOrderDetail.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '閲囪喘鍗曟槑缁�',
- name: 'purchaseOrderDetail',
- url: "/PurchaseOrderDetail/",
- sortName: "id"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([]);
- const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'purchaseOrderId',title:'澶磋〃涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'rowNo',title:'琛屽彿',type:'int',width:110,require:true,align:'left'},
- {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'purchaseDetailStatus',title:'閲囪喘鍗曟槑缁嗙姸鎬�',type:'int',width:110,require:true,align:'left'},
- {field:'warehouseId',title:'WarehouseId',type:'int',width:110,require:true,align:'left'},
- {field:'purchaseDetailQuantity',title:'PurchaseDetailQuantity',type:'float',width:110,require:true,align:'left'},
- {field:'unit',title:'Unit',type:'string',width:110,require:true,align:'left'},
- {field:'creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'codifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "#detailTable",
- columns: [],
- sortName: "",
- key: ""
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
-</script>
+import extend from "@/extension/inbound/purchaseOrderDetail.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "浜屾湡閲囪喘鍗曟槑缁�",
+ name: "purchaseOrderDetail",
+ url: "/PurchaseOrderDetail/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ purchaseOrderId: "",
+ detailId: "",
+ barCode: "",
+ materielCode: "",
+ materielName: "",
+ purchaseDetailStatus: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "澶磋〃", field: "purchaseOrderId", type: "like" },
+ { title: "涓婃父鏄庣粏Id", field: "detailId", type: "like" },
+ { title: "鐗╂枡鏉＄爜", field: "barCode", type: "like" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+ ],
+ [
+ { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
+ { title: "鐘舵��", field: "purchaseDetailStatus", type: "select", dataKey: "inboundState", data: [] },
+ ]
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "purchaseOrderId",
+ title: "澶磋〃",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "detailId",
+ title: "涓婃父鏄庣粏Id",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "barCode",
+ title: "鐗╂枡鏉＄爜",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialLot",
+ title: "鐗╂枡鎵规",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "purchaseDetailQuantity",
+ title: "鏁伴噺",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "purchaseDetailWide",
+ title: "骞呭",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "purchaseDetailThickness",
+ title: "鍗峰緞",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "purchaseDetailWeight",
+ title: "閲嶉噺",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "materielSpec",
+ title: "鐗╂枡瑙勬牸",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "purchaseDetailStatus",
+ title: "鏄庣粏鐘舵��",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind: { key: "inboundState", data: [] },
+ },
+ {
+ field: "purchaseDetailInboundQty",
+ title: "宸插叆搴撴暟閲�",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "id",
+ key: "id",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/returnBSTOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/returnBSTOrder.vue"
new file mode 100644
index 0000000..39ed9a9
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/returnBSTOrder.vue"
@@ -0,0 +1,167 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/inbound/returnBSTOrder.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "BST閫�鏂欏崟",
+ name: "returnBSTOrder",
+ url: "/returnBSTOrder/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ warehouseId:"",
+ paperWreturnId:"",
+ returnInboundNo:"",
+ paperWreturnNo:"",
+ returnDate:"",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
+ { title: "閫�鏂欏崟鏉ユ簮ID", field: "paperWreturnId", type: "like" },
+ { title: "WMS鍗曞彿", field: "returnInboundNo", type: "like" },
+ { title: "閫�鏂欏崟鍙�", field: "paperWreturnNo", type: "like", },
+ ],
+ [
+ { title: "閫�鏂欐棩鏈�", field: "returnDate", type: "datetime", }
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind: { key: "warehouses", data: [] }
+ },
+ {
+ field: "paperWreturnId",
+ title: "閫�鏂欏崟鏉ユ簮ID",
+ type: "int",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "returnInboundNo",
+ title: "WMS鍗曟嵁缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "paperWreturnNo",
+ title: "閫�鏂欏崟缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "employeeName",
+ title: "閫�鏂欏憳宸�",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "totalPaperWreturnLength",
+ title: "閫�鏂欐�婚暱搴�",
+ type: "decimal",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "returnOrderStatus",
+ title: "閫�鏂欏崟鐘舵��",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "wreturnDate",
+ title: "閫�鏂欐棩鏈�",
+ type: "date",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "鍏ュ簱鍗曟槑缁�",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/returnBSTOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/returnBSTOrderDetail.vue"
new file mode 100644
index 0000000..cd02bda
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/returnBSTOrderDetail.vue"
@@ -0,0 +1,214 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/inbound/returnBSTOrderDetail.js";
+import { ref, defineComponent } from "vue";
+import { data } from "vue-barcode";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "BST閫�鏂欏崟鏄庣粏",
+ name: "returnBSTOrderDetail",
+ url: "/ReturnBSTOrderDetail/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ returnBSTOrderId:"",
+ paperWreturnId:"",
+ materialId:"",
+ barcode:"",
+ materialNo:"",
+ materialName:"",
+ seqNo:"",
+ returnBSTOrderDetailStatus:"",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "澶磋〃", field: "returnBSTOrderId", type: "like" },
+ { title: "閫�鏂欐潵婧怚D", field: "paperWreturnId", type: "like" },
+ { title: "鐗╂枡鏉ユ簮ID", field: "materialId", type: "like" },
+ { title: "鐗╂枡鏉＄爜", field: "barcode", type: "like" },
+
+ ],
+ [
+ { title: "鐗╂枡缂栧彿", field: "materialNo", type: "like" },
+ { title: "鐗╂枡鍚嶇О", field: "materialName", type: "like" },
+ { title: "鎵规搴忓垪鍙�", field: "seqNo", type: "like" },
+ { title: "鐘舵��", field: "returnBSTOrderDetailStatus", type: "select", dataKey: "inboundState", data: [], },
+ ],
+ [
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ]
+
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "returnBSTOrderId",
+ title: "澶磋〃",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "paperWreturnId",
+ title: "閫�鏂欐潵婧怚D",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialId",
+ title: "鐗╂枡鏉ユ簮ID",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "barcode",
+ title: "鐗╂枡鏉＄爜",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialNo",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "seqNo",
+ title: "鎵规搴忓垪鍙�",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialWide",
+ title: "骞呭",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialThick",
+ title: "鐩村緞",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "procurementLength",
+ title: "閫�鏂欓暱搴�",
+ type: "decimal",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "qty",
+ title: "閫�鏂欐暟閲�",
+ type: "decimal",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "returnBSTOrderDetailStatus",
+ title: "鐘舵��",
+ type: "select",
+ width: 90,
+ align: "left",
+ bind: { key: "inboundState", data: [] },
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "鍏ュ簱鍗曟槑缁�",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outBSTPickInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outBSTPickInfo.vue"
new file mode 100644
index 0000000..2d0fa41
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outBSTPickInfo.vue"
@@ -0,0 +1,187 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/outbound/outBSTPickInfo.js";
+import { ref, defineComponent } from "vue";
+import { data } from "vue-barcode";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鍗氭�濋�氶鏂欎俊鎭�",
+ name: "outBSTPickInfo",
+ url: "/OutBSTPickInfo/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鍑哄簱涓昏〃ID", field: "outBSTOrderId", type: "like" },
+ { title: "鍏宠仈涓昏〃ID", field: "boardMpsId", type: "like" },
+ { title: "鐗╂枡鏉ユ簮ID", field: "materialId", type: "like" },
+ { title: "鐗╂枡缂栧彿", field: "materialNo", type: "like" },
+ ],
+ [
+ { title: "鐗╂枡鍚嶇О", field: "materialName", type: "like" },
+ { title: "鐘舵��", field: "outBSTOrderDetailStatus", type: "select", dataKey: "outboundStatusEnum", data: [] },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "outBSTOrderId",
+ title: "鍑哄簱涓昏〃ID",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "boardMpsId",
+ title: "鍏宠仈鐨勪富琛↖D",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "width",
+ title: "骞呭",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "xqLen",
+ title: "闇�姹傞暱搴�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "totalUsage",
+ title: "鎬荤敤閲�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "materialId",
+ title: "鐗╂枡鏉ユ簮ID",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialNo",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "procurementLength",
+ title: "閲囪喘闀垮害",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "assignTotalUsage",
+ title: "宸插垎閰嶇敤閲�",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "outTotalUsage",
+ title: "宸插嚭鐢ㄩ噺",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "outBSTOrderDetailStatus",
+ title: "鐘舵��",
+ type: "select",
+ width: 90,
+ align: "left",
+ bind: { key: "outboundStatusEnum", data: [] },
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "鍏ュ簱鍗曟槑缁�",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue"
index 1bcf0d6..7eede7f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue"
@@ -96,7 +96,7 @@
title: "鍗曟嵁绫诲瀷",
field: "orderType",
type: "select",
- dataKey: "outOrderType",
+ dataKey: "outOrderTypeEnum",
data: [],
},
@@ -111,8 +111,11 @@
{title: "璐т綅缂栧彿",field: "locationCode",type: "like",},
{ title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
{ title: "浠诲姟鍙�", field: "taskNum", type: "like" },
- { title: "鐘舵��", field: "status", type: "select",dataKey:"outLockStockStatusEnum", data:[]},
+ { title: "鐘舵��", field: "status", type: "select",dataKey:"outboundStatusEnum", data:[]},
],
+ [
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ]
]);
const columns = ref([
{
@@ -131,7 +134,34 @@
type: "string",
width: 150,
align: "left",
-
+ },
+ {
+ field: "orderType",
+ title: "鍗曟嵁绫诲瀷",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "outOrderTypeEnum", data: [] },
+ },
+ {
+ field: "orderDetailId",
+ title: "鍗曟嵁鏄庣粏涓婚敭",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "materielId",
+ title: "鐗╂枡id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
},
{
field: "batchNo",
@@ -149,20 +179,21 @@
align: "left",
},
{
- field: "orderType",
- title: "鍗曟嵁绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "outOrderType", data: [] },
- },
- {
field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
width: 120,
align: "left",
-
+ },
+ {
+ field: "stockId",
+ title: "搴撳瓨涓婚敭",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
},
{
field: "orderQuantity",
@@ -207,17 +238,17 @@
align: "left",
},
{
- field: "productionDate",
- title: "鐢熶骇鏃ユ湡",
+ field: "machineName",
+ title: "鏈哄彴浣嶇疆",
type: "string",
- width: 160,
+ width: 100,
align: "left",
},
{
- field: "effectiveDate",
- title: "鏈夋晥鏈�",
+ field: "makeCode",
+ title: "鍔犲伐涓績",
type: "string",
- width: 160,
+ width: 100,
align: "left",
},
{
@@ -230,10 +261,40 @@
{
field: "status",
title: "鐘舵��",
+ type: "select",
+ width: 100,
+ align: "left",
+ bind: { key: "outboundStatusEnum", data: [] },
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
type: "string",
width: 100,
align: "left",
- bind:{key:"outLockStockStatusEnum", data: []}
+ hidden: true,
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ hidden: true,
},
]);
const detail = ref({
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/proDeliveryOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/proDeliveryOrder.vue"
new file mode 100644
index 0000000..dd728d5
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/proDeliveryOrder.vue"
@@ -0,0 +1,169 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/outbound/proDeliveryOrder.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "閿�鍞嚭搴撳崟",
+ name: "proDeliveryOrder",
+ url: "/ProDeliveryOrder/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ warehouseId: "",
+ proDeliveryCode: "",
+ deliveryCode: "",
+ deliveryType: "",
+ proDeliveryStatus: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
+ { title: "WMS鍗曞彿", field: "proDeliveryCode", type: "like" },
+ { title: "鍑哄簱鍗曞彿", field: "deliveryCode", type: "like" },
+ { title: "璁㈠崟绫诲瀷", field: "deliveryType", type: "select", dataKey: "outOrderTypeEnum", data: [] },
+ ],
+ [
+ { title: "鐘舵��", field: "proDeliveryStatus", type: "select", dataKey: "outboundStatusEnum", data: [] },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind: { key: "warehouses", data: [] }
+ },
+ {
+ field: "proDeliveryCode",
+ title: "WMS鍗曞彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "deliveryCode",
+ title: "鍑哄簱鍗曞彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "deliveryType",
+ title: "璁㈠崟绫诲瀷",
+ type: "select",
+ width: 150,
+ align: "left",
+ bind: { key: "outOrderTypeEnum", data: [] },
+ },
+ {
+ field: "employeeName",
+ title: "鍒涘缓鍛樺伐",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "proDeliveryStatus",
+ title: "鐘舵��",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ bind: { key: "outboundStatusEnum", data: [] },
+ },
+ {
+ field: "planDate",
+ title: "璁″垝棰嗘枡鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "details",
+ title: "閲囪喘鍒楄〃",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "鍏ュ簱鍗曟槑缁�",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/proDeliveryOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/proDeliveryOrderDetail.vue"
new file mode 100644
index 0000000..7484b77
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/proDeliveryOrderDetail.vue"
@@ -0,0 +1,195 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/outbound/proDeliveryOrderDetail.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "閿�鍞嚭搴撳崟鏄庣粏",
+ name: "proDeliveryOrderDetail",
+ url: "/ProDeliveryOrderDetail/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ proDeliveryId: "",
+ detailId: "",
+ saleOrderNo: "",
+ customer: "",
+ materialCode: "",
+ materielName: "",
+ materialLot: "",
+ proDeliveryDetailStatus: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "澶磋〃", field: "proDeliveryId", type: "like" },
+ { title: "鍑哄簱鏄庣粏ID", field: "detailId", type: "like" },
+ { title: "閿�鍞崟鍙�", field: "saleOrderNo", type: "like" },
+ { title: "瀹㈡埛缂栧彿", field: "customer", type: "like" },
+ ],
+ [
+ { title: "鐗╂枡缂栧彿", field: "materialCode", type: "like" },
+ { title: "鐗╂枡鍚嶇О", field: "materialName", type: "like" },
+ { title: "鐗╂枡鎵规", field: "materialLot", type: "like" },
+ { title: "鐘舵��", field: "proDeliveryDetailStatus", type: "select", dataKey: "outboundStatusEnum", data: [] },
+ ],
+
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "proDeliveryId",
+ title: "澶磋〃",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "detailId",
+ title: "鍑哄簱鏄庣粏ID",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "saleOrderNo",
+ title: "閿�鍞崟鍙�",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "customer",
+ title: "瀹㈡埛缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialLot",
+ title: "鐗╂枡鎵规",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "quantity",
+ title: "鏁伴噺",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "assignTotalUsage",
+ title: "宸插垎閰嶉渶姹傛暟閲�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "outTotalUsage",
+ title: "宸插嚭闇�姹傛暟閲�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "proDeliveryDetailStatus",
+ title: "鐘舵��",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ bind: { key: "outboundStatusEnum", data: [] },
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "鍏ュ簱鍗曟槑缁�",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
index f42c0b2..0147d8e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
@@ -1,18 +1,10 @@
{
"Version": 1,
- "WorkspaceRootPath": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\",
+ "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|e:\\get\\longdeliliku\\\u9879\u76EE\u4EE3\u7801\\wms\\wmsservices\\widesea_basicservice\\base\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\base\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|e:\\get\\longdeliliku\\\u9879\u76EE\u4EE3\u7801\\wms\\wmsservices\\widesea_taskinfoservice\\taskservice_inbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\taskservice_inbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|e:\\get\\longdeliliku\\\u9879\u76EE\u4EE3\u7801\\wms\\wmsservices\\widesea_taskinfoservice\\assigninboundtasklocation_bc.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\assigninboundtasklocation_bc.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|c:\\users\\administrator\\desktop\\longdeliliku\\\u9879\u76EE\u4EE3\u7801\\wms\\wmsservices\\widesea_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|solutionrelative:widesea_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -27,48 +19,14 @@
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "LocationInfoService.cs",
- "DocumentMoniker": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_BasicService\\Base\\LocationInfoService.cs",
- "RelativeDocumentMoniker": "WIDESEA_BasicService\\Base\\LocationInfoService.cs",
- "ToolTip": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_BasicService\\Base\\LocationInfoService.cs",
- "RelativeToolTip": "WIDESEA_BasicService\\Base\\LocationInfoService.cs",
- "ViewState": "AgIAAG4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+ "Title": "TaskStatusEnum.cs",
+ "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs",
+ "RelativeDocumentMoniker": "WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs",
+ "ToolTip": "C:\\Users\\Administrator\\Desktop\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs",
+ "RelativeToolTip": "WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-09-11T09:31:06.62Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "AssignInboundTaskLocation_BC.cs",
- "DocumentMoniker": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_TaskInfoService\\AssignInboundTaskLocation_BC.cs",
- "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\AssignInboundTaskLocation_BC.cs",
- "ToolTip": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_TaskInfoService\\AssignInboundTaskLocation_BC.cs",
- "RelativeToolTip": "WIDESEA_TaskInfoService\\AssignInboundTaskLocation_BC.cs",
- "ViewState": "AgIAAEoAAAAAAAAAAAAhwJMAAAARAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-09-11T07:40:25.502Z",
- "EditorCaption": ""
- },
- {
- "$type": "Bookmark",
- "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
- },
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "TaskService_Inbound.cs",
- "DocumentMoniker": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_TaskInfoService\\TaskService_Inbound.cs",
- "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\TaskService_Inbound.cs",
- "ToolTip": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_TaskInfoService\\TaskService_Inbound.cs",
- "RelativeToolTip": "WIDESEA_TaskInfoService\\TaskService_Inbound.cs",
- "ViewState": "AgIAANABAAAAAAAAAAAAAOMBAABaAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-09-11T07:30:48.968Z",
+ "WhenOpened": "2025-11-16T11:09:41.55Z",
"EditorCaption": ""
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
index c093fd4..4c634aa 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
@@ -1,10 +1,10 @@
{
"Version": 1,
- "WorkspaceRootPath": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\",
+ "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|e:\\get\\longdeliliku\\\u9879\u76EE\u4EE3\u7801\\wms\\wmsservices\\widesea_taskinfoservice\\taskservice_inbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\taskservice_inbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|c:\\users\\administrator\\desktop\\longdeliliku\\\u9879\u76EE\u4EE3\u7801\\wms\\wmsservices\\widesea_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|solutionrelative:widesea_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -14,27 +14,23 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 2,
+ "SelectedChildIndex": 1,
"Children": [
{
"$type": "Bookmark",
- "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+ "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
},
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "TaskService_Inbound.cs",
- "DocumentMoniker": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_TaskInfoService\\TaskService_Inbound.cs",
- "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\TaskService_Inbound.cs",
- "ToolTip": "E:\\GET\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_TaskInfoService\\TaskService_Inbound.cs",
- "RelativeToolTip": "WIDESEA_TaskInfoService\\TaskService_Inbound.cs",
- "ViewState": "AgIAANABAAAAAAAAAAAAAOMBAAAJAAAAAAAAAA==",
+ "Title": "TaskStatusEnum.cs",
+ "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs",
+ "RelativeDocumentMoniker": "WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs",
+ "ToolTip": "C:\\Users\\Administrator\\Desktop\\LongDeLiLiKu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WMSServices\\WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs",
+ "RelativeToolTip": "WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-09-11T07:30:48.968Z",
+ "WhenOpened": "2025-11-16T11:09:41.55Z",
"EditorCaption": ""
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/ApiInfoCotroller.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/ApiInfoCotroller.cs"
new file mode 100644
index 0000000..8b93cf2
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/ApiInfoCotroller.cs"
@@ -0,0 +1,20 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IBasicService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Basic
+{
+ /// <summary>
+ /// 鎺ュ彛淇℃伅
+ /// </summary>
+ [Route("api/ApiInfo")]
+ [ApiController]
+ public class ApiInfoController : ApiBaseController<IApiInfoService, Dt_ApiInfo>
+ {
+ public ApiInfoController(IApiInfoService service) : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/CustomerController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/CustomerController.cs"
new file mode 100644
index 0000000..de67264
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/CustomerController.cs"
@@ -0,0 +1,20 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IBasicService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Basic
+{
+ /// <summary>
+ /// 瀹㈡埛淇℃伅
+ /// </summary>
+ [Route("api/CustomerInfo")]
+ [ApiController]
+ public class CustomerInfoController : ApiBaseController<ICustomerInfoService, Dt_CustomerInfo>
+ {
+ public CustomerInfoController(ICustomerInfoService service) : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\223\215\344\275\234\346\211\213\345\206\214/\351\276\231\345\210\251\345\276\227WMS\347\263\273\347\273\237\346\223\215\344\275\234\350\257\264\346\230\216\344\271\246.doc" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\223\215\344\275\234\346\211\213\345\206\214/\351\276\231\345\210\251\345\276\227WMS\347\263\273\347\273\237\346\223\215\344\275\234\350\257\264\346\230\216\344\271\246.doc"
index de12363..4fa0f3b 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\223\215\344\275\234\346\211\213\345\206\214/\351\276\231\345\210\251\345\276\227WMS\347\263\273\347\273\237\346\223\215\344\275\234\350\257\264\346\230\216\344\271\246.doc"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\223\215\344\275\234\346\211\213\345\206\214/\351\276\231\345\210\251\345\276\227WMS\347\263\273\347\273\237\346\223\215\344\275\234\350\257\264\346\230\216\344\271\246.doc"
Binary files differ
--
Gitblit v1.9.3