Browse Source

fix:企业准入bug修改

lazy 2 days ago
parent
commit
9d1a218bee

+ 7 - 5
src/views/creditManagement/components/BasicInfo.vue

@@ -18,8 +18,8 @@
       <el-form-item label="统一社会信用代码" prop="socialCreditCode">
       <el-form-item label="统一社会信用代码" prop="socialCreditCode">
         <el-input v-model="ruleForm.socialCreditCode" placeholder="请输入统一社会信用代码" disabled />
         <el-input v-model="ruleForm.socialCreditCode" placeholder="请输入统一社会信用代码" disabled />
       </el-form-item>
       </el-form-item>
-      <el-form-item label="资方" prop="socialCreditCode">
-        <el-input v-model="ruleForm.socialCreditCode" placeholder="请输入资方名称" disabled />
+      <el-form-item label="资方" prop="capitalName">
+        <el-input v-model="ruleForm.capitalName" placeholder="请输入资方名称" disabled />
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
   </div>
   </div>
@@ -42,7 +42,8 @@ export default {
       ruleForm: {
       ruleForm: {
         typeName: '',
         typeName: '',
         enterpriseName: '',
         enterpriseName: '',
-        socialCreditCode: ''
+        socialCreditCode: '',
+        capitalName: ''
       },
       },
       rules: {
       rules: {
         typeName: [{ required: true, message: '请选择企业类别', trigger: 'blur' }],
         typeName: [{ required: true, message: '请选择企业类别', trigger: 'blur' }],
@@ -55,11 +56,12 @@ export default {
     baseInfo: {
     baseInfo: {
       handler(newV) {
       handler(newV) {
         if (newV && Object.keys(newV)) {
         if (newV && Object.keys(newV)) {
-          const { companyType, companyName, code } = JSON.parse(JSON.stringify(newV))
+          const { companyType, companyName, code, capitalName } = JSON.parse(JSON.stringify(newV))
           this.ruleForm = {
           this.ruleForm = {
             typeName: companyType,
             typeName: companyType,
             enterpriseName: companyName,
             enterpriseName: companyName,
-            socialCreditCode: code
+            socialCreditCode: code,
+            capitalName
           }
           }
         }
         }
       },
       },

+ 9 - 6
src/views/enterpriseManage/enterpriseEntry/EnterpriseAll.vue

@@ -143,11 +143,14 @@ export default {
             return <div>{ row.zrStatus !== null ? row.zrStatus === 0 ? '不准入' : '准入' : '' }</div>
             return <div>{ row.zrStatus !== null ? row.zrStatus === 0 ? '不准入' : '准入' : '' }</div>
           }
           }
         },
         },
-        // {
-        //   label: '基础额度(万元)',
-        //   showTooltip: true,
-        //   prop: 'amount'
-        // },
+        {
+          label: '基础额度(万元)',
+          showTooltip: true,
+          prop: 'amount',
+          render: (h, row) => {
+            return <div>{  row.zrStatus === 1 ? '300' : '/' }</div>
+          }
+        },
         {
         {
           label: '最后更新时间',
           label: '最后更新时间',
           prop: 'lastUpdateDate',
           prop: 'lastUpdateDate',
@@ -216,7 +219,7 @@ export default {
     tablePower() {
     tablePower() {
       return ({ item, row }) => {
       return ({ item, row }) => {
         const { category } = item
         const { category } = item
-        if (category === 'timeAxis') {
+        if (category === 'timeAxis' || category === 'see') {
           if (row.companyZrId !== null) {
           if (row.companyZrId !== null) {
             return true
             return true
           }
           }

+ 1 - 1
src/views/enterpriseManage/enterpriseEntry/EnterpriseEdit.vue

@@ -46,7 +46,7 @@ export default {
           submitFlag: type === 'temp' ? 0 : 1
           submitFlag: type === 'temp' ? 0 : 1
         }
         }
         editCreditRecord(params).then(() => {
         editCreditRecord(params).then(() => {
-          this.$message.success('征信修改成功')
+          this.$message.success(type === 'temp' ? '暂存成功' : '征信修改成功')
           this.$router.push({ path: '/enterpriseEntry' })
           this.$router.push({ path: '/enterpriseEntry' })
         })
         })
       })
       })

+ 3 - 3
src/views/enterpriseManage/enterpriseEntry/EnterpriseEditRecord.vue

@@ -8,14 +8,14 @@
         <el-collapse-item v-for="(item, index) in advanceViewList" :id="index" :key="index" :name="index">
         <el-collapse-item v-for="(item, index) in advanceViewList" :id="index" :key="index" :name="index">
           <template slot="title">
           <template slot="title">
             <cy-view-bar
             <cy-view-bar
-              :view-bar-data="{ startTime: item.gmtCreate, assigneeName: item. legalPersonName, index: index + 1 }"
+              :view-bar-data="{ startTime: item.gmtCreate, assigneeName: item. legalPersonName || item.userCreateName, index: index + 1 }"
             >
             >
             </cy-view-bar>
             </cy-view-bar>
           </template>
           </template>
           <audit-edit-content :details-info="item" :disabled="true"></audit-edit-content>
           <audit-edit-content :details-info="item" :disabled="true"></audit-edit-content>
         </el-collapse-item>
         </el-collapse-item>
       </el-collapse>
       </el-collapse>
-      <!-- <el-empty v-else style="height: calc(100vh - 0.85rem - 90px)"></el-empty> -->
+      <el-empty v-else style="height: calc(100vh - 0.85rem - 220px)"></el-empty>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -43,7 +43,7 @@ export default {
       const { id } = this.$route.query
       const { id } = this.$route.query
       getRecordByEditHistory(id).then(({ data }) => {
       getRecordByEditHistory(id).then(({ data }) => {
         this.loading = false
         this.loading = false
-        this.advanceViewList = data
+        this.advanceViewList = data || []
       }).finally(() => {
       }).finally(() => {
         this.loading = false
         this.loading = false
       })
       })

+ 1 - 1
src/views/enterpriseManage/enterpriseEntry/EnterprisePendding.vue

@@ -63,7 +63,7 @@ export default {
         },
         },
         {
         {
           label: '最后更新时间',
           label: '最后更新时间',
-          prop: 'gmtModified',
+          prop: 'obj.gmtModified',
           showTooltip: true
           showTooltip: true
         },
         },
         {
         {

+ 1 - 1
src/views/enterpriseManage/enterpriseEntry/ExecuteApproval.vue

@@ -62,7 +62,7 @@ export default {
           flag: type === 'temp' ? 0 : 1
           flag: type === 'temp' ? 0 : 1
         }
         }
         executeApproval(params).then(() => {
         executeApproval(params).then(() => {
-          this.$message.success('业务审核成功')
+          this.$message.success(type === 'temp' ? '暂存成功' : '业务审核成功')
           this.$router.push({ path: '/enterpriseEntry' })
           this.$router.push({ path: '/enterpriseEntry' })
         })
         })
       })
       })

+ 3 - 3
src/views/enterpriseManage/enterpriseEntry/components/AuditContent.vue

@@ -329,13 +329,13 @@
         class="textarea-content"
         class="textarea-content"
         prop="approvalOpinion"
         prop="approvalOpinion"
         :rules="[
         :rules="[
-          { required: ruleForm.result === '通过', message: '请输入审批意见', trigger: 'blur' }
+          { required: ruleForm.result === '退回', message: '请输入审批意见', trigger: 'blur' }
         ]"
         ]"
       >
       >
         <el-input v-model="ruleForm.approvalOpinion" type="textarea" style="width: 100%;" rows="3" clearable :disabled="disabled"></el-input>
         <el-input v-model="ruleForm.approvalOpinion" type="textarea" style="width: 100%;" rows="3" clearable :disabled="disabled"></el-input>
       </el-form-item>
       </el-form-item>
       <template v-if="!hideRedNo">
       <template v-if="!hideRedNo">
-        <div v-if="ruleForm.result === '通过'">
+        <div v-if="ruleForm.result === '通过'" style="width: 100%;">
           <cy-info-title>
           <cy-info-title>
           综合评估
           综合评估
           <template #right>
           <template #right>
@@ -343,7 +343,7 @@
           </template>
           </template>
           </cy-info-title>
           </cy-info-title>
           <el-form-item label="红否结果" style="width: 100%;">
           <el-form-item label="红否结果" style="width: 100%;">
-            <el-input :value="ruleForm.redNo ? (ruleForm.redNo === 0 ? '非红否' : '红否') : ''" disabled></el-input>
+            <el-input :value="ruleForm.redNo !== '' ? (ruleForm.redNo === 0 ? '非红否' : '红否') : ''" disabled></el-input>
           </el-form-item>
           </el-form-item>
           <el-form-item v-if="ruleForm.redNo === 1" label="红否失败原因" style="width: 100%;">
           <el-form-item v-if="ruleForm.redNo === 1" label="红否失败原因" style="width: 100%;">
             <el-input :value="ruleForm.failReason" disabled></el-input>
             <el-input :value="ruleForm.failReason" disabled></el-input>