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

src/api/dictionary.js

@@ -20,3 +20,12 @@ export const getFilePerview = (params) => (
     responseType: 'arraybuffer'
   })
 )
+
+// 获取省市区
+export const getRegion = (params) => (
+  request({
+    url: '/department/findAll',
+    method: 'get',
+    params
+  })
+)

src/components/Breadcrumb/index.vue

@@ -67,7 +67,7 @@ export default {
 <style lang="scss" scoped>
 .app-breadcrumb.el-breadcrumb {
   display: inline-block;
-  font-size: 16px;
+  font-size: 14px;
   // line-height: 50px;
   // margin-left: 8px;
   margin-bottom: 20px;

src/components/CustomSelect/index.vue

@@ -6,7 +6,7 @@
       style="width: 100%"
       filterable
       clearable
-      placeholder="请选择公司名称"
+      :placeholder="placeholder"
       :disabled="disabled"
       @blur="selectBlur"
       @clear="selectClear"
@@ -28,6 +28,10 @@ export default {
     value: {
       type: [String, Number],
       default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请选择企业名称'
     }
   },
   data() {

src/router/moudules/myBusiness.js

@@ -21,21 +21,21 @@ export default {
         name: 'SupplierEnterprise',
         component: () => import('@/views/myBusiness/supplierEnterprise/index'),
         hidden: true,
-        meta: { title: '供应商企业信息', icon: 'dashboard' }
+        meta: { title: '供应商企业信息', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/guaranteeEnterprise/:id',
         name: 'GuaranteeEnterprise',
         component: () => import('@/views/myBusiness/guaranteeEnterprise/index'),
         hidden: true,
-        meta: { title: '担保企业信息' }
+        meta: { title: '担保企业信息', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/supplementaryInfo/:id',
         name: 'MyBusinessSupplementaryInfo',
         component: () => import('@/views/myBusiness/supplementaryInfo/index'),
         hidden: true,
-        meta: { title: '补充信息' }
+        meta: { title: '补充信息', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/supplementaryInfoSee/:id',
@@ -49,49 +49,49 @@ export default {
         name: 'MyBusinessProjectInfo',
         component: () => import('@/views/myBusiness/projectInfo/index'),
         hidden: true,
-        meta: { title: '项目信息' }
+        meta: { title: '项目信息', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/projectSupplement/:id',
         name: 'MyBusinessProjectSupplement',
         component: () => import('@/views/myBusiness/projectSupplement/index'),
         hidden: true,
-        meta: { title: '项目补充信息', icon: 'dashboard' }
+        meta: { title: '项目补充信息', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/projectView/:id',
         name: 'MyBusinessProjectView',
         component: () => import('@/views/myBusiness/admittanceDetail/projectDetail'),
         hidden: true,
-        meta: { title: '项目信息查看', icon: 'dashboard' }
+        meta: { title: '项目信息查看', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/offlineDueDiligence/:id',
         name: 'MyBusinessOfflineDueDiligence',
         component: () => import('@/views/myBusiness/offlineDueDiligence/index'),
         hidden: true,
-        meta: { title: '尽调预约', icon: 'dashboard' }
+        meta: { title: '尽调预约', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/videoDueDiligence/:id',
         name: 'MyBusinessVideoDueDiligence',
         component: () => import('@/views/myBusiness/videoDueDiligence/index'),
         hidden: true,
-        meta: { title: '视频尽调预约', icon: 'dashboard' }
+        meta: { title: '视频尽调预约', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/admittanceDetail/:id',
         name: 'MyBusinessAdmittanceDetail',
         component: () => import('@/views/myBusiness/admittanceDetail/index'),
         hidden: true,
-        meta: { title: '准入详情', icon: 'dashboard' }
+        meta: { title: '准入详情', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/error/:id',
         name: 'MyBusinessError',
         component: () => import('@/views/myBusiness/error'),
         hidden: true,
-        meta: { title: '结果', icon: 'dashboard' }
+        meta: { title: '结果', activeMenu: '/myBusiness' }
       }
     ]
   }]

src/router/moudules/myFinancing.js

@@ -26,28 +26,28 @@ export default {
         name: 'ApplyFinancing',
         component: () => import('@/views/myFinancing/applyFinancing/index'),
         hidden: true,
-        meta: { title: '申请融资' }
+        meta: { title: '申请融资', activeMenu: '/myFinancing' }
       },
       {
         path: '/myFinancing/repaymentPlay/:id',
         name: 'RepaymentPlay',
         component: () => import('@/views/myFinancing/repaymentPlay/index'),
         hidden: true,
-        meta: { title: '还款计划' }
+        meta: { title: '还款计划', activeMenu: '/myFinancing' }
       },
       {
         path: '/myFinancing/contractSign/:id',
         name: 'myFinancingContractSign',
         component: () => import('@/views/myFinancing/contractSign'),
         hidden: true,
-        meta: { title: '合同签署' }
+        meta: { title: '合同签署', activeMenu: '/myFinancing' }
       },
       {
         path: '/myFinancing/see/:id',
         name: 'MyFinancingSee',
         component: () => import('@/views/myFinancing/see'),
         hidden: true,
-        meta: { title: '查看' }
+        meta: { title: '查看', activeMenu: '/myFinancing' }
       }
     ]
   }]

src/store/modules/constant.js

@@ -1,10 +1,11 @@
-import { getTypeCode } from '@/api/dictionary.js'
+import { getTypeCode, getRegion } from '@/api/dictionary.js'
 import { strFirstUpper } from '@/utils/index.js'
 import constantData from './constantData.js'
+import { treeChildrenEmpty } from '@/utils'
 
 export default {
   state: {
-    noConstant: [],
+    noConstant: ['regionList'],
     tree: [],
     noCache: [],
     params: [],
@@ -15,7 +16,8 @@ export default {
       amountKind: [],
       invoiceType: [],
       InvoiceStatus: [],
-      ledgerStatus: []
+      ledgerStatus: [],
+      regionList: [] // 省市区
     }
   },
   mutations: {
@@ -79,6 +81,17 @@ export default {
           reject(error)
         })
       })
+    },
+    getRegionList({ commit }, type) {
+      return new Promise((resolve, reject) => {
+        getRegion().then(({ data }) => {
+          commit('SEY_DICT', { type, data: treeChildrenEmpty(data) })
+          resolve()
+        })
+          .catch(error => {
+            reject(error)
+          })
+      })
     }
   }
 }

src/store/modules/settings.js

@@ -29,4 +29,3 @@ export default {
   mutations,
   actions
 }
-

src/store/modules/user.js

@@ -8,7 +8,8 @@ const getDefaultState = () => {
     name: '',
     avatar: '',
     userInfo: {},
-    myTradeType: ''
+    myTradeType: '',
+    mySettlement: ''
   }
 }
 
@@ -32,6 +33,9 @@ const mutations = {
   },
   SET_TRADE_TYPE: (state, info) => {
     state.myTradeType = info
+  },
+  SET_SETTLMENT_TYPE: (state, info) => {
+    state.mySettlement = info
   }
 }
 

src/styles/element/ruleForm.scss

@@ -140,6 +140,10 @@ $orangeColor: #FE7D0B;
   background-color: #fff;
 }
 
+// 级联
+.el-cascader .el-input .el-input__inner:focus, .el-cascader .el-input.is-focus .el-input__inner {
+  border-color: $orangeColor;
+}
 // 下拉框
 .el-select {
   width: 100%;

src/styles/search.scss

@@ -5,13 +5,19 @@
     display: flex;
     justify-content: right;
     flex-wrap: wrap;
+    width: 100%;
     & > div {
-      margin-left: 10px;
+      margin-right: 10px;
       margin-bottom: 10px;
+      flex-grow: 1;
       .el-select, .el-input {
         min-width: 140px;
         width: 100%;
       }
+      &.right-btn {
+        margin-right: 0px;
+        flex-grow: 0;
+      }
     }
   }
 }

src/utils/index.js

@@ -387,3 +387,15 @@ export function formatMoney(amount, decimalPlaces = 2) {
   }
   return amountNum.toLocaleString(undefined, options)
 }
+
+// 处理tree children为空的情况
+export function treeChildrenEmpty(tree, type = 'children') {
+  return tree.map(item => {
+    if (item[type] && item[type].length !== 0) {
+      treeChildrenEmpty(item[type], type)
+    } else {
+      delete item[type]
+    }
+    return item
+  })
+}

src/views/login/index.vue

@@ -10,6 +10,7 @@
         <el-button type="text" @click="loginClick('register')">注册</el-button>
       </div>
     </div>
+
     <div class="login-bg">
       <img src="@/assets/login/bg.jpg" alt="">
     </div>

src/views/myBusiness/components/EnterpriseInspection.vue

@@ -99,7 +99,7 @@ export default {
   data() {
     return {
       formlabel: {
-        company: '公司名称',
+        company: '企业名称',
         key: 'corporateName'
       },
       listData: [],
@@ -113,7 +113,7 @@ export default {
       },
       rules: {
         corporateName: [
-          { required: true, message: `请输入${this.inspectionData?.company?.name || '公司名称'}`, trigger: 'change' }
+          { required: true, message: `请输入${this.inspectionData?.company?.name || '企业名称'}`, trigger: 'change' }
         ]
       }
     }

src/views/myBusiness/supplementaryInfo/components/AddInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="add-info">
-    <cy-info-title type="center">经营地址相关情况</cy-info-title>
+
     <el-form
       ref="ruleForm"
       :model="ruleForm"
@@ -8,10 +8,54 @@
       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>
+        <div v-if="!disabled" class="synchronization">
+          <el-button type="text" @click="synchronizationClick">一键同步</el-button>
+        </div>
+        <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" :disabled="disabled" placeholder="请输入经营地址" />
+        <div class="address">
+          <div v-if="!disabled">
+            <el-cascader
+              v-model="ruleForm.businessAddress"
+              style="width: 100%;"
+              placeholder="请选择省市区"
+              :options="constant.regionList"
+              :props="{ value: 'name', label: 'name' }"
+            />
+          </div>
+          <div>
+            <el-input v-model="ruleForm.businessAddress" disabled placeholder="请输入经营地址" />
+          </div>
+        </div>
       </el-form-item>
-      <el-form-item label="地点定位图" class="one-form-item form-required" prop="locationMap">
+      <el-form-item label="地点定位图" class="form-required" prop="locationMap">
         <cy-upload
           ref="locationMap"
           :upload-params="{
@@ -23,7 +67,7 @@
           placeholder="请上传地点定位图"
         />
       </el-form-item>
-      <el-form-item label="租房合同" class="one-form-item form-required">
+      <el-form-item label="租房合同" class="form-required">
         <cy-upload
           ref="rentalContract"
           :upload-params="{
@@ -35,7 +79,7 @@
           placeholder="请上传租房合同"
         />
       </el-form-item>
-      <el-form-item label="房费缴纳流水" class="one-form-item form-required">
+      <el-form-item label="房租缴纳流水" class="form-required">
         <cy-upload
           ref="waterElectricityFees"
           :upload-params="{
@@ -44,10 +88,10 @@
           :disabled="disabled"
           :file-data="waterElectricityFees"
           :upload-from-orange-status="true"
-          placeholder="请上传房费缴纳流水"
+          placeholder="请上传房租缴纳流水"
         />
       </el-form-item>
-      <el-form-item label="办公环境" class="one-form-item form-required">
+      <el-form-item label="办公环境图" class="form-required">
         <cy-upload
           ref="officeEnvironment"
           :upload-params="{
@@ -56,12 +100,12 @@
           :disabled="disabled"
           :file-data="officeEnvironment"
           :upload-from-orange-status="true"
-          placeholder="请上传办公环境"
+          placeholder="请上传办公环境图"
         />
       </el-form-item>
       <template v-if="!hasGuaranteeEnterprise">
         <cy-info-title type="center">公司相关信息</cy-info-title>
-        <el-form-item label="营业执照" class="one-form-item form-required" prop="businessLicense">
+        <el-form-item label="营业执照" class="form-required" prop="businessLicense">
           <cy-upload
             ref="businessLicense"
             :upload-params="{
@@ -73,7 +117,7 @@
             placeholder="请上传营业执照"
           />
         </el-form-item>
-        <el-form-item label="基本户信息" class="one-form-item form-required" prop="basicAccountInformation">
+        <el-form-item label="基本户信息" class="form-required" prop="basicAccountInformation">
           <cy-upload
             ref="basicAccountInformation"
             :upload-params="{
@@ -85,7 +129,7 @@
             placeholder="请上传基本户信息"
           />
         </el-form-item>
-        <el-form-item label="公司章程和修正案" class="one-form-item form-required" prop="articlesAssociation">
+        <el-form-item label="公司章程和修正案" class="form-required" prop="articlesAssociation">
           <cy-upload
             ref="articlesAssociation"
             :upload-params="{
@@ -97,7 +141,7 @@
             placeholder="请上传公司章程和修正案"
           />
         </el-form-item>
-        <el-form-item label="结案证明或判决书" class="one-form-item" prop="judgment">
+        <el-form-item label="结案证明或判决书" prop="judgment">
           <cy-upload
             ref="judgment"
             :upload-params="{
@@ -111,36 +155,7 @@
           />
         </el-form-item>
       </template>
-      <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>
-        <div v-if="!disabled" class="synchronization">
-          <el-button type="text" @click="synchronizationClick">一键同步</el-button>
-        </div>
-        <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>
@@ -148,6 +163,7 @@
 <script>
 import { salesContractManagementGetAuthStatus, salesContractManagementSignType } from '@/api/myTrade/salesContractManagement/salesContractManagement'
 import creditInvestigation from '../mixins/creditInvestigation'
+import { mapGetters } from 'vuex'
 export default {
   mixins: [creditInvestigation],
   props: {
@@ -166,7 +182,6 @@ export default {
   },
   data() {
     return {
-      testVal: '1111',
       tableKey: 0,
       ruleForm: {
         businessAddress: '',
@@ -260,6 +275,13 @@ export default {
         },
         {
           label: '认证状态',
+          headerAlign: 'center',
+          renderHeader: (h, row) => {
+            return <div>
+              <div>认证状态</div>
+              { !this.disabled && <div style='color:#FE7D0B'>(认证后请点击刷新)</div> }
+            </div>
+          },
           showTooltip: true,
           prop: 'authStatus',
           render: (h, row) => {
@@ -276,6 +298,13 @@ export default {
         },
         {
           label: '签署状态',
+          headerAlign: 'center',
+          renderHeader: (h, row) => {
+            return <div>
+              <div>签署状态</div>
+              {!this.disabled && <div style='color:#FE7D0B'>(签署后请点击刷新)</div>}
+            </div>
+          },
           showTooltip: true,
           prop: 'certificateSignStatus',
           render: (h, row) => {
@@ -292,6 +321,9 @@ export default {
       ]
     }
   },
+  computed: {
+    ...mapGetters(['constant'])
+  },
   watch: {
     addInfo: {
       handler(newV) {
@@ -330,6 +362,10 @@ export default {
       deep: true
     }
   },
+
+  created() {
+    this.$store.dispatch('getConstant', ['regionList'])
+  },
   methods: {
     refreshAuthStatus(row) {
       const { fddCustomerId } = row
@@ -407,11 +443,11 @@ export default {
             return
           }
           if (!waterElectricityFees.length) {
-            this.$message.warning('请上传房费缴纳流水')
+            this.$message.warning('请上传房租缴纳流水')
             return
           }
           if (!officeEnvironment.length) {
-            this.$message.warning('请上传办公环境')
+            this.$message.warning('请上传办公环境图')
             return
           }
 
@@ -464,9 +500,24 @@ export default {
     display: flex;
     align-items: center;
   }
+  .sgin-box {
+    justify-content: center;
+  }
   .icon-a-Group779, .icon-a-Group8131 {
     margin-left: 10px;
     font-size: 30px;
   }
+  .address {
+    display: flex;
+    & > div {
+      &:first-child {
+        width: calc(33.5% - 20px);
+        margin-right: 20px;
+      }
+      &:last-child {
+        width: 66.66%;
+      }
+    }
+  }
 }
 </style>

src/views/myBusiness/supplementaryInfo/components/BasicInfo.vue

@@ -6,11 +6,11 @@
       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="企业名称">
+        <el-input v-model="ruleForm.corporateName" disabled placeholder="请输入企业名称" />
       </el-form-item>
 
-      <el-form-item label="统一社会信用代码" class="one-form-item">
+      <el-form-item label="统一社会信用代码">
         <el-input v-model="ruleForm.socialCreditCode" disabled placeholder="请输入统一社会信用代码" />
       </el-form-item>
     </el-form>

src/views/myBusiness/supplementaryInfo/components/FinancialSituation.vue

@@ -12,7 +12,7 @@
       <el-form-item label="纳税申报表" style="width: 100%" class="form-required" prop="taxReturn">
         <template slot="label">
           <span>纳税申报表</span>
-          <span class="slot-name-desc">请上传经由税务网站下载的官方纳税申报表</span>
+          <span class="slot-name-desc">请于电子税务局网站(<span class="url-link" @click="taxBureauWebsiteClick">{{ taxBureauWebsite }}</span>)下载纳税申报表，并上传至此处</span>
         </template>
         <cy-upload
           ref="taxReturn"
@@ -29,7 +29,7 @@
       <cy-info-title>
         <div>
           近两年财务报表
-          <span class="slot-name-desc">请上传经由税务网站下载的官方财务报表</span>
+          <span class="slot-name-desc">请于电子税务局网站(<span class="url-link" @click="taxBureauWebsiteClick">{{ taxBureauWebsite }}</span>)下载财务报表，并上传至此处</span>
         </div>
         <div slot="right">
           <el-button v-if="!disabled" type="primary" @click="optionsClick('add')">新增</el-button>
@@ -78,6 +78,7 @@ export default {
     return {
       taxReturn: [],
       accountingreport: [],
+      taxBureauWebsite: '',
       ruleForm: {
       },
       rules: {
@@ -136,7 +137,8 @@ export default {
               uploadParams={{ fileType: 'enterprise_financial_statements' }}
               disabled={this.disabled}
               fileData={row.fileStorage}
-              defaultDesc='请上传附件'
+              defaultDesc='请上传上年度以及上个月的制式纳税申报表、报表(格式为:pdf)'
+              file-type='pdf'
             />
           }
         },
@@ -155,9 +157,10 @@ export default {
     financialInfo: {
       handler(newV) {
         if (newV && Object.keys(newV).length) {
-          const { taxReturn, corporateFinances, accountingreport } = newV
+          const { taxReturn, corporateFinances, accountingreport, taxBureauWebsite } = newV
           this.taxReturn = taxReturn
           this.accountingreport = accountingreport
+          this.taxBureauWebsite = taxBureauWebsite
           this.tableData = corporateFinances.map(item => {
             item.fileStorage = [item.fileStorage]
             return item
@@ -182,6 +185,9 @@ export default {
         this.tableData.splice(index, 1)
       }
     },
+    taxBureauWebsiteClick() {
+      window.open(this.taxBureauWebsite)
+    },
     getParams(type) {
       const taxReturn = this.$refs.taxReturn.getFileLists
       const corporateFinances = this.tableData.map((item, index) => {
@@ -257,6 +263,10 @@ export default {
 
 <style lang="scss" scoped>
 .financial-situation {
-
+  .slot-name-desc {
+    .url-link {
+      cursor: pointer;
+    }
+  }
 }
 </style>

src/views/myBusiness/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,36 @@
       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>
+        <div v-if="!disabled" class="synchronization">
+          <el-button type="text" @click="synchronizationClick">一键同步</el-button>
+        </div>
+        <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" :disabled="disabled" placeholder="请输入经营地址" />
       </el-form-item>
@@ -36,7 +66,7 @@
           placeholder="请上传租房合同"
         />
       </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="{
@@ -45,10 +75,10 @@
           :disabled="disabled"
           :file-data="waterElectricityFees"
           :upload-from-orange-status="true"
-          placeholder="请上传房费缴纳流水"
+          placeholder="请上传房租缴纳流水"
         />
       </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="{
@@ -57,7 +87,7 @@
           :disabled="disabled"
           :file-data="officeEnvironment"
           :upload-from-orange-status="true"
-          placeholder="请上传办公环境"
+          placeholder="请上传办公环境图"
         />
       </el-form-item>
       <cy-info-title type="center">公司相关信息</cy-info-title>
@@ -109,35 +139,7 @@
           placeholder="请上传结案证明或判决书"
         />
       </el-form-item>
-      <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>
-        <div v-if="!disabled" class="synchronization">
-          <el-button type="text" @click="synchronizationClick">一键同步</el-button>
-        </div>
-        <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>
@@ -388,11 +390,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/myFinancing/applyFinancing/index.vue

@@ -136,6 +136,7 @@
 <script>
 import { getProjectInfo, getFinishProCon, getApplicantInfo, chooseToAcceptTheGoods, generateReceivable, applySubmit, getDetailsInfo } from '@/api/myFinancing'
 import { validMail } from '@/utils/validate'
+import { deduplicateArray } from '@/utils'
 export default {
   name: 'ApplyFinancing',
   props: {
@@ -382,6 +383,15 @@ export default {
         {
           label: '结算状态',
           prop: 'settlementStatus'
+        },
+        {
+          label: '验收数量',
+          prop: 'acceptanceNumTotal'
+        },
+        {
+          label: '结算总价(元)',
+          prop: 'settlementAmountTotal',
+          type: 'num'
         }
       ],
       goodsTableData: [],
@@ -497,10 +507,16 @@ export default {
     },
     goodsSubmit() {
       const multipleList = this.$refs.goodsTable.multipleSelection
+      const list = deduplicateArray(multipleList, 'signConfirm')
+
       if (!multipleList.length) {
         this.$message.warning('请选择已验收的货物')
         return
       }
+      if (list.length < multipleList.length) {
+        this.$message.warning('已签署和未签署验收单不能同时选择')
+        return
+      }
       this.getMultipleList(multipleList)
       this.getReceivable()
       this.$refs.dialog.show = false

src/views/myFinancing/contractSign.vue

@@ -26,7 +26,11 @@
               <div>
                 认证状态: {{ modifyStatus(item.authStatus, 1) }}
               </div>
-              <el-button v-if="!disabled" type="text" icon="iconfont icon-a-Group8131" @click="refreshAuth(item)" />
+              <div v-if="!disabled" class="tips">
+                <span><span>*</span>签署后点击「刷新」按钮”</span>
+                <el-button type="text" icon="iconfont icon-a-Group8131" @click="refreshAuth(item)" />
+              </div>
+
             </div>
           </div>
           <div class="one-link">
@@ -35,7 +39,10 @@
           </div>
           <div v-for=" (citem, cindex) in item.contractElectronicCustomerInfos" :key="cindex" class="one-link">
             <div>签署状态：{{ modifyStatus(citem.signStatus, 2) }}</div>
-            <el-button v-if="!disabled" type="text" icon="iconfont icon-a-Group8131" @click="refreshSign(item, citem)" />
+            <div v-if="!disabled" class="tips">
+              <span><span>*</span>签署后点击「刷新」按钮”</span>
+              <el-button type="text" icon="iconfont icon-a-Group8131" @click="refreshSign(item, citem)" />
+            </div>
           </div>
         </div>
 
@@ -276,6 +283,16 @@ export default {
         align-items: center;
         height: 40px;
       }
+      .tips {
+        display: flex;
+        align-items: center;
+        & > span {
+          color: #b9b9b9;
+          & > span {
+            color: #ff1a1a;
+          }
+        }
+      }
     }
   }
 }

src/views/myFinancing/financingMain.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="financing-main">
     <div class="search">
-      <div />
+      <div class="left" />
       <div class="right">
         <div>
-          <el-input v-model="search.searchNumber" placeholder="请输入业务编号/保理合同编号" style="width: 300px" />
+          <el-input v-model="search.searchNumber" placeholder="请输入业务编号/保理合同编号" />
         </div>
         <div>
-          <el-select v-model="search.statusCode" placeholder="请选择状态" style="width: 200px" clearable>
+          <el-select v-model="search.statusCode" placeholder="请选择状态" clearable>
             <el-option
               v-for="item in constant.projectInitiationStatus"
               :key="item.code"
@@ -17,12 +17,10 @@
           </el-select>
         </div>
         <div>
-          <el-input v-model="search.fastSearch" placeholder="请输入项目名称/主企业名称/核心企业名称" style="width: 300px" />
+          <el-input v-model="search.fastSearch" placeholder="请输入项目名称/主企业名称/核心企业名称" />
         </div>
-        <div>
+        <div class="right-btn">
           <el-button type="primary" @click="featchData('search')">查询</el-button>
-        </div>
-        <div>
           <el-button type="primary" @click="applyFinancingClick">申请融资</el-button>
         </div>
       </div>

src/views/mySettlement/divideAccountsManage/index.vue

@@ -4,7 +4,7 @@
       <div class="left" />
       <div class="right">
         <div>
-          <el-input v-model="search.businessNo" style="width: 250px" placeholder="请输入业务编号" clearable />
+          <el-input v-model="search.businessNo" placeholder="请输入业务编号" clearable />
         </div>
         <div>
           <el-select v-model="search.status" placeholder="请选择状态" clearable>
@@ -17,9 +17,9 @@
           </el-select>
         </div>
         <div>
-          <el-input v-model="search.customerName" style="width: 300px" placeholder="请输入项目名称/主企业名称/核心企业名称" clearable />
+          <el-input v-model="search.customerName" placeholder="请输入项目名称/主企业名称/核心企业名称" clearable />
         </div>
-        <div class="leftBtn">
+        <div class="right-btn">
           <el-button type="primary" @click="fetchData('search')">查询</el-button>
         </div>
       </div>

src/views/mySettlement/invoicesManagement/index.vue

@@ -4,7 +4,7 @@
       <div class="left" />
       <div class="right">
         <div>
-          <el-input v-model="search.businessNo" style="width: 250px" placeholder="请输入业务编号" clearable />
+          <el-input v-model="search.businessNo" placeholder="请输入业务编号" clearable />
         </div>
         <div>
           <el-select v-model="search.status" placeholder="请选择状态" clearable>
@@ -17,9 +17,9 @@
           </el-select>
         </div>
         <div>
-          <el-input v-model="search.fastSearch" style="width: 300px" placeholder="请输入项目名称/主企业名称/核心企业名称" clearable />
+          <el-input v-model="search.fastSearch" placeholder="请输入项目名称/主企业名称/核心企业名称" clearable />
         </div>
-        <div class="leftBtn">
+        <div class="right-btn">
           <el-button type="primary" @click="fetchData('search')">查询</el-button>
           <el-button type="primary" icon="el-icon-plus" @click="modifyClick('create')">申请开票</el-button>
         </div>

src/views/mySettlement/tradeMain.vue

@@ -53,12 +53,12 @@ export default {
   },
   created() {
     // const { type } = this.$route.query
-    this.type = this.$store.state.user.myTradeType || 'InvoicesManagement'
+    this.type = this.$store.state.user.mySettlement || 'InvoicesManagement'
   },
   methods: {
     handlerOptions(name) {
       this.type = name
-      this.$store.commit('user/SET_TRADE_TYPE', name)
+      this.$store.commit('user/SET_SETTLMENT_TYPE', name)
     }
   }
 }