1

src/pages/financial/salesCommission.vue

@@ -41,7 +41,7 @@
     <div class="page-body salesCommission">
         <div class="page-search row items-center">
             <div class="col row wrap q-mr-lg q-col-gutter-md">
-              <!-- <div style="margin-right: 20px;" v-if='iscMaker==true'>
+              <div style="margin-right: 20px;" v-if='iscMaker==true'>
                 <div class="block">
                   <span style="margin-right: 5px;">校区</span>
                   <el-select v-model="msg.SchoolId" filterable @change="handleCurrentChanges(1)">
@@ -49,7 +49,7 @@
                     <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'></el-option>
                   </el-select>
                 </div>
-              </div> -->
+              </div>
               <div  v-if='isgenerate==true'>
                 <div class="block" style="display:flex">
                   <span style="margin-right: 5px;">选择月份</span>
@@ -310,22 +310,19 @@
         },
         tishi(Money,Id){
           let that = this
-                this.$q.dialog({
-                  title: "销售制单",
-                  message: "你正在进行所有校区一起制单操作？",
-                  persistent: true,
-                  cancel: {
-                    label: "取消",
-                    flat: true
-                  },
-                  ok: {
-                    label: "确认",
-                    flat: true,
-                    focus: true
-                  }
-                }).onOk(() => {
-                  this.getcomSendEmployeeList(Id)
-                });
+          this.$confirm('你正在进行所有校区一起制单操作？', '销售制单', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.getcomSendEmployeeList(Id)
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消'
+            });          
+          });
+         
         },
         getcomSendEmployeeList(Id){//获取可发放提成的用户
           getSellCommissionSendEmployeeList({PeriodId:Id}).then(res => {
@@ -360,20 +357,11 @@
             })
             return
           }
-          this.$q.dialog({
-            title: "设置用户状态",
-            message: "确认后无法更改用户制单状态，如果需修改请联系管理员",
-            persistent: true,
-            cancel: {
-              label: "取消",
-              flat: true
-            },
-            ok: {
-              label: "确认",
-              flat: true,
-              focus: true
-            }
-          }).onOk(() => {
+          this.$confirm('确认后无法更改用户制单状态，如果需修改请联系管理员', '设置用户状态', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             let EmpIds = '';
             let data = []
             this.multipleSelection.forEach(x=>{
@@ -386,7 +374,13 @@
             }).catch(() => {
 
             })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消'
+            });          
           });
+        
         }