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

src/api/financialManagement/financialManagement.js

@@ -98,10 +98,18 @@ export function onSubmit(data) {
   })
 }
 
-// 修改获取详情
+// 修改获取详情 -- 获取入账详情
 export function cashFlowGetEntryDetail(params) {
   return request({
     url: '/cashFlow/getEntryDetail/' + params,
     method: 'get'
   })
 }
+
+// 获取出账详情
+export function cashFlowGetExitDetail(params) {
+  return request({
+    url: '/cashFlow/getOutDetail/' + params,
+    method: 'get'
+  })
+}

src/router/moudules/financialManagement.js

@@ -19,6 +19,13 @@ export default {
       component: () => import('@/views/financialManagement/addAccounts'),
       hidden: true,
       meta: { title: '新增出入账' }
+    },
+    {
+      path: '/financialManagement/view/:id',
+      name: 'FinancialManagementView',
+      component: () => import('@/views/financialManagement/addAccounts'),
+      hidden: true,
+      meta: { title: '财务管理查看' }
     }
   ]
 }

src/store/modules/constant.js

@@ -35,6 +35,7 @@ export default {
       salesContractSettleCycleMethod: [], // 结算周期方式
       oaBillPaymentType: [], // 退款管理-付款类型
       principalPaymentMethod: [], // 授信决议 - 本金支付方式
+      projectInitiationStatus: [], // 融资管理 - 业务状态
     }
   },
   mutations: {

src/views/divideAccountsManage/edit.vue

@@ -250,7 +250,7 @@ export default {
           }
         },
         {
-          label: '是否计提',
+          label: '是否计提(履约保证金)',
           prop: 'accrual',
           showTooltip: true,
           width: '80',
@@ -339,7 +339,7 @@ export default {
           }
         },
         {
-          label: '计提金额',
+          label: '履约保证金',
           prop: 'accrualAmount',
           showTooltip: true,
           show: this.oneCalcStatus,

src/views/financialManagement/components/AddAccountsContent.vue

@@ -179,6 +179,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import { getEnterprises, getAttributionOfAccount, getCompanyOwnership, getInstitutionName, getNocapitalBankName, getBankCardNo, getBusinessType, getCpitalBankName, cashFlowGetEntryDetail } from '@/api/financialManagement/financialManagement'
+// cashFlowGetExitDetail
 import { codeChangeName, filterListData } from '@/utils/index'
 export default {
   components: {
@@ -292,7 +293,14 @@ export default {
     this.getAttributionOfAccount()
     this.getCompanyOwnership()
     this.getInstitutionName()
-    this.cashFlowGetEntryDetail()
+
+    // 这里增加一个判断，根据出入帐类型，来查看不同的详情
+    if (this.$route.query && this.$route.query.entryOutType === '1') {
+      this.cashFlowGetEntryDetail()
+    }
+    if (this.$route.query && this.$route.query.entryOutType === '2') {
+      this.getCashFlowGetExitDetail()
+    }
     // const { id } = this.$route.query
     // if (id) {
     // }
@@ -337,6 +345,46 @@ export default {
         })
       }
     },
+    // 获取出账详情
+    getCashFlowGetExitDetail() {
+      // const { id } = this.$route.query
+      // if (id) {
+      //   cashFlowGetExitDetail(id).then(data => {
+      //     const { cashFlowManageBaseVo } = data.data
+      //     this.ruleForm = {
+      //       id: cashFlowManageEntryInfo.id,
+      //       billType: 1,
+      //       companyId: cashFlowManageEntryInfo.companyId,
+      //       attributionOfAccountId: cashFlowManageEntryInfo.accountBelong,
+      //       companyOwnershipId: cashFlowManageEntryInfo.companyBelong,
+      //       refinancingManagementId: cashFlowManageEntryInfo.companyBelong,
+      //       bankCardNo: cashFlowManageEntryInfo.companyBelong,
+      //       bankCardNoId: cashFlowManageEntryInfo.companyBelong,
+      //       type: cashFlowManageEntryInfo.type,
+      //       incomeDate: cashFlowManageEntryInfo.incomeDate,
+      //       incomeAmount: cashFlowManageEntryInfo.incomeAmount,
+      //       invoiceAmount: cashFlowManageEntryInfo.invoiceAmount,
+      //       realAmount: cashFlowManageEntryInfo.realAmount,
+      //       remark: cashFlowManageEntryInfo.remark
+      //     }
+      //     const attributionOfAccountCode = codeChangeName(this.attributionOfAccountList, this.ruleForm.attributionOfAccountId, 'id', 'code')
+      //     if (attributionOfAccountCode === 'capital') {
+      //       this.refinancingManagementChange(this.ruleForm.companyOwnershipId)
+      //       this.ruleForm.businessTypeId = cashFlowManageEntryInfo.businessType
+      //       this.ruleForm.businessNumberId = cashFlowManageEntryInfo.businessTypeNumber
+      //       setTimeout(() => {
+      //         this.businessTypeChange()
+      //         this.ruleForm.bankName = cashFlowManageEntryInfo.bankName
+      //         this.bankChange()
+      //       }, 200)
+      //     } else {
+      //       this.companyOwnershipChange(this.ruleForm.companyOwnershipId)
+      //       this.ruleForm.bankName = cashFlowManageEntryInfo.bankName
+      //       this.bankChange()
+      //     }
+      //   })
+      // }
+    },
     getEnterprises() {
       getEnterprises().then(response => {
         this.corporateNameList = response.data
@@ -457,7 +505,7 @@ export default {
         // 当类型为现金时校验入账金额
         if (type === 'entryType_cash') {
           if (!incomeAmount) {
-            this.$message.warning('请输入账金额据金额')
+            this.$message.warning('请输入账金额')
             return
           }
         }

src/views/financialManagement/index.vue

@@ -126,7 +126,8 @@ export default {
             taskName: row.taskName,
             type,
             id: row.id,
-            msg
+            msg,
+            entryOutType: row.entryOutType
           }
         })
       } else if (row.taskName === '财务审核') {
@@ -134,6 +135,17 @@ export default {
           name: 'InvoicesManagementFinancialReview',
           params: { id: 'children' }
         })
+      } else {
+        // this.$router.push({
+        //   name: 'FinancialManagementView',
+        //   params: { id: 'children' },
+        //   query: {
+        //     taskName: row.taskName,
+        //     type,
+        //     id: row.id,
+        //     entryOutType: row.entryOutType // 出入账类型 1--入账 2--出账
+        //   }
+        // })
       }
     }
   }

src/views/financingManage/index.vue

@@ -20,10 +20,10 @@
                   style="width: 100%"
                 >
                   <el-option
-                    v-for="item in getStatusList"
-                    :key="item.id"
+                    v-for="item in constant.projectInitiationStatus"
+                    :key="item.code"
                     :label="item.name"
-                    :value="item.id"
+                    :value="item.code"
                   >
                   </el-option>
                 </el-select>
@@ -43,6 +43,7 @@
           :columns="columns"
           :data="tableData"
           :count="total"
+          parentComponent="FinancingManage"
         />
       </el-tabs>
     </template>
@@ -57,7 +58,7 @@ import { mapGetters } from 'vuex'
 import { getList, getAllList } from '@/api/financingManage'
 
 export default {
-  name: 'Demo',
+  name: 'FinancingManage',
   data() {
     return {
       total: 0,
@@ -180,9 +181,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters([
-      'name'
-    ]),
+    ...mapGetters(['constant']),
     tablePower() {
       return ({ item, tab, row }) => {
         const { tabPower, rowPower } = item
@@ -199,6 +198,7 @@ export default {
     }
   },
   mounted() {
+    this.$store.dispatch('getConstant', ['projectInitiationStatus'])
     this.fetchData()
   },
   methods: {
@@ -215,8 +215,9 @@ export default {
         ...this.search
       }
       if (this.activeName === 'all') {
-        getAllList(params).then(({ rows }) => {
+        getAllList(params).then(({ rows, records }) => {
           this.tableData = rows
+          this.total = records
         })
       } else {
         getList(params).then(({ rows }) => {

src/views/salesContractManagement/components/SalesContractReviewContent.vue

@@ -40,10 +40,10 @@
           {{ ruleForm.settleCycleMethod == 'salesContractSettleCycleMethod_fixed' ? '天' : '个自然月' }}
         </el-form-item>
         <el-form-item label="付款节点" prop="paymentNode">
-          <el-input v-model="ruleForm.paymentNode" :disabled="disabled" style="width: 100px;" />
+          <el-input v-model="ruleForm.paymentNode" :disabled="disabled" style="width: 180px;" />
         </el-form-item>
         <el-form-item label="付款期限" prop="paymentTerm">
-          <el-input v-model="ruleForm.paymentTerm" :disabled="disabled" style="width: 100px;" />
+          <el-input v-model="ruleForm.paymentTerm" :disabled="disabled" style="width: 210px;" />
         </el-form-item>
         <cy-info-title style="margin: 10px 0">质保金</cy-info-title>
         <el-form-item label="是否有质保金" prop="isRetention">
@@ -53,7 +53,9 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="ruleForm.isRetention" label="质保金比例" prop="retentionPercent" class="two-form-item">
-          <el-input v-model="ruleForm.retentionPercent" class="two-form-item" disabled />
+          <el-input v-model="ruleForm.retentionPercent" class="two-form-item" disabled>
+            <template slot="append">%</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="质保金是否有上限" prop="top">
           <el-radio-group v-model="ruleForm.top" :disabled="disabled">
@@ -61,17 +63,17 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="ruleForm.top" label="质保金上限" prop="retentionLimit" class="two-form-item">
+        <el-form-item v-if="ruleForm.top" label="质保金上限（元）" prop="retentionLimit" class="two-form-item">
           <el-input v-model="ruleForm.retentionLimit" class="two-form-item" :disabled="disabled" />
         </el-form-item>
         <el-form-item label="质保金释放规则" prop="releaseMethod" class="one-form-item">
           <el-input v-model="ruleForm.releaseMethod" class="one-form-item" :disabled="disabled" />
         </el-form-item>
-        <el-form-item label="质保期限" prop="retentionPeriod" class="one-form-item">
+        <el-form-item label="质保期限（天）" prop="retentionPeriod" class="one-form-item">
           <el-input v-model="ruleForm.retentionPeriod" class="one-form-item" :disabled="disabled" />
         </el-form-item>
         <cy-info-title style="margin: 10px 0">履约保证金</cy-info-title>
-        <el-form-item label="履约保证金上限" prop="performanceBondLimit" style="width: 100%">
+        <el-form-item label="履约保证金上限（元）" prop="performanceBondLimit" style="width: 100%">
           <el-input v-model="ruleForm.performanceBondLimit" :disabled="disabled" />
         </el-form-item>
       </template>