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

src/router/moudules/creditManage.js

@@ -78,35 +78,35 @@ export default {
         name: 'DueReview',
         component: () => import('@/views/creditManage/projectCredit/dueReview/index'),
         hidden: true,
-        meta: { title: '尽调审核', icon: 'dashboard' }
+        meta: { title: '尽调审核', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       },
       {
         path: '/projectCredit/projectAdmittance/:id',
         name: 'ProjectAdmittance',
         component: () => import('@/views/creditManage/projectCredit/projectAdmittance'),
         hidden: true,
-        meta: { title: '项目准入报告', icon: 'dashboard' }
+        meta: { title: '项目准入报告', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       },
       {
         path: '/projectCredit/companyAdmittance/:id',
         name: 'CompanyAdmittance',
         component: () => import('@/views/creditManage/projectCredit/companyAdmittance'),
         hidden: true,
-        meta: { title: '核心企业准入报告', icon: 'dashboard' }
+        meta: { title: '核心企业准入报告', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       },
       {
         path: '/projectCredit/projectView/:id',
         name: 'ProjectView',
         component: () => import('@/views/creditManage/projectCredit/projectView'),
         hidden: true,
-        meta: { title: '项目信息查看', icon: 'dashboard' }
+        meta: { title: '项目信息查看', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       },
       {
         path: '/projectCredit/companyView/:id',
         name: 'CompanyView',
         component: () => import('@/views/creditManage/projectCredit/companyView'),
         hidden: true,
-        meta: { title: '核心企业信息查看', icon: 'dashboard' }
+        meta: { title: '核心企业信息查看', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       }
     ]
   },

src/styles/index.scss

@@ -157,3 +157,8 @@ div:focus {
   width: calc(100% - 140px);
   line-height: 32px;
 }
+
+.option-label-tip {
+  font-size: 12px;
+  color: #838080;
+}

src/views/biddingManagement/components/GuaranteeConfirmContent.vue

@@ -62,7 +62,7 @@
           :disabled="disabled"
         />
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="投标说明："
         prop="desc"
         style="width: 100%;"
@@ -78,7 +78,7 @@
           placeholder="请上传投标说明"
           :disabled="disabled"
         />
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
   </div>
 </template>
@@ -103,8 +103,8 @@ module.exports = {
         tenderMethod: '',
         bidGuaranteeMethod: '',
         biddingGuaranteeLetterFile: [],
-        biddingPaymentVoucherFile: [],
-        bidingDescriptionFile: []
+        biddingPaymentVoucherFile: []
+        // bidingDescriptionFile: []
       },
       rules: {
         tenderMethod: [
@@ -120,14 +120,14 @@ module.exports = {
   watch: {
     deatailsInfo: {
       handler(newV) {
-        const { tenderMethod, bidGuaranteeMethod, depositAmount, guaranteeLetterFiles, paymentVoucherFiles, bidDescriptionFiles } = JSON.parse(JSON.stringify(newV))
+        const { tenderMethod, bidGuaranteeMethod, depositAmount, guaranteeLetterFiles, paymentVoucherFiles } = JSON.parse(JSON.stringify(newV))
         this.ruleForm = {
           tenderMethod,
           bidGuaranteeMethod,
           depositAmount,
           biddingGuaranteeLetterFile: guaranteeLetterFiles || [],
-          biddingPaymentVoucherFile: paymentVoucherFiles || [],
-          bidingDescriptionFile: bidDescriptionFiles || []
+          biddingPaymentVoucherFile: paymentVoucherFiles || []
+          // bidingDescriptionFile: bidDescriptionFiles || []
         }
       },
       immediate: true,
@@ -139,18 +139,18 @@ module.exports = {
       return new Promise((resolve, reject) => {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-            const bidingDescriptionList = this.$refs.bidingDescriptionFile.getFileLists
-            if (!bidingDescriptionList.length) {
-              this.$message.warning('请上传招标说明')
-              return
-            }
+            // const bidingDescriptionList = this.$refs.bidingDescriptionFile.getFileLists
+            // if (!bidingDescriptionList.length) {
+            //   this.$message.warning('请上传招标说明')
+            //   return
+            // }
             const { id, taskId } = this.$route.query
             const params = {
               tenderMethod: this.ruleForm.tenderMethod,
               bidGuaranteeMethod: this.ruleForm.bidGuaranteeMethod,
               biddingBasicInfoId: id,
-              taskId,
-              bidDescriptionFileIds: bidingDescriptionList.map(item => item.id)
+              taskId
+              // bidDescriptionFileIds: bidingDescriptionList.map(item => item.id)
             }
             if (this.ruleForm.bidGuaranteeMethod === 0) {
               const biddingPaymentVoucherList = this.$refs.biddingPaymentVoucherFile.getFileLists

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

@@ -317,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/ProjectInfo.vue

@@ -13,9 +13,11 @@
           <el-option
             v-for="item in projectTypes"
             :key="item.value"
-            :label="item.label"
+            :label="item.label.split(':')[0]"
             :value="item.value"
-          />
+          >
+            <span>{{ item.label.split(':')[0] }}</span><span class="option-label-tip">（{{ item.label.split(':')[1] }}）</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName" class="one-form-item">
@@ -114,9 +116,11 @@
           <el-option
             v-for="item in purposeList"
             :key="item.code"
-            :label="item.name"
+            :label="item.name.split('：')[0]"
             :value="item.code"
-          />
+          >
+            <span>{{ item.name.split('：')[0] }}</span><span class="option-label-tip">（{{ item.name.split('：')[1] }}）</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="具体用途" class="one-form-item" prop="purposeDetail">
@@ -273,15 +277,15 @@ export default {
       },
       projectTypes: [
         {
-          label: '固定项目',
+          label: '固定项目:货物与项目一一对应，非集采公司采购',
           value: 'c_project_type_1'
         },
         {
-          label: '集采项目',
+          label: '集采项目:货物与项目非一一对应，集采公司采购',
           value: 'c_project_type_2'
         },
         {
-          label: '无项目',
+          label: '无项目:暂无具体项目',
           value: 'c_project_type_3'
         }
       ]

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

@@ -357,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>