diff --git a/src/api/system/systemPDFTemplate.js b/src/api/system/systemPDFTemplate.js index 2a2325a..6a02198 100644 --- a/src/api/system/systemPDFTemplate.js +++ b/src/api/system/systemPDFTemplate.js @@ -59,20 +59,73 @@ export function systemPDFTemplateDeleteById(query) { }); } -export function moduleDetail(query) { +export function moduleBizDetail(query) { return axios({ - url: "/system/pdf/module/detail", - method: "get", - params: query + url: "/system/pdf/templateRelevanceBiz/getListByModelId", + method: "post", + data: query }); } export function updateDetailRel(query) { return axios({ - url: "/system/pdf/module/updateRl", + url: "/system/pdf/templateRelevanceBiz/updateRl", + method: "post", + data: query + }); +} + +export function moduleCodeDetail(query) { + return axios({ + url: "/system/pdf/templateRelevanceCode/getListByModelId", + method: "post", + data: query + }); +} + + +export function updateCodeDetailRel(query) { + return axios({ + url: "/system/pdf/templateRelevanceCode/updateRl", + method: "post", + data: query + }); +} + +export function moduleLabelDetail(query) { + return axios({ + url: "/system/pdf/templateRelevanceLabel/getListByModelId", method: "post", data: query }); } + +export function updateLabelDetailRel(query) { + return axios({ + url: "/system/pdf/templateRelevanceLabel/updateRl", + method: "post", + data: query + }); +} + + +export function moduleStatementDetail(query) { + return axios({ + url: "/system/pdf/templateRelevanceStatement/getListByModelId", + method: "post", + data: query + }); +} + + +export function updateStatementDetailRel(query) { + return axios({ + url: "/system/pdf/templateRelevanceStatement/updateRl", + method: "post", + data: query + }); +} + + diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue index 51f0f2f..2db03b6 100644 --- a/src/views/basic/product/productUdiType.vue +++ b/src/views/basic/product/productUdiType.vue @@ -221,6 +221,7 @@ export default { this.subData = JSON.parse(JSON.stringify(data)); } else if (formName === "add") { this.subData.parentCode = JSON.parse(JSON.stringify(this.pCode)); + this.subData={}; } this.getTreeselect(); this.subFormVisible = true; diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index 868c634..20f08a2 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -654,7 +654,6 @@ export default { this.imgList=[]; previewImage({imageUrl:row.licenseUrl,certFileUrl:this.certFileUrl}).then(response => { if (response.code === 20000) { - debugger this.imgList=response.data; } console.log(this.imgList) diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue index d3ea9f6..530930e 100644 --- a/src/views/inout/IoSupAduitOrder.vue +++ b/src/views/inout/IoSupAduitOrder.vue @@ -832,15 +832,16 @@ export default { printOrder(row) { let tQuery = { action: row.action, - moduleId: 1, + status: row.status, } this.loading = true; inspectionOrderPDFFromTemplateFile(tQuery).then((response) => { if (response.code === 20000) { tQuery = { + action: row.action, + status: row.status, templateId: response.data, orderIdFk: row.billNo, - action: row.action, moduleId: 1, } orderPDFFromTemplateFile(tQuery).then((response) => { diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue index bf7087c..f2aae59 100644 --- a/src/views/inout/IoSupSearchOrder.vue +++ b/src/views/inout/IoSupSearchOrder.vue @@ -790,7 +790,7 @@ export default { printOrder(row) { let tQuery = { action: row.action, - moduleId: 4, + status: row.status, } this.loading = true; inspectionOrderPDFFromTemplateFile(tQuery).then((response) => { @@ -798,6 +798,7 @@ export default { tQuery = { templateId: response.data, orderIdFk: row.billNo, + status: row.status, action: row.action, moduleId: 1, } diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue index 6903fb0..c02945b 100644 --- a/src/views/inout/IoSupSecAuditOrder.vue +++ b/src/views/inout/IoSupSecAuditOrder.vue @@ -870,7 +870,7 @@ export default { printOrder(row) { let tQuery = { action: row.action, - moduleId: 2, + status: row.status, } this.loading = true; inspectionOrderPDFFromTemplateFile(tQuery).then((response) => { @@ -879,6 +879,7 @@ export default { templateId: response.data, orderIdFk: row.billNo, action: row.action, + status: row.status, moduleId: 2, } orderPDFFromTemplateFile(tQuery).then((response) => { diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue index 0c45d5c..b0b0ab8 100644 --- a/src/views/inventory/inner/innerCodeDetail.vue +++ b/src/views/inventory/inner/innerCodeDetail.vue @@ -288,19 +288,16 @@ export default { }, printStockOrderDetailPDF(row) { let tQuery = { - queryId: null, - orderId: null, - countList: [], - moduleId: 6, + id: 1 }; - if (row == null) { - tQuery.orderId = this.formData.id; - } else { + // if (row == null) { + // tQuery.orderId = this.formData.id; + // } else { if (row.reCount <= 0) { return this.$message.error('数量错误'); } tQuery.queryId = row.id; - } + // } this.loading = true; inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => { diff --git a/src/views/purchase/cert/supCertSearch.vue b/src/views/purchase/cert/supCertSearch.vue index f996995..813410e 100644 --- a/src/views/purchase/cert/supCertSearch.vue +++ b/src/views/purchase/cert/supCertSearch.vue @@ -585,7 +585,7 @@ export default { this.getRegistrationList(); }, printSupCertPdf(row) { - let query = {moduleId: 8}; + let query = {id: 1}; this.loading = true; verifyTemplateFile(query).then((res) => { if (res.code === 20000) { @@ -625,7 +625,7 @@ export default { }, //生产企业打印 printSupCertManufacturerPdf(row) { - let query = {moduleId: 9}; + let query = {id: 2}; this.loading = true; verifyTemplateFile(query).then((res) => { if (res.code === 20000) { @@ -666,7 +666,7 @@ export default { //生产产品打印 printSupCertProductionPdf(row) { - let query = {moduleId: 10}; + let query = {id: 3}; this.loading = true; verifyTemplateFile(query).then((res) => { if (res.code === 20000) { diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue index f3a5fb0..ee92581 100644 --- a/src/views/purchase/company/supCompanyAduditDialog.vue +++ b/src/views/purchase/company/supCompanyAduditDialog.vue @@ -695,7 +695,7 @@ export default { this.$message.error("请先选择打印的证书!"); return } - let query = {moduleId: 8}; + let query = {id: 1}; this.loading = true; verifyTemplateFile(query).then((res) => { if (res.code === 20000) { diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue index 86752f2..1be03c9 100644 --- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue +++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue @@ -840,7 +840,7 @@ export default { this.$message.error("请先选择打印的证书!"); return } - let query = {moduleId: 9}; + let query = {id: 2}; this.loading = true; verifyTemplateFile(query).then((res) => { if (res.code === 20000) { diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue index 971a8af..668610c 100644 --- a/src/views/purchase/product/supProductAuditDialog.vue +++ b/src/views/purchase/product/supProductAuditDialog.vue @@ -814,7 +814,7 @@ export default { this.$message.error("请先选择打印的证书!"); return } - let query = {moduleId: 10}; + let query = {id: 3}; this.loading = true; verifyTemplateFile(query).then((res) => { if (res.code === 20000) { diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue index 1355b81..9b8d8c2 100644 --- a/src/views/supplier/products/supAddDiProductSelectUdi.vue +++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue @@ -193,13 +193,13 @@ - + - + @@ -207,13 +207,13 @@ - + - + @@ -221,13 +221,13 @@ - + - + @@ -235,13 +235,13 @@ - + - + @@ -390,6 +390,7 @@ export default { this.showSearch = !this.showSearch; }, getList() { + debugger if ( this.unionQuery.udiCode == '' && this.unionQuery.nameCode == '' && diff --git a/src/views/system/print/pdfBizPrintSet.vue b/src/views/system/print/pdfBizPrintSet.vue new file mode 100644 index 0000000..ad0a89e --- /dev/null +++ b/src/views/system/print/pdfBizPrintSet.vue @@ -0,0 +1,757 @@ + + + + + diff --git a/src/views/system/print/pdfCodePrintSet.vue b/src/views/system/print/pdfCodePrintSet.vue new file mode 100644 index 0000000..077584b --- /dev/null +++ b/src/views/system/print/pdfCodePrintSet.vue @@ -0,0 +1,758 @@ + + + + + diff --git a/src/views/system/print/pdfLabelPrintSet.vue b/src/views/system/print/pdfLabelPrintSet.vue new file mode 100644 index 0000000..7665bc2 --- /dev/null +++ b/src/views/system/print/pdfLabelPrintSet.vue @@ -0,0 +1,758 @@ + + + + + diff --git a/src/views/system/print/pdfPrintSet.vue b/src/views/system/print/pdfPrintSet.vue index 1bf6dfc..8c8eb43 100644 --- a/src/views/system/print/pdfPrintSet.vue +++ b/src/views/system/print/pdfPrintSet.vue @@ -1,418 +1,39 @@ diff --git a/src/views/system/print/pdfStatementPrintSet.vue b/src/views/system/print/pdfStatementPrintSet.vue new file mode 100644 index 0000000..17d10f6 --- /dev/null +++ b/src/views/system/print/pdfStatementPrintSet.vue @@ -0,0 +1,758 @@ + + + + + diff --git a/src/views/system/print/pdfTmpleateManage.vue b/src/views/system/print/pdfTmpleateManage.vue index 39c7c33..9af3071 100644 --- a/src/views/system/print/pdfTmpleateManage.vue +++ b/src/views/system/print/pdfTmpleateManage.vue @@ -122,18 +122,18 @@ - - - - - 待校验 - 待核对 - 待审核 - 已审核 - - - - + + + + + + + + + + + +