From 9873392b4b7506e710260f1708e59c43051bed72 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 22 Aug 2022 11:40:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?UDI=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/order.js | 9 + src/api/inout/stockOrder.js | 8 + src/router/index.js | 9 +- src/views/basic/UdiInfoManage.vue | 911 ++++++++++--------- src/views/business/stockOrderEditor.vue | 24 +- src/views/business/stockOrderInvSearch.vue | 967 +++++++++++++++++++++ src/views/business/stockOrderUpdate.vue | 355 ++++++++ src/views/inout/IOAddOrder.vue | 16 +- src/views/inout/IOErrorOrder.vue | 40 +- src/views/inventory/invUdiTraceOrder.vue | 1 + 10 files changed, 1838 insertions(+), 502 deletions(-) create mode 100644 src/views/business/stockOrderInvSearch.vue create mode 100644 src/views/business/stockOrderUpdate.vue diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 2528f95..6aa821f 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -348,3 +348,12 @@ export function getOrderById(params) { params: params }) } + + +export function updateOrder(data) { + return axios({ + url: "/udiwms/inout/order/updateOrder", + method: "post", + data: data + }) +} diff --git a/src/api/inout/stockOrder.js b/src/api/inout/stockOrder.js index 8c56a31..9fb29e3 100644 --- a/src/api/inout/stockOrder.js +++ b/src/api/inout/stockOrder.js @@ -296,5 +296,13 @@ export function submitStockOrderToThirdSys(params) { }) } +export function findOrderByStockOrder(query) { + return axios({ + url: "/udiwms/inout/order/findOrderByStockOrder", + method: 'get', + params: query + }); +} + diff --git a/src/router/index.js b/src/router/index.js index 0173a16..3edf0ed 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -70,7 +70,6 @@ import stockOrderRecedLog from "@/views/business/stockOrderRecedLog"; import thirdUploadSet from "@/views/thrsys/thirdUploadSet"; - //库存管理 import stockCheck from "../views/inventory/stockCheck.vue"; import onHand from "../views/inventory/OnHand.vue"; @@ -79,6 +78,7 @@ import stockPrint from "../views/inventory/IncodeSearch.vue"; import inCodePrint from "../views/inventory/IncodePrint.vue"; import stockCode from "../views/inventory/stockCode.vue"; import stockOrderDelSearch from "../views/business/stockOrderDelSearch"; +import stockOrderInvSearch from "../views/business/stockOrderInvSearch"; import stockOrderDelete from "../views/business/stockOrderDelete"; //库存 @@ -817,7 +817,6 @@ export const asyncRouterMap = [ }, - { path: "/smp", redirect: "/smp/udiinfoExportSmp", @@ -999,11 +998,11 @@ export const asyncRouterMap = [ } }, { - path: "stockOrderDelSearch", - component: stockOrderDelSearch, + path: "stockOrderInvSearch", + component: stockOrderInvSearch, name: "业务单据查询", meta: { - authRule: ["inv/stockOrderDelSearch"] + authRule: ["inv/stockOrderInvSearch"] } }, diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index d0cd0a4..4912e6c 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -72,13 +72,6 @@ - - - - - @@ -268,484 +261,487 @@ > - - - -
-
- 产品名称:  + + + + + +
+
+ 产品名称:  +
+
- -
- - -
-
- 产品标识:  + + +
+
+ 产品标识:  +
+
- -
- - - - - - - -
-
- 规格型号:  + + + + + + + +
+
+ 规格型号:  +
+
- -
- - - -
-
- 器械类别:  + + + +
+
+ 器械类别:  +
+
- -
- - - - -
-
- 产品类别:  + + + + +
+
+ 产品类别:  +
+
- -
- - -
-
- 分类编码:  + + +
+
+ 分类编码:  +
+
- -
- - - - - - -
-
- 商品条码:  + + + + + + +
+
+ 医疗器械注册人:  +
+
- -
- - -
-
- 医保编码:  + + +
+
+ 注册人英文名称:  +
+
- -
- - - - - -
-
- 医疗器械注册人:  + + + + + + +
+
+ 统一社会信用号:  +
+
- -
- - -
-
- 注册人英文名称:  + + +
+
+ 注册证/备案号:  +
+
- -
- - - - - - -
-
- 统一社会信用号:  + + + + +
+
+ 上级产品编码:  +
+
- -
- - -
-
- 注册证/备案号:  + + + +
+
+ 包装级别:  +
+
- -
- - - - -
-
- 上级产品编码:  + + + + +
+
+ 计量单位/包装级别:  +
+ +
- -
- - - -
-
- 包装级别:  + + + +
+
+ 包含下级包装数量:  +
+
- -
- - - - -
-
- 计量单位/包装级别:  + + + + +
+
+ 包含下级产品编码:  +
+ +
- - -
- - - -
-
- 包含下级包装数量:  + + + +
+
+ 包含最小销售包装数量:  +
+
- -
- - - - -
-
- 包含下级产品编码:  + + + + + +
+
+ 最小包装单元内包含使用单元数量:  +
+
- - -
- - - -
-
- 包含最小销售包装数量:  + + +
+
+ 当前版本号:  +
+ + 切换版本 +
- -
- - - - - -
-
- 最小包装单元内包含使用单元数量:  + + + + + +
+
+ 是否包含批号:  +
+
- -
- - -
-
- 生产厂家:  + + +
+
+ 是否包含序列号:  +
+
- -
- - - - -
-
- 是否包含批号:  + + + + +
+
+ 是否包含生产日期:  +
+
- -
- - -
-
- 是否包含序列号:  + + +
+
+ 是否包含失效日期:  +
+
- -
- - - - -
-
- 是否包含生产日期:  + + + + + + +
+
+ 商品条码:  +
+
- -
- - -
-
- 是否包含失效日期:  + + +
+
+ 医保编码:  +
+
- -
- - - - -
-
- 产品描述:  + + + + + +
+
+ 计量单位:  +
+
- -
- - -
-
- 当前版本号:  + + +
+
+ 生产厂家:  +
+
- - 切换版本 - -
- - - - -
-
- 价格:  + + + + + + +
+
+ 商品名称:  +
+
- -
- - - -
-
- 计量单位:  + + + +
+
+ 产品描述:  +
+
- -
- - - - - - -
- 以使用单元数量入库 - - 是否禁用 - - 是否寄售 - - 允许无批次号 - - 允许无失效日期 - - 允许无生产日期 - -
- - - - -
+ + + + + +
+ 以使用单元数量入库 + + 是否禁用 + + 是否寄售 + + 允许无批次号 + + 允许无失效日期 + + 允许无生产日期 + +
+ + + + +
提交 @@ -1407,6 +1403,7 @@ export default { .el-row { display: flex; flex-wrap: wrap; + margin-bottom: 6px; } .el-col { diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 4d63d47..7d47eec 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -563,18 +563,18 @@ export default { }, distributionVisible: false, detailFormRules: { - batchNo: [ - {required: true, message: "请输入批次号", trigger: "blur"} - ], - productDate: [ - {required: true, message: "请输入生产日期", trigger: "blur"} - ], - expireDate: [ - {required: true, message: "请输入失效日期", trigger: "blur"} - ], - sweepCount: [ - {required: true, message: "请输入扫码数量", trigger: "blur"} - ] + // batchNo: [ + // {required: true, message: "请输入批次号", trigger: "blur"} + // ], + // productDate: [ + // {required: true, message: "请输入生产日期", trigger: "blur"} + // ], + // expireDate: [ + // {required: true, message: "请输入失效日期", trigger: "blur"} + // ], + // sweepCount: [ + // {required: true, message: "请输入扫码数量", trigger: "blur"} + // ] }, detailFormVisible: false, detailFormData: {}, diff --git a/src/views/business/stockOrderInvSearch.vue b/src/views/business/stockOrderInvSearch.vue new file mode 100644 index 0000000..2d1945e --- /dev/null +++ b/src/views/business/stockOrderInvSearch.vue @@ -0,0 +1,967 @@ + + + + + + diff --git a/src/views/business/stockOrderUpdate.vue b/src/views/business/stockOrderUpdate.vue new file mode 100644 index 0000000..28e8e43 --- /dev/null +++ b/src/views/business/stockOrderUpdate.vue @@ -0,0 +1,355 @@ + + + + + diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index fd6db4e..06e22f6 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -787,14 +787,10 @@ export default { this.formData.batchNo = response.data.batchNo; this.formData.serialNo = response.data.serialNo; } else { - this.$alert(response.message, '提示', { - confirmButtonText: '确定', - type: 'warning', - closeOnClickModal: true, - callback: action => { - this.$refs.inputRef.focus(); - this.$refs.inputRef.select(); - } + this.$message({ + type: 'error', + message: "提交失败！" + this.editTitle, + customClass: 'messageIndex' }); } } @@ -1213,6 +1209,10 @@ export default {