no message

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -531,7 +531,7 @@
         </el-table>
           <div style="padding-bottom:15px">
               <el-pagination background @current-change="handleCurrentChanges"
-              layout="total,prev, pager, next, jumper" :page-size="pageSize" :total='total'>
+              layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
           </el-pagination>
           </div>
       </div>
@@ -1155,20 +1155,37 @@ export default {
             return;
         }
         let ids
+        let Money = 0
         ids = this.multipleSelection.map(x=>{ return x.FrID})
+        this.multipleSelection.forEach(x=>{
+          Money += Number(x.Money*100)
+        })
+        if(Money<=0){
+          this.Error('单据总金额需大于0');
+          return;
+        }
         let orderObj = {
           OtherType: 75,
+          Money: Money/100,
+          isVerifyMoney: true,
           ReFinanceIds: ids.join(','),//单号
           ReFinanceId2: 3,//成本
         }
-        this.$router.push({
-          name: 'ChoiceAddFinancialDocuments',
-          query: {
-            'Type': 2,
-            'blank': 'y',
-            'orderObj': JSON.stringify(orderObj),
-          }
-        });
+        this.$confirm(`总金额：${orderObj.Money},是否继续生成财务单据`, "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+              query: {
+                'Type': 2,
+                'blank': 'y',
+                'orderObj': JSON.stringify(orderObj),
+              }
+            });
+          })
       }
   }
 }

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1432,8 +1432,8 @@
           this.Error(`成本月结数据不能为空！`)
           return
         }
-        // 台湾提成汇率
-        if (this.orderObj && this.orderObj.Rate && this.orderObj.Money) {
+        // 台湾提成汇率 验证总金额是否一致
+        if (this.orderObj && this.orderObj.Money && (this.orderObj.Rate || this.orderObj.isVerifyMoney)) {
           let yballPrice = 0
           this.msg && this.msg.detailList && this.msg.detailList.forEach((item, i) => {
             yballPrice += Number(yballPrice) + Number(item.UnitPrice)