diff --git a/src/api/http.js b/src/api/http.js
index f42d7a6..f438fd3 100644
--- a/src/api/http.js
+++ b/src/api/http.js
@@ -63,7 +63,7 @@ export const creditEvaluationInput = data => {
   return post(`/judgment/bankCreditEvaluation/creditEvaluationInput`, data)
 }
 export const creditEvaluationDetails = data => {
-  return post(`/judgment/bankCreditEvaluation/creditEvaluationDetails`, data)
+  return get(`/judgment/bankCreditEvaluation/creditEvaluationDetails`, data)
 }
 export const loanApplicationInput = data => {
   return post(`/judgment/bankLoanApplication/loanApplicationInput`, data)
@@ -75,7 +75,7 @@ export const creditApplicationInput = data => {
   return post(`/judgment/bankCreditApplication/creditApplicationInput`, data)
 }
 export const creditApplicationDetails = data => {
-  return post(`/judgment/bankCreditApplication/creditApplicationDetails`, data)
+  return get(`/judgment/bankCreditApplication/creditApplicationDetails`, data)
 }
 export const companyLoanList = data => {
   return post(`/judgment/bankCompanyLoans/companyLoanList`, data)
diff --git a/src/pages/manage/list/corporateLoans/application.vue b/src/pages/manage/list/corporateLoans/application.vue
index f6d5c0e..64ec6b8 100644
--- a/src/pages/manage/list/corporateLoans/application.vue
+++ b/src/pages/manage/list/corporateLoans/application.vue
@@ -8,7 +8,7 @@
         <el-input v-model="keyword" placeholder="请输入客户姓名" clearable />
       </div>
 
-      <el-button type="primary" @click="$router.push('/counter/list/manage/corporateLoans-apply')">新建贷款申请</el-button>
+      <el-button type="primary" @click="toDetail(0)">新建贷款申请</el-button>
     </div>
 
     <el-table :data="list" stripe :header-cell-style="headerCellStyle">
@@ -81,7 +81,13 @@ export default {
     },
     // 详情
     toDetail (row) {
-      this.$router.push(`/counter/list/manage/corporateLoans-detail?id=${row.companyLoanId}`)
+      // 缓存信用评估几个id
+      this.$store.commit('system/setCreditIds', (row ? {
+        companyLoanId: row.companyLoanId, // 顶部三个tab切换的公共id
+        // creditEvaluationId: row.creditEvaluationId, // 信用评估的id
+      } : {}))
+      this.$router.push(row.loanApplicationAmount ? `/counter/list/manage/corporateLoans-detail?id=${row.companyLoanId}` : '/counter/list/manage/corporateLoans-apply')
+      // this.$router.push('/counter/list/manage/corporateLoans-apply')
     },
   },
 };
diff --git a/src/pages/manage/list/corporateLoans/apply/creditApplication/index.vue b/src/pages/manage/list/corporateLoans/apply/creditApplication/index.vue
index dc3ec47..d8e270e 100644
--- a/src/pages/manage/list/corporateLoans/apply/creditApplication/index.vue
+++ b/src/pages/manage/list/corporateLoans/apply/creditApplication/index.vue
@@ -100,7 +100,7 @@
           <h6 class="l-title">申请人特别说明（选填）</h6>
         </el-col>
         <el-col :span="24">
-          <el-input v-model="form.specialInstructions" type="textarea" maxlength="500" placeholder="请输入申请述求"></el-input>
+          <el-input v-model="form.specialInstructions" type="textarea" maxlength="500" placeholder="请输入申请诉求"></el-input>
         </el-col>
 
         <el-col :span="24" style="margin-top: 20px">
@@ -234,19 +234,55 @@
     </el-row>
 
     <div class="m-t-30 text-center">
-      <el-button @click="submit" type="primary" class="submitBtn" v-throttle>提交</el-button>
+      <el-button @click="beforeSubmit" type="primary" class="submitBtn" v-throttle>提交</el-button>
     </div>
+
+    <el-dialog :visible="visible" append-to-body style="z-index: 6000;" :close-on-click-modal="true" :show-close="false"
+      custom-class="dia">
+      <div class="data-dia23">
+        <div slot="title" class="dia-header">
+          <div class="data-title">提示</div>
+        </div>
+
+        <div class="popBody">
+          <p class="text-lg" style="color: #333">请进行授信审核</p>
+        </div>
+
+        <div class="popBtns">
+          <el-button class="close btn hover:bg-blue-100 " @click="visible = false">取 消</el-button>
+          <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="submit">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible="successVisible" append-to-body style="z-index: 6000;" :close-on-click-modal="false"
+      :show-close="false" custom-class="dia">
+      <div class="data-dia23">
+        <div slot="title" class="dia-header">
+          <div class="data-title">提示</div>
+        </div>
+
+        <div class="popBody" style="flex-direction: column;">
+          <p class="text-lg" style="margin-bottom: 10px;color: #333">授信完成</p>
+          <p class="text-lg" style="color: #333">可进行贷款申请</p>
+        </div>
+
+        <div class="popBtns">
+          <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="toStep3">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import { inputListen } from '@/utils/utilFunction.js'
-import { addOperation, creditApplicationInput } from '@/api/http'
+import { creditApplicationDetails, addOperation, creditApplicationInput } from '@/api/http'
 import { mapState, mapMutations } from 'vuex'
 export default {
   data () {
     return {
       form: {
-        applicationAccount: '913403005685450862',
+        applicationAccount: '6227007200580926',
         customerName: '丛小凤',
         identificationNumber: '220602199202281229',
         contactPhoneNumber: '15890317718',
@@ -291,6 +327,8 @@ export default {
           name: '不良'
         },
       ],
+      visible: false,
+      successVisible: false,
     }
   },
   computed: {
@@ -304,22 +342,44 @@ export default {
     inputListen,
     // 查询详情
     async getDetail () {
+      const id = this.creditIds.companyLoanId
+      let r
+      if (id) {
+        const res = await creditApplicationDetails({
+          companyLoanId: id
+        })
+        r = res.data.bankCreditApplication || {}
+        if (r.creditId) {
+          this.form.creditId = r.creditId
+          this.form.cooperationPeriod = r.cooperationPeriod
+          this.form.matureRepayment = r.matureRepayment === 'true'
+          this.form.otherRepaymentsCheck = !!r.otherRepayments
+          this.form.otherRepayments = r.otherRepayments
+          this.form.paymentForMaterials = r.paymentForMaterials === 'true'
+          this.form.payLaborCosts = r.payLaborCosts === 'true'
+          this.form.payExpenses = r.payExpenses === 'true'
+          this.form.otherUseCheck = !!r.otherUses
+          this.form.otherUses = r.otherUses
+          this.form.specialInstructions = r.specialInstructions
+        }
+      }
+      // 附件回显
       this.initCreditImportIds({
-        corporateIdCard: '',
-        mortgagePropertyCertificate: '',
-        proofOfMaritalStatus: '',
-        copyOfSpouseSIdCard: '',
-        originalBusinessLicense: '',
-        accountOpeningPermit: '',
-        leaseContract: '',
-        companyArticlesOfAssociation: '',
-        shareholderDocuments: '',
-        financialSeal: '',
-        oneYearTaxPaymentCertificate: '',
-        halfYearRevenue: '',
-        corporateFinancialStatements: '',
-        loanApplicationForm: '',
-        creditAuthorizationLetter: '',
+        corporateIdCard: r.corporateIdCard || '',
+        mortgagePropertyCertificate: r.mortgagePropertyCertificate || '',
+        proofOfMaritalStatus: r.proofOfMaritalStatus || '',
+        copyOfSpouseSIdCard: r.copyOfSpouseSIdCard || '',
+        originalBusinessLicense: r.originalBusinessLicense || '',
+        accountOpeningPermit: r.accountOpeningPermit || '',
+        leaseContract: r.leaseContract || '',
+        companyArticlesOfAssociation: r.companyArticlesOfAssociation || '',
+        shareholderDocuments: r.shareholderDocuments || '',
+        financialSeal: r.financialSeal || '',
+        oneYearTaxPaymentCertificate: r.oneYearTaxPaymentCertificate || '',
+        halfYearRevenue: r.halfYearRevenue || '',
+        corporateFinancialStatements: r.corporateFinancialStatements || '',
+        loanApplicationForm: r.loanApplicationForm || '',
+        creditAuthorizationLetter: r.creditAuthorizationLetter || '',
       })
     },
     // 导入
@@ -327,14 +387,17 @@ export default {
       this.setCreditImportIndex(i)
       this.$parent.$parent.$parent.showData('导入报表', 12)
     },
+    async beforeSubmit () {
+      const { form } = this
+      if (!form.matureRepayment && !form.otherRepaymentsCheck) return this.$message.error('请选择还款来源！')
+      if (form.otherRepaymentsCheck && !form.otherRepayments) return this.$message.error('请输入其他的还款来源！')
+      if (!form.paymentForMaterials && !form.payLaborCosts && !form.payExpenses && !form.otherUseCheck) return this.$message.error('请选择贷款用途！')
+      if (form.otherUseCheck && !form.otherUses) return this.$message.error('请输入其他的用途！')
+      this.visible = true
+    },
     async submit () {
       try {
         const { form } = this
-        if (!form.matureRepayment && !form.otherRepaymentsCheck) return this.$message.error('请选择还款来源！')
-        if (form.otherRepaymentsCheck && !form.otherRepayments) return this.$message.error('请输入其他的还款来源！')
-        if (!form.paymentForMaterials && !form.payLaborCosts && !form.payExpenses && !form.otherUses) return this.$message.error('请选择贷款用途！')
-        if (form.otherUseCheck && !form.otherUses) return this.$message.error('请输入其他的用途！')
-
         // 判分
         await creditApplicationInput({
           ...this.$store.state.system.creditIds,
@@ -344,31 +407,34 @@ export default {
 
         const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,768'
         const rule = []
-        form.matureRepayment && rule.push({ answerId: 799, emptyOne: '', emptyTwo: '', operationIds: preId + ',798,799', type: '' })
-        form.otherRepayments && rule.push({ answerId: 800, emptyOne: 125, emptyTwo: form.otherRepayments, operationIds: preId + ',798,800', type: 3 })
-        form.paymentForMaterials && rule.push({ answerId: 834, emptyOne: '', emptyTwo: '', operationIds: preId + ',833,834', type: '' })
-        form.payLaborCosts && rule.push({ answerId: 835, emptyOne: '', emptyTwo: '', operationIds: preId + ',833,835', type: '' })
-        form.payExpenses && rule.push({ answerId: 836, emptyOne: '', emptyTwo: '', operationIds: preId + ',833,836', type: '' })
-        form.otherUses && rule.push({ answerId: 800, emptyOne: 125, emptyTwo: form.otherUses, operationIds: preId + ',833,837', type: 3 })
+        form.cooperationPeriod && rule.push({ answerId: 875, emptyOne: 149, emptyTwo: form.cooperationPeriod, operationIds: preId + ',875', type: 3 })
+        form.matureRepayment && rule.push({ answerId: 798, emptyOne: 147, emptyTwo: 269, operationIds: preId + ',798', type: 1 })
+        form.otherRepayments && rule.push({ answerId: 798, emptyOne: 147, emptyTwo: 270, operationIds: preId + ',798', type: 1 })
+
+        form.paymentForMaterials && rule.push({ answerId: 833, emptyOne: 148, emptyTwo: 271, operationIds: preId + ',833', type: 1 })
+        form.payLaborCosts && rule.push({ answerId: 833, emptyOne: 148, emptyTwo: 272, operationIds: preId + ',833', type: 1 })
+        form.payExpenses && rule.push({ answerId: 833, emptyOne: 148, emptyTwo: 273, operationIds: preId + ',833', type: 1 })
+        form.otherUses && rule.push({ answerId: 833, emptyOne: 148, emptyTwo: 274, operationIds: preId + ',833', type: 1 })
+
         form.specialInstructions && rule.push({ answerId: 802, emptyOne: 125, emptyTwo: form.specialInstructions, operationIds: preId + ',802', type: 3 })
 
         // 附件的判分，都是点击题
         const files = this.creditImportIds
-        files.corporateIdCard && rule.push({ answerId: 804, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,804', type: '' })
-        files.mortgagePropertyCertificate && rule.push({ answerId: 805, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,805', type: '' })
-        files.proofOfMaritalStatus && rule.push({ answerId: 806, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,806', type: '' })
-        files.copyOfSpouseSIdCard && rule.push({ answerId: 807, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,807', type: '' })
-        files.originalBusinessLicense && rule.push({ answerId: 808, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,808', type: '' })
-        files.accountOpeningPermit && rule.push({ answerId: 809, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,809', type: '' })
-        files.leaseContract && rule.push({ answerId: 810, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,810', type: '' })
-        files.companyArticlesOfAssociation && rule.push({ answerId: 811, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,811', type: '' })
-        files.shareholderDocuments && rule.push({ answerId: 812, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,812', type: '' })
-        files.financialSeal && rule.push({ answerId: 813, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,813', type: '' })
-        files.oneYearTaxPaymentCertificate && rule.push({ answerId: 814, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,814', type: '' })
-        files.halfYearRevenue && rule.push({ answerId: 815, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,815', type: '' })
-        files.corporateFinancialStatements && rule.push({ answerId: 817, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,817', type: '' })
-        files.loanApplicationForm && rule.push({ answerId: 818, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,818', type: '' })
-        files.creditAuthorizationLetter && rule.push({ answerId: 819, emptyOne: '', emptyTwo: '', operationIds: preId + ',803,819', type: '' })
+        files.corporateIdCard && rule.push({ answerId: 804, emptyOne: 146, emptyTwo: files.corporateIdCard, operationIds: preId + ',803,804', type: 1 })
+        files.mortgagePropertyCertificate && rule.push({ answerId: 805, emptyOne: 146, emptyTwo: files.mortgagePropertyCertificate, operationIds: preId + ',803,805', type: 1 })
+        files.proofOfMaritalStatus && rule.push({ answerId: 806, emptyOne: 146, emptyTwo: files.proofOfMaritalStatus, operationIds: preId + ',803,806', type: 1 })
+        files.copyOfSpouseSIdCard && rule.push({ answerId: 807, emptyOne: 146, emptyTwo: files.copyOfSpouseSIdCard, operationIds: preId + ',803,807', type: 1 })
+        files.originalBusinessLicense && rule.push({ answerId: 808, emptyOne: 146, emptyTwo: files.originalBusinessLicense, operationIds: preId + ',803,808', type: 1 })
+        files.accountOpeningPermit && rule.push({ answerId: 809, emptyOne: 146, emptyTwo: files.accountOpeningPermit, operationIds: preId + ',803,809', type: 1 })
+        files.leaseContract && rule.push({ answerId: 810, emptyOne: 146, emptyTwo: files.leaseContract, operationIds: preId + ',803,810', type: 1 })
+        files.companyArticlesOfAssociation && rule.push({ answerId: 811, emptyOne: 146, emptyTwo: files.companyArticlesOfAssociation, operationIds: preId + ',803,811', type: 1 })
+        files.shareholderDocuments && rule.push({ answerId: 812, emptyOne: 146, emptyTwo: files.shareholderDocuments, operationIds: preId + ',803,812', type: 1 })
+        files.financialSeal && rule.push({ answerId: 813, emptyOne: 146, emptyTwo: files.financialSeal, operationIds: preId + ',803,813', type: 1 })
+        files.oneYearTaxPaymentCertificate && rule.push({ answerId: 814, emptyOne: 146, emptyTwo: files.oneYearTaxPaymentCertificate, operationIds: preId + ',803,814', type: 1 })
+        files.halfYearRevenue && rule.push({ answerId: 815, emptyOne: 146, emptyTwo: files.halfYearRevenue, operationIds: preId + ',803,815', type: 1 })
+        files.corporateFinancialStatements && rule.push({ answerId: 817, emptyOne: 146, emptyTwo: files.corporateFinancialStatements, operationIds: preId + ',803,817', type: 1 })
+        files.loanApplicationForm && rule.push({ answerId: 818, emptyOne: 146, emptyTwo: files.loanApplicationForm, operationIds: preId + ',803,818', type: 1 })
+        files.creditAuthorizationLetter && rule.push({ answerId: 819, emptyOne: 146, emptyTwo: files.creditAuthorizationLetter, operationIds: preId + ',803,819', type: 1 })
 
         await addOperation({
           parentId: preId,
@@ -377,15 +443,21 @@ export default {
           startTime: sessionStorage.getItem('startTime')
         })
 
-        this.$message.success('保存成功！')
-        this.$parent.active = '3'
-        this.$parent.curStep = 0
+        this.successVisible = true
       } catch { (e) => { } }
     },
+    // 跳转到第三步
+    toStep3 () {
+      this.$parent.active = '3'
+      this.$parent.curStep = 0
+      this.$parent.tab3Disabled = false
+    },
   },
 }
 </script>
 <style lang='scss' scoped>
+@import '@/styles/dialog.scss';
+
 .l-title {
   margin-bottom: 15px;
   font-size: 18px;
diff --git a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue
index cfecb6b..01511e5 100644
--- a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue
+++ b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue
@@ -49,7 +49,7 @@
           <el-form-item label="客户名称" prop="customerName">
             <el-input v-model="form.customerName" />
           </el-form-item>
-          <el-form-item label="证件号码" prop="identificationNumber">
+          <el-form-item label="代码证号" prop="identificationNumber">
             <el-input v-model="form.identificationNumber" />
           </el-form-item>
           <el-form-item label="注册地址" prop="companyRegisteredAddress">
@@ -75,7 +75,9 @@
             <el-input v-model="form.registrationType" />
           </el-form-item>
           <el-form-item label="营业执照到期日" prop="expirationDateOfBusinessLicense">
-            <el-input v-model="form.expirationDateOfBusinessLicense" />
+            <el-date-picker v-model="form.expirationDateOfBusinessLicense" type="date" placeholder="选择日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
           </el-form-item>
           <el-form-item label="借款人性质" prop="natureOfBorrower">
             <el-input v-model="form.natureOfBorrower" />
@@ -93,11 +95,12 @@
 </template>
 <script>
 import { inputListen } from '@/utils/utilFunction.js'
-import { addOperation, creditEvaluationInput } from '@/api/http'
-import { mapMutations, mapGetters } from 'vuex'
+import { creditEvaluationDetails, addOperation, creditEvaluationInput } from '@/api/http'
+import { mapMutations, mapState } from 'vuex'
 export default {
   data () {
     return {
+      id: this.$route.query.id,
       form: {
         applicationAccount: '',
         customerName: '',
@@ -117,7 +120,7 @@ export default {
         yearOfEstablishment: '',
         registrationType: '',
         mainBusinessScope: '',
-        expirationDateOfBusinessLicense: '',
+        expirationDateOfBusinessLicense: '2050-01-01',
         financialReportSubmissionMethod: '',
         natureOfBorrower: '',
       },
@@ -130,11 +133,19 @@ export default {
           }
         ],
       },
+      pickerOptions: {
+        disabledDate (v) {
+          return v.getTime() < new Date().getTime() - 86400000
+        },
+      },
       submited: 0
     }
   },
+  computed: {
+    ...mapState('system', ['creditIds']),
+  },
   mounted () {
-
+    this.getDetail()
   },
   methods: {
     ...mapMutations({
@@ -144,7 +155,25 @@ export default {
       setPopId: 'system/setPopId',
       setTipsOperate: 'system/setTipsOperate',
       setCreditIds: 'system/setCreditIds',
+      setCreditImportIds: 'system/setCreditImportIds',
     }),
+    // 查询详情
+    async getDetail () {
+      const id = this.creditIds.companyLoanId
+      if (id) {
+        const res = await creditEvaluationDetails({
+          companyLoanId: id
+        })
+        const r = res.data.bankCreditEvaluation
+        r.identificationType = +r.identificationType
+        r.currency = 12
+        r.accountType = 97
+        r.interestRate = 3.2
+        r.interestCalculationMethod = 83
+        r.withdrawalMethod = 114
+        this.form = r
+      }
+    },
     // 账号blur事件
     accountBlur () {
       if (this.form.applicationAccount === 12802851701099) {
@@ -182,6 +211,7 @@ export default {
           projectId: +sessionStorage.getItem('projectId'),
           startTime: sessionStorage.getItem('startTime')
         })
+        this.setCreditImportIds()
         // 缓存信用评估几个id
         this.setCreditIds({
           companyLoanId: data.companyLoanId, // 顶部三个tab切换的公共id
@@ -191,15 +221,6 @@ export default {
       } catch { (e) => { } }
     },
     inputListen,
-  },
-  computed: {
-    ...mapGetters({
-      dataFlow: 'system/dataFlow',
-      needsModule: 'system/needsModule',
-      idCardNumber: 'system/idCardNumber',
-      inMyWork: 'system/inMyWork',
-      getSelectList: 'system/getSelectList',
-    })
   }
 }
 </script>
diff --git a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/importReport.vue b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/importReport.vue
index db9ae58..76a7d04 100644
--- a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/importReport.vue
+++ b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/importReport.vue
@@ -32,7 +32,7 @@
   </div>
 </template>
 <script>
-import { addOperation, creditEvaluationInput } from '@/api/http'
+import { creditEvaluationDetails, addOperation, creditEvaluationInput } from '@/api/http'
 import { mapMutations, mapState } from 'vuex'
 
 export default {
@@ -48,19 +48,21 @@ export default {
     this.getDetail()
   },
   methods: {
-    ...mapMutations('system', ['setCreditImportIds', 'setCreditImportIndex', 'initCreditImportIds', 'setTipsOperate']),
+    ...mapMutations('system', ['setCreditImportIndex', 'initCreditImportIds']),
     // 查询详情
     async getDetail () {
-      this.initCreditImportIds({
-        importBalanceSheet: '',
-        importIncomeStatement: '',
-        importCashFlowStatement: '',
-      })
-      if (this.id) {
-        // 查看及展期
-        const { data } = await personalBasicFind(this.id)
-        this.basicForm = data.data
-        this.form = data.data.bankPersonalLoanContractInfo
+      // debugger
+      const id = this.creditIds.companyLoanId
+      if (id) {
+        const res = await creditEvaluationDetails({
+          companyLoanId: id
+        })
+        const r = res.data.bankCreditEvaluation
+        this.initCreditImportIds({
+          importBalanceSheet: r.importBalanceSheet || '',
+          importIncomeStatement: r.importIncomeStatement || '',
+          importCashFlowStatement: r.importCashFlowStatement || '',
+        })
       }
     },
     // 导入
diff --git a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/preLoan.vue b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/preLoan.vue
index e423998..45adf09 100644
--- a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/preLoan.vue
+++ b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/preLoan.vue
@@ -80,9 +80,9 @@
   </div>
 </template>
 <script>
-import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, inputListen, messageIdCard, messageCard, messagePassword } from '@/utils/utilFunction.js';
-import { addOperation, creditEvaluationInput } from '@/api/http'
-import { mapMutations, mapGetters } from 'vuex'
+import { myValidate } from '@/utils/utilFunction.js';
+import { creditEvaluationDetails, addOperation, creditEvaluationInput } from '@/api/http'
+import { mapState } from 'vuex'
 export default {
   data () {
     return {
@@ -199,15 +199,32 @@ export default {
     }
   },
   computed: {
-    // 贷款相关id
-    creditIds: function () {
-      return this.$store.state.system.creditIds
-    },
+    ...mapState('system', ['creditIds']),
   },
   mounted () {
-
+    this.getDetail()
   },
   methods: {
+    // 查询详情
+    async getDetail () {
+      const id = this.creditIds.companyLoanId
+      if (id) {
+        const res = await creditEvaluationDetails({
+          companyLoanId: id
+        })
+        const r = res.data.bankCreditEvaluation
+        r.externalUnfavorableGuarantee = +r.externalUnfavorableGuarantee || 204
+        r.tradeFinancingRecords = +r.tradeFinancingRecords || 204
+        r.businessStatus = +r.businessStatus || 205
+        r.businessInvestmentErrors = +r.businessInvestmentErrors || 204
+        r.badDebtReserves = +r.badDebtReserves || 204
+        r.enterpriseCustomerAnalysis = +r.enterpriseCustomerAnalysis || 205
+        r.majorLegalLitigation = +r.majorLegalLitigation || 204
+        r.compensationMajorAccidents = +r.compensationMajorAccidents || 204
+        r.loanRiskSituation = +r.loanRiskSituation || 204
+        this.form = r
+      }
+    },
     async next () {
       this.$refs.form.validate(myValidate(async () => {
         try {
diff --git a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/rating.vue b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/rating.vue
index e7b983d..bfdd7ee 100644
--- a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/rating.vue
+++ b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/rating.vue
@@ -88,15 +88,9 @@
   </div>
 </template>
 <script>
-import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, inputListen, messageIdCard, messageCard, messagePassword } from '@/utils/utilFunction.js';
-import { addOperation, creditEvaluationInput } from '@/api/http'
+import { creditEvaluationDetails, addOperation, creditEvaluationInput } from '@/api/http'
+import { mapState } from 'vuex'
 export default {
-  computed: {
-    // 贷款相关id
-    creditIds: function () {
-      return this.$store.state.system.creditIds
-    },
-  },
   data () {
     return {
       opt1: [
@@ -215,10 +209,33 @@ export default {
       submited: 0
     }
   },
+  computed: {
+    ...mapState('system', ['creditIds']),
+  },
   mounted () {
-
+    this.getDetail()
   },
   methods: {
+    // 查询详情
+    async getDetail () {
+      const id = this.creditIds.companyLoanId
+      if (id) {
+        const res = await creditEvaluationDetails({
+          companyLoanId: id
+        })
+        const r = res.data.bankCreditEvaluation
+        r.profitRecord = +r.profitRecord || 208
+        r.leadershipAdaptabilityAndDevelopment = +r.leadershipAdaptabilityAndDevelopment || 205
+        r.leadershipStyleAndConduct = +r.leadershipStyleAndConduct || 205
+        r.leadershipEducation = +r.leadershipEducation || 203
+        r.leadershipManagement = +r.leadershipManagement || 205
+        r.enterpriseDevelopmentCapability = +r.enterpriseDevelopmentCapability || 216
+        r.enterpriseDevelopmentProspects = +r.enterpriseDevelopmentProspects || 219
+        r.corporateReputation = +r.corporateReputation || 205
+        r.haveAnyBadCreditRecords = +r.haveAnyBadCreditRecords || 204
+        this.form = r
+      }
+    },
     confirmSubmit () {
       this.submitVisible = true
     },
@@ -251,6 +268,7 @@ export default {
         })
         this.$message.success('创建成功！')
         this.$parent.active = '2'
+        this.$parent.tab2Disabled = false
       } catch { (e) => { } }
     },
   },
diff --git a/src/pages/manage/list/corporateLoans/apply/index.vue b/src/pages/manage/list/corporateLoans/apply/index.vue
index 9dae9af..85661f2 100644
--- a/src/pages/manage/list/corporateLoans/apply/index.vue
+++ b/src/pages/manage/list/corporateLoans/apply/index.vue
@@ -5,8 +5,8 @@
       <div class="nav">
         <el-menu :default-active="active" class="el-menu-demo" mode="horizontal" @select="handleSelect">
           <el-menu-item index="1">信用评估</el-menu-item>
-          <el-menu-item index="2">授信申请</el-menu-item>
-          <el-menu-item index="3">贷款申请</el-menu-item>
+          <el-menu-item :disabled="tab2Disabled" index="2">授信申请</el-menu-item>
+          <el-menu-item :disabled="tab3Disabled" index="3">贷款申请</el-menu-item>
         </el-menu>
       </div>
       <MyTitle :titleArr="['公司贷款', '新建贷款申请', text]" />
@@ -33,6 +33,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+import { creditApplicationDetails, loanApplicationDetails } from '@/api/http'
 import Basic from './creditEvaluation/basic.vue'
 import ImportReport from './creditEvaluation/importReport.vue'
 import PreLoan from './creditEvaluation/preLoan.vue'
@@ -52,6 +54,9 @@ export default {
     LoanApplication2,
     MyTitle
   },
+  computed: {
+    ...mapState('system', ['creditIds']),
+  },
   data () {
     return {
       text: '',
@@ -59,18 +64,37 @@ export default {
         '1': '信用评估',
         '2': '授信申请',
         '3': '贷款申请',
-      },
-      form: {
-
       },
       visible: false,
-      options: [],
       active: '1',
       steps: ['1.客户基本信息', '2.导入报表', '3.贷前调查', '4.等级评定'],
       curStep: 0,
+      tab2Disabled: true,
+      tab3Disabled: true,
+    }
+  },
+  mounted () {
+    const id = this.creditIds.companyLoanId
+    if (id) {
+      this.getTab2Detail(id)
+      this.getTab3Detail(id)
     }
   },
   methods: {
+    // 查询授信申请详情（没有则禁用该切换）
+    async getTab2Detail (id) {
+      const res = await creditApplicationDetails({
+        companyLoanId: id
+      })
+      this.tab2Disabled = !res.data.bankCreditApplication
+    },
+    // 查询贷款申请详情（没有则禁用该切换）
+    async getTab3Detail (id) {
+      const res = await loanApplicationDetails({
+        companyLoanId: id
+      })
+      this.tab3Disabled = !res.data.bankLoanApplication
+    },
     handleSelect (val) {
       this.curStep = 0
       this.text = this.textObj[val]
diff --git a/src/pages/manage/list/corporateLoans/apply/loanApplication/step1.vue b/src/pages/manage/list/corporateLoans/apply/loanApplication/step1.vue
index fe0fc05..122fd3e 100644
--- a/src/pages/manage/list/corporateLoans/apply/loanApplication/step1.vue
+++ b/src/pages/manage/list/corporateLoans/apply/loanApplication/step1.vue
@@ -26,7 +26,7 @@
           <el-form-item label="客户名称">
             <el-input v-model="form.customerName" disabled />
           </el-form-item>
-          <el-form-item label="证件号码">
+          <el-form-item label="代码证号">
             <el-input v-model="form.corporateIdNumber" disabled />
           </el-form-item>
           <el-form-item label="法人姓名">
@@ -42,7 +42,7 @@
         </el-col>
         <el-col :span="10" :offset="1">
           <el-form-item label="授信金额">
-            <el-input v-model="form.creditAmount" />
+            <el-input v-model="form.creditAmount" disabled />
           </el-form-item>
         </el-col>
 
@@ -57,8 +57,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="贷款申请金额" required>
-            <el-input v-model="form.loanApplicationAmount" placeholder="不大于授信金额"
-              @input="val => inputListen(val, form, 'loanApplicationAmount')" ref="loanApplicationAmount" />
+            <el-input :value="form.loanApplicationAmount" placeholder="不大于授信金额"
+              @input="val => ismoney(val, form, 'loanApplicationAmount')" ref="loanApplicationAmount" />
           </el-form-item>
           <el-form-item label="发放方式" required>
             <el-select v-model.trim="form.distributionMethod" placeholder="请选择">
@@ -92,42 +92,74 @@
   </div>
 </template>
 <script>
-import { inputListen } from '@/utils/utilFunction.js'
-import { addOperation, loanApplicationInput } from '@/api/http'
-import { mapMutations, mapGetters } from 'vuex'
+import { ismoney } from '@/utils/utilFunction.js'
+import { loanApplicationDetails, addOperation, loanApplicationInput } from '@/api/http'
+import { mapMutations, mapState } from 'vuex'
 import Util from '@/libs/util'
 export default {
   data () {
     return {
       Util,
       form: {
-        applicationNumber: '913403005685450862',
+        applicationNumber: '12802851701099',
         customerName: '袋鼠互联网科技有限公司',
         identificationType: 82,
         identificationNumber: '913403005685450862',
         companyRegisteredAddress: '广东省深圳市南山区前海一号2020室',
         corporateName: '丛小凤',
-        corporateIdNumber: '220602199202281229',
+        corporateIdNumber: '913403005685450862',
         creditRating: 'AAAA',
 
         creditAmount: '12,000,000.00',
         creditTermOne: 231,
-        annualizedInterestRate: '',
         loanApplicationAmount: '',
         repaymentMethodOne: 235,
         distributionMethod: 238,
-        loanApplicationDate: Util.formatDate('yyyy-MM-dd', new Date()),
+        loanApplicationDate: '',
       },
     }
   },
+  computed: {
+    ...mapState('system', ['creditIds']),
+  },
   mounted () {
-    console.log(11, this.$store.state.system)
+    this.getDetail()
   },
   methods: {
     ...mapMutations({
       setCreditIds: 'system/setCreditIds',
     }),
-    inputListen,
+    ismoney,
+    // 查询详情
+    async getDetail () {
+      const id = this.creditIds.companyLoanId
+      if (id) {
+        const res = await loanApplicationDetails({
+          companyLoanId: id
+        })
+        const r = res.data.bankLoanApplication
+        if (r) {
+          this.form = {
+            applicationNumber: '12802851701099',
+            customerName: '袋鼠互联网科技有限公司',
+            identificationType: 82,
+            identificationNumber: '913403005685450862',
+            companyRegisteredAddress: r.companyRegisteredAddress,
+            corporateName: r.corporateName,
+            corporateIdNumber: r.corporateIdNumber,
+            creditRating: r.creditRating,
+
+            creditAmount: '12,000,000.00',
+            creditTermOne: +r.creditTermOne || 231,
+            loanApplicationAmount: r.loanApplicationAmount,
+            repaymentMethodOne: +r.repaymentMethodOne || 235,
+            distributionMethod: +r.distributionMethod || 238,
+            loanApplicationDate: r.loanApplicationDate,
+            loanId: r.loanId
+          }
+        }
+      }
+    },
     async next () {
       const { form } = this
       if (!form.loanApplicationAmount) return this.$message.error('请填写贷款申请金额！')
@@ -136,7 +168,7 @@ export default {
         const { data } = await loanApplicationInput({
           ...this.$store.getters['system/commonIds'],
           ...form,
-          companyLoanId: this.$store.state.system.creditIds.companyLoanId,
+          companyLoanId: this.creditIds.companyLoanId,
         })
 
         const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,768'
@@ -161,15 +193,6 @@ export default {
       } catch { (e) => { } }
     },
   },
-  computed: {
-    ...mapGetters({
-      dataFlow: 'system/dataFlow',
-      needsModule: 'system/needsModule',
-      idCardNumber: 'system/idCardNumber',
-      inMyWork: 'system/inMyWork',
-      getSelectList: 'system/getSelectList'
-    })
-  }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue b/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue
index 6190860..3a4d8a4 100644
--- a/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue
+++ b/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue
@@ -2,20 +2,20 @@
 <template>
   <div>
     <el-row :gutter="20" style="margin: 0">
-      <el-form ref="form" :model="form" label-width="140px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-col :span="24">
           <h6 class="l-title">客户信息</h6>
         </el-col>
         <el-col :span="10" :offset="1">
           <el-form-item label="贷款类型">
-            <el-select value="企业经营贷款" placeholder="请选择">
+            <el-select value="企业经营贷款" placeholder="请选择" disabled>
               <el-option value="企业经营贷款"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="授信金额">
             <el-input v-model="form.creditAmount" disabled />
           </el-form-item>
-          <el-form-item label="起息日期" prop="valueDate" required>
+          <el-form-item label="起息日期" prop="valueDate">
             <el-date-picker v-model="form.valueDate" type="date" placeholder="选择日期" format="yyyy-MM-dd"
               value-format="yyyy-MM-dd" @change="maturityDateCalc"></el-date-picker>
           </el-form-item>
@@ -25,7 +25,7 @@
           <el-form-item label="执行利率">
             <el-input value="3.2%" disabled />
           </el-form-item>
-          <el-form-item label="担保方式" required>
+          <el-form-item label="担保方式" prop="guaranteeMethod">
             <el-select v-model="form.guaranteeMethod" placeholder="请选择">
               <el-option v-for="(item, i) in Util.guaranteeMethods" :key="i" :label="item.name"
                 :value="item.id"></el-option>
@@ -34,7 +34,7 @@
           <el-form-item label="利息总额">
             <el-input v-model="form.totalInterestAmount" disabled />
           </el-form-item>
-          <el-form-item label="还款账号" required>
+          <el-form-item label="还款账号" prop="repaymentAccount">
             <el-input v-model="form.repaymentAccount" />
           </el-form-item>
         </el-col>
@@ -76,18 +76,55 @@
     </el-row>
 
     <div class="text-center m-t-20">
-      <el-button @click="submit" type="primary" class="submitBtn" v-throttle>提交</el-button>
+      <el-button @click="beforeSubmit" type="primary" class="submitBtn" v-throttle>提交</el-button>
     </div>
+
+    <el-dialog :visible="visible" append-to-body style="z-index: 6000;" :close-on-click-modal="true" :show-close="false"
+      custom-class="dia">
+      <div class="data-dia23">
+        <div slot="title" class="dia-header">
+          <div class="data-title">提示</div>
+        </div>
+
+        <div class="popBody">
+          <p class="text-lg" style="color: #333">确定提交贷款申请吗？</p>
+        </div>
+
+        <div class="popBtns">
+          <el-button class="close btn hover:bg-blue-100 " @click="visible = false">取 消</el-button>
+          <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="submit">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible="successVisible" append-to-body style="z-index: 6000;" :close-on-click-modal="false"
+      :show-close="false" custom-class="dia">
+      <div class="data-dia23">
+        <div slot="title" class="dia-header">
+          <div class="data-title">提示</div>
+        </div>
+
+        <div class="popBody">
+          <p class="text-lg" style="color: #333">贷款申请成功！</p>
+        </div>
+
+        <div class="popBtns">
+          <el-button class="sure btn hover:bg-blue-700 " type="primary"
+            @click="$router.push('/counter/list/manage/corporateLoans-application')">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import { addOperation, loanApplicationInput, loanApplicationDetails } from '@/api/http'
 import Util from '@/libs/util'
+import { mapMutations, mapState } from 'vuex'
 export default {
   data () {
     return {
       Util,
-      creditIds: this.$store.state.system.creditIds,
+      step1: {},
       form: {
         valueDate: '',
         creditTermTwo: 231,
@@ -96,29 +133,68 @@ export default {
         expirationDate: '',
         totalInterestAmount: '',
         loanAmount: '',
-        propertyCertificateNo: '',
         repaymentMethodTwo: '',
-        interestTotal: '',
         repaymentAccount: '',
       },
+      rules: {
+        valueDate: [
+          {
+            required: true,
+            message: '请选择起息日期',
+            trigger: 'change'
+          }
+        ],
+        guaranteeMethod: [
+          {
+            required: true,
+            message: '请选择担保方式',
+            trigger: 'change'
+          }
+        ],
+        repaymentAccount: [
+          {
+            required: true,
+            message: '请输入还款账号',
+            trigger: 'blur'
+          }
+        ],
+      },
+      visible: false,
+      successVisible: false,
     }
   },
+  computed: {
+    ...mapState('system', ['creditIds']),
+  },
   mounted () {
     this.getDetail()
   },
   methods: {
     // 查询详情
     async getDetail () {
-      if (this.creditIds.companyLoanId) {
+      const id = this.creditIds.companyLoanId
+      if (id) {
         // 第一步填写的贷款金额和还款方式要在这个第二步回显，并且修改后不会影响第一步
         const res = await loanApplicationDetails({
-          companyLoanId: this.creditIds.companyLoanId
+          companyLoanId: id
         })
-        const data = res.data.bankLoanApplication
-        this.form.loanAmount = data.loanApplicationAmount
-        this.form.repaymentMethodTwo = +data.repaymentMethodOne
-        this.form.creditTermTwo = +data.creditTermOne
-        this.form.creditAmount = data.creditAmount
+        const r = res.data.bankLoanApplication
+        if (r) {
+          this.step1 = r
+
+          this.form = {
+            valueDate: r.valueDate,
+            creditTermTwo: +r.creditTermOne,
+            loanTerm: +r.loanTerm || 120,
+            guaranteeMethod: +r.guaranteeMethod || 242,
+            expirationDate: r.expirationDate,
+            totalInterestAmount: r.totalInterestAmount,
+            loanAmount: r.loanApplicationAmount,
+            repaymentMethodTwo: +r.repaymentMethodOne,
+            repaymentAccount: r.repaymentAccount,
+            creditAmount: r.creditAmount,
+          }
+        }
       }
     },
     // 到期日期计算
@@ -130,13 +206,21 @@ export default {
         this.form.expirationDate = Util.formatDate('yyyy-MM-dd', date)
       }
     },
-    async submit () {
+    async beforeSubmit () {
       try {
         const { form } = this
         if (!form.valueDate) return this.$message.error('请选择起息日期！')
+        if (new Date(form.valueDate) < new Date(this.step1.loanApplicationDate)) return this.$message.error('起息日期不得早于申请日期！')
         if (!form.repaymentAccount) return this.$message.error('请输入还款账号！')
+        if (+form.loanAmount > 12000000) return this.$message.error('贷款金额不得大于授信金额！')
+        this.visible = true
+      } catch { (e) => { } }
+    },
+    async submit () {
+      try {
+        const { form } = this
         await loanApplicationInput({
-          ...this.$store.state.system.creditIds,
+          ...this.creditIds,
           ...form,
         })
 
@@ -159,14 +243,15 @@ export default {
           projectId: +sessionStorage.getItem('projectId'),
           startTime: sessionStorage.getItem('startTime')
         })
-        this.$message.success('保存成功！')
-        this.$router.back()
+        this.successVisible = true
       } catch { (e) => { } }
     },
   },
 }
 </script>
 <style lang='scss' scoped>
+@import '@/styles/dialog.scss';
+
 .l-title {
   margin-bottom: 15px;
   font-size: 18px;
diff --git a/src/pages/manage/list/corporateLoans/detail.vue b/src/pages/manage/list/corporateLoans/detail.vue
index b84db56..074a736 100644
--- a/src/pages/manage/list/corporateLoans/detail.vue
+++ b/src/pages/manage/list/corporateLoans/detail.vue
@@ -162,9 +162,17 @@
       <el-button @click="$router.back()" type="primary" class="submitBtn" v-throttle>关闭</el-button>
     </div>
 
-    <el-dialog title="放款" :visible.sync="loanVisible" width="300px" z-index="6000" :append-to-body="true">
-      <el-date-picker v-model="loanDate" type="date" placeholder="请选择放款日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-        style="width: 100%;"></el-date-picker>
+    <el-dialog :visible.sync="loanVisible" z-index="6000" width="500px" append-to-body :show-close="false"
+      custom-class="dia">
+      <div class="data-dia23">
+        <div slot="title" class="dia-header">
+          <div class="data-title">放款</div>
+        </div>
+        <div style="padding: 30px 0;">
+          <el-date-picker v-model="loanDate" type="date" placeholder="请选择放款日期" format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+        </div>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="loanVisible = false">取消</el-button>
         <el-button type="primary" @click="loanSubmit">确定</el-button>
@@ -272,6 +280,8 @@ export default {
 }
 </script>
 <style lang='scss' scoped>
+@import '@/styles/dialog.scss';
+
 .wrap {
   width: 100%;
   height: calc(100vh - 118px);
diff --git a/src/pages/manage/list/personalLoans/detail.vue b/src/pages/manage/list/personalLoans/detail.vue
index 7873f4b..b53da5c 100644
--- a/src/pages/manage/list/personalLoans/detail.vue
+++ b/src/pages/manage/list/personalLoans/detail.vue
@@ -190,19 +190,35 @@
         }}</el-button>
     </div>
 
-    <el-dialog title="放款" :visible.sync="loanVisible" width="300px" z-index="6000" :append-to-body="true">
-      <el-date-picker v-model="disbursementDate" type="date" placeholder="请选择放款日期" format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+    <el-dialog :visible.sync="loanVisible" z-index="6000" width="500px" append-to-body :show-close="false"
+      custom-class="dia">
+      <div class="data-dia23">
+        <div slot="title" class="dia-header">
+          <div class="data-title">放款</div>
+        </div>
+        <div style="padding: 30px 0;">
+          <el-date-picker v-model="disbursementDate" type="date" placeholder="请选择放款日期" format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+        </div>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="loanVisible = false">取消</el-button>
         <el-button type="primary" @click="loanSubmit">确定</el-button>
       </span>
     </el-dialog>
 
-    <el-dialog title="请选择展期期限" :visible.sync="extensionVisible" width="300px" z-index="6000" :append-to-body="true">
-      <el-select v-model="extensionPeriod" placeholder="请选择" size="small" style="width: 100%;">
-        <el-option v-for="(item, i) in extensions" :key="i" :label="item.name" :value="item.id"></el-option>
-      </el-select>
+    <el-dialog :visible.sync="extensionVisible" width="500px" z-index="6000" append-to-body :show-close="false"
+      custom-class="dia">
+      <div class="data-dia23">
+        <div slot="title" class="dia-header">
+          <div class="data-title">请选择展期期限</div>
+        </div>
+        <div style="padding: 30px 0;">
+          <el-select v-model="extensionPeriod" placeholder="请选择" size="small" style="width: 100%;">
+            <el-option v-for="(item, i) in extensions" :key="i" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </div>
+      </div>
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="extensionVisible = false">取消</el-button>
@@ -666,6 +682,8 @@ export default {
 }
 </script>
 <style lang='scss' scoped>
+@import '@/styles/dialog.scss';
+
 .wrap {
   width: 100%;
   height: calc(90vh - 27px);
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 8d467bd..5ec4489 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -1456,8 +1456,37 @@ const myInitState = {
   },
   '业务三十六': {
     id: 844,
-    name: '贷款业务',
-    data: [13, 16, 770, 771, 772, 442, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 817, 818, 819],
+    name: '个人贷款业务',
+    data: [13],
+    needs: [],
+    isStamp: {
+      // '业务专用章': [ 411 ]
+    },
+    backPeople: [],
+    // backPeople: [ ],
+    cultureArr: [],
+
+    moneyBox: [], // 钱箱
+    needBackMoney: false, // 需要钱箱取钱
+    peopleSign: [], // 客户签字
+    cultureIn: [], // 传票栏
+    sealBox: [], // 印章盒
+    currencyDetector: [], // 验钞机
+    printer: [], // 打印机
+    resource: [], // 资料
+
+    importanceArr: [], // 重要空白凭证箱
+    commonArr: [], // 普通凭证箱
+    dataFlow: {
+      currency: 153,
+      goldLogo: 150,
+      voucherNumber,
+    }
+  },
+  '业务三十七': {
+    id: 893,
+    name: '公司贷款业务',
+    data: [770, 771, 772, 442, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 817, 818, 819],
     needs: [],
     isStamp: {
       // '业务专用章': [ 411 ]
@@ -2776,8 +2805,37 @@ export default {
       },
       '业务三十六': {
         id: 844,
-        name: '贷款业务',
-        data: [13, 16, 770, 771, 772, 442, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 817, 818, 819],
+        name: '个人贷款业务',
+        data: [13],
+        needs: [],
+        isStamp: {
+          // '业务专用章': [ 411 ]
+        },
+        backPeople: [],
+        // backPeople: [ ],
+        cultureArr: [],
+
+        moneyBox: [], // 钱箱
+        needBackMoney: false, // 需要钱箱取钱
+        peopleSign: [], // 客户签字
+        cultureIn: [], // 传票栏
+        sealBox: [], // 印章盒
+        currencyDetector: [], // 验钞机
+        printer: [], // 打印机
+        resource: [], // 资料
+
+        importanceArr: [], // 重要空白凭证箱
+        commonArr: [], // 普通凭证箱
+        dataFlow: {
+          currency: 153,
+          goldLogo: 150,
+          voucherNumber,
+        }
+      },
+      '业务三十七': {
+        id: 893,
+        name: '公司贷款业务',
+        data: [770, 771, 772, 442, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 817, 818, 819],
         needs: [],
         isStamp: {
           // '业务专用章': [ 411 ]
@@ -3286,8 +3344,6 @@ export default {
     setCreditImportIds (state, val) {
       if (val) {
         state.creditImportIds[state.creditImportIndex] = val
-        // state.creditImportIds.push(val)
-        console.log("🚀 ~ setCreditImportIds ~ state.creditImportIds[state.creditImportIndex]:", state.creditImportIds, state.creditImportIds[state.creditImportIndex])
       } else {
         state.creditImportIds = {}
       }