Merge branch 'bug-fix'

src/views/financialManagement/contractProgress.vue

@@ -510,7 +510,6 @@
         // 转化
         placementForm.placementData.forEach(element => {
           element.amount = parseFloat(element.amount)
-          element.invoice_date = element.invoice_date+'-01'
         });
         let param={
           contract_register_id:contractInfo.form.contract_register_id,
@@ -654,7 +653,7 @@
           <div class="info-box" >
             <div class="info-box-head">合规登记</div>
             <!-- 合同信息 -->
-            <div class="info-row" >
+            <div class="info-row" id="contract-info-container">
               <div class="info-row-title">合同信息</div>
               <div style="margin: 0 5vw;">
                 <el-form :model="contractInfo.form" inline ref="contractInfoForm" label-width="130" :disabled="contractInfo.operationtype!='compliance'"
@@ -853,13 +852,13 @@
                     </el-table-column>
                     <el-table-column label="到款月" width="180" align="center" prop="invoice_date">
                       <template #header>
-                        <span style="color: #FF3400;">*</span>到款月
+                        <span style="color: #FF3400;">*</span>到款日
                       </template>
                       <template #default="{row,$index}">
                         <el-form-item :prop="`placementData.${$index}.invoice_date`" :show-message="false"
                         :rules="{required:true,message:()=>{ ElMessage.error('请选择到款日期')},trigger:'change'}">             
-                          <el-date-picker v-model="row.invoice_date" type="month" style="width: 124px;" :clearable="false"
-                          placeholder="请选择月份" value-format="YYYY-MM" format="YYYY-MM"></el-date-picker>
+                          <el-date-picker v-model="row.invoice_date" style="width: 124px;" :clearable="false"
+                          placeholder="请选择日期" value-format="YYYY-MM-DD" format="YYYY-MM-DD"></el-date-picker>
                         </el-form-item>
                       </template>
                     </el-table-column>
@@ -1103,9 +1102,11 @@
     .el-timeline-item__tail{
       border-left:2px solid #D6DBE2 ;
     }
-    .el-input__wrapper,.el-input{
-      min-width: 286px;
-      width: 15vw;
+    #contract-info-container{
+      .el-input__wrapper,.el-input{
+        min-width: 286px;
+        width: 15vw;
+      }
     }
     #info-invoice-box{
       .el-input__wrapper{

src/views/financialManagement/financialList.vue

@@ -326,7 +326,7 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
         <!-- 到款详情弹窗 -->
         <el-dialog v-model="dialog.refundDetailShow" title="到款详情" width="500px" :close-on-click-modal="false">
           <el-table :data="dialog.refundDetailList" border max-height="600px">
-            <el-table-column label="到款月" prop="invoice_time" align="center"></el-table-column>
+            <el-table-column label="到款日" prop="invoice_time" align="center"></el-table-column>
             <el-table-column label="到款金额（元）" prop="amount" align="center"></el-table-column>
           </el-table>
         </el-dialog>