From 783cf5ebe7feca64a8e793e9a5d748e78575f3fd Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 19 May 2022 09:18:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E8=B4=A6=E5=8F=B7=E5=88=86=E7=B1=BB=EF=BC=8C=E9=A2=84?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=EF=BC=8C=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/busOriginType.js | 11 +- src/api/inout/erpOrder.js | 2 +- src/api/inventory/InvPreInProducts.js | 36 ++ src/router/index.js | 20 +- src/views/basic/BussinessTypeLocl.vue | 20 +- src/views/basic/BussinessTypeLoclModify.vue | 27 +- src/views/basic/BussinessTypeThird.vue | 79 ++- src/views/basic/BussinessTypeThirdModify.vue | 9 +- src/views/basic/UdiRlDetailDialog.vue | 437 ++++++++++++++ .../basic/basicCompanyProductsImport.vue | 2 +- src/views/business/stockOrder.vue | 8 +- .../business/stockOrderNewSelectProduct.vue | 72 ++- src/views/business/stockOrderWaitCheck.vue | 8 +- src/views/business/stockQRCodeExport.vue | 564 +++++++++++------- src/views/inout/IOAddOrder.vue | 38 +- src/views/inout/IONewOrder.vue | 2 + .../inventory/InvPreInProductsDetail.vue | 259 ++++++++ src/views/inventory/InvProducts.vue | 6 +- src/views/inventory/InvStatistics.vue | 8 +- src/views/inventory/invPreInProducts.vue | 347 +++++++++++ src/views/thrsys/SysUdimsConfig.vue | 86 ++- src/views/thrsys/ThrOrdedrReceiveAdd.vue | 5 +- src/views/thrsys/thrOrderNew.vue | 2 +- 23 files changed, 1685 insertions(+), 363 deletions(-) create mode 100644 src/api/inventory/InvPreInProducts.js create mode 100644 src/views/basic/UdiRlDetailDialog.vue create mode 100644 src/views/inventory/InvPreInProductsDetail.vue create mode 100644 src/views/inventory/invPreInProducts.vue diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js index b061532..23b08e9 100644 --- a/src/api/basic/busOriginType.js +++ b/src/api/basic/busOriginType.js @@ -17,11 +17,20 @@ export function updateBussinessType(query) { export function insertBussinessType(query) { return axios({ - url: "/udiwms/originBusType/insert", + url: "/udiwms/originBusType/add", method: "post", data: query }); } +export function delBussinessType(query) { + return axios({ + url: "/udiwms/originBusType/delete", + method: "post", + data: query + }); +} + + export function downloadBussinessType(query) { return axios({ diff --git a/src/api/inout/erpOrder.js b/src/api/inout/erpOrder.js index ffba4d6..4535a6b 100644 --- a/src/api/inout/erpOrder.js +++ b/src/api/inout/erpOrder.js @@ -11,7 +11,7 @@ export function getErpMainOrder(query) { export function getCloudErp(query) { return axios({ - url: "/udiwms/erpOrder/filter", + url: "/spms/erpOrder/filter", method: "get", params: query }); diff --git a/src/api/inventory/InvPreInProducts.js b/src/api/inventory/InvPreInProducts.js new file mode 100644 index 0000000..6de1c9f --- /dev/null +++ b/src/api/inventory/InvPreInProducts.js @@ -0,0 +1,36 @@ +import axios from "../../utils/axios"; + + +export function filterProducts(query) { + return axios({ + url: "/spms/prein/inv/products/filter", + method: "get", + params: query + }); +} + +export function filterDetailProducts(query) { + return axios({ + url: "/spms/prein/inv/products/filterDetail", + method: "get", + params: query + }); +} + +export function deleteProducts(query) { + return axios( + { + url: "/spms/prein/inv/products/delete", + method: "post", + data: query + } + ) +} +export function statDetailProducts(query) { + return axios({ + url: "/spms/prein/inv/products/stat", + method: "get", + params: query + }); +} + diff --git a/src/router/index.js b/src/router/index.js index 1f7b78a..2d33481 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -71,6 +71,7 @@ import stockOrderDelSearch from "../views/business/stockOrderDelSearch"; //库存 import invProducts from "../views/inventory/InvProducts.vue"; import invPreProducts from "../views/inventory/invPreProducts" +import invPreInProducts from "../views/inventory/invPreInProducts" import udiTrace from "../views/inventory/UdiCodeTrace.vue"; import invUdiTraceOrder from "@/views/inventory/invUdiTraceOrder"; import invStatistics from "@/views/inventory/InvStatistics"; @@ -328,15 +329,6 @@ export const asyncRouterMap = [ }, children: [ - // { - // path: "ioErrorOrder", - // component: ioErrorOrder, - // name: "异常单据管理", - // - // meta: { - // authRule: ["inout/ioErrorOrder"] - // } - // }, { path: "/receiveOrder", component: Empty, @@ -1048,7 +1040,15 @@ export const asyncRouterMap = [ } }, - + { + path: "invPreInProducts", + component: invPreInProducts, + name: "预验收库存查询", + icon: "", + meta: { + authRule: ["inv/invPreInProducts"] + } + }, // { // path: "stockCheck", diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue index b31619c..b9675b8 100644 --- a/src/views/basic/BussinessTypeLocl.vue +++ b/src/views/basic/BussinessTypeLocl.vue @@ -34,28 +34,21 @@ - - - - - + + + - - - - - - - import { getOriginBusType, - updateBussinessType, + updateBussinessType, delBussinessType, insertBussinessType, downloadBussinessType } from "../../api/basic/busOriginType"; @@ -237,6 +224,8 @@ export default { }, onAddSubmit() { + + insertBussinessType(this.inputQuery) .then((response) => { this.loading = false; @@ -263,7 +252,7 @@ export default { }, handleModifyClick(row) { - this.modifyDialogVisible = true; + this.inputQuery = { id: row.id, remark: row.remark, @@ -273,16 +262,44 @@ export default { thirdSys: row.thirdSys, thirdSysName: row.thirdSysName }; + this.modifyDialogVisible = true; + }, + + + handleDeleteClick(row) { + this.deleteDialog(row.id) + }, + + handleAddClick() { + this.inputQuery = { + action: "", + name: "", + enable: "", + remark: "", + thirdSys: null, + thirdSysName: null + }; + this.addDialogVisible = true; }, deleteDialog(rowId) { - this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", { + this.$confirm("此操作将永久删除该单据类型信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }) .then(() => { - this.deleteOrders(rowId); + let query = { + id: rowId, + } + delBussinessType(query) + .then((response) => { + this.getList(); + }) + .catch(() => { + }); + + }) .catch(() => { }); diff --git a/src/views/basic/BussinessTypeThirdModify.vue b/src/views/basic/BussinessTypeThirdModify.vue index 677b4f7..aed48cc 100644 --- a/src/views/basic/BussinessTypeThirdModify.vue +++ b/src/views/basic/BussinessTypeThirdModify.vue @@ -10,7 +10,7 @@ style="width: 200px" size="small" splaceholder="请输入内容" - :disabled="true" + :disabled="!isAdd" v-model="inputQuery.name" > @@ -22,7 +22,7 @@ +
+ + + + + + + + + + + + + + + + + + +
+
+ 产品名称:  +
+ +
+ + +
+
+ 产品标识:  +
+ +
+ + + + + + + +
+
+ 规格型号:  +
+ +
+ + + +
+
+ 器械类别:  +
+ +
+ + + + +
+
+ 产品类别:  +
+ +
+ + +
+
+ 分类编码:  +
+ +
+ + + + + + +
+
+ 商品条码:  +
+ +
+ + +
+
+ 医保编码:  +
+ +
+ + + + + +
+
+ 医疗器械注册人:  +
+ +
+ + +
+
+ 注册人英文名称:  +
+ +
+ + + + + + +
+
+ 统一社会信用号:  +
+ +
+ + +
+
+ 注册证/备案号:  +
+ +
+ + + + +
+
+ 上级产品编码:  +
+ +
+ + + +
+
+ 包装级别:  +
+ +
+ + + + +
+
+ 计量单位/包装级别:  +
+ + +
+ + + +
+
+ 包含下级包装数量:  +
+ +
+ + + + +
+
+ 包含下级产品编码:  +
+ + +
+ + + +
+
+ 包含最小销售包装数量:  +
+ +
+ + + + +
+
+ 最小包装单元内包含使用单元数量:  +
+ +
+ + + + 以使用单元数量入库 + + + + + + +
+ + + + + diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue index 829b6d7..b246cf4 100644 --- a/src/views/basic/basicCompanyProductsImport.vue +++ b/src/views/basic/basicCompanyProductsImport.vue @@ -562,7 +562,7 @@ - 以使用单元数量入库 diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 8f71974..a3cec90 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -483,11 +483,11 @@ export default { }, onSubmit() { if (this.actDateRange !== null) { - this.filterQuery.startTime = this.actDateRange[0]; - this.filterQuery.endTime = this.actDateRange[1]; + this.query.startTime = this.actDateRange[0]; + this.query.endTime = this.actDateRange[1]; } else { - this.filterQuery.startTime = null; - this.filterQuery.endTime = null; + this.query.startTime = null; + this.query.endTime = null; } this.getList(); diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index 7f540af..20b2c33 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -95,6 +95,17 @@ prop="qxlb" show-overflow-tooltip > + + + - + + + @@ -114,7 +135,7 @@ import { stockOrderDetailFilterProduct } from "../../api/inout/stockOrder"; import store from "../../store"; - +import udiRlDetailDialog from "./../basic/UdiRlDetailDialog"; export default { name: "closeDialog", props: { @@ -146,6 +167,7 @@ export default { total: 1, currentRow: null, loading: false, + udiRlDetailVisible:false, multipleUdiSelection: [], thirdSys: [], thirdSysFk: null, @@ -222,6 +244,11 @@ export default { console.log(val); this.currentRow = val; }, + handleDetailClick(row) { + this.currentRow = row; + this.udiRlDetailVisible = true; + + }, handleErpPageChange(val) { this.listQuery.page = val; this.getList(); @@ -256,10 +283,7 @@ export default { intentBack() { this.closeDialog(); }, - combine() {//012693548470801311200226172302271020022632100025 - // if (this.$isBlank(this.currentRow.id)) { - // return; - // } + combine() { let selection = this.$refs.multipleTable.selection; if (selection.length < 1) { this.$message.error('未选择产品'); @@ -290,51 +314,25 @@ export default { this.loading = false; }); - // let tQuery = { - // id: this.currentRow.id - // }; - // if (this.orderEditor) { - // tQuery.orderId = this.orderId; - // console.log(tQuery) - // addStockOrderDetailFromCodeById(tQuery).then((response) => { - // this.loading = false; - // if (response.code === 20000) { - // this.closeDialog(response); - // } else { - // this.$message.error(response.message); - // } - // }).catch(() => { - // this.loading = false; - // }); - // } else { - // getStockOrderDetailInstrumentById(tQuery).then((response) => { - // this.loading = false; - // if (response.code === 20000) { - // this.closeDialog(response.data); - // } else { - // this.$message.error(response.message); - // } - // }).catch(() => { - // this.loading = false; - // }); - // } }, handleSelectionUdiChange(val) { - console.log("----" + val); this.multipleUdiSelection = val; }, }, created() { if (this.$isNotBlank(this.data)) { - console.log(this.data.stockOrderLists); this.listQuery.nameCode = this.data.udi; - this.listQuery.billType = this.data.formData.billType; + if (this.data.billType != null) { + this.listQuery.billType = this.data.billType; + } else + this.listQuery.billType = this.data.formData.billType; this.listQuery.corpId = this.data.formData.corpId; this.orderEditor = this.data.orderEditor; this.orderId = this.data.orderId; this.getList(); } }, + components: {udiRlDetailDialog}, }; diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index af433b7..198db92 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -456,11 +456,11 @@ export default { onSubmit() { if (this.actDateRange !== null) { - this.filterQuery.startTime = this.actDateRange[0]; - this.filterQuery.endTime = this.actDateRange[1]; + this.query.startTime = this.actDateRange[0]; + this.query.endTime = this.actDateRange[1]; } else { - this.filterQuery.startTime = null; - this.filterQuery.endTime = null; + this.query.startTime = null; + this.query.endTime = null; } this.getList(); diff --git a/src/views/business/stockQRCodeExport.vue b/src/views/business/stockQRCodeExport.vue index ac33ec2..fa40287 100644 --- a/src/views/business/stockQRCodeExport.vue +++ b/src/views/business/stockQRCodeExport.vue @@ -3,14 +3,14 @@ - - - - - - - - + 打印全部 + @@ -70,6 +70,7 @@ @@ -94,9 +95,9 @@ {{ scope.row.updateTime }} - + @@ -107,7 +108,7 @@ type="text" size="small" @click.native="printStockOrderDetailPDF(scope.row)" - >打印 + >标签打印 @@ -124,178 +125,331 @@ + + + 刷新 + + + + + + + + + + + + + + + + + + diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 4e57f7a..d79e2d7 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -175,6 +175,10 @@ 允许出库自动缺量补单 + 是否预验收产品 + @@ -384,6 +388,7 @@ export default { action: null, locStorageCode: null, outChangeEnable: false, + preCheck: false, }, curId: null, storageList: [], @@ -436,6 +441,7 @@ export default { fromCorp: this.formData.fromCorp, fromCorpId: this.formData.fromCorpId, outChangeEnable: this.formData.outChangeEnable, + preCheck: this.formData.preCheck, } submitOrderWeb(tQuery) .then((response) => { @@ -528,14 +534,6 @@ export default { addCodeSubmit(tQuery) { addOrderWeb(tQuery).then((response) => { - // let teQuery = {code: this.formData.code}; - // expireTimeCheck(teQuery).then((response) => { - // if (response.code === 20000) { - // } else { - // this.$message.warning(response.message); - // } - // this.loading = false; - // }); if (response.code === 20000) { this.idQuery.id = response.data.orderId; @@ -558,28 +556,12 @@ export default { this.getCodeList(); this.selectRlTitle = response.message; this.bindRl(response.data); - // this.$alert(response.message, '提示', { - // confirmButtonText: '确定', - // type: 'warning', - // closeOnClickModal: true, - // callback: action => { - // this.bindRl(response.data); - // } - // }); } else if (response.code == 503) { this.curRow = response.data; this.idQuery.id = this.curRow.orderId; this.getCodeList(); this.selectUnitTitle = response.message; this.handleUnitClick(response.data); - // this.$alert(response.message, '提示', { - // confirmButtonText: '确定', - // type: 'warning', - // closeOnClickModal: true, - // callback: action => { - // this.handleUnitClick(response.data); - // } - // }); } else if (response.code == 504) { this.$confirm(response.message, "提示", { @@ -627,10 +609,8 @@ export default { this.isScan = !this.isScan; if (this.isScan) { this.scanText = "扫码录入："; - // document.getElementById("inputer").focus(); } else { this.scanText = "手动录入："; - // this.$refs.inputRef.focus(); } }, @@ -955,25 +935,21 @@ export default { this.formData.fromCorpId = this.idQuery.fromCorpId; this.formData.locStorageCode = this.idQuery.locStorageCode; this.formData.outChangeEnable = this.idQuery.outChangeEnable; + this.formData.preCheck = this.idQuery.preCheck; this.actionEnable = true; this.getCodeList(); } else { this.corpOrderIdDisabled = false; if (JSON.stringify(this.$route.query) === '{}') { - // this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + ''); let date = new Date(); this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10); } else { // 将参数拷贝进查询对象 let query = this.$route.query; this.orderNo = query.id; - this.query = Object.assign(this.query, query); this.query.limit = parseInt(this.query.limit); this.query.corpOrderId = query.id; - - // 加载表格数据 - // this.getCodeList(); } } diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index 8ad1060..93821fa 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -481,11 +481,13 @@ export default { this.idQuery.corpOrderId = row.corpOrderId; this.idQuery.billType = row.action; this.idQuery.locStorageCode = row.locStorageCode; + this.idQuery.preCheck = row.preCheck; } this.addOrderVisible = true; this.idQuery.action = row.action; this.idQuery.fromCorp = row.fromCorp; this.idQuery.fromCorpId = row.fromCorpId; + this.idQuery.preCheck = row.preCheck; }, errOrders() { this.errOrderVisible = true; diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue new file mode 100644 index 0000000..1c6942f --- /dev/null +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -0,0 +1,259 @@ + + + + + + diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue index cb88494..058829e 100644 --- a/src/views/inventory/InvProducts.vue +++ b/src/views/inventory/InvProducts.vue @@ -80,7 +80,11 @@ - + + + diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue index 381c850..12235d6 100644 --- a/src/views/inventory/InvStatistics.vue +++ b/src/views/inventory/InvStatistics.vue @@ -8,7 +8,7 @@ - + @@ -84,7 +84,11 @@ - + + + diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue new file mode 100644 index 0000000..68974d1 --- /dev/null +++ b/src/views/inventory/invPreInProducts.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index 880cce9..765a482 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -11,9 +11,9 @@ - 上游是否联通 + 下游是否联通 - +
数据同步轮询时间(单位:分钟):  第三方业务单据 + - 已完成扫码单据 + DI产品信息 + + + + + {{ busType.name }} + + + + + + + + 待校验单据 + 未验收单据 + 已完成单据 + + @@ -69,6 +92,7 @@ diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue index 5c8cd91..37d842c 100644 --- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue +++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue @@ -1,8 +1,6 @@