diff --git a/src/views/basic/basicCompany.vue b/src/views/basic/basicCompany.vue index c898c1f..d0d5a60 100644 --- a/src/views/basic/basicCompany.vue +++ b/src/views/basic/basicCompany.vue @@ -106,6 +106,7 @@ size="small" placeholder="请输入内容" v-model="inputQuery.contacts" + @blur="inputQuery.contacts=$event.target.value.trim()" > @@ -633,8 +634,10 @@ export default { this.certQuery.customerId = this.inputQuery.customerId; filterCompanyCert(this.certQuery) .then((response) => { + this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total; }) .catch(() => { this.certLoading = false; diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue index a95aba0..8d0a20e 100644 --- a/src/views/purchase/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApplyEditDiaolog.vue @@ -280,7 +280,7 @@ export default { }, methods: { saveOrder(status) { - debugger + this.$refs["dataForm"].validate(valid => { if (valid) { if (this.codeArray.length < 1) { diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue index 8f57ea2..fb53f18 100644 --- a/src/views/purchase/purPlanEditDialog.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -304,7 +304,7 @@ export default { }, methods: { saveOrder(status) { - debugger + this.$refs["dataForm"].validate(valid => { if (valid) { if (this.codeArray.length < 1) { diff --git a/src/views/purchase/supCertSet.vue b/src/views/purchase/supCertSet.vue index 3cb9983..a25f7e5 100644 --- a/src/views/purchase/supCertSet.vue +++ b/src/views/purchase/supCertSet.vue @@ -385,7 +385,7 @@
- 产品类型: + 器械类别:
diff --git a/src/views/purchase/supCertSetSelectDialog.vue b/src/views/purchase/supCertSetSelectDialog.vue index 3ed93db..a66aa95 100644 --- a/src/views/purchase/supCertSetSelectDialog.vue +++ b/src/views/purchase/supCertSetSelectDialog.vue @@ -33,7 +33,7 @@ - + diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue index af86aee..9cc2a37 100644 --- a/src/views/purchase/supCertificationAdd.vue +++ b/src/views/purchase/supCertificationAdd.vue @@ -97,7 +97,7 @@ :total="total" > { this.certLoading = false; diff --git a/src/views/purchase/supManufacturerAuditDialog.vue b/src/views/purchase/supManufacturerAuditDialog.vue index 0950aff..7d633b4 100644 --- a/src/views/purchase/supManufacturerAuditDialog.vue +++ b/src/views/purchase/supManufacturerAuditDialog.vue @@ -492,6 +492,9 @@ export default { this.getCompanyCertList(); }, getCompanyCertList() { + if(this.editType!=2 && this.editType!=0){ + this.certQuery.auditStatus = 20; + } this.certLoading = true; this.certQuery.type = 2; filterCompanyCert(this.certQuery) diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue index 641b090..41659cb 100644 --- a/src/views/purchase/supManufacturerEditDialog.vue +++ b/src/views/purchase/supManufacturerEditDialog.vue @@ -382,7 +382,7 @@ export default { required: true, message: "请输入企业名称", trigger: "blur" - } + }, ], creditCode: [ { @@ -511,7 +511,7 @@ export default { }, methods: { onModifySubmit(type) { - + //判断本企业产品是否是通过审核的 let query = { customerId: this.$store.getters.customerId @@ -528,6 +528,7 @@ export default { }); }, addOrModifyCompany (type){ + this.$refs["inputQuery"].validate(valid => { if (valid) { @@ -660,14 +661,23 @@ export default { }, handleChange(value) { - this.inputQuery.placeArea = + if(value.length==3){ + this.inputQuery.placeArea = CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]]; - console.log(this.inputQuery.placeArea) + }else if(value.length==2){ + this.inputQuery.placeArea = + CodeToText[value[0]] + CodeToText[value[1]]; + } this.inputQuery.placeAreaCode = value.toString(); }, handleChange2(value) { - this.inputQuery.productionArea = + if(value.length==3){ + this.inputQuery.productionArea = CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]]; + }else if(value.length==2){ + this.inputQuery.productionArea = + CodeToText[value[0]] + CodeToText[value[1]]; + } this.inputQuery.productionAreaCode = value.toString(); }, uploadHandleRemove(file, fileList) { diff --git a/src/views/purchase/supProductAuditDialog.vue b/src/views/purchase/supProductAuditDialog.vue index 86663d0..d93d8d2 100644 --- a/src/views/purchase/supProductAuditDialog.vue +++ b/src/views/purchase/supProductAuditDialog.vue @@ -440,6 +440,10 @@ export default { if (this.editType == 0) { this.inputQuery.productId = getUUID(""); } else { + if(this.editType!=2 && this.editType!=0){ + this.certQuery.auditStatus = 20; + } + this.getCompanyCertList(); this.pmQuery.customerId = this.inputQuery.customerId; this.findPMMethod(); diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 205e193..1bad363 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -603,6 +603,10 @@ export default { }); }, saveOrder() { + if (this.total < 1) { + this.$message.error('未添加条码'); + return; + } if (this.formData.action == null || this.formData.action == '') { this.$message.error('未选择扫码单据类型'); return