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 3f158f6..b16ab2b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -79,6 +79,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"; //库存 @@ -1007,11 +1008,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/BussinessType.vue b/src/views/basic/BussinessType.vue index 7856bfa..772e2db 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -200,6 +200,7 @@ export default { checkPc: null, checkWebNew: null, checkChange: null, + checkCopy: null, secCheckUdims: null, secCheckPdaEd: null, secCheckPdaUn: null, @@ -211,6 +212,7 @@ export default { checkSp: null, checkBalacne: null, secCheckBalacne: null, + secCheckCopy: null, corpType: null, storageCode: null, supplementOrderType: null, @@ -409,6 +411,8 @@ export default { defaultSubInv: row.defaultSubInv, defaultInv: row.defaultInv, orderVisibleType: row.orderVisibleType, + checkCopy: row.checkCopy, + secCheckCopy: row.secCheckCopy, }; this.modifyDialogVisible = true; diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index c7855b4..0d9341a 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -351,6 +351,12 @@ + +
+ 手动补单 + +
+ @@ -422,6 +428,12 @@ + +
+ 手动补单 + +
+ @@ -443,7 +455,7 @@ import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; export default { - name: "inputQuery", + name: "BussinessTypeModify", props: { inputQuery: { type: Object, 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 b62264f..d6a2a24 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -564,18 +564,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 298c117..d33f5c2 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -826,14 +826,10 @@ export default { } 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' }); } } @@ -1267,6 +1263,10 @@ export default {