diff --git a/public/打包设置.txt b/public/打包设置.txt index 4dbc562..d8012cf 100644 --- a/public/打包设置.txt +++ b/public/打包设置.txt @@ -12,3 +12,12 @@ "BASE_URL": "http://192.168.0.66:8500/SPMS_SERVER", "SERVER_IP": "http://192.168.0.66:8500/SPMS_SERVER", "hosp_name": "诏安县总医院（测试）" + + "BASE_URL": "http://192.168.0.109:9906", + "SERVER_IP": "http://192.168.0.109:9906", + "hosp_name": "诏安县总医院（测试）" + + + "BASE_URL": "http://127.0.0.1:9906", + "SERVER_IP": "http://127.0.0.1:9906", + "hosp_name": "诏安县总医院（测试）" diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js index 13fcfd2..e3ab8dc 100644 --- a/src/api/warehouse/order.js +++ b/src/api/warehouse/order.js @@ -356,5 +356,14 @@ export function getOrderById(params) { }) } +export function updateOrder(data) { + return axios({ + url: "/udiwms/inout/order/updateOrder", + method: "post", + data: data + }) +} + + diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js index ca9e50b..43d76fa 100644 --- a/src/api/warehouse/stockOrder.js +++ b/src/api/warehouse/stockOrder.js @@ -279,5 +279,16 @@ export function updateStatus(query) { } +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 af1c53b..4ddcc6d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -49,6 +49,7 @@ import waitOrder from "../views/warehouse/IOWaitOrder.vue"; import stockOrder from "../views/warehouse/stockOrder"; import stockOrderInCode from "../views/warehouse/stockOrderInCode"; import stockOrderDelSearch from "../views/warehouse/stockOrderDelSearch"; +import stockOrderInvSearch from "../views/warehouse/stockOrderInvSearch"; import stockOrderDelete from "../views/warehouse/stockOrderDelete"; import stockOrderEditor from "../views/warehouse/stockOrderEditor"; import stockOrderSearch from "../views/warehouse/stockOrderSearch"; @@ -287,7 +288,6 @@ export const asyncRouterMap = [ }, - { path: "/systemParam", component: Empty, @@ -335,8 +335,6 @@ export const asyncRouterMap = [ }, - - ] }, { @@ -441,9 +439,6 @@ export const asyncRouterMap = [ }, - - - ] }, @@ -563,7 +558,6 @@ export const asyncRouterMap = [ }, - ] }, { @@ -720,11 +714,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 6a5b098..cce1890 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -46,28 +46,21 @@ - - - - - - - - 查询 - 关联添加 - - 添加DI信息 - - 添加产品信息 @@ -83,7 +76,6 @@ key="1" @selection-change="handleSelectionChange" > - - - - - - - - - - - - - - - - - - - - - - - @@ -272,482 +236,489 @@ > - - - -
-
- 产品名称:  + + + + + +
+
+ 产品名称:  +
+
- -
- - -
-
- 产品标识:  + + +
+
+ 产品标识:  +
+
- -
- - - - - - - -
-
- 规格型号:  + + + + + + + +
+
+ 规格型号:  +
+
- -
- - - -
-
- 器械类别:  + + + +
+
+ 器械类别:  +
+
- -
- - - - -
-
- 产品类别:  + + + + +
+
+ 产品类别:  +
+
- -
- - -
-
- 分类编码:  + + +
+
+ 分类编码:  +
+
- -
- - - - - - -
-
- 商品条码:  + + + + + + +
+
+ 医疗器械注册人:  +
+
- -
- - -
-
- 医保编码:  + + +
+
+ 注册人英文名称:  +
+
- -
- - - - - -
-
- 医疗器械注册人:  + + + + + + +
+
+ 统一社会信用号:  +
+
- -
- - -
-
- 注册人英文名称:  + + +
+
+ 注册证/备案号:  +
+
- -
- - - - - - -
-
- 统一社会信用号:  + + + + +
+
+ 上级产品编码:  +
+
- -
- - -
-
- 注册证/备案号:  + + + +
+
+ 包装级别:  +
+
- -
- - - - -
-
- 上级产品编码:  + + + + +
+
+ 计量单位/包装级别:  +
+ +
- -
- - - -
-
- 包装级别:  + + + +
+
+ 包含下级包装数量:  +
+
- -
- - - - -
-
- 计量单位/包装级别:  + + + + +
+
+ 包含下级产品编码:  +
+ +
- - -
- - - -
-
- 包含下级包装数量:  + + + +
+
+ 包含最小销售包装数量:  +
+
- -
- - - - -
-
- 包含下级产品编码:  + + + + + +
+
+ 最小包装单元内包含使用单元数量:  +
+
- - -
- - - -
-
- 包含最小销售包装数量:  + + +
+
+ 当前版本号:  +
+ + 切换版本 +
- -
- - - - - -
-
- 最小包装单元内包含使用单元数量:  + + + + + +
+
+ 是否包含批号:  +
+
- -
- - -
-
- 生产厂家:  + + +
+
+ 是否包含序列号:  +
+
- -
- - - - -
-
- 是否包含批号:  + + + + +
+
+ 是否包含生产日期:  +
+
- -
- - -
-
- 是否包含序列号:  + + +
+
+ 是否包含失效日期:  +
+
- -
- - - - -
-
- 是否包含生产日期:  + + + + + + +
+
+ 商品条码:  +
+
- -
- - -
-
- 是否包含失效日期:  + + +
+
+ 医保编码:  +
+
- -
- - - - -
-
- 计量单位:  + + + + + +
+
+ 计量单位:  +
+
- -
- - - -
-
- 当前版本号:  + + +
+
+ 生产厂家:  +
+
- - 切换版本 - -
- - - - - - -
-
- 商品名称:  + + + + + + +
+
+ 商品名称:  +
+
- -
- - - -
-
- 产品描述:  + + + +
+
+ 产品描述:  +
+
- -
- - - - - -
- 以使用单元数量入库 - - 是否禁用 - - 是否寄售 - - 允许无批次号 - - 允许无失效日期 - - 允许无生产日期 - -
- - - - -
+ + + + + +
+ 以使用单元数量入库 + + 是否禁用 + + 是否寄售 + + 允许无批次号 + + 允许无失效日期 + + 允许无生产日期 + +
+ + + + + + +
提交 @@ -1199,7 +1170,6 @@ export default { this.editQuery = row; this.relevanceEdit = { id: row.id, - // thirdId: row.thirdId, isUseDy: row.isUseDy, isDisable: row.isDisable, isLock: row.isLock, @@ -1213,8 +1183,6 @@ export default { page: 1, limit: 10, }; - console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy); - this.getDetailList(ttquery); this.getThirdSysDetail(); }, @@ -1422,6 +1390,7 @@ export default { .el-row { display: flex; flex-wrap: wrap; + margin-bottom: 6px; } .el-col { diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue index fdcb546..545ad75 100644 --- a/src/views/basic/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/UdiInfoSelectLocalUdi.vue @@ -715,6 +715,12 @@ div /deep/ .el-table .success-row { /*transition: all .5s;*/ } +.el-row { + display: flex; + flex-wrap: wrap; + margin-bottom: 6px; +} + .query-form-item { display: block !important; margin-right: 10px; diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue index 81d212a..a0eebc6 100644 --- a/src/views/basic/basicCompanyProducts.vue +++ b/src/views/basic/basicCompanyProducts.vue @@ -208,7 +208,6 @@ disabled >解绑 - @@ -265,493 +264,497 @@ > - - - -
-
- 产品名称:  + + + + + +
+
+ 产品名称:  +
+
- -
- - -
-
- 产品标识:  + + +
+
+ 产品标识:  +
+
- -
- - - - - - - -
-
- 规格型号:  + + + + + + + +
+
+ 规格型号:  +
+
- -
- - - -
-
- 器械类别:  + + + +
+
+ 器械类别:  +
+
- -
- - - - -
-
- 产品类别:  + + + + +
+
+ 产品类别:  +
+
- -
- - -
-
- 分类编码:  + + +
+
+ 分类编码:  +
+
- -
- - - - - - -
-
- 商品条码:  + + + + + + +
+
+ 医疗器械注册人:  +
+
- -
- - -
-
- 医保编码:  + + +
+
+ 注册人英文名称:  +
+
- -
- - - - - -
-
- 医疗器械注册人:  + + + + + + +
+
+ 统一社会信用号:  +
+
- -
- - -
-
- 注册人英文名称:  + + +
+
+ 注册证/备案号:  +
+
- -
- - - - - - -
-
- 统一社会信用号:  + + + + +
+
+ 上级产品编码:  +
+
- -
- - -
-
- 注册证/备案号:  + + + +
+
+ 包装级别:  +
+
- -
- - - - -
-
- 上级产品编码:  + + + + +
+
+ 计量单位/包装级别:  +
+ +
- -
- - - -
-
- 包装级别:  + + + +
+
+ 包含下级包装数量:  +
+
- -
- - - - -
-
- 计量单位/包装级别:  + + + + +
+
+ 包含下级产品编码:  +
+ +
- - -
- - - -
-
- 包含下级包装数量:  + + + +
+
+ 包含最小销售包装数量:  +
+
- -
- - - - -
-
- 包含下级产品编码:  + + + + + +
+
+ 最小包装单元内包含使用单元数量:  +
+
- - -
- - - -
-
- 包含最小销售包装数量:  + + +
+
+ 当前版本号:  +
+ + 切换版本 +
- -
- - - - - -
-
- 最小包装单元内包含使用单元数量:  + + + + +
+
+ 是否包含批号:  +
+
- -
- - -
-
- 生产厂家:  + + +
+
+ 是否包含序列号:  +
+
- -
- - - - -
-
- 是否包含批号:  + + + + +
+
+ 是否包含生产日期:  +
+
- -
- - -
-
- 是否包含序列号:  + + +
+
+ 是否包含失效日期:  +
+
- -
- - - - -
-
- 是否包含生产日期:  + + + + + + +
+
+ 商品条码:  +
+
- -
- - -
-
- 是否包含失效日期:  + + +
+
+ 医保编码:  +
+
- -
- - - - -
-
- 商品名称:  + + + + + +
+
+ 商品名称:  +
+
- -
- - -
-
- 当前版本号:  + + +
+
+ 生产厂家:  +
+
- - 切换版本 - -
- - - - -
-
- 产品价格:  + + + + +
+
+ 产品价格:  +
+
- -
- - -
-
- 计量单位:  + + +
+
+ 计量单位:  +
+
- -
- - - - - - -
-
- 产品描述:  + + + + + + +
+
+ 产品描述:  +
+
- -
- - - - -
- 以使用单元数量入库 - - 是否禁用 - - 是否寄售 - - 允许无批次号 - - 允许无失效日期 - - 允许无生产日期 - -
- - - - -
+ + + + +
+ 以使用单元数量入库 + + 是否禁用 + + 是否寄售 + + 允许无批次号 + + 允许无失效日期 + + 允许无生产日期 + +
+ + + + +
提交 @@ -2049,6 +2052,7 @@ export default { .el-row { display: flex; flex-wrap: wrap; + margin-bottom: 6px; } .el-col { diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index fc3904d..fb80f1f 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -1361,6 +1361,8 @@ export default { this.selectBussinessTypeList = []; this.bussinessTypeList = res.data.list; + this.bussinessTypeTotal = res.data.total; + var that = this; that.$nextTick(() => { if (that.$refs.typeList) { diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index eb7c0d7..aef65ce 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -284,7 +284,6 @@ @@ -755,11 +754,6 @@ export default { }, // 显示表单 handleDetailForm(index, row) { - // this.detailFormVisible = true; - // this.detailFormData = {}; - // if (row !== null) { - // this.detailFormData = Object.assign({}, row); - // } this.stockOrderEditVisible = true; }, hideDetailForm() { diff --git a/src/views/warehouse/stockOrderInvSearch.vue b/src/views/warehouse/stockOrderInvSearch.vue new file mode 100644 index 0000000..eb383f2 --- /dev/null +++ b/src/views/warehouse/stockOrderInvSearch.vue @@ -0,0 +1,967 @@ + + + + + + diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue index feab805..0c9a68f 100644 --- a/src/views/warehouse/stockOrderSearch.vue +++ b/src/views/warehouse/stockOrderSearch.vue @@ -949,7 +949,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - // this.getSubInvList(); + this.getSubInvList(); this.getList(); } }) diff --git a/src/views/warehouse/stockOrderUpdate.vue b/src/views/warehouse/stockOrderUpdate.vue new file mode 100644 index 0000000..2fb3760 --- /dev/null +++ b/src/views/warehouse/stockOrderUpdate.vue @@ -0,0 +1,355 @@ + + + + +