Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -3289,9 +3289,12 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 
 	}
 	var certSubList1 []suppliercertsub.OilSupplierCertSub
-	total := certsubService.GetPagingEntitiesWithOrderBytbl("", file.CurrentPage, file.Size, "Id", true, &certSubList1, "IsQuestion = 2 and SupplierId = "+strconv.Itoa(supplierEntity.Id))
+	var total int64
 	if file.CertId != "0" {
 		total = certsubService.GetPagingEntitiesWithOrderBytbl("", file.CurrentPage, file.Size, "Id", true, &certSubList1, "IsQuestion = 2 and SupplierId = "+strconv.Itoa(supplierEntity.Id)+" and SupplierCertId = "+file.CertId)
+	} else {
+		total = certsubService.GetPagingEntitiesWithOrderBytbl("", file.CurrentPage, file.Size, "Id", true, &certSubList1, "IsQuestion = 2 and SupplierId = "+strconv.Itoa(supplierEntity.Id))
+
 	}
 	var datainfo DataInfo
 	datainfo.CurrentItemCount = total

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/basisedit.vue

@@ -883,7 +883,25 @@
         if (!this.formData.Id || !this.certId) {
           this.addEntity()
         } else {
-          this.updateEntity()
+          let fileType = {
+            Type: this.formData.OperType === '制造商' ? 1 : 2,
+            SupplierId: this.formData.Id,
+            CertId: this.certId,
+            Grade: this.formData.Grade
+          }
+          api.checkSupplierFileNew(fileType, this.$axios).then(res => {
+            if (res.data.code === 1) {
+              this.updateEntity()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+              this.saveLoading = false
+            }
+          }).catch(err => {
+            console.error(err)
+          })
         }
       },
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/techedit.vue

@@ -878,7 +878,25 @@
         if (!this.formData.Id || !this.certId) {
           this.addEntity()
         } else {
-          this.updateEntity()
+          let fileType = {
+            Type: this.formData.OperType === '制造商' ? 1 : 2,
+            SupplierId: this.formData.Id,
+            CertId: this.certId,
+            Grade: this.formData.Grade
+          }
+          api.checkSupplierFileNew(fileType, this.$axios).then(res => {
+            if (res.data.code === 1) {
+              this.updateEntity()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+              this.saveLoading = false
+            }
+          }).catch(err => {
+            console.error(err)
+          })
         }
       },