merge

src/api/acceptanceManagement/index.js

@@ -83,3 +83,12 @@ export function Loadings(text, time = timeout) {
   return loading
 }
 
+// 验收单管理 - 法务审核
+
+export const businessReviewSubmit = (data) => (
+  request({
+    url: '/acceptance/businessReview',
+    method: 'post',
+    data
+  })
+)

src/components/UpDownDrag/index.vue

@@ -97,7 +97,8 @@ export default {
     display: flex;
     justify-content: space-between;
     padding: 0 20px;
-    margin-bottom: 20px;
+    /* margin-bottom: 20px; */
+    z-index: 20;
   }
   .drag-container-bottom {
     width: 100%;
@@ -105,5 +106,7 @@ export default {
     background-color: #fff;
     height: calc(100vh - 560px);
     overflow-y: auto;
+    z-index: 20;
+    padding-top: 20px;
   }
 </style>

src/router/moudules/tradeManagement.js

@@ -150,6 +150,14 @@ export default {
           hidden: true,
           meta: { title: '法务审核' }
         },
+
+        {
+          path: '/acceptanceManagement/businessReview/:id',
+          name: 'AccepetanceBusinessReview',
+          component: () => import('@/views/acceptanceManagement/businessReview'),
+          hidden: true,
+          meta: { title: '业务审核' }
+        },
         {
           path: '/acceptanceManagement/adjustReview/:id',
           name: 'AccepetanceAdjustReview',

src/utils/validate.js

@@ -55,3 +55,16 @@ export function validNumber(number) {
 export function validCharacter(character) {
   return /^[\u4E00-\u9FA5]+$/.test(character)
 }
+
+/**
+ * 校验是否是null undefined ''
+ * @param {null undefined '' } value
+ * @returns {Boolean}
+ */
+export function validSpecialEmpty(value) {
+  if (value === null || value === undefined || value === '') {
+    return true
+  } else {
+    return false
+  }
+}

src/views/acceptanceManagement/businessReview.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="business-review">
+    <cy-up-down-drag>
+      <div slot="top">
+        <history-view></history-view>
+      </div>
+      <div slot="bar">
+        <div>
+          业务审核
+        </div>
+      </div>
+      <div slot="bottom">
+        <template>
+          <acceptance-conclusion ref="conclusion" type="businessReview"></acceptance-conclusion>
+          <div class="submit-btn">
+            <el-button style="width: 150px;" @click="() => { $router.go(-1) }">取消</el-button>
+            <el-button style="width: 150px;" type="primary" @click="onSubmit">提交</el-button>
+          </div>
+        </template>
+      </div>
+    </cy-up-down-drag>
+  </div>
+</template>
+
+<script >
+import AcceptanceConclusion from './components/AcceptanceConclusion.vue'
+import HistoryView from './components/HistoryView.vue'
+import { businessReviewSubmit } from '@/api/acceptanceManagement/index'
+import { Loading } from 'element-ui'
+export default {
+  name: 'AcceptanceLegalReview',
+  components: {
+    AcceptanceConclusion,
+    HistoryView
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    async onSubmit() {
+      const { approvalConclusion, approvalComment } = await this.$refs.conclusion.getSubmit()
+      const { taskId, id } = this.$route.query
+      const params = {
+        Loading: true,
+        approvalConclusion,
+        approvalComment,
+        taskId,
+        acceptanceBasicInfoId: id
+      }
+      businessReviewSubmit(params).then(() => {
+        this.$message.success('提交成功')
+        this.$router.go(-1)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/acceptanceManagement/components/AcceptanceConclusion.vue

@@ -5,8 +5,8 @@
       <el-form-item label="审批结论：" prop="approvalConclusion">
         <el-radio-group v-model="ruleForm.approvalConclusion">
           <el-radio label="pass" :disabled="disabled">通过</el-radio>
-          <el-radio v-show="show" label="back" :disabled="disabled">退回</el-radio>
-          <el-radio label="veto" :disabled="disabled">否决</el-radio>
+          <el-radio v-show="show || type === 'businessReview'" label="back" :disabled="disabled">退回</el-radio>
+          <el-radio v-if="type !== 'businessReview'" label="veto" :disabled="disabled">否决</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item
@@ -39,6 +39,10 @@ export default {
     deatailsInfo: {
       type: Object,
       default: () => {}
+    },
+    type: {
+      type: String,
+      default: '' // 'businessReview' 业务审核
     }
   },
   data() {

src/views/acceptanceManagement/components/HistoryView.vue

@@ -3,7 +3,7 @@
     <div v-if="advanceViewList.length" class="view-steps-box">
       <cy-steps :steps-data="advanceViewList"></cy-steps>
     </div>
-    <div v-loading="loading" class="tempalte-content">
+    <div v-loading="loading">
       <el-collapse v-if="advanceViewList.length" v-model="activeNames">
         <el-collapse-item v-for="(item, index) in advanceViewList" :key="index" :name="index">
           <template slot="title">
@@ -17,6 +17,7 @@
           <legal-review v-if="item.formBusinessName === '法务审核'" :details-info="item.obj"></legal-review>
           <price-adjust v-if="item.formBusinessName.includes('单价调整')" :details-info="item.obj"></price-adjust>
           <adjust-review v-if="item.formBusinessName === '单价变更审核'" :details-info="item.obj"></adjust-review>
+          <acceptance-conclusion v-if="item.formBusinessName === '业务审核'" :deatails-info="item.obj" type="businessReview"></acceptance-conclusion>
         </el-collapse-item>
       </el-collapse>
       <!-- <el-empty v-else style="height: calc(100vh - 0.85rem - 90px)"></el-empty> -->
@@ -32,6 +33,7 @@ import SignConfirm from './historyViewContent/signConfirm'
 import LegalReview from './historyViewContent/legalReview'
 import PriceAdjust from './historyViewContent/priceAdjust'
 import AdjustReview from './historyViewContent/adjustReview'
+import AcceptanceConclusion from './AcceptanceConclusion.vue'
 
 export default {
   components: {
@@ -39,7 +41,8 @@ export default {
     SignConfirm,
     LegalReview,
     PriceAdjust,
-    AdjustReview
+    AdjustReview,
+    AcceptanceConclusion
   },
   mixins: [collapseSeeMix],
   data() {

src/views/acceptanceManagement/index.vue

@@ -157,6 +157,16 @@ export default {
               taskId: row.taskId
             }
           })
+        } else if (row.taskName === '业务审核') {
+          this.$router.push({
+            name: 'AccepetanceBusinessReview',
+            params: { id: row.id },
+            query: {
+              taskName: row.taskName,
+              id: row.id,
+              taskId: row.taskId
+            }
+          })
         }
       } else if (type === 'timeAxis') {
         this.timeAxisClick(row)

src/views/acceptanceManagement/legalReview.vue

@@ -111,4 +111,3 @@ export default {
     right: 40px;
   } */
 </style>
-

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

@@ -78,7 +78,6 @@ export default {
       this.$emit('isHistoricalCooperation', this.ruleForm.historicalCooperation)
     },
     passData(submitType) {
-      console.log(submitType, 888)
       return new Promise((resolve, reject) => {
         if (submitType === 'submit' || submitType === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {

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

@@ -130,10 +130,10 @@ export default {
               let errorStr = ''
               if (res.data.errors.length) {
                 res.data.errors.map(item => {
-                  errorStr += item + '!'
-                })
-                const msg = errorStr.substring(0, errorStr.length - 1)
-                this.$message.warning({ message: msg, duration: 3500 })
+                  errorStr += item + ';'
+                })
+                const msg = errorStr.substring(0, errorStr.length - 1)
+                this.$message.warning({ message: msg, duration: 3500 })
               }
             } else {
               this.$message.success('评估成功')

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

@@ -100,9 +100,10 @@ export default {
               let errorStr = ''
               if (res.data.errors.length) {
                 res.data.errors.map(item => {
-                  errorStr += item
+                  errorStr += item + ';'
                 })
-                this.$message.warning({ message: errorStr, duration: 3500 })
+                const msg = errorStr.substring(0, errorStr.length - 1)
+                this.$message.warning({ message: msg, duration: 3500 })
               }
             } else {
               this.$message.success('评估成功')

src/views/creditManage/supplierManage/admissionReport/components/CompanyBasicInfo/BusinessAddress.vue

@@ -46,7 +46,7 @@
         />
       </el-form-item>
       <el-form-item
-        label=" 办公环境"
+        label=" 办公环境图"
         prop="resource"
       >
         <cy-upload
@@ -54,7 +54,7 @@
           :upload-params="{}"
           :file-data="ruleForm.fileStorageList"
           :upload-from-orange-status="true"
-          placeholder="请上 办公环境"
+          placeholder="请上 办公环境图"
         />
       </el-form-item>
       <el-form-item

src/views/creditManage/supplierManage/auditing/auditingMain.vue

@@ -7,7 +7,7 @@
         <main-enterprise :ref="'mainEnterprise'+index" :details-info="item" :disabled="disabled" type-name="主企业审核" />
       </div>
     </cy-info-title>
-    <cy-info-title type="collapse" name="企业商誉情况">
+    <cy-info-title type="collapse" name="企业商誉情况" style="margin-top: 20px">
       <corporate-goodwill ref="mainCorporate" :disabled="disabled" :details-info="detailsInfo.enterprise" />
     </cy-info-title>
     <cy-info-title v-if="detailsInfo.hasGuaranteeEnterprise" type="collapse" name="担保企业审核">

src/views/creditManage/supplierManage/auditing/components/CorporateGoodwill/index.vue

@@ -144,7 +144,7 @@ export default {
             if (newsTable.length) {
               for (let i = 0; i < newsTable.length; i++) {
                 const { News } = newsTable[i]
-                if (News !== 1 || News !== 0) {
+                if (News !== 1 && News !== 0) {
                   this.$message.warning('请选择重大负面新闻舆情')
                   return
                 }

src/views/creditManage/supplierManage/auditing/components/MainEnterprise.vue

@@ -53,6 +53,24 @@
           </el-form-item>
         </div>
       </div>
+      <el-form-item label="有无失信被执行记录" prop="recordOfDishonestyExecution">
+        <el-select v-model="ruleForm.recordOfDishonestyExecution" :disabled="disabled" placeholder="请选择有无失信被执行记录">
+          <el-option label="有" :value="1"></el-option>
+          <el-option label="无" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="有无被执行记录" prop="executedRecord">
+        <el-select v-model="ruleForm.executedRecord" :disabled="disabled" placeholder="请选择有无被执行记录">
+          <el-option label="有" :value="1"></el-option>
+          <el-option label="无" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="有无限高消费情况" prop="stCount">
+        <el-select v-model="ruleForm.stCount" :disabled="disabled" placeholder="请选择有无限高消费情况">
+          <el-option label="有" :value="1"></el-option>
+          <el-option label="无" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
   </div>
 </template>
@@ -84,7 +102,10 @@ export default {
         accumulatedOverdueTimes: '',
         numberOfApprovalQueries: '',
         amountOfGuaranteeLiability: '',
-        badRecords: ''
+        badRecords: '',
+        recordOfDishonestyExecution: '',
+        executedRecord: '',
+        stCount: ''
       },
       rules: {
         numberOfOverdueAccounts: [
@@ -110,6 +131,15 @@ export default {
         ],
         badRecords: [
           { required: true, message: '请选择关注类和不良类贷款记录', trigger: 'change' }
+        ],
+        recordOfDishonestyExecution: [
+          { required: true, message: '请选择有无信被执行记录', trigger: 'change' }
+        ],
+        executedRecord: [
+          { required: true, message: '请选择有无被执行记录', trigger: 'change' }
+        ],
+        stCount: [
+          { required: true, message: '请选择有无限高消费情况', trigger: 'change' }
         ]
       },
       tableData: [],

src/views/creditManage/supplierManage/auditingTwo/auditingTwoMain.vue

@@ -23,6 +23,7 @@
 
 <script>
 import { getTwoReviewInfo, oneClickSecondEvaluationSubmit } from '@/api/creditManage/supplierManage'
+import { validSpecialEmpty } from '@/utils/validate'
 export default {
   components: {
     BasicInfo: () => import('./components/BasicInfo'),
@@ -100,27 +101,26 @@ export default {
     async oneClickCalculation() {
       const data = await this.getParams()
       const { scopeCompliance, mapFilesCompliance, rentalFilesCompliance, waterFilesCompliance, officeFilesCompliance } = data
-      if (scopeCompliance === undefined) {
+      if (validSpecialEmpty(scopeCompliance)) {
         this.$message.warning('请选择经营范围是否达标')
         return
       }
-      if (mapFilesCompliance === undefined) {
+      if (validSpecialEmpty(mapFilesCompliance)) {
         this.$message.warning('请选择地点定位图是否达标')
         return
-      }  
-      if (rentalFilesCompliance === undefined) {
+      }
+      if (validSpecialEmpty(rentalFilesCompliance)) {
         this.$message.warning('请选择租房合同是否达标')
         return
       }
-      if (waterFilesCompliance === undefined) {
-        this.$message.warning('请选择房费缴纳流水是否达标')
+      if (validSpecialEmpty(waterFilesCompliance)) {
+        this.$message.warning('请选择房租缴纳流水是否达标')
         return
       }
-      if (officeFilesCompliance === undefined) {
-        this.$message.warning('请选择办公环境是否达标')
+      if (validSpecialEmpty(officeFilesCompliance)) {
+        this.$message.warning('请选择办公环境图是否达标')
         return
       }
-      console.log(data, 8888)
       oneClickSecondEvaluationSubmit({ Loading: true, ...data }).then(({ data }) => {
         this.assessData = data
       })
@@ -130,24 +130,24 @@ export default {
       const auditConclusion = await this.$refs.auditConclusion.getParams()
       const assess = await this.$refs.assess.getParams()
       const { scopeCompliance, mapFilesCompliance, rentalFilesCompliance, waterFilesCompliance, officeFilesCompliance } = data
-      if (scopeCompliance === undefined) {
+      if (validSpecialEmpty(scopeCompliance)) {
         this.$message.warning('请选择经营范围是否达标')
         return false
       }
-      if (mapFilesCompliance === undefined || !mapFilesCompliance) {
+      if (validSpecialEmpty(mapFilesCompliance)) {
         this.$message.warning('请选择地点定位图是否达标')
         return
       }
-      if (rentalFilesCompliance === undefined || !rentalFilesCompliance) {
+      if (validSpecialEmpty(rentalFilesCompliance)) {
         this.$message.warning('请选择租房合同是否达标')
         return
       }
-      if (waterFilesCompliance === undefined || !waterFilesCompliance) {
-        this.$message.warning('请选择房费缴纳流水是否达标')
+      if (validSpecialEmpty(waterFilesCompliance)) {
+        this.$message.warning('请选择房租缴纳流水是否达标')
         return
       }
-      if (officeFilesCompliance === undefined || !officeFilesCompliance) {
-        this.$message.warning('请选择办公环境是否达标')
+      if (validSpecialEmpty(officeFilesCompliance)) {
+        this.$message.warning('请选择办公环境图是否达标')
         return
       }
 

src/views/creditManage/supplierManage/auditingTwo/components/BusinessAddress.vue

@@ -27,7 +27,7 @@
               />
             </div>
             <div class="address-box">
-              <div>房费缴纳流水：</div>
+              <div>房租缴纳流水：</div>
               <cy-upload
                 ref="fileStorage"
                 :upload-params="{}"
@@ -36,7 +36,7 @@
               />
             </div>
             <div class="address-box">
-              <div>办公环境：</div>
+              <div>办公环境图：</div>
               <cy-upload
                 ref="fileStorage"
                 :upload-params="{}"

src/views/creditManage/supplierManage/supplementaryInfo/components/AddInfo.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="add-info">
-    <cy-info-title type="center">经营地址相关情况</cy-info-title>
     <el-form
       ref="ruleForm"
       :model="ruleForm"
@@ -8,6 +7,34 @@
       label-position="top"
       class="rule-form-orange"
     >
+      <cy-info-title type="center">征信信息</cy-info-title>
+      <el-form-item style="width: 100%">
+        <template slot="label">
+          <span>个人征信</span>
+          <span class="slot-name-desc">烦请本人线上查询个人征信，并填写我司邮箱作为央行等银行发送征信报告的指定邮箱operation@changan-inkasso.com</span>
+        </template>
+        <cy-comm-table
+          ref="commTable"
+          style="margin-top: 10px; width: 100%"
+          :columns="columns"
+          :data="tableData"
+          :count="0"
+        />
+      </el-form-item>
+      <el-form-item style="width: 100%">
+        <template slot="label">
+          <span>企业征信查询授权书</span>
+          <span class="slot-name-desc">必须已认证已签署才可提交</span>
+        </template>
+        <cy-comm-table
+          name="enterprise"
+          style="margin-top: 10px; width: 100%"
+          :columns="enterpriseColumns"
+          :data="enterpriseTableData"
+          :count="0"
+        />
+      </el-form-item>
+      <cy-info-title type="center">企业经营地址</cy-info-title>
       <el-form-item label="经营地址" style="width: 100%;" prop="businessAddress">
         <el-input v-model="ruleForm.businessAddress" placeholder="请输入经营地址" disabled />
       </el-form-item>
@@ -35,7 +62,7 @@
           disabled
         />
       </el-form-item>
-      <el-form-item label="房费缴纳流水" class="one-form-item form-required">
+      <el-form-item label="房租缴纳流水" class="one-form-item form-required">
         <cy-upload
           ref="waterElectricityFees"
           :upload-params="{
@@ -43,11 +70,11 @@
           }"
           :file-data="waterElectricityFees"
           :upload-from-orange-status="true"
-          placeholder="请上传房费缴纳流水"
+          placeholder="请上传房租缴纳流水"
           disabled
         />
       </el-form-item>
-      <el-form-item label="办公环境" class="one-form-item form-required">
+      <el-form-item label="办公环境图" class="one-form-item form-required">
         <cy-upload
           ref="officeEnvironment"
           :upload-params="{
@@ -55,7 +82,7 @@
           }"
           :file-data="officeEnvironment"
           :upload-from-orange-status="true"
-          placeholder="请上传办公环境"
+          placeholder="请上传办公环境图"
           disabled
         />
       </el-form-item>
@@ -110,33 +137,7 @@
           />
         </el-form-item>
       </template>
-      <cy-info-title type="center">征信相关情况111</cy-info-title>
-      <el-form-item style="width: 100%">
-        <template slot="label">
-          <span>个人征信</span>
-          <span class="slot-name-desc">烦请本人线上查询个人征信，并填写我司邮箱作为央行等银行发送征信报告的指定邮箱operation@changan-inkasso.com</span>
-        </template>
-        <cy-comm-table
-          ref="commTable"
-          style="margin-top: 10px; width: 100%"
-          :columns="columns"
-          :data="tableData"
-          :count="0"
-        />
-      </el-form-item>
-      <el-form-item style="width: 100%">
-        <template slot="label">
-          <span>企业征信查询授权书</span>
-          <span class="slot-name-desc">必须已认证已签署才可提交</span>
-        </template>
-        <cy-comm-table
-          name="enterprise"
-          style="margin-top: 10px; width: 100%"
-          :columns="enterpriseColumns"
-          :data="enterpriseTableData"
-          :count="0"
-        />
-      </el-form-item>
+
     </el-form>
   </div>
 </template>
@@ -352,11 +353,11 @@ export default {
             return
           }
           if (!waterElectricityFees.length) {
-            this.$message.warning('请上传房费缴纳流水')
+            this.$message.warning('请上传房租缴纳流水')
             return
           }
           if (!officeEnvironment.length) {
-            this.$message.warning('请上传办公环境')
+            this.$message.warning('请上传办公环境图')
             return
           }
 

src/views/creditManage/supplierManage/supplementaryInfo/components/BasicInfo.vue

@@ -6,8 +6,8 @@
       label-width="150px"
       class="rule-form-orange"
     >
-      <el-form-item label="公司名称" class="one-form-item">
-        <el-input v-model="ruleForm.corporateName" disabled placeholder="请输入公司名称" />
+      <el-form-item label="企业名称" class="one-form-item">
+        <el-input v-model="ruleForm.corporateName" disabled placeholder="请输入企业名称" />
       </el-form-item>
 
       <el-form-item label="公统一社会信用代码" class="one-form-item">

src/views/creditManage/supplierManage/supplementaryInfo/components/GuaranteeAddInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="guarantee-add-info">
-    <cy-info-title type="center">经营地址相关情况</cy-info-title>
+
     <el-form
       ref="ruleForm"
       :model="ruleForm"
@@ -9,6 +9,33 @@
       label-width="150px"
       class="rule-form-orange"
     >
+      <cy-info-title type="center">征信信息</cy-info-title>
+      <el-form-item style="width: 100%">
+        <template slot="label">
+          <span>个人征信</span>
+          <span class="slot-name-desc">烦请本人线上查询个人征信，并填写我司邮箱作为央行等银行发送征信报告的指定邮箱operation@changan-inkasso.com</span>
+        </template>
+        <cy-comm-table
+          ref="commTable"
+          style="margin-top: 10px; width: 100%"
+          :columns="columns"
+          :data="tableData"
+          :count="0"
+        />
+      </el-form-item>
+      <el-form-item style="width: 100%">
+        <template slot="label">
+          <span>企业征信查询授权书</span>
+          <span class="slot-name-desc">必须已认证已签署才可提交</span>
+        </template>
+        <cy-comm-table
+          style="margin-top: 10px; width: 100%"
+          :columns="enterpriseColumns"
+          :data="enterpriseTableData"
+          :count="0"
+        />
+      </el-form-item>
+      <cy-info-title type="center">企业经营地址</cy-info-title>
       <el-form-item label="经营地址" style="width: 100%;" prop="businessAddress">
         <el-input v-model="ruleForm.businessAddress" placeholder="请输入经营地址" disabled />
       </el-form-item>
@@ -36,7 +63,7 @@
           disabled
         />
       </el-form-item>
-      <el-form-item label="房费缴纳流水" class="one-form-item form-required" prop="waterElectricityFees">
+      <el-form-item label="房租缴纳流水" class="one-form-item form-required" prop="waterElectricityFees">
         <cy-upload
           ref="waterElectricityFees"
           :upload-params="{
@@ -44,11 +71,11 @@
           }"
           :file-data="waterElectricityFees"
           :upload-from-orange-status="true"
-          placeholder="请上传房费缴纳流水"
+          placeholder="请上传房租缴纳流水"
           disabled
         />
       </el-form-item>
-      <el-form-item label="办公环境" class="one-form-item form-required" prop="officeEnvironment">
+      <el-form-item label="办公环境图" class="one-form-item form-required" prop="officeEnvironment">
         <cy-upload
           ref="officeEnvironment"
           :upload-params="{
@@ -56,7 +83,7 @@
           }"
           :file-data="officeEnvironment"
           :upload-from-orange-status="true"
-          placeholder="请上传办公环境"
+          placeholder="请上传办公环境图"
           disabled
         />
       </el-form-item>
@@ -109,32 +136,7 @@
           disabled
         />
       </el-form-item>
-      <cy-info-title type="center">征信相关情况222</cy-info-title>
-      <el-form-item style="width: 100%">
-        <template slot="label">
-          <span>个人征信</span>
-          <span class="slot-name-desc">烦请本人线上查询个人征信，并填写我司邮箱作为央行等银行发送征信报告的指定邮箱operation@changan-inkasso.com</span>
-        </template>
-        <cy-comm-table
-          ref="commTable"
-          style="margin-top: 10px; width: 100%"
-          :columns="columns"
-          :data="tableData"
-          :count="0"
-        />
-      </el-form-item>
-      <el-form-item style="width: 100%">
-        <template slot="label">
-          <span>企业征信查询授权书</span>
-          <span class="slot-name-desc">必须已认证已签署才可提交</span>
-        </template>
-        <cy-comm-table
-          style="margin-top: 10px; width: 100%"
-          :columns="enterpriseColumns"
-          :data="enterpriseTableData"
-          :count="0"
-        />
-      </el-form-item>
+
     </el-form>
   </div>
 </template>
@@ -333,11 +335,11 @@ export default {
             return
           }
           if (!waterElectricityFees.length) {
-            this.$message.warning('请上传房费缴纳流水')
+            this.$message.warning('请上传房租缴纳流水')
             return
           }
           if (!officeEnvironment.length) {
-            this.$message.warning('请上传办公环境')
+            this.$message.warning('请上传办公环境图')
             return
           }
           if (!businessLicense.length) {

src/views/creditManage/supplierManage/videoDue/components/Assess.vue

@@ -13,8 +13,11 @@
       <el-form-item label="得分" prop="name">
         <el-input v-model="detailsInfo.score" disabled placeholder="请输入得分" />
       </el-form-item>
+      <el-form-item label="修改得分" prop="fixScore">
+        <el-input v-model="detailsInfo.fixScore" :disabled="disabled" placeholder="请输入修改得分" />
+      </el-form-item>
       <el-form-item label="授信额度" prop="name">
-        <el-input v-model="detailsInfo.creditLimit" disabled placeholder="请输入授信额度" >
+        <el-input v-model="detailsInfo.creditLimit" disabled placeholder="请输入授信额度">
           <template slot="append">万元</template>
         </el-input>
       </el-form-item>
@@ -43,11 +46,15 @@ export default {
   data() {
     return {
       ruleForm: {
-        evaluationOpinions: ''
+        evaluationOpinions: '',
+        fixScore: ''
       },
       rules: {
         evaluationOpinions: [
           { required: true, message: '请选择审批结论', trigger: 'change' }
+        ],
+        fixScore: [
+          { required: true, message: '请输入修改得分', trigger: 'blur' }
         ]
       }
     }
@@ -55,15 +62,15 @@ export default {
   watch: {
     detailsInfo: {
       handler(newV) {
-        console.log(newV)
-        const { revenueRating, admitted, score, creditLimit, guaranteeEnterpriseResult, evaluationOpinions } = newV
+        const { revenueRating, admitted, score, creditLimit, guaranteeEnterpriseResult, evaluationOpinions, fixScore } = JSON.parse(JSON.stringify(newV))
         this.ruleForm = {
           revenueRating,
           admitted,
           score,
           creditLimit,
           guaranteeEnterpriseResult,
-          evaluationOpinions
+          evaluationOpinions,
+          fixScore
         }
       },
       deep: true,

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

@@ -44,14 +44,14 @@
           placeholder="请上水电费缴纳流水"
         />
       </el-form-item>
-      <el-form-item label="办公环境">
+      <el-form-item label="办公环境图">
         <cy-upload
           ref="fileStorage"
           :upload-params="{}"
           :file-data="defaultDatailsInfo.officeFiles"
           disabled
           :upload-from-orange-status="true"
-          placeholder="请上传办公环境"
+          placeholder="请上传办公环境图"
         />
       </el-form-item>
       <el-form-item label="标准分值">

src/views/divideAccountsManage/edit.vue

@@ -292,7 +292,7 @@ export default {
           label: '是否计提(履约保证金)',
           prop: 'accrual',
           showTooltip: true,
-          width: '80',
+          width: '100',
           render: (h, row) => {
             return <el-select v-model={ row.accrual } disabled={this.disabled} onChange={() => { this.oneCalc('click') }} placeholder='请选择是否计提'>
               <el-option label='是' value={true}></el-option>
@@ -323,10 +323,10 @@ export default {
           }
         },
         {
-          label: '是否分配融资利息',
+          label: '是否分配融资利息和管理费',
           prop: 'hasAssignInterest',
           showTooltip: true,
-          width: '80',
+          width: '110',
           render: (h, row) => {
             return <el-select disabled={this.disabled} v-model={ row.hasAssignInterest } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
               <el-option label='是' value={true}></el-option>
@@ -344,18 +344,18 @@ export default {
             return <span> { this.handlerMoneyEmpty(row.financingInterest) }</span>
           }
         },
-        {
-          label: '是否分配管理费',
-          prop: 'hasAssignManagementFee',
-          showTooltip: true,
-          width: '80',
-          render: (h, row) => {
-            return <el-select disabled={this.disabled} v-model={ row.hasAssignManagementFee } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
-              <el-option label='是' value={true}></el-option>
-              <el-option label='否' value={false}></el-option>
-            </el-select>
-          }
-        },
+        // {
+        //   label: '是否分配管理费',
+        //   prop: 'hasAssignManagementFee',
+        //   showTooltip: true,
+        //   width: '80',
+        //   render: (h, row) => {
+        //     return <el-select disabled={this.disabled} v-model={ row.hasAssignManagementFee } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
+        //       <el-option label='是' value={true}></el-option>
+        //       <el-option label='否' value={false}></el-option>
+        //     </el-select>
+        //   }
+        // },
         {
           label: '融资管理费',
           prop: 'financingManagementFee',