开票&到款登记

src/views/financialManagement/contractProgress.vue

@@ -99,29 +99,29 @@
     },
     moneyData:{
       // 开票金额
-      haveInvoiceMoney:'',
-      waitInvoiceMoney:'',
+      haveInvoiceMoney:0,
+      waitInvoiceMoney:0,
       allInvoiceMoney:'',
       // 到款金额
-      havePlacementMoney:'',
-      waitPlacementMoney:'',
-      allPlacementMoney:'',
+      havePlacementMoney:0,
+      waitPlacementMoney:0,
+      allPlacementMoney:0,
       // FICC开票金额
-      haveInvoiceMoneyFICC:'',
-      waitInvoiceMoneyFICC:'',
-      allInvoiceMoneyFICC:'',
+      haveInvoiceMoneyFICC:0,
+      waitInvoiceMoneyFICC:0,
+      allInvoiceMoneyFICC:0,
       // FICC到款金额
-      havePlacementMoneyFICC:'',
-      waitPlacementMoneyFICC:'',
-      allPlacementMoneyFICC:'', 
+      havePlacementMoneyFICC:0,
+      waitPlacementMoneyFICC:0,
+      allPlacementMoneyFICC:0, 
       // 权益开票金额
-      haveInvoiceMoneyQY:'',
-      waitInvoiceMoneyQY:'',
-      allInvoiceMoneyQY:'',
+      haveInvoiceMoneyQY:0,
+      waitInvoiceMoneyQY:0,
+      allInvoiceMoneyQY:0,
       // 权益到款金额
-      havePlacementMoneyQY:'',
-      waitPlacementMoneyQY:'',
-      allPlacementMoneyQY:'',
+      havePlacementMoneyQY:0,
+      waitPlacementMoneyQY:0,
+      allPlacementMoneyQY:0,
     },
 
     // 有效期
@@ -324,16 +324,56 @@
 
 
 // -----------------------------监听
+  // 已开票金额-FICC
+  watch(()=> contractInfo.moneyData.haveInvoiceMoneyFICC ,(newValue)=>{
+    contractInfo.moneyData.waitInvoiceMoneyFICC = contractInfo.moneyData.allInvoiceMoneyFICC-newValue
+    contractInfo.moneyData.waitInvoiceMoneyFICC=Math.round(contractInfo.moneyData.waitInvoiceMoneyFICC*100)/100
+    contractInfo.moneyData.waitInvoiceMoney = 
+    Math.round((contractInfo.moneyData.waitInvoiceMoneyFICC+contractInfo.moneyData.waitInvoiceMoneyQY)*100)/100
+    
+    contractInfo.moneyData.haveInvoiceMoney = 
+    Math.round((contractInfo.moneyData.haveInvoiceMoneyFICC+contractInfo.moneyData.haveInvoiceMoneyQY)*100)/100
+  })
+  // 已开票金额-QY
+  watch(()=> contractInfo.moneyData.haveInvoiceMoneyQY ,(newValue)=>{
+    contractInfo.moneyData.waitInvoiceMoneyQY = contractInfo.moneyData.allInvoiceMoneyQY-newValue
+    contractInfo.moneyData.waitInvoiceMoneyQY=Math.round(contractInfo.moneyData.waitInvoiceMoneyQY*100)/100
+    contractInfo.moneyData.waitInvoiceMoney = 
+    Math.round((contractInfo.moneyData.waitInvoiceMoneyFICC+contractInfo.moneyData.waitInvoiceMoneyQY)*100)/100
+    
+    contractInfo.moneyData.haveInvoiceMoney = 
+    Math.round((contractInfo.moneyData.haveInvoiceMoneyFICC+contractInfo.moneyData.haveInvoiceMoneyQY)*100)/100
+  })
   // 已开票金额
-  watch(()=> contractInfo.moneyData.haveInvoiceMoney ,(newValue)=>{
-    contractInfo.moneyData.waitInvoiceMoney = contractInfo.moneyData.allInvoiceMoney-newValue
-    contractInfo.moneyData.waitInvoiceMoney=Math.round(contractInfo.moneyData.waitInvoiceMoney*100)/100
+  // watch(()=> contractInfo.moneyData.haveInvoiceMoney ,(newValue)=>{
+  //   contractInfo.moneyData.waitInvoiceMoney = contractInfo.moneyData.allInvoiceMoney-newValue
+  //   contractInfo.moneyData.waitInvoiceMoney=Math.round(contractInfo.moneyData.waitInvoiceMoney*100)/100
+  // })
+  // 已到款金额-FICC
+  watch(()=> contractInfo.moneyData.havePlacementMoneyFICC ,(newValue)=>{
+    contractInfo.moneyData.waitPlacementMoneyFICC = contractInfo.moneyData.allPlacementMoneyFICC-newValue
+    contractInfo.moneyData.waitPlacementMoneyFICC=Math.round(contractInfo.moneyData.waitPlacementMoneyFICC*100)/100
+    contractInfo.moneyData.waitPlacementMoney = 
+    Math.round((contractInfo.moneyData.waitPlacementMoneyQY+contractInfo.moneyData.waitPlacementMoneyFICC)*100)/100
+    
+    contractInfo.moneyData.havePlacementMoney = 
+    Math.round((contractInfo.moneyData.havePlacementMoneyFICC+contractInfo.moneyData.havePlacementMoneyQY)*100)/100
   })
-  // 已到款金额
-  watch(()=> contractInfo.moneyData.havePlacementMoney ,(newValue)=>{
-    contractInfo.moneyData.waitPlacementMoney = contractInfo.moneyData.allPlacementMoney-newValue
-    contractInfo.moneyData.waitPlacementMoney=Math.round(contractInfo.moneyData.waitPlacementMoney*100)/100
+  // 已到款金额-QY
+  watch(()=> contractInfo.moneyData.havePlacementMoneyQY ,(newValue)=>{
+    contractInfo.moneyData.waitPlacementMoneyQY = contractInfo.moneyData.allPlacementMoneyQY-newValue
+    contractInfo.moneyData.waitPlacementMoneyQY=Math.round(contractInfo.moneyData.waitPlacementMoneyQY*100)/100
+    contractInfo.moneyData.waitPlacementMoney = 
+    Math.round((contractInfo.moneyData.waitPlacementMoneyQY+contractInfo.moneyData.waitPlacementMoneyFICC)*100)/100
+    
+    contractInfo.moneyData.havePlacementMoney = 
+    Math.round((contractInfo.moneyData.havePlacementMoneyFICC+contractInfo.moneyData.havePlacementMoneyQY)*100)/100
   })
+  // 已到款金额
+  // watch(()=> contractInfo.moneyData.havePlacementMoney ,(newValue)=>{
+  //   contractInfo.moneyData.waitPlacementMoney = contractInfo.moneyData.allPlacementMoney-newValue
+  //   contractInfo.moneyData.waitPlacementMoney=Math.round(contractInfo.moneyData.waitPlacementMoney*100)/100
+  // })
 
   watch(()=>contractInfo.form.new_company,(newVal)=>{
     if(newVal==1){
@@ -652,6 +692,41 @@
       amount:'',invoice_date:'',remark:'',amountDomType:'text',remarkDomType:'text'})
     }
   }
+  // 切换套餐类型
+  const productIdChange=(value,type,row)=>{
+    // 清空销售
+    if(type=='invoice'){
+      row.seller_id=''
+    }
+    if(!row.origin_amount) return
+    if(type=='invoice'){
+      // 开票
+      if(value==1){
+        //切换成FICC套餐类型
+        contractInfo.moneyData.haveInvoiceMoneyFICC += row.origin_amount
+        contractInfo.moneyData.haveInvoiceMoneyQY -= row.origin_amount
+      }else{
+        //切换成QY套餐类型
+        contractInfo.moneyData.haveInvoiceMoneyFICC -= row.origin_amount
+        contractInfo.moneyData.haveInvoiceMoneyQY += row.origin_amount
+      }
+      contractInfo.moneyData.haveInvoiceMoneyFICC = Math.round(contractInfo.moneyData.haveInvoiceMoneyFICC*100)/100
+      contractInfo.moneyData.haveInvoiceMoneyQY = Math.round(contractInfo.moneyData.haveInvoiceMoneyQY*100)/100
+    }else{
+      if(value==1){
+        //切换成FICC套餐类型
+        contractInfo.moneyData.havePlacementMoneyFICC += row.origin_amount
+        contractInfo.moneyData.havePlacementMoneyQY -= row.origin_amount
+      }else{
+        //切换成QY套餐类型
+        contractInfo.moneyData.havePlacementMoneyFICC -= row.origin_amount
+        contractInfo.moneyData.havePlacementMoneyQY += row.origin_amount
+      }
+      contractInfo.moneyData.havePlacementMoneyFICC = Math.round(contractInfo.moneyData.havePlacementMoneyFICC*100)/100
+      contractInfo.moneyData.havePlacementMoneyQY = Math.round(contractInfo.moneyData.havePlacementMoneyQY*100)/100
+    }
+  }
+
   // 表格删除行
   const deleteRow=(type,row,index)=>{
     let tempArr=[]
@@ -688,15 +763,25 @@
           tempArr.splice(index,1)
           let money=0                                           
           tempArr.map(item =>{
-            money+=parseFloat(item.origin_amount) || 0
+            if(item.service_product_id == row.service_product_id){
+              money+=parseFloat(item.origin_amount) || 0
+            }
             // console.log(money);
           })
           // 保留两位小数、防止计算时精度丢失
           money=Math.round(money*100)/100
           if(type=='invoice'){
-            contractInfo.moneyData.haveInvoiceMoney=money
+            if(row.service_product_id==1){
+              contractInfo.moneyData.haveInvoiceMoneyFICC=money
+            }else{
+              contractInfo.moneyData.haveInvoiceMoneyQY=money
+            }
           }else{
-            contractInfo.moneyData.havePlacementMoney=money
+            if(row.service_product_id==1){
+              contractInfo.moneyData.havePlacementMoneyFICC=money
+            }else{
+              contractInfo.moneyData.havePlacementMoneyQY=money
+            }
           }
         }else{
           tempArr.splice(index,1)
@@ -705,7 +790,7 @@
     }
   }
   // 金额改变
-  const moneyChange=(type,value,index)=>{ 
+  const moneyChange=(type,value,index,row)=>{ 
     // console.log(value);
     let numerValue=parseFloat(value)
     let tempArr=[]
@@ -726,20 +811,30 @@
     (value.endsWith('0') && value.indexOf('.')==(value.length-2)))&&numerValue){
       tempArr[index].origin_amount=numerValue
     }
-    console.log(rmbRate.value);
+    // console.log(rmbRate.value);
     tempArr[index].amount=tempArr[index].origin_amount/rmbRate.value
 
     let money=0
     tempArr.map(item =>{
-      money+=Math.round(item.origin_amount*100)/100 || 0
+      if(item.service_product_id == row.service_product_id){
+        money+=Math.round(item.origin_amount*100)/100 || 0
+      }
     })
     // 保留两位小数、防止计算时精度丢失
     money=Math.round(money*100)/100
     
     if(type=='invoice'){
-      contractInfo.moneyData.haveInvoiceMoney=money
+      if(row.service_product_id==1){
+        contractInfo.moneyData.haveInvoiceMoneyFICC=money
+      }else{
+        contractInfo.moneyData.haveInvoiceMoneyQY=money
+      }
     }else{
-      contractInfo.moneyData.havePlacementMoney=money
+      if(row.service_product_id==1){
+        contractInfo.moneyData.havePlacementMoneyFICC=money
+      }else{
+        contractInfo.moneyData.havePlacementMoneyQY=money
+      }
     }
   }
   // 金额格式化，保留两位小数
@@ -1196,12 +1291,48 @@
       placementForm.placementData[0].service_product_id=sellerListType.value == 3?'':sellerListType.value
 
       // 开票
-      contractInfo.moneyData.allInvoiceMoney = contractInfo.moneyData.allPlacementMoney=res.data.contract_amount
-      contractInfo.moneyData.haveInvoiceMoney=res.data.invoiced_amount
-      contractInfo.moneyData.havePlacementMoney=res.data.payment_amount
+      // haveInvoiceMoney:'',
+      // waitInvoiceMoney:'',
+      // allInvoiceMoney:'',
+      // // 到款金额
+      // havePlacementMoney:'',
+      // waitPlacementMoney:'',
+      // allPlacementMoney:'',
+      // // FICC开票金额
+      // haveInvoiceMoneyFICC:'',
+      // waitInvoiceMoneyFICC:'',
+      // allInvoiceMoneyFICC:'',
+      // // FICC到款金额
+      // havePlacementMoneyFICC:'',
+      // waitPlacementMoneyFICC:'',
+      // allPlacementMoneyFICC:'', 
+      // // 权益开票金额
+      // haveInvoiceMoneyQY:'',
+      // waitInvoiceMoneyQY:'',
+      // allInvoiceMoneyQY:'',
+      // // 权益到款金额
+      // havePlacementMoneyQY:'',
+      // waitPlacementMoneyQY:'',
+      // allPlacementMoneyQY:'',
+      // FICC套餐总金额 = FICC套餐剩余开篇金额
+      contractInfo.moneyData.waitInvoiceMoneyFICC=contractInfo.moneyData.waitPlacementMoneyFICC=
+      contractInfo.moneyData.allInvoiceMoneyFICC = contractInfo.moneyData.allPlacementMoneyFICC=
+      res.data.service_amount_list.find(item => item.product_id==1)?.service_amount
+      // 权益套餐总金额 = 权益套餐剩余开篇金额
+      contractInfo.moneyData.waitInvoiceMoneyQY=contractInfo.moneyData.waitPlacementMoneyQY=
+      contractInfo.moneyData.allInvoiceMoneyQY = contractInfo.moneyData.allPlacementMoneyQY=
+      res.data.service_amount_list.find(item => item.product_id==2)?.service_amount
+
       if(res.data.invoice_list.length>0){
         invoiceForm.invoiceData=[]
         res.data.invoice_list.map(item=>{
+          if(item.service_product_id==1){
+            // FICC
+            contractInfo.moneyData.haveInvoiceMoneyFICC+=item.origin_amount
+          }else{
+            // 权益
+            contractInfo.moneyData.haveInvoiceMoneyQY+=item.origin_amount
+          }
           invoiceForm.invoiceData.push({
             invoice_id:item.contract_invoice_id,
             service_product_id:item.service_product_id,
@@ -1232,6 +1363,13 @@
       if(res.data.payment_list.length>0){
         placementForm.placementData=[]
         res.data.payment_list.map(item=>{
+          if(item.service_product_id==1){
+            // FICC
+            contractInfo.moneyData.havePlacementMoneyFICC+=item.origin_amount
+          }else{
+            // 权益
+            contractInfo.moneyData.havePlacementMoneyQY+=item.origin_amount
+          }
           placementForm.placementData.push({
             invoice_id:item.contract_invoice_id,
             service_product_id:item.service_product_id,
@@ -1256,6 +1394,15 @@
           })
         }
       }
+      contractInfo.moneyData.haveInvoiceMoney=
+      contractInfo.moneyData.haveInvoiceMoneyFICC+contractInfo.moneyData.haveInvoiceMoneyQY
+      contractInfo.moneyData.havePlacementMoney=
+      contractInfo.moneyData.havePlacementMoneyFICC+contractInfo.moneyData.havePlacementMoneyQY
+
+      contractInfo.moneyData.waitInvoiceMoney = contractInfo.moneyData.waitPlacementMoney=
+      contractInfo.moneyData.waitInvoiceMoneyFICC+contractInfo.moneyData.waitInvoiceMoneyQY
+      contractInfo.moneyData.allInvoiceMoney = contractInfo.moneyData.allPlacementMoney=
+      contractInfo.moneyData.allInvoiceMoneyFICC+contractInfo.moneyData.allInvoiceMoneyQY
     })
   }else if(supplementary_item.id){
     // 拿到预登记详情信息
@@ -1494,7 +1641,7 @@
                           <div class="invoice-payment-money-multiple-head" @click="isIandPExpand.haveInvoice=!isIandPExpand.haveInvoice">
                             <span style="margin-right: 20px;">已开票金额</span>
                             <span>
-                              <span class="invoice-payment-money">{{moneyFormatter(500)}}</span>
+                              <span class="invoice-payment-money">{{moneyFormatter(contractInfo.moneyData?.haveInvoiceMoney)}}</span>
                             （{{ contractInfo.currencyUnit }}）
                             </span>
                             <el-icon size="16px">
@@ -1505,11 +1652,11 @@
                           <div class="invoice-payment-money-multiple-body">
                             <div style="margin-bottom: 16px;">
                               <span style="margin-right: 20px;">FICC套餐</span>
-                              <span class="invoice-payment-money">{{ moneyFormatter(200) }}</span>（{{ contractInfo.currencyUnit }}）
+                              <span class="invoice-payment-money">{{ moneyFormatter(contractInfo.moneyData?.haveInvoiceMoneyFICC) }}</span>（{{ contractInfo.currencyUnit }}）
                             </div>
                             <div>
                               <span style="margin-right: 20px;">权益套餐</span>
-                              <span class="invoice-payment-money">{{ moneyFormatter(300) }}</span>（{{ contractInfo.currencyUnit }}）
+                              <span class="invoice-payment-money">{{ moneyFormatter(contractInfo.moneyData?.haveInvoiceMoneyQY) }}</span>（{{ contractInfo.currencyUnit }}）
                             </div>
                           </div>
                         </div>
@@ -1523,7 +1670,7 @@
                           <div class="invoice-payment-money-multiple-head" @click="isIandPExpand.waitInvoice=!isIandPExpand.waitInvoice">
                             <span style="margin-right: 20px;">剩余开票金额</span>
                             <span>
-                              <span class="invoice-payment-money">{{moneyFormatter(500)}}</span>
+                              <span class="invoice-payment-money">{{moneyFormatter(contractInfo.moneyData?.waitInvoiceMoney)}}</span>
                             （{{ contractInfo.currencyUnit }}）
                             </span>
                             <el-icon size="16px">
@@ -1534,11 +1681,11 @@
                           <div class="invoice-payment-money-multiple-body">
                             <div style="margin-bottom: 16px;">
                               <span style="margin-right: 20px;">FICC套餐</span>
-                              <span class="invoice-payment-money">{{ moneyFormatter(200) }}</span>（{{ contractInfo.currencyUnit }}）
+                              <span class="invoice-payment-money">{{ moneyFormatter(contractInfo.moneyData?.waitInvoiceMoneyFICC) }}</span>（{{ contractInfo.currencyUnit }}）
                             </div>
                             <div>
                               <span style="margin-right: 20px;">权益套餐</span>
-                              <span class="invoice-payment-money">{{ moneyFormatter(300) }}</span>（{{ contractInfo.currencyUnit }}）
+                              <span class="invoice-payment-money">{{ moneyFormatter(contractInfo.moneyData?.waitInvoiceMoneyQY) }}</span>（{{ contractInfo.currencyUnit }}）
                             </div>
                           </div>
                         </div>
@@ -1564,13 +1711,13 @@
                           <template #default="{row,$index}">
                             <el-form-item :prop="`invoiceData.${$index}.service_product_id`" :show-message="false" v-if="!row.invoice_id"
                             :rules="{required:true,message:()=>{ ElMessage.error('套餐类型不能为空')},trigger:'change'}">
-                              <el-select v-model="row.service_product_id" style="width: 124px;"
+                              <el-select v-model="row.service_product_id" style="width: 124px;" @change="value=> productIdChange(value,'invoice',row)"
                               placeholder="请选择套餐" filterable>
                                 <el-option label="FICC套餐" :value="1"></el-option>
                                 <el-option label="权益套餐" :value="2"></el-option>
                               </el-select>
                             </el-form-item>
-                            <span v-else>{{ row.service_product_id || '--' }}</span>
+                            <span v-else>{{ row.service_product_id?row.service_product_id==1?'FICC套餐':'权益套餐' : '--' }}</span>
                           </template>
                         </el-table-column>
                         <el-table-column label="开票金额" width="160" show-overflow-tooltip  align="center" prop="origin_amount">
@@ -1587,7 +1734,7 @@
                               </label>
                               <el-input v-model.trim="row.origin_amount" :id="'invoice'+$index+'origin_amount'" style="width: 124px;" 
                               v-show="row.amountDomType=='input'" @blur="iandPAmountBlur(row)"
-                                placeholder="请输入金额" @input="(e)=>moneyChange('invoice',e,$index)"></el-input>
+                                placeholder="请输入金额" @input="(e)=>moneyChange('invoice',e,$index,row)"></el-input>
                             </el-form-item>
                             <span  v-else>{{ row.origin_amount.toFixed(2)}}</span>
                           </template>
@@ -1608,7 +1755,7 @@
                               <el-date-picker v-model="row.invoice_date" style="width: 124px;"
                               placeholder="请选择日期" value-format="YYYY-MM-DD" :clearable="false" ></el-date-picker>
                             </el-form-item>
-                            <span v-else>{{ row.invoice_date }}</span>
+                            <span v-show="row.invoice_id">{{ row.invoice_date || '--' }}</span>
                           </template>
                         </el-table-column >
                         <el-table-column label="销售" width="120" align="center" prop="seller_id">
@@ -1687,7 +1834,7 @@
                           <div class="invoice-payment-money-multiple-head" @click="isIandPExpand.havePlacement=!isIandPExpand.havePlacement">
                             <span style="margin-right: 20px;">已到款金额</span>
                             <span>
-                              <span class="invoice-payment-money">{{moneyFormatter(500)}}</span>
+                              <span class="invoice-payment-money">{{moneyFormatter(contractInfo.moneyData.havePlacementMoney)}}</span>
                             （{{ contractInfo.currencyUnit }}）
                             </span>
                             <el-icon size="16px">
@@ -1698,11 +1845,11 @@
                           <div class="invoice-payment-money-multiple-body">
                             <div style="margin-bottom: 16px;">
                               <span style="margin-right: 20px;">FICC套餐</span>
-                              <span class="invoice-payment-money">{{ moneyFormatter(200) }}</span>（{{ contractInfo.currencyUnit }}）
+                              <span class="invoice-payment-money">{{ moneyFormatter(contractInfo.moneyData.havePlacementMoneyFICC) }}</span>（{{ contractInfo.currencyUnit }}）
                             </div>
                             <div>
                               <span style="margin-right: 20px;">权益套餐</span>
-                              <span class="invoice-payment-money">{{ moneyFormatter(300) }}</span>（{{ contractInfo.currencyUnit }}）
+                              <span class="invoice-payment-money">{{ moneyFormatter(contractInfo.moneyData.havePlacementMoneyQY) }}</span>（{{ contractInfo.currencyUnit }}）
                             </div>
                           </div>
                         </div>
@@ -1717,7 +1864,7 @@
                           <div class="invoice-payment-money-multiple-head" @click="isIandPExpand.waitPlacement=!isIandPExpand.waitPlacement">
                             <span style="margin-right: 20px;">剩余到款金额</span>
                             <span>
-                              <span class="invoice-payment-money">{{moneyFormatter(500)}}</span>
+                              <span class="invoice-payment-money">{{moneyFormatter(contractInfo.moneyData.waitPlacementMoney)}}</span>
                             （{{ contractInfo.currencyUnit }}）
                             </span>
                             <el-icon size="16px">
@@ -1728,11 +1875,11 @@
                           <div class="invoice-payment-money-multiple-body">
                             <div style="margin-bottom: 16px;">
                               <span style="margin-right: 20px;">FICC套餐</span>
-                              <span class="invoice-payment-money">{{ moneyFormatter(200) }}</span>（{{ contractInfo.currencyUnit }}）
+                              <span class="invoice-payment-money">{{ moneyFormatter(contractInfo.moneyData.waitPlacementMoneyFICC) }}</span>（{{ contractInfo.currencyUnit }}）
                             </div>
                             <div>
                               <span style="margin-right: 20px;">权益套餐</span>
-                              <span class="invoice-payment-money">{{ moneyFormatter(300) }}</span>（{{ contractInfo.currencyUnit }}）
+                              <span class="invoice-payment-money">{{ moneyFormatter(contractInfo.moneyData.waitPlacementMoneyQY) }}</span>（{{ contractInfo.currencyUnit }}）
                             </div>
                           </div>
                         </div>
@@ -1758,7 +1905,7 @@
                           <template #default="{row,$index}">
                             <el-form-item :prop="`placementData.${$index}.service_product_id`" :show-message="false" v-if="!row.invoice_id"
                             :rules="{required:true,message:()=>{ ElMessage.error('套餐类型不能为空')},trigger:'change'}">
-                              <el-select v-model="row.service_product_id" style="width: 124px;"
+                              <el-select v-model="row.service_product_id" style="width: 124px;" @change="value=> productIdChange(value,'placement',row)"
                               placeholder="请选择套餐" filterable>
                                 <el-option label="FICC套餐" :value="1"></el-option>
                                 <el-option label="权益套餐" :value="2"></el-option>
@@ -1781,7 +1928,7 @@
                               </label>
                               <el-input v-model.trim="row.origin_amount" :id="'placement'+$index+'origin_amount'" 
                               style="width: 124px;" v-show="row.amountDomType=='input'" @blur="iandPAmountBlur(row)"
-                              placeholder="请输入金额" @input="(e)=>moneyChange('placement',e,$index)"></el-input>
+                              placeholder="请输入金额" @input="(e)=>moneyChange('placement',e,$index,row)"></el-input>
                             </el-form-item>
                             <span  v-else>{{ row.origin_amount.toFixed(2)}}</span>
                           </template>
@@ -1802,7 +1949,7 @@
                               <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>
-                            <span v-else>{{ row.invoice_date }}</span>
+                            <span v-show="row.invoice_id">{{ row.invoice_date || '--' }}</span>
                           </template>
                         </el-table-column>
                         <el-table-column label="备注" width="160" align="center" prop="remark" show-overflow-tooltip >