diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js index b649268..743ce5f 100644 --- a/src/api/basic/udiRelevance.js +++ b/src/api/basic/udiRelevance.js @@ -25,6 +25,15 @@ export function getSmUdiInfos(query) { }); } + +export function getCertUdis(query) { + return axios({ + url: "/udi/cert/filterUdi", + method: "get", + params: query + }); +} + export function deletetUdiInfos(query) { return axios({ url: "/udi/udirel/deleteById", diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index d7b0fd7..6e6c877 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -300,6 +300,20 @@ + +
+
+ 允许无序列号:  +
+ + + + + +
+ + +
@@ -312,8 +326,6 @@
- -
@@ -1223,6 +1235,7 @@ export default { allowNoBatch: null, allowNoExpire: null, allowNoProduct: null, + allowNoSerial:null, pId: null, }, defaultSys: null, diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index af6e15b..87e630e 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -467,6 +467,29 @@ + + + + + 允许无序列号 + + + + + + + + + + + + + 允许无序列号 + + + + + 是否必须维护资质材料 diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue index 25f4e6d..7f0d15a 100644 --- a/src/views/inout/DialogSelectRl.vue +++ b/src/views/inout/DialogSelectRl.vue @@ -469,6 +469,9 @@ 允许无生产日期 + 允许无序列号 +
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index 55cf7fc..6fc9485 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -450,6 +450,7 @@ export default { mainAction: null, action: null, page: 1, + statusType: "supInvoice", limit: 10, startTime: null, endTime: null, @@ -592,6 +593,7 @@ export default { action: null, page: 1, limit: 10, + statusType: "supInvoice", startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue index c6a6414..f5fb6a9 100644 --- a/src/views/inout/IoSupSecAuditOrder.vue +++ b/src/views/inout/IoSupSecAuditOrder.vue @@ -787,7 +787,7 @@ export default { printOrder(row) { let tQuery = { action: row.action, - moduleId: 1, + moduleId: 2, } this.loading = true; inspectionOrderPDFFromTemplateFile(tQuery).then((response) => { @@ -796,7 +796,7 @@ export default { templateId: response.data, orderIdFk: row.billNo, action: row.action, - moduleId: 1, + moduleId: 2, } orderPDFFromTemplateFile(tQuery).then((response) => { //将pdf文件转换为url。 diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue index 9079bc3..3c94f5f 100644 --- a/src/views/purchase/cert/supCertificationAdd.vue +++ b/src/views/purchase/cert/supCertificationAdd.vue @@ -1,190 +1,201 @@ diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue index 2a1c385..818d488 100644 --- a/src/views/purchase/company/companyProducts.vue +++ b/src/views/purchase/company/companyProducts.vue @@ -1,617 +1,537 @@