no message

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue

@@ -131,11 +131,6 @@
                     prop="DeptName"
                     label="部门">
                     </el-table-column>
-                    <el-table-column
-                    prop="EmpId"
-                    label="用户Id"
-                    show-overflow-tooltip>
-                </el-table-column>
                     <el-table-column
                     prop="EmName"
                     label="姓名"
@@ -299,6 +294,19 @@
                     data.push(item.EmpId)
                 })
                 this.BillMakingMsg.EmpIds = data.join(',')
+                this.$confirm("是否制单? 制单后无法更改制单状态,如需修改请联系管理员", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                .then(() => {
+                    this.BillMakingFun()
+                })
+                .catch(() => {});
+                
+                
+            },
+            BillMakingFun(){
                 this.crmapipost(
                     '/api/Commission/SetCommissionSendEmployee', this.BillMakingMsg,
                     res => {
@@ -328,7 +336,6 @@
                     },
                     err => {}
                 )
-                
             },
             // 点击制单
             YijianZD(item,type) {

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -94,9 +94,9 @@
           <td>{{item.OrderId}}</td>
           <td>{{item.OrderProfit}}</td>
           <td>{{item.Commission}}</td>
-          <td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
+          <td>{{item.CommissionRate}}%</td>
           <td>{{item.BonusMoney}}</td>
-          <td>{{item.BonusRate?item.BonusRate+'%':'-'}}</td>
+          <td>{{item.BonusRate}}%</td>
           <td>{{item.Month}}</td>
           <td>{{item.Remark?item.Remark:'-'}}</td>
         </tr>
@@ -137,14 +137,17 @@
           disabled: true,
           titleList:[
               {name:'不限',id:'-1'},
-              {name:'引流规则',id:'2'},
-              {name:'销售规则',id:'1'}
+              {name:'引流',id:'2'},
+              {name:'销售',id:'1'}
           ],
 
         }
       },
       mounted() {
         let userInfo = this.getLocalStorage();
+        
+        this.getEmployee() //人员
+        this.GetCommissionPeroidsList()//期数
         let ActionMenuCode = userInfo.ActionMenuCode;
         if (this.$route.query) { //不大于0的话用默认值
           if (this.$route.query.PeriodsId && this.$route.query.PeriodsId > 0) {
@@ -154,9 +157,6 @@
             this.msg.EmpType = this.$route.query.EmpType
           }
         }
-        this.getList();
-        this.getEmployee() //人员
-        this.GetCommissionPeroidsList()//期数
       },
       methods: {
         GetCommissionPeroidsList() { //期数下拉
@@ -183,6 +183,10 @@
             res => {
               if (res.data.resultCode == 1) {
                 this.searchList = res.data.data;
+                if (this.$route.query.EmpId) {
+                  this.msg.EmpId = Number(this.$route.query.EmpId)
+                  this.getList()
+                }
               }
             },
             err => {}

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue

@@ -114,9 +114,9 @@
                     <span class="cursor-p">{{item.WageType!=1?'上季度定档':'新员工比例'}}</span>
                 </td>
                 <td>{{item.Commission}}</td>
-                <td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
+                <td>{{item.CommissionRate}}%</td>
                 <td>{{item.BonusMoney}}</td>
-                <td>{{item.bonusRate?item.bonusRate+'%':'-'}}</td>
+                <td>{{item.BonusRate}}%</td>
                 <td>{{item.Month}}</td>
                 <td>
 
@@ -266,8 +266,8 @@
                 departMentList:[],
                 titleList:[
                     {name:'不限',id:'-1'},
-                    {name:'引流规则',id:'2'},
-                    {name:'销售规则',id:'1'}
+                    {name:'引流',id:'2'},
+                    {name:'销售',id:'1'}
                 ],
             }
         },
@@ -344,7 +344,8 @@
                     path: path,
                     query: {
                         PeriodsId: this.$route.query.PeriodsId,
-                        EmpType:this.msg.EmpType,   
+                        EmpType:this.msg.EmpType,
+                        EmpId: item.EmpId,  
                         blank: 'y',
                         tab: '票务提现详情'
                     }

src/components/FinancialModule/addFinancialDocuments.vue

@@ -693,8 +693,8 @@ export default {
             czmsg:{},
             czmsgState:false,
             maxmoneyTips:false,
-            crmOrderObj:{},
-            commissionObj:{}
+            crmOrderObj:null,
+            commissionObj:null
         }
     },
     methods:{
@@ -927,7 +927,7 @@ export default {
 
               let totalAmount = this.$commonUtils.addCommas(Math.round(this.commissionObj.totalAmount* 100) / 100)
                 if(this.allPriceTo!=totalAmount){
-                    this.Error(`实付金额不能大于小于${totalAmount}！`)
+                    this.Error(`实付金额必须等于${totalAmount}！`)
                     return
                 }