Bladeren bron

fix:增项申请-分办提交工作流未刷新; 资质文件获取列表方法

baichengfei 5 jaren geleden
bovenliggende
commit
7e70545902

+ 1 - 1
src/dashoo.cn/backend/api/business/oilsupplier/supplierfile/supplierfileService.go

@@ -115,6 +115,6 @@ func (s *SupplierfileService) CheckIsManuf(id string) (IsManufacturer string) {
 //查看是否为制造商
 func (s *SupplierfileService) GetListBySupplierId(SupplierId string) (entitys []OilSupplierFile) {
 	queryWhere := "SupplierId='" + SupplierId + "'"
-	s.GetEntityByWhere("OilSupplierFile", queryWhere, &entitys)
+	s.GetEntitysByWhere("OilSupplierFile", queryWhere, &entitys)
 	return entitys
 }

+ 2 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -664,7 +664,7 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(certId, &supplierCertEntity)
-	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.Id), certId)
+	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.SupplierId), certId)
 
 	//取出企业主表
 	supplierSvc := supplier.GetOilSupplierService(utils.DBE)
@@ -757,7 +757,7 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(certId, &supplierCertEntity)
 	//检查是否可提交
-	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.Id), certId)
+	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.SupplierId), certId)
 	//取出企业主表
 	supplierSvc := supplier.GetOilSupplierService(utils.DBE)
 	var supplierEntity supplier.OilSupplier

+ 7 - 4
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -1256,14 +1256,15 @@
             })
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.dialogCommonAuditMakeSureVisible = false
-          this.btnloading = false
+          _this.dialogCommonAuditMakeSureVisible = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
         })
@@ -1374,10 +1375,11 @@
               type: 'success',
               message: res.data.message
             })
-            _this.dialogSecUnitSeparateVisible = false
-            _this.btnloading = false
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
+            _this.dialogSecUnitSeparateVisible = false
+            _this.btnloading = false
           } else {
             this.$message({
               type: 'warning',
@@ -1480,6 +1482,7 @@
             })
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',

+ 11 - 7
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -1380,17 +1380,18 @@
               type: 'success',
               message: res.data.message
             })
-            this.btnloading = false
-            this.dialogSecUnitSeparateVisible = false
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
+            _this.btnloading = false
+            _this.dialogSecUnitSeparateVisible = false
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.btnloading = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
           this.btnloading = false
@@ -1483,6 +1484,7 @@
             })
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
@@ -1601,13 +1603,14 @@
             _this.dialogBusinessOfficeSeparateAuditVisible = false
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.btnloading = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
         })
@@ -1637,17 +1640,18 @@
               type: 'success',
               message: res.data.message
             })
-            _this.dialogConcentrateAuditVisible = false
-            _this.btnloading = false
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
+            _this.dialogConcentrateAuditVisible = false
+            _this.btnloading = false
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.btnloading = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
         })

+ 10 - 7
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -1287,14 +1287,15 @@
             })
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.dialogCommonAuditMakeSureVisible = false
-          this.btnloading = false
+          _this.dialogCommonAuditMakeSureVisible = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
         })
@@ -1405,17 +1406,18 @@
               type: 'success',
               message: res.data.message
             })
-            this.dialogSecUnitSeparateVisible = false
-            this.btnloading = false
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
+            _this.dialogSecUnitSeparateVisible = false
+            _this.btnloading = false
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.btnloading = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
           this.btnloading = false
@@ -1509,14 +1511,15 @@
             })
             _this.getEntityById()
             _this.isAccess()
+            _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.dialogBusinessOfficeSeparateAuditVisible = false
-          this.btnloading = false
+          _this.dialogBusinessOfficeSeparateAuditVisible = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
         })