From 6ee6f1f94f1e135673bbc59780a8c37f1f257abe Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 6 Dec 2022 17:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/udiInfo.js | 9 + src/api/warehouse/order.js | 8 + src/router/index.js | 21 +- src/utils/date.js | 7 + src/views/basic/UdiInfoSearch.vue | 1125 +++++++++-------- src/views/thrsys/SysUdimsData.vue | 35 +- src/views/warehouse/stockOrderDelSearch.vue | 4 +- src/views/warehouse/stockOrderDelete.vue | 4 +- src/views/warehouse/stockOrderPreInChange.vue | 606 +++++++++ 9 files changed, 1265 insertions(+), 554 deletions(-) create mode 100644 src/views/warehouse/stockOrderPreInChange.vue diff --git a/src/api/basic/udiInfo.js b/src/api/basic/udiInfo.js index b14450c..be320e5 100644 --- a/src/api/basic/udiInfo.js +++ b/src/api/basic/udiInfo.js @@ -8,6 +8,15 @@ export function getUdiInfos(query) { }); } +export function vailUdiCode(query) { + return axios({ + url: "/udidl/device/vailUdiCode", + method: "get", + params: query + }); +} + + export function filterCompany(query) { return axios({ url: "/udiwms/udiinfo/filterCompany", diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js index e3ab8dc..7c94753 100644 --- a/src/api/warehouse/order.js +++ b/src/api/warehouse/order.js @@ -340,6 +340,14 @@ export function filterOrderForDelete(params) { }); } +export function filterPreInChange(params) { + return axios({ + url: "/udiwms/inout/order/filterPreInChange", + method: "get", + params: params + }); +} + export function updateOrderInfo(data) { return axios({ url: "/udiwms/inout/order/updateOrderInfo", diff --git a/src/router/index.js b/src/router/index.js index bf080df..4b7f8ce 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,6 +54,7 @@ import stockOrderDelSearch from "../views/warehouse/stockOrderDelSearch"; import stockOrderInvSearch from "../views/warehouse/stockOrderInvSearch"; import stockOrderDelete from "../views/warehouse/stockOrderDelete"; import stockOrderChange from "../views/warehouse/stockOrderChange"; +import stockOrderPreInChange from "../views/warehouse/stockOrderPreInChange"; import stockOrderEditor from "../views/warehouse/stockOrderEditor"; import stockOrderSearch from "../views/warehouse/stockOrderSearch"; import stockOrderNew from "../views/warehouse/stockOrderNew"; @@ -1330,6 +1331,17 @@ export const asyncRouterMap = [ } }, + + { + path: "stockOrderPreInChange", + component: stockOrderPreInChange, + name: "预验收查询", + meta: { + authRule: ["stock/stockOrderPreInChange"] + } + }, + + { path: "stockOrderChange", component: stockOrderChange, @@ -1577,7 +1589,14 @@ export const asyncRouterMap = [ }, ] }, - + { + path: "supDiSearch", + name: "DI信息查询", + component: diSearch, + meta: { + authRule: ["product/supDiSearch"] + } + }, { path: "/spInv", diff --git a/src/utils/date.js b/src/utils/date.js index f863cb9..fdbc07f 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -22,3 +22,10 @@ export function formatDate (date, fmt) { function padLeftZero (str) { return ('00' + str).substr(str.length); }; + + + +export function convertDate(date) { + var time="20"+date.substring(0,2)+"-"+date.substring(2,4)+"-"+date.substring(4,6); + return time; +}; diff --git a/src/views/basic/UdiInfoSearch.vue b/src/views/basic/UdiInfoSearch.vue index df43698..28d2b5c 100644 --- a/src/views/basic/UdiInfoSearch.vue +++ b/src/views/basic/UdiInfoSearch.vue @@ -1,577 +1,604 @@ diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue index 5dfd71f..587032e 100644 --- a/src/views/thrsys/SysUdimsData.vue +++ b/src/views/thrsys/SysUdimsData.vue @@ -79,7 +79,7 @@ + + + + + + { diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index 3eb2ec6..83b25c0 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -187,7 +187,8 @@ - + + @@ -493,6 +494,7 @@ export default { handleCurrentChange(val) { this.query.page = val; this.getList(); + }, handleEdit(index, row) { this.currentCheckIndex = index; diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue index 3a7929e..521c966 100644 --- a/src/views/warehouse/stockOrderDelete.vue +++ b/src/views/warehouse/stockOrderDelete.vue @@ -128,7 +128,8 @@ label="失效日期" prop="expireDate" :show-overflow-tooltip="true" - > + > + +
+ + + + + + + + + + + + + + + 查询 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ errorDetail }} + + 关 闭 + + + + + + + 创建时间： + + + + + + 审核时间： + + + + +
+ 提交 + + 取消 + +
+ + +
+ + + + + +