1

src/components/FinancialModule/MonthlyCostStatement/components/selectListData.vue

@@ -129,7 +129,9 @@
           <el-select style="width: 90px;" filterable v-model="financeType" placeholder="请选择">
           <el-option label="收款单" :value="1"></el-option>
           <el-option label="支出单" :value="2"></el-option>
+          <el-option label="预付冲抵单" :value="3"></el-option>
         </el-select>
+        <el-input v-if="financeType==3" style="width: 140px;" v-model="MatchFrId" placeholder="请输入预付款单号"></el-input>
         </div>
       </el-dialog>
     </div>
@@ -142,6 +144,7 @@
       return {
         showDialog: true,
         financeType : 2,
+        MatchFrId:'',
         dataList: [],
         OriginalMoney: 0,//原币合计
         OriginalMoneyThe: 0,//原币合计支
@@ -240,7 +243,7 @@
                 'orderObj': JSON.stringify(orderObj),
               }
           });
-        }else{
+        }else if(this.financeType ==1){
           let orderObj = {
             CostType: this.OriginalMoneyClosed!=0?1863:null,
             CostType2: this.isHandlingChargeThe!=0?1863:null,
@@ -265,6 +268,31 @@
               }
           });
         }
+        else{
+          let orderObj = {
+            CostType: null,
+            CostType2: null,
+            CostType3: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?114:null,//114转账手续费
+            HandlingChargeMoney: this.isHandlingChargeThe!=0?this.HandlingChargeMoneyThe:null,//手续费
+            balanceMoney: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?this.balanceMoney:null,//差额
+            OtherType: 75,
+            Money: this.OriginalMoneyThe!=0?this.OriginalMoneyThe:null,
+            MoneyClosed: this.OriginalMoneyClosed!=0?Number(`-${this.OriginalMoneyClosed}`):null,
+            isVerifyMoney: true,
+            ReFinanceIds: ids.join(','),//单号
+            MatchFrId:this.MatchFrId
+          }
+          this.$emit('close')
+          this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+              query: {
+                'Type': 2,
+                'searchTitle': '分摊',
+                'blank': 'y',
+                'orderObj': JSON.stringify(orderObj),
+              }
+          });
+        }
       },
       close(){
         this.$emit('close')

src/components/FinancialModule/addFinancialDocuments.vue

@@ -2458,7 +2458,7 @@
                   CostTypeId: this.orderObj.CostType,
                   CurrencyId: '',
                   Remark: '',
-                  CostTypeName: '支付月结预提成本或费用',
+                  CostTypeName: this.orderObj.CostType? '支付月结预提成本或费用':'',
                   yTotalPrice: '',
                   yTotalPriceTo: '',
                   bTotalPrice: '',