票务、同业提成

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue

@@ -275,15 +275,47 @@
                 }
                 this.btnLoading = true;
                 this.crmapipost(
-                    "/api/Commission/SetTicketCommission", { Month: this.Month },
+                    "/api/Commission/SetTicketCommission", {
+                      Month: this.Month,
+                      IsForceSend:0
+                    },
                     res => {
                         this.btnLoading = false;
-
                         if (res.data.resultCode == 1) {
                             this.handleCurrentChange(1);
                             this.Success('报表生成成功')
                         } else {
-                            this.Error(res.data.message);
+                          let buttomTitle
+                          if(res.data.message.indexOf('Warning')!=-1){
+                            buttomTitle = '强制发放'
+                          }else{
+                            buttomTitle = '确定'
+                          }
+                          this.$confirm(res.data.message, "提示", {
+                              confirmButtonText: buttomTitle,
+                              cancelButtonText: "取消",
+                              type: "warning"
+                          })
+                          .then(() => {
+                            if(buttomTitle=='强制发放'){
+                              this.btnLoading = true;
+                              this.crmapipost(
+                              "/api/Commission/SetTicketCommission", {
+                                Month: this.Month,
+                                IsForceSend: 1 },
+                              res => {
+                                this.btnLoading = false
+                                if (res.data.resultCode == 1) {
+                                    this.handleCurrentChange(1);
+                                    this.Success('报表生成成功')
+                                }
+                              })
+                            }
+
+                          })
+                          .catch(() => {
+
+                          });
                         }
                     }
                 );

src/components/FinancialModule/TradeCommission/TicketCommission.vue

@@ -212,20 +212,47 @@
                 }
                 this.btnLoading = true;
                 this.apipost(
-                    "sellcommission_SetTYSaleCommissionSend", { Month: this.Month },
+                    "sellcommission_SetTYSaleCommissionSend", {
+                      Month: this.Month,
+                      IsForceSend:0
+                    },
                     res => {
                         this.btnLoading = false;
                         if (res.data.resultCode == 1) {
                             this.handleCurrentChange(1);
                             this.Success('报表生成成功')
                         } else {
+                          let buttomTitle
+                          if(res.data.message.indexOf('Warning')!=-1){
+                            buttomTitle = '强制发放'
+                          }else{
+                            buttomTitle = '确定'
+                          }
                           this.$confirm(res.data.message, "提示", {
-                                confirmButtonText: "确定",
+                              confirmButtonText: buttomTitle,
                               cancelButtonText: "取消",
                               type: "warning"
                           })
-                            .then(() => {})
-                            .catch(() => {});
+                          .then(() => {
+                            if(buttomTitle=='强制发放'){
+                              this.btnLoading = true;
+                              this.apipost(
+                              "sellcommission_SetTYSaleCommissionSend", {
+                                Month: this.Month,
+                                IsForceSend: 1 },
+                              res => {
+                                this.btnLoading = false
+                                if (res.data.resultCode == 1) {
+                                    this.handleCurrentChange(1);
+                                    this.Success('报表生成成功')
+                                }
+                              })
+                            }
+
+                          })
+                          .catch(() => {
+
+                          });
                         }
                     }
                 );