Merge branch 'dev1.0.2' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into dev1.0.2

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: {

src/views/creditManage/supplierManage/videoDue/components/CompanyBasicInfo/RegisteredCapital.vue

@@ -98,12 +98,14 @@ export default {
   watch: {
     datailsInfo: {
       handler(newV) {
+        if (newV.value === undefined) return
         const { capitalQuestion, capitalFeedback, capitalConclusion, capitalFile } = newV.value
         this.ruleForm = {
           capitalQuestion,
           capitalFeedback,
-          capitalConclusion: capitalConclusion || ''
+          capitalConclusion: newV.value.capitalConclusion || ''
         }
+        console.log(this.ruleForm)
         this.capitalFile = capitalFile || []
       },
       deep: true,

src/views/creditManage/supplierManage/videoDue/components/OperateFinance/OperateSituation.vue

@@ -180,12 +180,12 @@ export default {
         if (newV.value === undefined) return
         const { upstreamProcurementDocumentsList, salesDocumentsInfoList, videoDueDiligenceOperations } = JSON.parse(JSON.stringify(newV.value))
         const upstreamTableData = upstreamProcurementDocumentsList.map(item => {
-          item.result = item.result ? item.result : ''
+          item.result = item.result === null ? '' : item.result
           return item
         })
         this.$set(this, 'upstreamTableData', upstreamTableData)
         const downstreamTableData = salesDocumentsInfoList.map(item => {
-          item.result = item.result ? item.result : ''
+          item.result = item.result === null ? '' : item.result
           return item
         })
         this.$set(this, 'downstreamTableData', downstreamTableData)

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

src/views/financingManage/components/FinancingViewContent.vue

@@ -23,7 +23,7 @@
           <approve-content v-if="item.formBusinessName === '豁免-风控审核'" :details-info="item.obj" disabled />
           <payment-approve-content v-if="item.formBusinessName === '付款审核'" :details-info="item.obj" disabled />
         </el-collapse-item>
-      </el-collapse>
+      </el-collapse>   
       <!-- <el-empty v-else style="height: calc(100vh - 0.85rem - 90px)"></el-empty> -->
     </div>
   </div>
@@ -34,7 +34,6 @@ import { doBusinessHistoryView } from '@/api/dictionary'
 import collapseSeeMix from '@/mixins/collapseSeeMix'
 
 export default {
-  mixins: [collapseSeeMix],
   components: {
     ApplyFinancing: () => import('./ApplyFinancing.vue'),
     LimitExpenditure: () => import('../limitExpenditure/mainContent.vue'),
@@ -47,6 +46,7 @@ export default {
     PaymentApproveContent: () => import('./PaymentApproveContent.vue')
 
   },
+  mixins: [collapseSeeMix],
   provide() {
     return {
       disabled: true

src/views/financingManage/index.vue

@@ -267,7 +267,10 @@ export default {
       if (type === 'see') {
         this.$router.push({
           name: 'FinancingView',
-          params: { id }
+          params: { id },
+          query: {
+            type: 'see'
+          }
         })
       }
       if (type === 'edit') {

src/views/financingManage/limitExpenditure/components/FinancingInfo.vue

@@ -362,7 +362,7 @@ export default {
           this.ruleFormKey += 1
           setTimeout(() => {
             this.getBusinessTypeInfoData()
-          }, 300)
+          }, 500)
         }
       },
       immediate: true,
@@ -450,9 +450,12 @@ export default {
       })
     },
     getBusinessTypeInfoData() {
-      getBusinessTypeByManagement({ refinancingManagementId: this.refinancingManagement.id }).then(({ data }) => {
-        this.businessTypeInfo = data.data
-      })
+      if(this.refinancingManagement) {
+        getBusinessTypeByManagement({ refinancingManagementId: this.refinancingManagement.id }).then(({ data }) => {
+          this.businessTypeInfo = data.data
+        })
+      }
+    
     },
     getBusinessTypeInfo() {
       this.ruleForm.businessType = ''

src/views/financingManage/limitExpenditure/components/ResponsiblePerson.vue

@@ -71,7 +71,7 @@ export default {
         },
         {
           label: '保证合同编号',
-          prop: 'guaranteeContractNo',
+          prop: 'maxGuarMcc',
           width: 160
         },
         {

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,37 +162,57 @@ export default {
       expenditurePlanData: {
         incomeExpenditurePlanList: [],
         planIrrStr: ''
-
       },
       formKey: 0
     }
   },
-  //  watch: {
-  //   deatailsInfo: {
-  //     handler(newV) {
-  //       const { approvalConclusion, approvalComments } = JSON.parse(JSON.stringify(newV))
-  //       this.ruleForm.approvalConclusion = approvalConclusion
-  //       this.ruleForm.approvalComments = approvalComments
-  //     },
-  //     immediate: true,
-  //     deep: true
-  //   }
-  // },
+  watch: {
+    detailsInfo: {
+      handler(newV) {
+        if (newV === undefined) return
+        if (this.$route.query?.type === 'see') {
+          const { incomeExpenditurePlanHisList, reviewFinancingInfoHis, reviewMasterContractHis, rltRepayHisList, 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 || [],
+            rltRepayList: rltRepayHisList || []
+          }
+          this.incomeExpenditurePlanList = incomeExpenditurePlanHisList
+          this.planIrrStr = planIrrStr
+          this.expenditurePlanData = {
+            incomeExpenditurePlanList: incomeExpenditurePlanHisList || [],
+            planIrrStr: planIrrStr
+          }
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   created() {
     this.getDeatils()
   },
   methods: {
     getDeatils() {
       const { id } = this.$route.params
+      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  
+          planIrrStr: this.ruleForm.planIrrStr
         }
         this.formKey += 1
       })
@@ -205,7 +227,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()
         })
@@ -216,7 +238,7 @@ export default {
         incomeExpenditurePlanList: this.$refs.revenueExpenditurePlan.getParams()
       }
       getTrr(params).then(({ data }) => {
-        this.ruleForm.planIrrStr = data
+        this.planIrrStr = data
       })
     },
     async getParams(type) {
@@ -280,12 +302,11 @@ export default {
         })
       } else {
         const data = await this.getParams(type)
-        if(data.incomeExpenditurePlanList && data.incomeExpenditurePlanList.length) {
+        if (data.incomeExpenditurePlanList && data.incomeExpenditurePlanList.length) {
           await this.automaticGeneration()
         }
         this.$refs.ruleForm.validate(async(valid) => {
           if (valid) {
-            
             data.visible = type !== 'temp'
             setTimeout(() => {
               reviewQuotaDisburseSubmit(data).then(() => {