2
3
yuedefeng 5 роки тому
батько
коміт
cb79ec2917

+ 17 - 12
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -1039,7 +1039,7 @@
   import annualapi from '@/api/oilsupplier/annualaudit'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
-  import WfHistory from '@/components/workflow/wfmultihistory.vue'
+  import WfHistory from '@/components/workflow/wfhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -2516,6 +2516,10 @@
             this.formDataCert.SkillerTotal = res.data.SkillerTotal
             this.formDataCert.Status = res.data.Status
             this.formDataCert.WorkflowId = res.data.WorkflowId
+
+            this.GetItemsDatas()
+            this.GetChangeEntity(res.data.Id)
+
             // this.$refs['GoodsInfo'].CityAry = []
             // this.$refs['GoodsInfo'].CityAry.push(this.formData.Province)
             // this.$refs['GoodsInfo'].CityAry.push(this.formData.City)
@@ -2525,17 +2529,18 @@
             // this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkCity)
             // this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkStreet)
             // this.$refs['GoodsInfo'].UnitRelationAry = []
-            this.$refs['equipmentList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
-            this.$refs['performanceList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
-            this.$refs['patentList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
-            this.$refs['winningList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
-            this.$refs['businessList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
-            // this.$refs['subfileList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
-            if (this.certId && this.WorkflowId) {
-              this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
-            }
-            this.GetItemsDatas()
-            this.GetChangeEntity(res.data.Id)
+            this.$nextTick(() => {
+              this.$refs['equipmentList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
+              this.$refs['performanceList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
+              this.$refs['patentList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
+              this.$refs['winningList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
+              this.$refs['businessList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
+              // this.$refs['subfileList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
+              if (this.certId && this.WorkflowId && this.$refs['WfHistory']) {
+                this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
+              }
+            })
+
           }).catch(err => {
             console.error(err)
           })