diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js index c568b4e..b237b36 100644 --- a/src/api/inout/orderDetailBiz.js +++ b/src/api/inout/orderDetailBiz.js @@ -41,6 +41,15 @@ export function updateById(data) { }); } + +export function updateBizById(data) { + return axios({ + url: "/udiwms/inout/bizDetail/updateById", + method: "post", + data: data + }); +} + export function insertInvoice(params) { return axios({ url: "/udiwms/inout/biz/insertInvoice", diff --git a/src/api/inout/orderDetailResult.js b/src/api/inout/orderDetailResult.js index 244896f..f7b60a8 100644 --- a/src/api/inout/orderDetailResult.js +++ b/src/api/inout/orderDetailResult.js @@ -15,3 +15,20 @@ export function getResultOrderList(params) { params: params }); } +export function verifyTemplateFile(data) { + return axios({ + url: "/udiwms/pdf/template/order/result/file", + method: "post", + data: data + }); +} + +export function printOrder(data) { + return axios({ + url: "/udiwms/inout/resultDetail/filterOrderPrint", + method: "post", + headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, + responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf + data: data + }); +} diff --git a/src/api/itextpdf/itextpdf.js b/src/api/itextpdf/itextpdf.js index ffb5177..5ec423b 100644 --- a/src/api/itextpdf/itextpdf.js +++ b/src/api/itextpdf/itextpdf.js @@ -71,6 +71,26 @@ export function stockQRCodeTextPDFFromTemplateFile(query) { responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf }); } + + +//---------打印码 +export function inspectionStockQRCodeTextPDFFromTemplateStatementFile(query) { + return axios({ + url: "/udiwms/pdf/template/inspection/stock/qrcode/text/statement/file", + method: "post", + data: query, + }); +} +export function stockQRCodeTextPDFFromTemplateStatementFile(query) { + return axios({ + url: "/udiwms/pdf/template/stock/qrcode/text/statement/file", + method: "post", + data: query, + headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, + responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf + }); +} + export function stockQRCodeTextPDFFromTemplateFileMax(query) { return axios({ url: "/udiwms/pdf/template/stock/qrcode/text/maxfile", diff --git a/src/views/basic/business/stockOrderQRCodeDetail.vue b/src/views/basic/business/stockOrderQRCodeDetail.vue index 55c54af..d6a9955 100644 --- a/src/views/basic/business/stockOrderQRCodeDetail.vue +++ b/src/views/basic/business/stockOrderQRCodeDetail.vue @@ -5,7 +5,8 @@ 生成内部码 - 打印全部 + 标签打印全部 + 报表打印全部 @@ -76,6 +77,13 @@ >标签打印 + 报表打印 + @@ -157,7 +165,7 @@ import draggable from "vuedraggable"; import { filterTemp, inspectionOrderDetailPDFFromTemplateFile, - inspectionStockQRCodeTextPDFFromTemplateFile, + inspectionStockQRCodeTextPDFFromTemplateFile, inspectionStockQRCodeTextPDFFromTemplateStatementFile,stockQRCodeTextPDFFromTemplateStatementFile, orderDetailPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax } from "@/api/itextpdf/itextpdf"; import {generateInCodeQRCodeText, generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode"; @@ -262,6 +270,69 @@ export default { this.total = 0; }); }, + printStockOrderDetailStatementPDF(row) { + let tQuery = { + queryId: null, + orderId: null, + countList: [], + labelId: 5 + }; + if (row == null) { + tQuery.orderId = this.query.orderIdFk; + } else { + if (row.reCount <= 0) { + return this.$message.error('数量错误'); + } + tQuery.queryId = row.id; + } + this.loading = true; + inspectionStockQRCodeTextPDFFromTemplateStatementFile(tQuery).then((response) => { + if (response.code === 20000) { + if (row != null) { + tQuery.id = row.id; + tQuery.rowCount = row.reCount; + let data = { + queryId: row.id, + rowCount: row.count + } + tQuery.countList.push(data); + } else { + for (let i = 0; i < this.codeArray.length; i++) { + let data = { + queryId: this.codeArray[i].id, + rowCount: this.codeArray[i].count + } + tQuery.countList.push(data); + } + } + let count = 0; + for (let i = 0; i < tQuery.countList.length; i++) { + + count = count + tQuery.countList[i].rowCount; + console.log(count); + } + stockQRCodeTextPDFFromTemplateStatementFile(tQuery).then((response) => { + //将pdf文件转换为url。 + const binaryData = []; + binaryData.push(response); + //获取blob链接。 + let url = window.URL.createObjectURL( + new Blob(binaryData, {type: "application/pdf"}) + ); + this.loading = false; + window.open(url);//打开新标签页，预览pdf。 + this.getOrderQRCodeTextList(); + }).catch(() => { + this.loading = false; + }); + } else { + this.loading = false; + this.$message.error(response.message); + } + }).catch(() => { + this.loading = false; + }); + }, handleLableChange(val) { this.refreshQuery.page = val.page; this.refeshLabel(); diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 4d27e3a..95b582b 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -2,21 +2,40 @@
- - - - {{ + + + + + {{ node.label }} - + > + + + + + + + 显示/隐藏搜索栏 - + >显示/隐藏搜索栏 + 重置 - + >重置 + 查询 - + >查询 + 选入DI信息 - + >选入DI信息 + 添加院内字典 - + >添加院内字典 + 关联添加 - + >关联添加 +
@@ -276,27 +289,27 @@ size="small" :disabled="scope.row.originUuid != null" @click.native.stop="intentSelectUdi(scope.row)" - >关联DI + >关联DI 详情 + >详情 编辑 + >编辑 删除 + >删除 @@ -905,7 +918,7 @@
{{ productRemarkSet.remarkTitle1 }}: {{ productRemarkSet.remarkTitle1 }}: 
{{ productRemarkSet.remarkTitle2 }}: {{ productRemarkSet.remarkTitle2 }}: 
{{ productRemarkSet.remarkTitle3 }}: {{ productRemarkSet.remarkTitle3 }}: 
{{ productRemarkSet.remarkTitle4 }}: {{ productRemarkSet.remarkTitle4 }}: 
{{ productRemarkSet.remarkTitle5 }}: {{ productRemarkSet.remarkTitle5 }}: 
{{ productRemarkSet.remarkTitle6 }}: {{ productRemarkSet.remarkTitle6 }}: 
{{ productRemarkSet.remarkTitle7 }}: {{ productRemarkSet.remarkTitle7 }}: 
{{ productRemarkSet.remarkTitle8 }}: {{ productRemarkSet.remarkTitle8 }}: 
切换版本 + >切换版本 - 更新当前版本信息 + 更新当前版本信息 @@ -1275,14 +1291,14 @@ size="small" icon="search" @click="onAddSubmit(false)" - >提交 + >提交 取消 + >取消
@@ -1304,14 +1320,14 @@ size="small" icon="search" @click="onAddSingleSubmit(false)" - >提交 + >提交 取消 + >取消 @@ -1450,13 +1466,14 @@ import { spcombie, lockStatus, removeDiRl, - disableUdi, syncOnline, + disableUdi, + syncOnline, } from "@/api/basic/product/udiRelevance"; import { selectSysParamByKey, finProductSet, } from "@/api/param/systemParamConfig"; -import {filterByUuid} from "@/api/basic/product/udiInfo"; +import { filterByUuid } from "@/api/basic/product/udiInfo"; import selectUdi from "./UdiInfoSelectRel.vue"; import selectErp from "./udiInfoselectErpUdi"; @@ -1467,12 +1484,13 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit"; import productUdiType from "@/views/basic/product/productUdiType"; import selectHospProduct from "@/views/basic/product/bindHospProduct"; import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct"; -import {getBasicHospType, getListTree} from "@/api/basic/basicHospType"; -import {dlLastVersionByDi} from "@/api/basic/udiInfo"; +import { getBasicHospType, getListTree } from "@/api/basic/basicHospType"; +import { dlLastVersionByDi } from "@/api/basic/udiInfo"; export default { data() { return { + Dictionary: false, //物资字典显示、隐藏 filterQuery: { lockStatus: null, unionCode: null, @@ -1563,7 +1581,7 @@ export default { selectVersionVisible: false, selectLocalVisible: false, //关联UDI isUseDyCheck: false, - lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"}, + lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" }, activeNames: ["1"], useNumEnable: true, updateLoading: false, @@ -1694,8 +1712,7 @@ export default { this.$message.error(response.message); } }) - .catch(() => { - }); + .catch(() => {}); }, deleteDialog(rowId) { @@ -1707,8 +1724,7 @@ export default { .then(() => { this.deleteOrders(rowId); }) - .catch(() => { - }); + .catch(() => {}); }, intentDetail() { @@ -1746,11 +1762,9 @@ export default { this.$message.error(response.message); } }) - .catch(() => { - }); + .catch(() => {}); }) - .catch(() => { - }); + .catch(() => {}); }, removeDi() { @@ -1777,11 +1791,9 @@ export default { this.$message.error(response.message); } }) - .catch(() => { - }); + .catch(() => {}); }) - .catch(() => { - }); + .catch(() => {}); }, intentSelectErp(val) { @@ -1961,6 +1973,12 @@ export default { isAdavence: row.isAdavence, }; this.editFormat = JSON.parse(JSON.stringify(row)); + if( this.editFormat.overStockNum == null){ + this.editFormat.overStockNum = 0; + } + if( this.editFormat.lowStockNum == null){ + this.editFormat.lowStockNum = 0; + } this.editDiDialogVisible = true; }, closeDialog() { @@ -2067,8 +2085,7 @@ export default { var invlist = response.data || []; this.treeList = this.handleTree(invlist, "code", "parentCode"); }) - .catch(() => { - }); + .catch(() => {}); }, addHospProduct(data) { @@ -2106,9 +2123,12 @@ export default { type: "warning", }) .then(() => { - debugger + debugger; this.updateLoading = true; - let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid}; + let query = { + uuid: this.editQuery.uuid, + originUuid: this.editQuery.originUuid, + }; syncOnline(query) .then((response) => { this.updateLoading = false; @@ -2125,13 +2145,10 @@ export default { this.total = 0; }); }) - .catch(() => { - }); - + .catch(() => {}); }, }, - mounted() { - }, + mounted() {}, components: { ProductSingleEdit, ProductEdit, @@ -2153,10 +2170,12 @@ export default { };