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

src/views/capitalManage/customerDisburseInfo/components/ApprovalContent.vue

@@ -13,12 +13,12 @@
         label="审批意见："
         style="width: 100%;"
         class="textarea-content"
-        prop="approvalComment"
+        prop="approvalComments"
         :rules="[
           { required: ruleForm.approvalConclusion === 'back' || ruleForm.approvalConclusion === 'veto', message: '请输入审批意见', trigger: 'blur' }
         ]"
       >
-        <el-input v-model="ruleForm.approvalComment" :disabled="disabled" type="textarea" style="width: 100%;" rows="3" clearable></el-input>
+        <el-input v-model="ruleForm.approvalComments" :disabled="disabled" type="textarea" style="width: 100%;" rows="3" clearable></el-input>
       </el-form-item>
     </el-form>
   </div>
@@ -43,7 +43,7 @@ export default {
       key: 0,
       ruleForm: {
         approvalConclusion: '',
-        approvalComment: ''
+        approvalComments: ''
       },
       rules: {
         approvalConclusion: [
@@ -56,9 +56,9 @@ export default {
     detailsInfo: {
       handler(newV) {
         if (newV && Object.keys(newV).length) {
-          const { approvalConclusion, approvalComment } = JSON.parse(JSON.stringify(newV))
+          const { approvalConclusion, approvalComments } = JSON.parse(JSON.stringify(newV))
           this.ruleForm.approvalConclusion = approvalConclusion
-          this.ruleForm.approvalComment = approvalComment
+          this.ruleForm.approvalComments = approvalComments
         }
       },
       immediate: true,

src/views/capitalManage/customerDisburseInfo/components/ContractContent.vue

@@ -2,18 +2,17 @@
   <div class="contract-content">
     <el-form class="rule-form" label-width="150px" label-position="left">
       <cy-info-title>合同清单</cy-info-title>
-      <div :key="'downstreamDetailList' + index + 5" class="form-upload-box">
-        <div class="form-upload-name form-required" style="width: 150px;">
-          上传附件：
-        </div>
-        <cy-upload
-          ref="contractCheckListFileList"
-          :file-data="deatailsInfo.contractCheckListFileList"
-          :upload-params="uploadParams"
-          :disabled="disabled"
-          :upload-from-status="true"
-        >
-        </cy-upload>
+      <div :key="'downstreamDetailList' + index + 5" style="width: 100%;">
+        <el-form-item label="上传附件" class="form-required" style="width: 100%;">
+          <cy-upload
+            ref="contractCheckListFileList"
+            :file-data="deatailsInfo.contractCheckListFileList"
+            :upload-params="uploadParams"
+            :disabled="disabled"
+            :upload-from-orange-status="true"
+          >
+          </cy-upload>
+        </el-form-item>
       </div>
     </el-form>
   </div>

src/views/capitalManage/customerDisburseInfo/components/EditContent.vue

@@ -2,16 +2,16 @@
   <div class="customer-edit-content">
     <el-form ref="ruleForm" :model="detailsInfo" label-position="top" label-width="120px" class="rule-form-orange">
       <cy-info-title>基础信息</cy-info-title>
-      <el-form-item label="客户名称：">
+      <el-form-item label="客户名称">
         <el-input v-model="detailsInfo.customerName" placeholder="请输入客户名称" disabled />
       </el-form-item>
-      <el-form-item label="放款金额：">
-        <cy-amount-input v-model="detailsInfo.loanAmountTotal" placeholder="请输入放款金额" :is-unit="true" :unit-name="detailsInfo.currencyCode" disabled></cy-amount-input>
+      <el-form-item label="放款金额">
+        <cy-amount-input v-model="detailsInfo.loanAmountTotal" placeholder="请输入放款金额" :is-unit="detailsInfo.currencyCode ? true : false" :unit-name="detailsInfo.currencyCode" disabled></cy-amount-input>
       </el-form-item>
-      <el-form-item label="放款日期：">
+      <el-form-item label="放款日期">
         <el-input v-model="getLoanDateList" placeholder="请输入放款日期" disabled />
       </el-form-item>
-      <el-form-item label="到期日：">
+      <el-form-item label="到期日">
         <el-input v-model="detailsInfo.expireDate" placeholder="请输入到期日" disabled />
       </el-form-item>
       <cy-info-title v-if="detailsInfo.upstreamShow">上游-底层合同</cy-info-title>
@@ -19,66 +19,64 @@
         <template v-for="(item, index) in detailsInfo.upstreamDetailList">
           <el-form-item
             :key="'upstreamDetailList' + index + 1"
-            label="合同编号："
+            label="合同编号"
           >
             <el-input v-model="item.upstreamContractNo" placeholder="请输入合同编号" disabled></el-input>
           </el-form-item>
           <el-form-item
             :key="'upstreamDetailList' + index + 2"
-            label="合同金额："
+            label="合同金额"
           >
             <cy-amount-input v-model="item.upstreamContractAmount" placeholder="请输入合同金额" :is-unit="true" unit-name="CNY" disabled></cy-amount-input>
           </el-form-item>
           <el-form-item
             :key="'upstreamDetailList' + index + 3"
-            label="合同账期："
+            label="合同账期"
           >
             <el-input v-model="item.upstreamContractPaymentDays" placeholder="请输入合同账期" disabled></el-input>
           </el-form-item>
           <el-form-item
             :key="'upstreamDetailList' +index + 4"
-            label="应收账款金额："
+            label="应收账款金额"
           >
             <cy-amount-input v-model="item.upstreamAccountsReceivableAmount" placeholder="请输入应收账款金额" :is-unit="true" unit-name="CNY" disabled></cy-amount-input>
           </el-form-item>
-          <div :key="'upstreamDetailList' +index + 5" class="form-upload-box">
-            <div class="form-upload-name form-required" style="width: 170px;">
-              采购合同：
-            </div>
-            <cy-upload
-              :ref="'upPurchContractFiles' + index"
-              :disabled="disabled"
-              :upload-params="uploadParams"
-              :file-data="item.upstreamPurchContractFiles"
-              :upload-from-status="true"
-            >
-            </cy-upload>
+
+          <div :key="'upstreamDetailList' +index + 5" style="width: 100%">
+            <el-form-item label="采购合同" class="form-required" style="width: 100%;">
+              <cy-upload
+                :ref="'upPurchContractFiles' + index"
+                :disabled="disabled"
+                :upload-params="uploadParams"
+                :file-data="item.upstreamPurchContractFiles"
+                :upload-from-orange-status="true"
+              >
+              </cy-upload>
+            </el-form-item>
           </div>
-          <div :key="'upstreamDetailList' +index + 6" class="form-upload-box">
-            <div class="form-upload-name form-required" style="width: 170px;">
-              结算单：
-            </div>
-            <cy-upload
-              :ref="`upSettlementFiles${index}`"
-              :disabled="disabled"
-              :upload-params="uploadParams"
-              :file-data="item.upstreamSettlementFiles"
-              :upload-from-status="true"
-            >
-            </cy-upload>
+          <div :key="'upstreamDetailList' +index + 6" style="width: 100%;">
+            <el-form-item label="结算单" class="form-required" style="width: 100%;">
+              <cy-upload
+                :ref="`upSettlementFiles${index}`"
+                :disabled="disabled"
+                :upload-params="uploadParams"
+                :file-data="item.upstreamSettlementFiles"
+                :upload-from-orange-status="true"
+              >
+              </cy-upload>
+            </el-form-item>
           </div>
-          <div :key="'upstreamDetailList' +index + 7" class="form-upload-box" style="margin-bottom: 20px;">
-            <div class="form-upload-name" style="width: 170px;">
-              发票：
-            </div>
-            <cy-upload
-              :ref="`upInvoiceFiles${index}`"
-              :disabled="disabled"
-              :upload-params="uploadParams"
-              :file-data="item.upstreamInvoiceFiles"
-              :upload-from-status="true"
-            >
-            </cy-upload>
+          <div :key="'upstreamDetailList' +index + 7" style="width: 100%; margin-bottom: 20px;">
+            <el-form-item label="发票" class="form-required" style="width: 100%;">
+              <cy-upload
+                :ref="`upInvoiceFiles${index}`"
+                :disabled="disabled"
+                :upload-params="uploadParams"
+                :file-data="item.upstreamInvoiceFiles"
+                :upload-from-orange-status="true"
+              >
+              </cy-upload>
+            </el-form-item>
           </div>
         </template>
       </template>
@@ -87,97 +85,92 @@
       <template v-for="(item, index) in detailsInfo.downstreamDetailList">
         <el-form-item
           :key="'downstreamDetailList' + index + 1"
-          label="合同编号："
+          label="合同编号"
         >
           <el-input v-model="item.downstreamContractNo" placeholder="请输入合同编号" disabled></el-input>
         </el-form-item>
         <el-form-item
           :key="'downstreamDetailList' +index + 2"
-          label="合同金额："
+          label="合同金额"
         >
           <cy-amount-input v-model="item.downstreamContractAmount" placeholder="请输入合同金额" :is-unit="true" unit-name="CNY" disabled></cy-amount-input>
         </el-form-item>
         <el-form-item
           :key="'downstreamDetailList' +index + 3"
-          label="合同账期："
+          label="合同账期"
         >
           <el-input v-model="item.downstreamContractPaymentDays" placeholder="请输入合同账期" disabled></el-input>
         </el-form-item>
         <el-form-item
           :key="'downstreamDetailList' +index + 4"
-          label="应收账款金额："
+          label="应收账款金额"
         >
           <cy-amount-input v-model="item.downstreamAccountsReceivableAmount" placeholder="请输入应收账款金额" :is-unit="true" unit-name="CNY" disabled></cy-amount-input>
         </el-form-item>
-        <div :key="'downstreamDetailList' +index + 5" class="form-upload-box">
-          <div class="form-upload-name form-required" style="width: 170px;">
-            销售合同：
-          </div>
-          <cy-upload
-            :ref="'downSalesContractFiles' + index"
-            :disabled="disabled"
-            :upload-params="uploadParams"
-            :file-data="item.downstreamSalesContractFiles"
-            :upload-from-status="true"
-          >
-          </cy-upload>
+        <div :key="'downstreamDetailList' +index + 5" style="width: 100%;">
+          <el-form-item label="销售合同" class="form-required" style="width: 100%;">
+            <cy-upload
+              :ref="'downSalesContractFiles' + index"
+              :disabled="disabled"
+              :upload-params="uploadParams"
+              :file-data="item.downstreamSalesContractFiles"
+              :upload-from-orange-status="true"
+            >
+            </cy-upload>
+          </el-form-item>
         </div>
-        <div :key="'downstreamDetailList' +index + 6" class="form-upload-box">
-          <div class="form-upload-name form-required" style="width: 170px;">
-            结算单：
-          </div>
+        <div :key="'downstreamDetailList' +index + 6" style="width: 100%;">
+          <el-form-item label="结算单" class="form-required" style="width: 100%;">
+            <cy-upload
+              :ref="`downSettlementFiles${index}`"
+              :disabled="disabled"
+              :upload-params="uploadParams"
+              :file-data="item.downstreamSettlementFiles"
+              :upload-from-orange-status="true"
+            >
+            </cy-upload>
+          </el-form-item>
+        </div>
+        <div :key="'downstreamDetailList' +index + 7" style="width: 100%; margin-bottom: 20px;">
+          <el-form-item label="发票" class="form-required" style="width: 100%;">
+            <cy-upload
+              :ref="`downInvoiceFiles${index}`"
+              :disabled="disabled"
+              :upload-params="uploadParams"
+              :file-data="item.downstreamInvoiceFiles"
+              :upload-from-orange-status="true"
+            >
+            </cy-upload>
+          </el-form-item>
+        </div>
+      </template>
+
+      <cy-info-title>保理业务合同及附件</cy-info-title>
+      <div style="width: 100%;">
+        <el-form-item label="合同及附件" class="form-required" style="width: 100%;">
           <cy-upload
-            :ref="`downSettlementFiles${index}`"
+            ref="attachmentFiles"
             :disabled="disabled"
             :upload-params="uploadParams"
-            :file-data="item.downstreamSettlementFiles"
-            :upload-from-status="true"
+            :file-data="detailsInfo.attachmentFiles"
+            :upload-from-orange-status="true"
           >
           </cy-upload>
-        </div>
-        <div :key="'downstreamDetailList' +index + 7" class="form-upload-box" style="margin-bottom: 20px;">
-          <div class="form-upload-name" style="width: 170px;">
-            发票：
-          </div>
+        </el-form-item>
+      </div>
+
+      <cy-info-title>其他</cy-info-title>
+      <div style="width: 100%;">
+        <el-form-item label="其他附件" style="width: 100%;">
           <cy-upload
-            :ref="`downInvoiceFiles${index}`"
+            ref="otherFiles"
             :disabled="disabled"
             :upload-params="uploadParams"
-            :file-data="item.downstreamInvoiceFiles"
-            :upload-from-status="true"
+            :file-data="detailsInfo.otherFiles"
+            :upload-from-orange-status="true"
           >
           </cy-upload>
-        </div>
-      </template>
-
-      <cy-info-title>保理业务合同及附件</cy-info-title>
-      <div class="form-upload-box">
-        <div class="form-upload-name form-required" style="width: 170px;">
-          合同及附件：
-        </div>
-        <cy-upload
-          ref="attachmentFiles"
-          :disabled="disabled"
-          :upload-params="uploadParams"
-          :file-data="detailsInfo.attachmentFiles"
-          :upload-from-status="true"
-        >
-        </cy-upload>
-      </div>
-
-      <cy-info-title>保理业务合同及附件</cy-info-title>
-      <div class="form-upload-box">
-        <div class="form-upload-name" style="width: 170px;">
-          其他附件：
-        </div>
-        <cy-upload
-          ref="otherFiles"
-          :disabled="disabled"
-          :upload-params="uploadParams"
-          :file-data="detailsInfo.otherFiles"
-          :upload-from-status="true"
-        >
-        </cy-upload>
+        </el-form-item>
       </div>
     </el-form>
   </div>

src/views/capitalManage/customerDisburseInfo/index.vue

@@ -76,8 +76,8 @@ export default {
       timeAxisParams: {
         businessKey: '',
         businessType: 'FinancialCustomerExpenditure'
-      }
-      // btnPermission: JSON.parse(sessionStorage.getItem('buttons')) || []
+      },
+      btnPermission: JSON.parse(sessionStorage.getItem('buttons')) || []
     }
   },
   computed: {

src/views/capitalManage/customerDisburseInfo/indexTable.js

@@ -176,8 +176,8 @@ export default {
       // }
       return {
         sortTable: true,
-        maxHeight: 'calc(100vh - 360px)',
-        height: 'calc(100vh - 360px)'
+        maxHeight: 'calc(100vh - 406px)',
+        height: 'calc(100vh - 406px)'
       }
     }
   }

src/views/capitalManage/customerInfo/components/ExamineContent.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="customer-conclusion">
     <cy-info-title>审批结论</cy-info-title>
-    <el-form ref="ruleForm" :key="key" :model="ruleForm" :rules="rules" label-width="150px" label-position="top" class="rule-form-orange">
-      <el-form-item label="审批结论：" prop="approvalConclusion">
+    <el-form ref="ruleForm" :key="key" :model="ruleForm" :rules="rules" label-position="top" class="rule-form-orange">
+      <el-form-item label="审批结论" prop="approvalConclusion">
         <el-radio-group v-model="ruleForm.approvalConclusion" :disabled="disabled">
           <el-radio label="pass">通过</el-radio>
           <el-radio label="veto">拒绝</el-radio>
@@ -10,15 +10,15 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        label="审批意见："
+        label="审批意见"
         style="width: 100%;"
         class="textarea-content"
-        prop="approvalComment"
+        prop="approvalComments"
         :rules="[
           { required: ruleForm.approvalConclusion === 'back' || ruleForm.approvalConclusion === 'veto', message: '请输入审批意见', trigger: 'blur' }
         ]"
       >
-        <el-input v-model="ruleForm.approvalComment" :disabled="disabled" type="textarea" style="width: 100%;" rows="3" clearable></el-input>
+        <el-input v-model="ruleForm.approvalComments" :disabled="disabled" type="textarea" style="width: 100%;" rows="3" clearable></el-input>
       </el-form-item>
     </el-form>
   </div>
@@ -43,7 +43,7 @@ export default {
       key: 0,
       ruleForm: {
         approvalConclusion: '',
-        approvalComment: ''
+        approvalComments: ''
       },
       rules: {
         approvalConclusion: [
@@ -56,9 +56,9 @@ export default {
     detailsInfo: {
       handler(newV) {
         if (newV && Object.keys(newV).length) {
-          const { approvalConclusion, approvalComment } = JSON.parse(JSON.stringify(newV))
+          const { approvalConclusion, approvalComments } = JSON.parse(JSON.stringify(newV))
           this.ruleForm.approvalConclusion = approvalConclusion
-          this.ruleForm.approvalComment = approvalComment
+          this.ruleForm.approvalComments = approvalComments
         }
       },
       immediate: true,

src/views/capitalManage/customerInfo/index.vue

@@ -60,8 +60,8 @@ export default {
       timeAxisParams: {
         businessKey: '',
         businessType: 'FinancialCustomer'
-      }
-      // btnPermission: JSON.parse(sessionStorage.getItem('buttons')) || []
+      },
+      btnPermission: JSON.parse(sessionStorage.getItem('buttons')) || []
     }
   },
   computed: {