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

src/api/capitalFinancialManage/index.js

@@ -147,7 +147,7 @@ export function getAdvancePaymentList(data) {
 // 资方垫付信息-查询详情
 export function getAdvancePaymentDetails(params) {
   return request({
-    url: '/financing/from/advancePayment/findBySearch',
+    url: '/financing/from/advancePayment/getDetail',
     method: 'get',
     params
   })

src/views/capitalFinancingManage/advancePayment/index.vue

@@ -6,7 +6,7 @@
         <div />
         <div class="right">
           <div>
-            <el-input v-model="search.fastSearch" placeholder="请输入供应商名称/用户唯一标识/合同编号/借据编号" clearable></el-input>
+            <el-input v-model="search.fastSearch" style="width: 350px;" placeholder="请输入供应商名称/用户唯一标识/合同编号/借据编号" clearable></el-input>
           </div>
           <div>
             <el-input v-model="search.repayNo" placeholder="请输入还款编号" clearable></el-input>
@@ -257,7 +257,7 @@ export default {
       this.loading = false
 
       if (res.success) {
-        this.tableData = res.data
+        this.tableData = res.rows
         this.total = res.records
       }
     },

src/views/capitalFinancingManage/loanMoney/index.vue

@@ -217,23 +217,23 @@ export default {
       }
     },
     tablePower() {
-      return true
-      // return ({ item, row }) => {
-      //   const { rowPower } = item
-      //   if (rowPower) {
-      //     // entryOutType 出入帐类型 1--入账 2--出账 出账只存在查看按钮
-      //     if (rowPower.includes(row.cashStatus) || row.entryOutType === '2') {
-      //       return false
-      //     }
-      //     // 入账且状态为已分配不展示编辑按钮
-      //     if (row.entryOutType === '1' && row.cashStatus !== '1') {
-      //       return false
-      //     }
-      //     return true
-      //   } else {
-      //     return true
-      //   }
-      // }
+      return ({ item, row }) => {
+        return true
+        const { rowPower } = item
+        if (rowPower) {
+          // entryOutType 出入帐类型 1--入账 2--出账 出账只存在查看按钮
+          if (rowPower.includes(row.cashStatus) || row.entryOutType === '2') {
+            return false
+          }
+          // 入账且状态为已分配不展示编辑按钮
+          if (row.entryOutType === '1' && row.cashStatus !== '1') {
+            return false
+          }
+          return true
+        } else {
+          return true
+        }
+      }
     }
   },
   mounted() {

src/views/financingManage/components/ApplyFinancing.vue

@@ -95,7 +95,7 @@
           <el-radio :label="false">否</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item  
+      <el-form-item
         label="保理申请人银行名称"
         prop="applicantDesignatedBankName"
         :rules="[