From 6db8e7dcbb1bfe368a88a21f8856449ed40935f5 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 28 十二月 2024 16:57:30 +0800
Subject: [PATCH] 更新前端
---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue | 16 +++
代码管理/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue | 35 +++++++-
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue | 13 +++
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 27 +++++-
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue | 59 +++++++++++++-
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue | 59 +++++++++++++-
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue | 9 ++
代码管理/WMS/WIDESEA_WMSClient/src/api/http.js | 2
8 files changed, 192 insertions(+), 28 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
index f72cad1..83d4d24 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
@@ -19,7 +19,7 @@
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = 'http://115.159.85.185:9291/';
+ axios.defaults.baseURL = 'http://10.30.4.92:9293/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
index 4afd641..ff75f6e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
@@ -32,7 +32,14 @@
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
- const searchFormOptions = 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:[]}
+ ]
+ ]);
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',sort:true},
{field:'name',title:'瀹㈡埛鍚嶇О',type:'string',width:110,align:'left'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue"
index 80aec3d..0c76511 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue"
@@ -30,9 +30,21 @@
sortName: "id"
});
const editFormFields = ref({});
- const editFormOptions = ref([]);
+ const editFormOptions = ref([
+
+ ]);
const searchFormFields = ref({});
- const searchFormOptions = 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:"",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'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
index e402f39..07e3c78 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
@@ -32,7 +32,18 @@
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
- const searchFormOptions = ref([]);
+ const searchFormOptions = ref([
+ [
+ {title:"鍛樺伐鍙�", field:"code", type:"like"},
+ {title:"閮ㄩ棬缂栫爜", field:"deptNo", type:"like"},
+ {title:"閮ㄩ棬鍚嶇О", field : "name", type:"like"}
+ ],
+ [
+ {title:"鐘舵��", field:"state",type:"select",dataKey:"",data:[]},
+ {title:"搴撳瓨缁勭粐", field:"invOrgId", type:"like"},
+ {title:"绫诲瀷", field:"type", type:"select", dataKey:"", data:[]},
+ ]
+ ]);
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',sort:true},
{field:'deptNo',title:'閮ㄩ棬缂栫爜',type:'string',width:110,align:'left'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
index 09f6687..cbefc41 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
@@ -32,7 +32,19 @@
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
- const searchFormOptions = ref([]);
+ const searchFormOptions = ref([
+ [
+ {title:"妫�楠屽崟鍙�", field:"checkOrderNo",type:"like"},
+ {title:"鏀惰揣鍗曞彿", field:"receiveOrderNo",type:"like"},
+ {title:"璐ㄦ鍗曠姸鎬�", field:"checkOrderStatus",type:"select",dataKey:"",data:[]},
+ {title:"瀹℃壒鐘舵��", field:"auditStatus",type:"select",dataKey:"",data:[]},
+ ],
+ [
+ {title:"鏀惰揣鍗曟槑缁嗚鍙�", field:"receiveDetailRowNo",type:"like"},
+ {title:"鐗╂枡缂栧彿", field:"materielCode",type:"like"},
+ {title:"妫�楠岀粨鏋�", field:"result",type:"like"},
+ ]
+ ]);
const columns = ref([{field:'checkOrderId',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'checkOrderNo',title:'妫�楠屽崟鍙�',type:'string',width:110,require:true,align:'left',sort:true},
{field:'receiveOrderNo',title:'鏀惰揣鍗曞彿',type:'string',width:110,require:true,align:'left'},
@@ -53,11 +65,22 @@
{field:'modifier',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: ""
+ cnName: "妫�楠岀粨鏋�",
+ table: "CheckOrderResult",
+ columns: [
+ {field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'checkOrderId',title:'妫�楠屽崟涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'defectCode',title:'缂洪櫡浠ｇ爜',type:'string',width:110,require:true,align:'left'},
+ {field:'result',title:'妫�楠岀粨鏋�',type:'string',width:110,require:true,align:'left'},
+ {field:'quantity',title:'鏁伴噺',type:'float',width:110,require:true,align:'left'},
+ {field:'note',title:'澶囨敞',type:'string',width:220,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:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}
+ ],
+ sortName: "id",
+ key: "id"
});
return {
table,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue"
index 4336f9a..749258e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue"
@@ -32,7 +32,37 @@
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
- const searchFormOptions = ref([]);
+ const searchFormOptions = ref([
+ [
+ { title: "鍗曟嵁缂栧彿", field: "orderNo", 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: "createType",
+ type: "select",
+ dataKey: "createType",
+ data: [],
+ },
+ { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ ]);
const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'orderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
{field:'upperOrderNo',title:'涓婃父鍗曟嵁缂栧彿',type:'string',width:110,align:'left'},
@@ -47,11 +77,28 @@
{field:'modifier',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: ""
+ cnName: "鍘嗗彶鍏ュ簱鍗曟槑缁�",
+ table: "InboundOrderDetail_Hty",
+ columns: [
+ {field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'orderId',title:'鍏ュ簱鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'materielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,require:true,align:'left'},
+ {field:'batchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
+ {field:'orderQuantity',title:'鍗曟嵁鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'receiptQuantity',title:'缁勭洏鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'overInQuantity',title:'涓婃灦鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'orderDetailStatus',title:'璁㈠崟鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',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:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}
+ ],
+ sortName: "id",
+ key: "id"
});
return {
table,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue"
index d08c302..7019c6c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue"
@@ -32,7 +32,37 @@
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
- const searchFormOptions = ref([]);
+ const searchFormOptions = ref([
+ [
+ { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+ { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+ {
+ title: "鍗曟嵁绫诲瀷",
+ field: "orderType",
+ type: "select",
+ dataKey: "outOrderType",
+ data: [],
+ },
+ {
+ title: "鍗曟嵁鐘舵��",
+ field: "orderStatus",
+ type: "select",
+ dataKey: "inboundState",
+ 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:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'orderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
{field:'upperOrderNo',title:'涓婃父鍗曟嵁缂栧彿',type:'string',width:110,align:'left'},
@@ -47,11 +77,28 @@
{field:'modifier',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: ""
+ cnName: "鍘嗗彶鍑哄簱鍗曟槑缁�",
+ table: "OutboundOrderDetail_Hty",
+ columns: [
+ {field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'orderId',title:'鍑哄簱鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'materielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,align:'left'},
+ {field:'batchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
+ {field:'orderQuantity',title:'鍗曟嵁鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'lockQuantity',title:'閿佸畾鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'overOutQuantity',title:'宸插嚭鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'orderDetailStatus',title:'璁㈠崟鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',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:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}
+ ],
+ sortName: "id",
+ key: "id"
});
return {
table,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index faf241b..de7233b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -37,7 +37,11 @@
deviceRemark: "",
});
const editFormOptions = ref([
-
+ [
+ {field:'palletCode',title:'鎵樼洏缂栧彿',type:'string'},
+ {field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
+ {field:'isFull',title:'鏄惁婊＄洏',type:'select',dataKey:"yesno",data:[]},
+ ]
]);
const searchFormFields = ref({
palletCode: "",
@@ -119,10 +123,23 @@
},
]);
const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
+ cnName: "鍘嗗彶搴撳瓨淇℃伅",
+ table: "StockInfo_Hty",
+ columns: [
+ {field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'palletCode',title:'鎵樼洏缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
+ {field:'locationCode',title:'璐т綅缂栧彿',type:'string',width:110,align:'left'},
+ {field:'isFull',title:'鏄惁婊＄洏',type:'bool',width:110,require:true,align:'left'},
+ {field:'stockStatus',title:'搴撳瓨鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',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:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}
+ ],
+ sortName: "id",
});
return {
table,
--
Gitblit v1.9.3