diff --git a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue index fe23640..5f3d044 100644 --- a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue +++ b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue @@ -305,14 +305,17 @@ created () { //如果是流程中表单,则需要加载流程表单data this.showFlowData(); - if (!this.isNew){ - this.init(); - } + let company = sessionStorage.getItem("PARENT_ID"); let userInfo=sessionStorage.getItem("USER_INFORMATION"); console.log(userInfo) // userInfo.company=company; - this.popupCallback(company,userInfo); + if (!this.isNew){ + this.init(); + }else { + this.popupCallback(company,userInfo); + } + }, methods: { /*回显数据*/ diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index dfb8364..fab9e62 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -369,15 +369,17 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' created() { //如果是流程中表单,则需要加载流程表单data this.showFlowData() - if (!this.isNew) { - this.init() - } + let company = sessionStorage.getItem('PARENT_ID') let puwwcid = sessionStorage.getItem('PUWWC_Id') let userInfo = sessionStorage.getItem('USER_INFORMATION') console.log(userInfo) // userInfo.company=company; - this.popupCallback(company, userInfo, puwwcid) + if (!this.isNew) { + this.init() + }else { + this.popupCallback(company, userInfo, puwwcid) + } }, methods: { //tab 值改变触发事件 diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue index ec5ab4d..d15cf47 100644 --- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue +++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue @@ -388,16 +388,17 @@ created() { //如果是流程中表单,则需要加载流程表单data this.showFlowData() - if (!this.isNew) { - this.init() - } + let company = sessionStorage.getItem('PARENT_ID') let userInfo = sessionStorage.getItem('USER_INFORMATION') // console.log("userInfouserInfo",JSON.parse(userInfo)); // userInfo.company=company; - this.popupCallback(company, userInfo) - + if (!this.isNew) { + this.init() + }else { + this.popupCallback(company, userInfo) + } }, methods: { async onSelect(record) { diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index cd03a2f..97f56f3 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -408,14 +408,16 @@ created() { //如果是流程中表单,则需要加载流程表单data //this.showFlowData() - if (!this.isNew) { - this.init() - } + let company = sessionStorage.getItem('PARENT_ID') let puwwcid = sessionStorage.getItem('PUWWC_Id') let userInfo = sessionStorage.getItem('USER_INFORMATION') // userInfo.company=company; - this.popupCallback(company, userInfo, puwwcid) + if (!this.isNew) { + this.init() + }else { + this.popupCallback(company, userInfo, puwwcid) + } }, methods: { shuliang() { diff --git a/src/views/activiti/form/ProcessMaterialsReturnForm.vue b/src/views/activiti/form/ProcessMaterialsReturnForm.vue index 35ef0dc..219c7a5 100644 --- a/src/views/activiti/form/ProcessMaterialsReturnForm.vue +++ b/src/views/activiti/form/ProcessMaterialsReturnForm.vue @@ -308,14 +308,16 @@ created () { //如果是流程中表单,则需要加载流程表单data this.showFlowData(); - if (!this.isNew){ - this.init(); - } + let company = sessionStorage.getItem("PARENT_ID"); let userInfo=sessionStorage.getItem("USER_INFORMATION"); console.log(userInfo) // userInfo.company=company; - this.popupCallback(company,userInfo); + if (!this.isNew){ + this.init(); + }else { + this.popupCallback(company,userInfo); + } }, methods: { /*回显数据*/ diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue index 721bf4a..5cd7977 100644 --- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue +++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue @@ -214,12 +214,14 @@ created () { //如果是流程中表单,则需要加载流程表单data this.showFlowData(); + + let company = sessionStorage.getItem("PARENT_ID"); + let userInfo=sessionStorage.getItem("USER_INFORMATION"); if (!this.isNew){ this.init(); + }else { + this.popupCallback(company,userInfo); } - let company = sessionStorage.getItem("PARENT_ID"); - let userInfo=sessionStorage.getItem("USER_INFORMATION"); - this.popupCallback(company,userInfo); }, methods: { /*回显数据*/ diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue index fd84e88..2b14343 100644 --- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue +++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue @@ -355,9 +355,10 @@ let userInfo = sessionStorage.getItem('USER_INFORMATION') // console.log(userInfo) // userInfo.company=company; - this.popupCallback(company, userInfo) if (!this.isNew){ this.init(); + }else { + this.popupCallback(company, userInfo) } }, methods: { diff --git a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue index 7d1e75b..49e3224 100644 --- a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue +++ b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue @@ -302,14 +302,16 @@ created () { //如果是流程中表单,则需要加载流程表单data this.showFlowData(); - if (!this.isNew){ - this.init(); - } + let company = sessionStorage.getItem("PARENT_ID"); let userInfo=sessionStorage.getItem("USER_INFORMATION"); console.log(userInfo) // userInfo.company=company; - this.popupCallback(company,userInfo); + if (!this.isNew){ + this.init(); + }else { + this.popupCallback(company,userInfo); + } }, methods: { /*回显数据*/ diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index b645bdd..2dcc0ce 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -615,14 +615,16 @@ created() { //如果是流程中表单,则需要加载流程表单data //this.showFlowData() - if (!this.isNew) { - this.init() - } + this.getAllTable() let company = sessionStorage.getItem('PARENT_ID') let userInfo = sessionStorage.getItem('USER_INFORMATION') // userInfo.company=company; - this.popupCallback(company, userInfo) + if (!this.isNew) { + this.init() + }else { + this.popupCallback(company, userInfo) + } // this.descriptionFetchDatas(); },