diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 9080d82..1954df3 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -791,6 +791,7 @@ export default { } let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData))); tQuery.orderId = this.orderFormData.billNo; + tQuery.productType = 1 if (this.viewType == 2) { //扫码单据立即提交 submitCodes(tQuery) .then((response) => { diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue index 6584310..4d26250 100644 --- a/src/views/supplier/company/basicCompanyProductsImport.vue +++ b/src/views/supplier/company/basicCompanyProductsImport.vue @@ -1252,6 +1252,7 @@ export default { // } // if (this.editQuery.basicPrductRemak7 != null) { this.findThrTypeMethod(this.repEditQuery.basicPrductRemak7); + this.getList(); }, directives: { 'debounce-input': { diff --git a/src/views/supplier/drugProducts/supDiProductsCheck.vue b/src/views/supplier/drugProducts/supDiProductsCheck.vue index c8e0bdc..1346f34 100644 --- a/src/views/supplier/drugProducts/supDiProductsCheck.vue +++ b/src/views/supplier/drugProducts/supDiProductsCheck.vue @@ -499,7 +499,7 @@ export default { } }, auditDialog(_this, row) { - _this.title = "物资入院审核" + _this.title = "药品入院审核" if (row.type == 1) { let query = {devKey: row.deviceRecordKey} getDiProductDetail(query).then((res) => { diff --git a/src/views/supplier/drugProducts/supProductsAdd.vue b/src/views/supplier/drugProducts/supProductsAdd.vue index 349f060..20c9f19 100644 --- a/src/views/supplier/drugProducts/supProductsAdd.vue +++ b/src/views/supplier/drugProducts/supProductsAdd.vue @@ -482,6 +482,7 @@ export default { this.newProductData.sourceType = 1 if (this.newType == 1) { + this.newProductData.productType = 2 saveNewProduct(this.newProductData).then((res) => { if (res.code == 20000) { this.$message.success("添加成功"); @@ -496,6 +497,7 @@ export default { }) } else if (this.newType == 2) { // addProduct(this.newProductData).then((res) => { + this.newProductData.productsType = 2 addThrAddProductsNew(this.newProductData).then((res) => { if (res.code == 20000) { this.$message.success("添加成功"); diff --git a/src/views/supplier/drugProducts/supProductsAddDi.vue b/src/views/supplier/drugProducts/supProductsAddDi.vue index 9b646d4..ace96fe 100644 --- a/src/views/supplier/drugProducts/supProductsAddDi.vue +++ b/src/views/supplier/drugProducts/supProductsAddDi.vue @@ -454,6 +454,7 @@ export default { checkStatus: null, page: 1, limit: 20, + productsType:2 }, total: 0, tableHeader: [], @@ -512,6 +513,7 @@ export default { name: null, page: 1, limit: 20, + productsType:2 }; this.getList(); }, diff --git a/src/views/supplier/products/selectDIDetailDialog.vue b/src/views/supplier/products/selectDIDetailDialog.vue index ff6012e..4670324 100644 --- a/src/views/supplier/products/selectDIDetailDialog.vue +++ b/src/views/supplier/products/selectDIDetailDialog.vue @@ -573,6 +573,7 @@ export default { uuid: this.editDate.uuid, customerId: this.editDate.customerId, remark: this.remark + } updateDiProduct(query).then((res) => { if (res.code === 20000) { diff --git a/src/views/supplier/products/supProductsAdd.vue b/src/views/supplier/products/supProductsAdd.vue index 349f060..662f7eb 100644 --- a/src/views/supplier/products/supProductsAdd.vue +++ b/src/views/supplier/products/supProductsAdd.vue @@ -481,7 +481,9 @@ export default { this.newProductData.sourceType = 1 + if (this.newType == 1) { + this.newProductData.productType = 1 saveNewProduct(this.newProductData).then((res) => { if (res.code == 20000) { this.$message.success("添加成功"); @@ -495,6 +497,7 @@ export default { this.$message.error(error.message); }) } else if (this.newType == 2) { + this.newProductData.productsType = 1 // addProduct(this.newProductData).then((res) => { addThrAddProductsNew(this.newProductData).then((res) => { if (res.code == 20000) { diff --git a/src/views/supplier/products/supProductsAddDi.vue b/src/views/supplier/products/supProductsAddDi.vue index a21a0b6..c960d2b 100644 --- a/src/views/supplier/products/supProductsAddDi.vue +++ b/src/views/supplier/products/supProductsAddDi.vue @@ -454,6 +454,7 @@ export default { checkStatus: null, page: 1, limit: 20, + productsType:1 }, total: 0, tableHeader: [], @@ -512,6 +513,7 @@ export default { name: null, page: 1, limit: 20, + productsType:1 }; this.getList(); },