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

public/UEditor/ueditor.all.min.js

@@ -8024,9 +8024,10 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
                 serverUrl = imageUrl.replace(/^(.*[\/]).+([\.].+)$/, '$1controller$2');
             }
             if (actionName == 'uploadimage' || actionName == 'uploadscrawl' || actionName == 'listfile' || actionName =='uploadfile') {
-                const url = serverUrl;
-                const domain = url.split('/').slice(0, 3).join('/');
-                return domain + '/fileStorage/imgUpload';
+                // const url = serverUrl;
+                // console.log(this.getOpt('uploadUrl'))
+                // const domain = url.split('/').slice(0, 3).join('/');
+                return this.getOpt('uploadUrl');
             }
             if(serverUrl) {
                 serverUrl = serverUrl + (serverUrl.indexOf('?') == -1 ? '?':'&') + 'action=' + (actionName || '');

src/components/UnifiedEditor/index.vue

@@ -219,10 +219,11 @@ export default {
         imageInsertAlign: 'none',
         imageMaxSize: 20480000,
         // 访问 UEditor 静态资源的根路径，可参考 https://hc199421.gitee.io/vue-ueditor-wrap/#/faq
-        UEDITOR_HOME_URL: '/UEditor/',
+        UEDITOR_HOME_URL: process.env.NODE_ENV === 'development' ? '/UEditor/' : `/factoring-trade/UEditor/`,
         // 服务端接口（这个地址是我为了方便各位体验文件上传功能搭建的临时接口，请勿在生产环境使用！！！）
         // serverUrl: 'https://ueditor.zhenghaochuan.com/cos',
-        serverUrl: `${process.env.VUE_APP_BASE_API}/fileStorage/getUeconfig`
+        serverUrl: process.env.NODE_ENV === 'development' ? `${process.env.VUE_APP_BASE_API}/fileStorage/getUeconfig` : '/tradeV4-backend/fileStorage/getUeconfig',
+        uploadUrl: process.env.NODE_ENV === 'development' ? `${process.env.VUE_APP_BASE_API}/fileStorage/imgUpload` : '/tradeV4-backend/fileStorage/imgUpload'
         // headers: {
         //   Authorization: '',
         //   tenantId: ''
@@ -251,6 +252,9 @@ export default {
       deep: true
     }
   },
+  mounted() {
+    console.log(process.env.NODE_ENV === 'development')
+  },
   methods: {
     getUEContent() {
       return this.ueditor

src/components/Upload/index.vue

@@ -472,9 +472,9 @@ export default {
 </script>
 
 <style lang="scss">
-.cy-upload-content .el-upload-list  {
-  margin-top: -42px;
-}
+// .cy-upload-content .el-upload-list  {
+//   margin-top: -42px;
+// }
 
 .cy-upload {
   width: 100%;

src/router/moudules/refundManage.js

@@ -9,7 +9,7 @@ export default {
   children: [
     {
       path: '/refundManage/index',
-      name: 'FinancingManage',
+      name: 'FefundManage',
       component: () => import('@/views/refundManage/index'),
       meta: { title: '退款管理', breadcrumb: false }
     },

src/utils/index.js

@@ -244,8 +244,8 @@ export function exportFile(res, name) {
   var newName = ''
   var filename = res.headers
   filename = filename['content-disposition']
-  filename = filename.split(';')[1].split('filename=')[1].split('.')
-  newName = decodeURI(filename[0]) + '.' + filename[1]
+  filename = filename.split(';')[1].split('filename=')[1]
+  newName = decodeURI(filename)
   link.setAttribute(
     'download',
     name || newName

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

@@ -414,7 +414,7 @@ export default {
           postData.projectCoreEnterpriseNewsList = projectOwnerNewsList
         }
 
-        if (submitType === 'submit') {
+        if (submitType === 'submit' || submitType === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(postData)

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

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

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

@@ -204,7 +204,7 @@ export default {
         projectCoreEnterpriseFiles
       }
       return new Promise((resolve, reject) => {
-        if (submitType === 'submit') {
+        if (submitType === 'submit' || submitType === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(projectCoreEnterprise)

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

@@ -130,9 +130,10 @@ export default {
               let errorStr = ''
               if (res.data.errors.length) {
                 res.data.errors.map(item => {
-                  errorStr += item
-                })
-                this.$message.warning({ message: errorStr, 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/Cooperation.vue

@@ -99,7 +99,7 @@ export default {
     // 提交参数
     passData(type) {
       return new Promise((resolve, reject) => {
-        if (type === 'submit') {
+        if (type === 'submit' || type === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(this.ruleForm)

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

@@ -355,7 +355,7 @@ export default {
       delete params.biddingFiles
       delete params.departmentFiles
       return new Promise((resolve, reject) => {
-        if (type === 'submit') {
+        if (type === 'submit' || type === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (this.ruleForm.projectType === 'c_project_type_1') {
               if (!biddingFile.length) {

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

@@ -453,7 +453,7 @@ export default {
           })
           postData.projectOwnerNewsList = projectOwnerNewsList
         }
-        if (type === 'submit') {
+        if (type === 'submit' || type === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(postData)

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

@@ -133,7 +133,7 @@ export default {
               defaultDesc='请上传附件'
             />
           }
-        },
+        },   
         {
           label: '征信报告',
           prop: 'inDate',

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

@@ -104,19 +104,19 @@ export default {
         this.$message.warning('请选择经营范围是否达标')
         return
       }
-      if (mapFilesCompliance === undefined || !mapFilesCompliance) {
+      if (mapFilesCompliance === undefined) {
         this.$message.warning('请选择地点定位图是否达标')
         return
-      }
-      if (rentalFilesCompliance === undefined || !rentalFilesCompliance) {
+      }  
+      if (rentalFilesCompliance === undefined) {
         this.$message.warning('请选择租房合同是否达标')
         return
       }
-      if (waterFilesCompliance === undefined || !waterFilesCompliance) {
+      if (waterFilesCompliance === undefined) {
         this.$message.warning('请选择房费缴纳流水是否达标')
         return
       }
-      if (officeFilesCompliance === undefined || !officeFilesCompliance) {
+      if (officeFilesCompliance === undefined) {
         this.$message.warning('请选择办公环境是否达标')
         return
       }

src/views/financialManagement/addAccounts.vue

@@ -7,10 +7,10 @@
     </div> -->
     <div slot="bottom">
       <div class="tempalte-content" style="min-height: auto; padding: 0px 20px ">
-        <!-- 入账 -->
-        <add-accounts-content v-if="settleType === '1'" ref="addAccountsContent" :disabled="disabled" />
         <!-- 出账 -->
         <edit-exit-account v-if="settleType === '2'" ref="exitAccountsContent" :disabled="disabled"></edit-exit-account>
+        <!-- 入账 -->
+        <add-accounts-content v-else ref="addAccountsContent" :disabled="disabled" />
         <div v-if="!disabled" 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>
@@ -45,12 +45,7 @@ export default {
   },
   methods: {
     onSubmit() {
-      if (this.settleType === '1') {
-        this.submitEntryFinance()
-      }
-      // if (this.settleType === '2') {
-      //   this.submitExitFinance()
-      // }
+      this.submitEntryFinance()
     },
     // 提交入账
     submitEntryFinance() {

src/views/financialManagement/components/EditExitAccount.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="add-accounts-content">
-    <el-form ref="ruleForm" :key="key" :model="ruleForm" :rules="rules" label-width="150px" label-position="top" class="rule-form-orange">
+    <!-- :rules="rules" -->
+    <el-form ref="ruleForm" :key="key" :model="ruleForm" label-width="150px" label-position="top" class="rule-form-orange">
       <cy-info-title>出账信息</cy-info-title>
       <el-form-item label="核心企业名称" prop="customerName">
         <el-input
           v-model="ruleForm.customerName"
           placeholder="请输入核心企业名称"
-          :disabled="disabled"
+          disabled
         >
         </el-input>
       </el-form-item>
@@ -14,7 +15,7 @@
         <el-input
           v-model="ruleForm.businessName"
           placeholder="请输入业务名称"
-          :disabled="disabled"
+          disabled
         >
         </el-input>
       </el-form-item>
@@ -22,7 +23,7 @@
         <el-input
           v-model="ruleForm.businessNumber"
           placeholder="请输入业务编号"
-          :disabled="disabled"
+          disabled
         >
         </el-input>
       </el-form-item>
@@ -30,7 +31,7 @@
         <el-input
           v-model="ruleForm.supplierName"
           placeholder="请输入供应商名称"
-          :disabled="disabled"
+          disabled
         >
         </el-input>
       </el-form-item>
@@ -38,15 +39,15 @@
         <el-input
           v-model="ruleForm.contractNumber"
           placeholder="请输入采购合同编号"
-          :disabled="disabled"
+          disabled
         >
         </el-input>
       </el-form-item>
-      <el-form-item label="类型" prop="type">
+      <el-form-item label="类型" prop="cashTypeDict.name">
         <el-input
-          v-model="ruleForm.type"
+          v-model="ruleForm.cashTypeDict.name"
           placeholder="请输入采购合同编号"
-          :disabled="disabled"
+          disabled
         >
         </el-input>
       </el-form-item>
@@ -54,7 +55,7 @@
         <el-input
           v-model="ruleForm.amount"
           placeholder="请输入金额"
-          :disabled="disabled"
+          disabled
         >
         </el-input>
       </el-form-item>
@@ -65,32 +66,31 @@
           clearable
           placeholder="请选择日期"
           style="width: 100%"
-          :picker-options="pickerOptions"
           value-format="yyyy-MM-dd"
+          disabled
         >
         </el-date-picker>
       </el-form-item>
       <el-form-item style="width: 100%;">
         <el-table
           :data="exitFinanceData"
-          :span-method="spanMethod"
           :default-expand-all="true"
           @expand-change="entryTableExpandChange"
         >
-          <!-- <el-table-column type="expand">
+          <el-table-column type="expand">
             <template slot-scope="props">
               <template v-if="disabled">
                 <div class="entry-table-expand">
-                  {{ (!props.row.xxs || props.row.xxs == '') ? '无附件' : '' }}
+                  {{ (!props.row.fileText || props.row.fileText == '') ? '无附件' : '' }}
                 </div>
               </template>
-              <template v-else>
+              <!-- <template v-else>
                 <div style="width: 100%">
                   <unified-editor :content.sync="props.row.lifeFeedback" />
                 </div>
-              </template>
+              </template> -->
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column
             label="序号"
             type="index"
@@ -98,70 +98,53 @@
           >
           </el-table-column>
           <el-table-column
-            property="date"
+            prop="loanDate"
             label="此次放款日期"
             width="120"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
           <el-table-column
-            property="date"
+            prop="loanAmount"
             label="此次放款金额"
             width="120"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
           <el-table-column label="打款账户">
-            <el-table-column label="公司归属" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.companyOwnerId" placeholder="请选择归属公司">
-                  <el-option
-                    v-for="item in companyOwnershipCapitalList"
-                    :key="item.id"
-                    :label="item.institutionName"
-                    :value="item.id"
-                  />
-                </el-select>
-              </template>
+            <el-table-column label="公司归属" prop="fromCompanyBelongName" :show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column label="银行名称" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column label="银行卡号" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="银行名称" prop="fromBankName" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="银行卡号" prop="fromBankAccount" :show-overflow-tooltip="true"></el-table-column>
           </el-table-column>
           <el-table-column label="收款账户">
-            <el-table-column label="银行名称" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column label="银行卡号" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="银行名称" prop="toCompanyBelongName" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="银行卡号" prop="toBankName" :show-overflow-tooltip="true"></el-table-column>
           </el-table-column>
           <el-table-column
-            property="date"
+            prop="currExecutor"
             label="当前执行人"
             width="120"
           >
           </el-table-column>
-          <el-table-column label="操作">
+          <!-- <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button type="text" @click="addExitFinanceRow">增加</el-button>
               <el-button v-if="scope.$index !== 0 && exitFinanceData.length >= 2" type="text" @click="delExitFinanceRow(scope.$index, scope.row)">删除</el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </el-form-item>
-      <el-form-item label="备注" style="width: 100%">
-        <el-input
-          v-model="ruleForm.remark"
-          placeholder="请输入备注"
-        />
-      </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex'
-import { getEnterprises, getAttributionOfAccount, getCompanyOwnership, getInstitutionName, getNocapitalBankName, getBankCardNo, getBusinessType, getCpitalBankName, cashFlowGetExitDetail } from '@/api/financialManagement/financialManagement'
-import { codeChangeName, filterListData } from '@/utils/index'
+import { cashFlowGetExitDetail } from '@/api/financialManagement/financialManagement'
 export default {
-  components: {
-    UnifiedEditor: () => import('@/components/UnifiedEditor/index.vue')
-  },
+  // components: {
+  //   UnifiedEditor: () => import('@/components/UnifiedEditor/index.vue')
+  // },
   props: {
     disabled: {
       type: Boolean,
@@ -170,11 +153,6 @@ export default {
   },
   data() {
     return {
-      pickerOptions: {
-        disabledDate(time) {
-          return time.getTime() > Date.now()
-        }
-      },
       key: 0,
       ruleForm: {
         id: '',
@@ -185,254 +163,71 @@ export default {
         contractNumber: '',
         amount: '',
         cashDate: '',
-        type: '',
-        remark: ''
-      },
-      rules: {
-        customerName: [
-          { required: true, message: '请输入核心企业名称', trigger: 'change' }
-        ],
-        businessName: [
-          { required: true, message: '请输入业务名称', trigger: 'change' }
-        ],
-        businessNumber: [
-          { required: true, message: '请输入业务编号', trigger: 'change' }
-        ],
-        supplierName: [
-          { required: true, message: '请输入供应商名称', trigger: 'blur' }
-        ],
-        contractNumber: [
-          { required: true, message: '请输入采购合同编号', trigger: 'blur' }
-        ],
-        amount: [
-          { required: true, message: '请输入金额', trigger: 'blur' }
-        ],
-        type: [
-          { required: true, message: '请选择类型', trigger: 'blur' }
-        ],
-        cashDate: [
-          { required: true, message: '请选择出账日期', trigger: 'blur' }
-        ]
+        cashTypeDict: ''
       },
-      exitFinanceData: [
-        {
-          date: '2024-03-22'
-        }
-      ],
-      companyOwnershipCapitalList: [] // 归属公司列表
+      // rules: {
+      //   customerName: [
+      //     { required: true, message: '请输入核心企业名称', trigger: 'change' }
+      //   ],
+      //   businessName: [
+      //     { required: true, message: '请输入业务名称', trigger: 'change' }
+      //   ],
+      //   businessNumber: [
+      //     { required: true, message: '请输入业务编号', trigger: 'change' }
+      //   ],
+      //   supplierName: [
+      //     { required: true, message: '请输入供应商名称', trigger: 'blur' }
+      //   ],
+      //   contractNumber: [
+      //     { required: true, message: '请输入采购合同编号', trigger: 'blur' }
+      //   ],
+      //   amount: [
+      //     { required: true, message: '请输入金额', trigger: 'blur' }
+      //   ],
+      //   type: [
+      //     { required: true, message: '请选择类型', trigger: 'blur' }
+      //   ],
+      //   cashDate: [
+      //     { required: true, message: '请选择出账日期', trigger: 'blur' }
+      //   ]
+      // },
+      exitFinanceData: []
     }
   },
   computed: {
     ...mapGetters([
       'name',
       'constant'
-    ]),
-    getCompanyOwnershipList() {
-      return (attributionOfAccountId) => {
-        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'])
-        } else if (attributionOfAccountCode === 'noLongSilver') {
-          list = filterListData(this.companyOwnershipList, ['zi_guan', 'factoring', 'investment', 'shen_zhen_chang_yin', 'shang_hai_yin_guo'])
-        }
-        return list
-      }
-    },
-    isCapital() {
-      return (attributionOfAccountId) => {
-        const attributionOfAccountCode = codeChangeName(this.attributionOfAccountList, attributionOfAccountId, 'id', 'code')
-        if (attributionOfAccountCode === 'longSilver') {
-          return false
-        } else if (attributionOfAccountCode === 'noLongSilver') {
-          return false
-        } else if (attributionOfAccountCode === 'capital') {
-          return true
-        } else if (attributionOfAccountCode === 'undefined') {
-          return false
-        }
-      }
-    }
+    ])
   },
   created() {
     this.$store.dispatch('getConstant', ['cashFlowEntryType'])
-    this.getEnterprises()
-    this.getAttributionOfAccount()
-    this.getCompanyOwnership()
-    this.getInstitutionName()
 
     this.getCashFlowGetExitDetail()
   },
   methods: {
-    spanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 10) {
-        console.log(column)
-        return { rowspan: 1, colspan: 10 }
-      }
-    },
-    addExitFinanceRow() {
-      this.exitFinanceData.push({ date: '2024-03-23' })
-    },
-    delExitFinanceRow(index) {
-      this.exitFinanceData.splice(index, 1)
-    },
+    // addExitFinanceRow() {
+    //   this.exitFinanceData.push()
+    // },
+    // delExitFinanceRow(index) {
+    //   this.exitFinanceData.splice(index, 1)
+    // },
     // 获取出账详情
     getCashFlowGetExitDetail() {
       const { id } = this.$route.query
       if (id) {
-        cashFlowGetExitDetail(id).then(data => {
-          console.log(data)
+        cashFlowGetExitDetail(id).then(res => {
+          console.log(res)
+          const fieldArr = ['id', 'customerName', 'businessName', 'businessNumber', 'supplierName', 'platformName', 'cashTypeDict', 'amount', 'contractNumber', 'cashDate']
+          fieldArr.forEach(el => {
+            if (res.data.cashFlowManageBaseVo[el]) {
+              this.ruleForm[el] = res.data.cashFlowManageBaseVo[el]
+            }
+          })
+          this.exitFinanceData = res.data.cashFlowManageBaseVo.cashFlowManageOutInfoList
         })
       }
     },
-    getEnterprises() {
-      getEnterprises().then(response => {
-        this.corporateNameList = response.data
-      })
-    },
-    getAttributionOfAccount() {
-      getAttributionOfAccount({ parentCode: 'attributionOfAccount' }).then(response => {
-        this.attributionOfAccountList = response.data
-      })
-    },
-    getCompanyOwnership() {
-      getCompanyOwnership({ parentCode: 'companyOwnership' }).then(response => {
-        this.companyOwnershipList = response.data
-      })
-    },
-    // 获取归属公司列表
-    getInstitutionName() {
-      getInstitutionName().then(response => {
-        this.companyOwnershipCapitalList = response.data.data
-      })
-    },
-    // 归属公司方法chang
-    refinancingManagementChange(companyOwnership) {
-      const params = {
-        refinancingManagementId: companyOwnership
-      }
-      getBusinessType(params).then(({ data }) => {
-        // this.businessTypeList = data.data
-        console.log('businessTypeList -----------')
-        console.log(data.data)
-      })
-    },
-    attributionOfAccountChange() {
-      this.ruleForm.companyOwnershipId = ''
-      this.ruleForm.refinancingManagementId = ''
-      this.ruleForm.bankName = ''
-      this.ruleForm.bankCardNo = ''
-      this.ruleForm.bankCardNoId = ''
-      this.ruleForm.businessTypeId = ''
-      this.ruleForm.businessNumberId = ''
-    },
-    companyOwnershipChange(companyOwnership) {
-      this.ruleForm.bankName = ''
-      this.ruleForm.bankCardNo = ''
-      this.ruleForm.bankCardNoId = ''
-      this.ruleForm.businessTypeId = ''
-      this.ruleForm.businessNumberId = ''
-      const params = {
-        companyOwnershipId: companyOwnership
-      }
-      getNocapitalBankName(params).then(({ data }) => {
-        this.bankList = data
-        this.nanCapitalDataList = data
-      })
-    },
-    // 获取银行列表
-    getBankList() {
-      getCpitalBankName(params).then(({ data }) => {
-        console.log('getCpitalBankName -------------')
-        console.log(data)
-        this.bankList = data
-      })
-    },
-    bankChange() {
-      this.ruleForm.bankCardNo = ''
-      this.ruleForm.bankCardNoId = ''
-      const { bankName, companyOwnershipId, attributionOfAccountId, refinancingManagementId, businessTypeId } = this.ruleForm
-      const attributionOfAccountCode = codeChangeName(this.attributionOfAccountList, attributionOfAccountId, 'id', 'code')
-      let params = {}
-      if (attributionOfAccountCode === 'capital') {
-        params = {
-          refinancingManagementId,
-          bankName,
-          businessType: businessTypeId
-        }
-      } else {
-        params = {
-          companyOwnershipId,
-          bankName
-        }
-      }
-      getBankCardNo(params).then(response => {
-        this.ruleForm.bankCardNo = response.data[0].bankCardNo
-        this.ruleForm.bankCardNoId = response.data[0].id
-      })
-    },
-    getParams() {
-      return new Promise((resolve, reject) => {
-        const { companyId, attributionOfAccountId, companyOwnershipId, refinancingManagementId, bankCardNoId, businessTypeId, businessNumberId, type, incomeDate, incomeAmount, invoiceAmount, realAmount, remark, bankName, bankCardNo, id } = this.ruleForm
-
-        // 账户归属选择为资方的时候校验公司归属和业务类型
-        if (this.isCapital(attributionOfAccountId)) {
-          if (!refinancingManagementId) {
-            this.$message.warning('请选择公司归属')
-            return
-          }
-          if (!businessTypeId) {
-            this.$message.warning('请选择业务类型')
-            return
-          }
-        }
-        if (!this.isCapital(attributionOfAccountId)) {
-          if (!companyOwnershipId) {
-            this.$message.warning('请选择公司归属')
-            return
-          }
-        }
-        // 当类型为现金时校验入账金额
-        if (type === 'entryType_cash') {
-          if (!incomeAmount) {
-            this.$message.warning('请输入账金额')
-            return
-          }
-        }
-        // 当类型为票据贴现时校验票据金额和实际金额
-        if (type === 'entryType_bills_discounted') {
-          if (!invoiceAmount) {
-            this.$message.warning('请输入票据金额')
-            return
-          }
-          if (!realAmount) {
-            this.$message.warning('请输入实际金额')
-            return
-          }
-        }
-
-        const param = {
-          Loading: true,
-          id,
-          companyId,
-          accountBelong: attributionOfAccountId,
-          companyBelong: companyOwnershipId || refinancingManagementId,
-          bankAccountId: bankCardNoId,
-          businessType: businessTypeId,
-          businessTypeNumber: businessNumberId,
-          type,
-          incomeDate,
-          remark,
-          bankName,
-          bankAccount: bankCardNo
-        }
-        this.$refs.ruleForm.validate((valid) => {
-          if (valid) {
-            resolve(param)
-          }
-        })
-      })
-    },
     entryTableExpandChange() {
       return
     }

src/views/financialManagement/indexTable.js

@@ -160,7 +160,8 @@ export default {
       return ({ item, row }) => {
         const { rowPower } = item
         if (rowPower) {
-          if (rowPower.includes(row.cashStatus)) {
+          // entryOutType 出入帐类型 1--入账 2--出账 出账只存在查看按钮
+          if (rowPower.includes(row.cashStatus) || row.entryOutType === '2') {
             return false
           }
           return true

src/views/financingManage/index.vue

@@ -128,11 +128,14 @@ export default {
         {
           label: '执行人',
           prop: 'executor',
-          showTooltip: true
+          showTooltip: true,
+          render: (h, row) => {
+            return <div>{this.activeName === 'all' ? row.assignee.name : row.executor}</div>
+          }
         },
         {
           label: '状态',
-          prop: 'financingStatus',
+          prop: 'statusStr',
           showTooltip: true
         },
         {

src/views/refundManage/indexTable.js

@@ -92,7 +92,7 @@ export default {
               {
                 msg: '退款申请',
                 icon: 'iconfont icon-xiugai',
-                power: '',
+                power: 'applyRefund',
                 tabPower: ['all'],
                 category: 'edit',
                 rowPower: []
@@ -100,7 +100,7 @@ export default {
               {
                 msg: '查看',
                 icon: 'iconfont icon-Magnifier',
-                power: '',
+                power: 'viewRefundManagement',
                 tabPower: ['all'],
                 // rowPower: ['保证方式确认'],
                 category: 'see'
@@ -110,7 +110,7 @@ export default {
               return (
                 this.tablePower({ item, tab: this.activeName, row }) &&
                 <el-tooltip class='item' effect='dark' content={item.msg} placement='top' >
-                  <span class='table-icon-box'>
+                  <span class='table-icon-box' v-power={item.power}>
                     <i class={item.icon} onClick={() => { this.handlerOperate(item.category, row) }}></i>
                   </span>
                 </el-tooltip>
@@ -201,7 +201,7 @@ export default {
               {
                 msg: '编辑',
                 icon: 'iconfont icon-xiugai',
-                power: '',
+                power: 'applyRefund',
                 tabPower: ['pending'],
                 // rowPower: [''],
                 category: 'edit'
@@ -209,7 +209,7 @@ export default {
               {
                 msg: '查看',
                 icon: 'iconfont icon-Magnifier',
-                power: '',
+                power: 'viewRefundManagement',
                 tabPower: ['all', 'pending'],
                 // rowPower: [''],
                 category: 'see'
@@ -219,7 +219,7 @@ export default {
               return (
                 this.tablePower({ item, tab: this.activeName, row }) &&
                 <el-tooltip class='item' effect='dark' content={item.msg} placement='top' >
-                  <span class='table-icon-box'>
+                  <span class='table-icon-box' v-power={item.power}>
                     <i class={item.icon} onClick={() => { this.handlerOperate(item.category, row) }}></i>
                   </span>
                 </el-tooltip>