Преглед изворни кода

fix(融资管理):额度支用三方协议查看

sufan пре 7 месеци
родитељ
комит
50a80bd794

+ 10 - 6
src/components/Steps/index.vue

@@ -29,16 +29,19 @@ export default {
   },
   data() {
     return {
-      active: 3
+      active: 3,
+      businessNavigationHeight: 0
     }
   },
   computed: {
     getBusinessNavigationHeight() {
-      if (this.$refs.businessNavigation) {
-        return this.$refs.businessNavigation.clientHeight
-      } else {
-        return 100
-      }
+      return this.businessNavigationHeight ? this.businessNavigationHeight : 100
+      // if (this.$refs.businessNavigation) {
+      //   console.log(this.$refs.businessNavigation.clientHeight, 8888888888)
+      //   return this.$refs.businessNavigation.clientHeight
+      // } else {
+      //   return 100
+      // }
     }
   },
   watch: {
@@ -51,6 +54,7 @@ export default {
     }
   },
   mounted() {
+    this.businessNavigationHeight = this.$refs.businessNavigation.clientHeight
     this.$store.commit('scrollStore/SET_STEP_HEIGHT', this.getBusinessNavigationHeight)
   },
   methods: {

+ 3 - 1
src/views/financingManage/components/ContractApprovalContent.vue

@@ -73,7 +73,9 @@ export default {
           conclusion,
           suggestion
         }
-        this.$refs.ruleForm.resetFields()
+        this.$nextTick(() => {
+          this.$refs.ruleForm.resetFields()
+        })
       },
       immediate: true,
       deep: true

Разлика између датотеке није приказан због своје велике величине
+ 74 - 51
src/views/financingManage/limitExpenditure/components/TripartiteAgreement.vue


+ 28 - 23
src/views/financingManage/limitExpenditure/mainContent.vue

@@ -81,8 +81,8 @@
       <revenue-expenditure-plan
         ref="revenueExpenditurePlan"
         :details-info="{
-          incomeExpenditurePlanList: ruleForm.incomeExpenditurePlanList || [],
-          planIrrStr: ruleForm.planIrrStr
+          incomeExpenditurePlanList: incomeExpenditurePlanList || [],
+          planIrrStr: planIrrStr
         }"
         :disabled="disabled"
         @getTrrData="getTrrData"
@@ -140,6 +140,8 @@ export default {
         },
         incomeExpenditurePlanList: []
       },
+      incomeExpenditurePlanList: [],
+      planIrrStr: '',
       rules: {
         approvalConclusion: [
           { required: true, message: '请选择审批结论', trigger: 'change' }
@@ -160,7 +162,6 @@ export default {
       expenditurePlanData: {
         incomeExpenditurePlanList: [],
         planIrrStr: ''
-
       },
       formKey: 0
     }
@@ -169,23 +170,25 @@ export default {
     detailsInfo: {
       handler(newV) {
         if (newV === undefined) return
-        // if (this.$route.query?.type === 'see') {
-        //   const { incomeExpenditurePlanHisList, reviewFinancingInfoHis, reviewMasterContractHis, reviewTransferReceivableHis, mortgageBasicInfoHisList, reviewBasicContractHisList } = JSON.parse(JSON.stringify(newV))
-        //   this.ruleForm = {
-        //     ...this.ruleForm,
-        //     ...JSON.parse(JSON.stringify(newV)),
-        //     incomeExpenditurePlanList: incomeExpenditurePlanHisList,
-        //     mortgageBasicInfoList: mortgageBasicInfoHisList || [],
-        //     reviewBasicContractList: reviewBasicContractHisList || [],
-        //     reviewMasterContract: reviewMasterContractHis || [],
-        //     reviewFinancingInfo: reviewFinancingInfoHis || [],
-        //     reviewTransferReceivable: reviewTransferReceivableHis || []
-        //   }
-        //   this.expenditurePlanData = {
-        //     incomeExpenditurePlanList: this.ruleForm.incomeExpenditurePlanList || [],
-        //     planIrrStr: this.ruleForm.planIrrStr
-        //   }
-        // }
+        if (this.$route.query?.type === 'see') {
+          const { incomeExpenditurePlanHisList, reviewFinancingInfoHis, reviewMasterContractHis, reviewTransferReceivableHis, mortgageBasicInfoHisList, reviewBasicContractHisList, planIrrStr } = JSON.parse(JSON.stringify(newV))
+          this.ruleForm = {
+            ...this.ruleForm,
+            ...JSON.parse(JSON.stringify(newV)),
+            incomeExpenditurePlanList: incomeExpenditurePlanHisList,
+            mortgageBasicInfoList: mortgageBasicInfoHisList || [],
+            reviewBasicContractList: reviewBasicContractHisList || [],
+            reviewMasterContract: reviewMasterContractHis || [],
+            reviewFinancingInfo: reviewFinancingInfoHis || [],
+            reviewTransferReceivable: reviewTransferReceivableHis || []
+          }
+          this.incomeExpenditurePlanList = incomeExpenditurePlanHisList
+          this.planIrrStr = planIrrStr
+          this.expenditurePlanData = {
+            incomeExpenditurePlanList: incomeExpenditurePlanHisList || [],
+            planIrrStr: planIrrStr
+          }
+        }
       },
       immediate: true,
       deep: true
@@ -197,13 +200,15 @@ export default {
   methods: {
     getDeatils() {
       const { id } = this.$route.params
-      // if (this.$route.query?.type === 'see') return
+      if (this.$route.query?.type === 'see') return
       if (!id) return
       getLimitExpenditureDatails({ id }).then(({ data }) => {
         this.ruleForm = {
           ...this.ruleForm,
           ...data
         }
+        this.incomeExpenditurePlanList = data.incomeExpenditurePlanList
+        this.planIrrStr = data.planIrrStr
         this.expenditurePlanData = {
           incomeExpenditurePlanList: this.ruleForm.incomeExpenditurePlanList || [],
           planIrrStr: this.ruleForm.planIrrStr
@@ -221,7 +226,7 @@ export default {
     async automaticGeneration() {
       const params = await this.$refs.financingInfo.getParams()
       getExpenditurePlan(params).then(({ data }) => {
-        this.ruleForm.incomeExpenditurePlanList = data
+        this.incomeExpenditurePlanList = data
         this.$nextTick(() => {
           this.getTrrData()
         })
@@ -232,7 +237,7 @@ export default {
         incomeExpenditurePlanList: this.$refs.revenueExpenditurePlan.getParams()
       }
       getTrr(params).then(({ data }) => {
-        this.ruleForm.planIrrStr = data
+        this.planIrrStr = data
       })
     },
     async getParams(type) {