项目授信加校验

src/views/creditManage/projectCredit/dueReview/components/Company/Auditing.vue

@@ -28,11 +28,11 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="股东信息" style="width: 100%">
+      <el-form-item label="实际控制人" style="width: 100%">
         <cy-comm-table
           ref="commTable"
           :columns="columns"
-          :data="ruleForm.regStocks"
+          :data="ruleForm.actualControllerList"
         />
       </el-form-item>
       <el-form-item label="国有控股比例" prop="holdingRatio">
@@ -183,7 +183,7 @@ export default {
         equityHierarchy: '',
         equityHierarchyDetail: '',
         involvingLitigationAccess: '',
-        regStocks: [],
+        actualControllerList: [],
         privateLendings: [],
         equityFreezeDataList: [],
         majorAnomalies: [],
@@ -235,22 +235,18 @@ export default {
           index: true
         },
         {
-          label: '股东名称',
-          prop: 'stockName',
+          label: '实控人名称',
+          prop: 'name',
           showTooltip: true
         },
         {
-          label: '股东类型',
+          label: '最终受益股份',
           showTooltip: true,
-          prop: 'stockType'
+          prop: 'finalBenefitPercent'
         },
         {
-          label: '持股比例',
-          prop: 'stockPercent'
-        },
-        {
-          label: '认缴出资额(万元)',
-          prop: 'shouldCapi'
+          label: '表决权',
+          prop: 'controlPercent'
         }
       ]
     }
@@ -321,101 +317,155 @@ export default {
         // 民间借贷
         if (this.ruleForm.privateLendings.length) {
           const projectOwnerPrivateLendings = []
-          this.$refs.privateLending.tableData.map(ele => {
+          const flag = this.$refs.privateLending.tableData.some(ele => {
             const obj = ele
             obj.cJudgmentDocumentsId = ele.id
             // delete obj.id
             projectOwnerPrivateLendings.push(obj)
+            return ele.privateLending === null
           })
           postData.projectCoreEnterprisePrivateLendingList = projectOwnerPrivateLendings
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有民间借贷', duration: 2000 })
+            return false
+          }
         }
         // 股权冻结
         if (this.ruleForm.equityFreezeDataList.length) {
           const projectOwnerEquityFreezes = []
-          this.$refs.equityFreeze.tableData.map(ele => {
+          const flag = this.$refs.equityFreeze.tableData.some(ele => {
             const obj = ele
             obj.cEquityFreezeDataId = ele.id
             // delete obj.id
             projectOwnerEquityFreezes.push(obj)
+
+            return ele.equityFreeze === null
           })
           postData.projectCoreEnterpriseEquityFreezeList = projectOwnerEquityFreezes
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有股权冻结', duration: 2000 })
+            return false
+          }
         }
         // 重大异常诉讼
         if (this.ruleForm.majorAnomalies.length) {
           const projectOwnerMajorAbnormalLitigations = []
-          this.$refs.majorAbnormalLitigation.tableData.map(ele => {
+          const flag = this.$refs.majorAbnormalLitigation.tableData.some(ele => {
             const obj = ele
             obj.cJudgmentDocumentsId = ele.id
             // delete obj.id
             projectOwnerMajorAbnormalLitigations.push(obj)
+
+            return ele.majorAbnormalLitigation === null
           })
           postData.projectCoreEnterpriseMajorAbnormalLitigationList = projectOwnerMajorAbnormalLitigations
+          console.log(flag)
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有重大异常诉讼', duration: 2000 })
+            return false
+          }
         }
         // 严重违法
         if (this.ruleForm.seriousIllegalData.length) {
           const projectOwnerSeriousIllegalities = []
-          this.$refs.seriousIllegality.tableData.map(ele => {
+          const flag = this.$refs.seriousIllegality.tableData.some(ele => {
             const obj = ele
             obj.cSeriousIllegalDataId = ele.id
             // delete obj.id
             projectOwnerSeriousIllegalities.push(obj)
+
+            return ele.seriousIllegality === null
           })
           postData.projectCoreEnterpriseSeriousIllegalityList = projectOwnerSeriousIllegalities
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有严重违法', duration: 2000 })
+            return false
+          }
         }
         // 欠税公告
         if (this.ruleForm.taxOweNoticeData.length) {
           const projectOwnerTaxOweNotices = []
-          this.$refs.taxOweNotice.tableData.map(ele => {
+          const flag = this.$refs.taxOweNotice.tableData.some(ele => {
             const obj = ele
             obj.cTaxOweNoticeDataId = ele.id
             // delete obj.id
             projectOwnerTaxOweNotices.push(obj)
+
+            return ele.taxOweNotice === null
           })
           postData.projectCoreEnterpriseTaxOweNoticeList = projectOwnerTaxOweNotices
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有欠税公告', duration: 2000 })
+            return false
+          }
         }
         // 税收违法
         if (this.ruleForm.taxIllegalData.length) {
           const projectOwnerTaxIllegalDataList = []
-          this.$refs.taxIllegal.tableData.map(ele => {
+          const flag = this.$refs.taxIllegal.tableData.some(ele => {
             const obj = ele
             obj.cTaxIllegalDataId = ele.id
             // delete obj.id
             projectOwnerTaxIllegalDataList.push(obj)
+
+            return ele.taxIllegal === null
           })
           postData.projectCoreEnterpriseTaxIllegalDataList = projectOwnerTaxIllegalDataList
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有税收违法', duration: 2000 })
+            return false
+          }
         }
         // 黑名单信息
         if (this.ruleForm.blacklists.length) {
           const projectOwnerBlacklists = []
-          this.$refs.blacklist.tableData.map(ele => {
+          const flag = this.$refs.blacklist.tableData.some(ele => {
             const obj = ele
             obj.cBlacklistId = ele.id
             // delete obj.id
             projectOwnerBlacklists.push(obj)
+
+            return ele.blacklist === null
           })
           postData.projectCoreEnterpriseBlacklistList = projectOwnerBlacklists
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有黑名单信息', duration: 2000 })
+            return false
+          }
         }
         // 其他经营异常
         if (this.ruleForm.exceptionData.length) {
           const projectOwnerExceptionDataList = []
-          this.$refs.exception.tableData.map(ele => {
+          const flag = this.$refs.exception.tableData.some(ele => {
             const obj = ele
             obj.cExceptionDataId = ele.id
             // delete obj.id
             projectOwnerExceptionDataList.push(obj)
+
+            return ele.exception === null
           })
           postData.projectCoreEnterpriseExceptionDataList = projectOwnerExceptionDataList
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有其他经营异常', duration: 2000 })
+            return false
+          }
         }
         // 重大负面新闻舆情
         if (this.ruleForm.news.length) {
           const projectOwnerNewsList = []
-          this.$refs.News.tableData.map(ele => {
+          const flag = this.$refs.News.tableData.some(ele => {
             const obj = ele
             obj.cNewsId = ele.id
             // delete obj.id
             projectOwnerNewsList.push(obj)
+
+            return ele.News === null
           })
           postData.projectCoreEnterpriseNewsList = projectOwnerNewsList
+          if (flag && submitType !== 'temp') {
+            this.$message.warning({ message: '请选择是否有重大负面新闻舆情', duration: 2000 })
+            return false
+          }
         }
 
         if (submitType === 'submit' || submitType === 'assess') {

src/views/creditManage/projectCredit/dueReview/components/Project/ProjectOwner.vue

@@ -36,11 +36,11 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="股东信息" style="width: 100%">
+      <el-form-item label="实际控制人" style="width: 100%">
         <cy-comm-table
           ref="commTable"
           :columns="columns"
-          :data="ruleForm.regStocks"
+          :data="ruleForm.actualControllerList"
         />
       </el-form-item>
       <el-form-item label="国有控股比例" prop="holdingRatio">
@@ -203,7 +203,7 @@ export default {
         equityHierarchy: '',
         equityHierarchyDetail: '',
         involvingLitigationAccess: '',
-        regStocks: [],
+        actualControllerList: [],
         privateLendings: [],
         equityFreezeDataList: [],
         majorAnomalies: [],
@@ -261,22 +261,18 @@ export default {
           index: true
         },
         {
-          label: '股东名称',
-          prop: 'stockName',
+          label: '实控人名称',
+          prop: 'name',
           showTooltip: true
         },
         {
-          label: '股东类型',
+          label: '最终受益股份',
           showTooltip: true,
-          prop: 'stockType'
+          prop: 'finalBenefitPercent'
         },
         {
-          label: '持股比例',
-          prop: 'stockPercent'
-        },
-        {
-          label: '认缴出资额(万元)',
-          prop: 'shouldCapi'
+          label: '表决权',
+          prop: 'controlPercent'
         }
       ]
     }
@@ -361,102 +357,158 @@ export default {
         // 民间借贷
         if (this.ruleForm.privateLendings.length) {
           const projectOwnerPrivateLendings = []
-          this.$refs.privateLending.tableData.map(ele => {
+          const flag = this.$refs.privateLending.tableData.some(ele => {
             const obj = ele
             obj.cJudgmentDocumentsId = ele.id
             // delete obj.id
             projectOwnerPrivateLendings.push(obj)
+
+            return ele.privateLending === null
           })
           postData.projectOwnerPrivateLendings = projectOwnerPrivateLendings
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有民间借贷', duration: 2000 })
+            return false
+          }
         }
         // 股权冻结
         if (this.ruleForm.equityFreezeDataList.length) {
           const projectOwnerEquityFreezes = []
-          this.$refs.equityFreeze.tableData.map(ele => {
+          const flag = this.$refs.equityFreeze.tableData.some(ele => {
             const obj = ele
             obj.cEquityFreezeDataId = ele.id
             // delete obj.id
             projectOwnerEquityFreezes.push(obj)
+
+            return ele.equityFreeze === null
           })
           postData.projectOwnerEquityFreezes = projectOwnerEquityFreezes
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有股权冻结', duration: 2000 })
+            return false
+          }
         }
         // 重大异常诉讼
         if (this.ruleForm.majorAnomalies.length) {
           const projectOwnerMajorAbnormalLitigations = []
-          this.$refs.majorAbnormalLitigation.tableData.map(ele => {
+          const flag = this.$refs.majorAbnormalLitigation.tableData.some(ele => {
             const obj = ele
             obj.cJudgmentDocumentsId = ele.id
             // delete obj.id
             projectOwnerMajorAbnormalLitigations.push(obj)
+
+            return ele.majorAbnormalLitigation === null
           })
           postData.projectOwnerMajorAbnormalLitigations = projectOwnerMajorAbnormalLitigations
+          console.log(postData)
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有重大异常诉讼', duration: 2000 })
+            return false
+          }
         }
         // 严重违法
         if (this.ruleForm.seriousIllegalData.length) {
           const projectOwnerSeriousIllegalities = []
-          this.$refs.seriousIllegality.tableData.map(ele => {
+          const flag = this.$refs.seriousIllegality.tableData.some(ele => {
             const obj = ele
             obj.cSeriousIllegalDataId = ele.id
             // delete obj.id
             projectOwnerSeriousIllegalities.push(obj)
+
+            return ele.seriousIllegality === null
           })
           postData.projectOwnerSeriousIllegalities = projectOwnerSeriousIllegalities
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有严重违法', duration: 2000 })
+            return false
+          }
         }
         // 欠税公告
         if (this.ruleForm.taxOweNoticeData.length) {
           const projectOwnerTaxOweNotices = []
-          this.$refs.taxOweNotice.tableData.map(ele => {
+          const flag = this.$refs.taxOweNotice.tableData.some(ele => {
             const obj = ele
             obj.cTaxOweNoticeDataId = ele.id
             // delete obj.id
             projectOwnerTaxOweNotices.push(obj)
+
+            return ele.taxOweNotice === null
           })
           postData.projectOwnerTaxOweNotices = projectOwnerTaxOweNotices
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有欠税公告', duration: 2000 })
+            return false
+          }
         }
         // 税收违法
         if (this.ruleForm.taxIllegalData.length) {
           const projectOwnerTaxIllegalDataList = []
-          this.$refs.taxIllegal.tableData.map(ele => {
+          const flag = this.$refs.taxIllegal.tableData.some(ele => {
             const obj = ele
             obj.cTaxIllegalDataId = ele.id
             // delete obj.id
             projectOwnerTaxIllegalDataList.push(obj)
+
+            return ele.taxIllegal === null
           })
           postData.projectOwnerTaxIllegalDataList = projectOwnerTaxIllegalDataList
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有税收违法', duration: 2000 })
+            return false
+          }
         }
         // 黑名单信息
         if (this.ruleForm.blacklists.length) {
           const projectOwnerBlacklists = []
-          this.$refs.blacklist.tableData.map(ele => {
+          const flag = this.$refs.blacklist.tableData.some(ele => {
             const obj = ele
             obj.cBlacklistId = ele.id
             // delete obj.id
             projectOwnerBlacklists.push(obj)
+
+            return ele.blacklist === null
           })
           postData.projectOwnerBlacklists = projectOwnerBlacklists
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有黑名单信息', duration: 2000 })
+            return false
+          }
         }
         // 其他经营异常
         if (this.ruleForm.exceptionData.length) {
           const projectOwnerExceptionDataList = []
-          this.$refs.exception.tableData.map(ele => {
+          const flag = this.$refs.exception.tableData.some(ele => {
             const obj = ele
             obj.cExceptionDataId = ele.id
             // delete obj.id
             projectOwnerExceptionDataList.push(obj)
+
+            return ele.exception === null
           })
           postData.projectOwnerExceptionDataList = projectOwnerExceptionDataList
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有其他经营异常', duration: 2000 })
+            return false
+          }
         }
         // 重大负面新闻舆情
         if (this.ruleForm.news.length) {
           const projectOwnerNewsList = []
-          this.$refs.News.tableData.map(ele => {
+          const flag = this.$refs.News.tableData.some(ele => {
             const obj = ele
             obj.cNewsId = ele.id
             // delete obj.id
             projectOwnerNewsList.push(obj)
+
+            return ele.News === null
           })
           postData.projectOwnerNewsList = projectOwnerNewsList
+          if (flag && type !== 'temp') {
+            this.$message.warning({ message: '请选择是否有重大负面新闻舆情', duration: 2000 })
+            return false
+          }
         }
+
         if (type === 'submit' || type === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {

src/views/creditManage/supplierManage/videoDue/components/CorporateGoodwill/OtherOperations.vue

@@ -58,7 +58,7 @@ export default {
           ruleRequired: this.type === 'supplier' || this.type === 'videoDue' || this.type === 'projectOwner',
           render: (h, row) => {
             return <el-select
-              v-model={row.blacklist}
+              v-model={row.exception}
               disabled={this.disabled}
               placeholder='请选择黑名单'>
               <el-option label='是' value={1}></el-option>