票务、同业提成

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue

@@ -32,7 +32,7 @@
     <div class="flexOne domesticCommission">
         <div>
             <ul class="opUl">
-                
+
                 <li>
                     <em>选择月份</em>
                     <el-date-picker v-model="Month" value-format="yyyy-MM" type="month" placeholder="选择月">
@@ -161,7 +161,7 @@
               </template>
 			<div slot="footer" class="dialog-footer">
 				<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
-				<button class="normalBtn" type="primary" @click="BillMaking">确定</button>				
+				<button class="normalBtn" type="primary" @click="BillMaking">确定</button>
 			</div>
 		</el-dialog>
     </div>
@@ -220,14 +220,14 @@
                     }else{
                         zong += x.WageMoney;
                     }
-                    
+
                 });
                 this.totalAmount = zong;
             },
             closeChangeMachie(done){//弹出框关闭初始化弹框内表单
 		         done();
 		    },
-            
+
             handleCurrentChange(val) {
                 this.msg.pageIndex = val;
                 this.getList();
@@ -236,7 +236,7 @@
                 let title = ''
                 if(type==1){
                     title = '当期利润差额'
-                    
+
                 }else{
                     title = '期数详情'
                 }
@@ -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(() => {
+
+                          });
                         }
                     }
                 );
@@ -312,8 +344,8 @@
                     this.BillMakingFun()
                 })
                 .catch(() => {});
-                
-                
+
+
             },
             BillMakingFun(){
                 this.crmapipost(
@@ -342,7 +374,7 @@
                         } else {
                             this.Error(res.data.message)
                         }
-                        
+
                     },
                     err => {}
                 )
@@ -388,4 +420,4 @@
 
         }
     }
-</script>
\ No newline at end of file
+</script>

src/components/FinancialModule/TradeCommission/TicketCommission.vue

@@ -34,13 +34,13 @@
             <ul class="opUl">
                 <li>
                     <em>出团公司</em>
-                    <el-select filterable  v-model='msg.OutBranchId' 
+                    <el-select filterable  v-model='msg.OutBranchId'
                     @change='handleCurrentChange(1)' :disabled="disabled">
                     <el-option label="不限" :value="-1" :key="-1"></el-option>
                     <el-option
                     v-for="item in companyList"
-                    :label='item.BName' 
-                    :value='item.Id' 
+                    :label='item.BName'
+                    :value='item.Id'
                     :key='item.Id'
                     ></el-option>
                     </el-select>
@@ -212,27 +212,54 @@
                 }
                 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 {
-                            this.$confirm(res.data.message, "提示", {
-                                confirmButtonText: "确定",
-                                cancelButtonText: "取消",
-                                type: "warning"
-                            })
-                            .then(() => {})
-                            .catch(() => {});
+                          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.apipost(
+                              "sellcommission_SetTYSaleCommissionSend", {
+                                Month: this.Month,
+                                IsForceSend: 1 },
+                              res => {
+                                this.btnLoading = false
+                                if (res.data.resultCode == 1) {
+                                    this.handleCurrentChange(1);
+                                    this.Success('报表生成成功')
+                                }
+                              })
+                            }
+
+                          })
+                          .catch(() => {
+
+                          });
                         }
                     }
                 );
             },
             // 点击制单
             YijianZD(item) {
-                let Money 
+                let Money
                 if(this.msg.OutBranchId>-1){
                     if(item.BranchCommission>0){
                             Money=item.BranchCommission
@@ -240,7 +267,7 @@
                             this.Error("公司提成为0,不能制单!")
                             return;
                         }
-                    
+
                 }else{
                     Money=item.SumPrice
                 }
@@ -267,12 +294,12 @@
                         query.id = 28
                         query.Name = "总部销售提成单"
                     }
-                    
+
                     this.$router.push({
                         path: "/addFinancialDocuments",
                         query
                     });
-                
+
 
             },
             gofinancialdetail(item) {
@@ -289,4 +316,4 @@
 
         }
     }
-</script>
\ No newline at end of file
+</script>