Merge branch 'dev1.0.3' of http://222.90.211.174:3000/suf/factoring-trade-front-end-v2 into dev1.0.3

src/api/financialManagement/financialManagement.js

@@ -44,6 +44,15 @@ export const getCompanyOwnership = (params) => (
   })
 )
 
+// 财务管理新增出入帐--归属公司字典查询
+export const getCompanyOwnershipTemp = (params) => (
+  request({
+    url: '/cashFlow/dict/getByCode',
+    method: 'get',
+    params: params
+  })
+)
+
 // 获取资方公司归属
 export const getInstitutionName = (params) => (
   request({

src/views/creditInfoManage/components/CompanyAdd.vue

@@ -47,6 +47,7 @@
           }"
           :file-data="ruleForm.creditAuth"
           :upload-from-orange-status="true"
+          :limit="1"
           placeholder="请上传征信查询授权书"
         />
       </el-form-item>
@@ -61,6 +62,7 @@
           }"
           :file-data="ruleForm.creditReport"
           :upload-from-orange-status="true"
+          :limit="1"
           placeholder="请上传征信报告"
         />
       </el-form-item>

src/views/creditInfoManage/components/CompanyEdit.vue

@@ -65,6 +65,7 @@
             :upload-from-orange-status="true"
             placeholder="请上传征信查询授权书"
             :disabled="type==='view'"
+            :limit="1"
           />
         </el-form-item>
         <el-form-item label="征信查询日期" prop="searchDate" style="width: 100%;" :rules="[{required: operationShow, trigger: 'change', message: '请选择征信查询日期'}]">
@@ -81,6 +82,7 @@
             :upload-from-orange-status="true"
             placeholder="请上传征信标报告"
             :disabled="type==='view'"
+            :limit="1"
           />
         </el-form-item>
       </template>

src/views/creditInfoManage/components/PersonAdd.vue

@@ -47,6 +47,7 @@
           }"
           :file-data="ruleFormPer.cardPhoto"
           :upload-from-orange-status="true"
+          :limit="1"
           placeholder="请上传证照正面"
         />
       </el-form-item>
@@ -58,6 +59,7 @@
           }"
           :file-data="ruleFormPer.cardRevPhoto"
           :upload-from-orange-status="true"
+          :limit="1"
           placeholder="请上传证照反面"
         />
       </el-form-item>
@@ -71,6 +73,7 @@
             fileType: 'creditReport'
           }"
           :file-data="ruleFormPer.creditReport"
+          :limit="1"
           :upload-from-orange-status="true"
           placeholder="请上传征信报告"
         />

src/views/creditInfoManage/components/PersonEdit.vue

@@ -52,6 +52,7 @@
           :upload-from-orange-status="true"
           placeholder="请上传证照正面"
           :disabled="type==='view'"
+          :limit="1"
         />
       </el-form-item>
       <el-form-item label="证照反面" prop="cardRevPhoto" style="width: 100%">
@@ -64,6 +65,7 @@
           :upload-from-orange-status="true"
           placeholder="请上传证照反面"
           :disabled="type==='view'"
+          :limit="1"
         />
       </el-form-item>
 
@@ -100,6 +102,7 @@
             :upload-from-orange-status="true"
             placeholder="请上传征信报告"
             :disabled="type==='view'"
+            :limit="1"
           />
         </el-form-item>
       </template>

src/views/financialManagement/components/AddAccountsContent.vue

@@ -178,9 +178,9 @@
 </template>
 <script>
 import { mapGetters } from 'vuex'
-import { getEnterprises, getAttributionOfAccount, getCompanyOwnership, getInstitutionName, getNocapitalBankName, getBankCardNo, getBusinessType, getCpitalBankName, cashFlowGetEntryDetail } from '@/api/financialManagement/financialManagement'
+import { getEnterprises, getAttributionOfAccount, getCompanyOwnershipTemp, getInstitutionName, getNocapitalBankName, getBankCardNo, getBusinessType, getCpitalBankName, cashFlowGetEntryDetail } from '@/api/financialManagement/financialManagement'
 // cashFlowGetExitDetail
-import { codeChangeName, filterListData } from '@/utils/index'
+import { codeChangeName } from '@/utils/index'
 export default {
   components: {
     UnifiedEditor: () => import('@/components/UnifiedEditor/index.vue')
@@ -266,9 +266,11 @@ export default {
         const attributionOfAccountCode = codeChangeName(this.attributionOfAccountList, attributionOfAccountId, 'id', 'code')
         let list = []
         if (attributionOfAccountCode === 'longSilver') {
-          list = filterListData(this.companyOwnershipList, ['shang_hai_ao_hong', 'xi_an_ao_hong', 'shan_xi_ka_fubao', 'shen_zhen_chang_yin_bao', 'shang_hai_ke_fubao'])
+          list = this.companyOwnershipList.filter(el => el.value === '1181')
+          // list = filterListData(this.companyOwnershipList, ['shang_hai_ao_hong', 'xi_an_ao_hong', 'shan_xi_ka_fubao', 'shen_zhen_chang_yin_bao', 'shang_hai_ke_fubao'])
         } else if (attributionOfAccountCode === 'noLongSilver') {
-          list = filterListData(this.companyOwnershipList, ['zi_guan', 'factoring', 'investment', 'shen_zhen_chang_yin', 'shang_hai_yin_guo'])
+          // list = filterListData(this.companyOwnershipList, ['zi_guan', 'factoring', 'investment', 'shen_zhen_chang_yin', 'shang_hai_yin_guo'])
+          list = this.companyOwnershipList.filter(el => el.value === '1182')
         }
         return list
       }
@@ -399,7 +401,7 @@ export default {
       })
     },
     getCompanyOwnership() {
-      getCompanyOwnership({ parentCode: 'companyOwnership' }).then(response => {
+      getCompanyOwnershipTemp({ code: 'companyOwnership' }).then(response => {
         this.companyOwnershipList = response.data
       })
     },

src/views/systemManage/orgManage/components/orgInfo.vue

@@ -243,6 +243,10 @@ export default {
       })
     },
     deleteOrg() {
+      if (this.tableData.length > 0) {
+        this.$message.error('该部门下有成员，不能删除')
+        return
+      }
       const data = new FormData()
       data.append('id', this.info.id)
       request({