优化代码修复elemeUI升级后onConfirm不好使等问题，首页顶部加了版本号

Web/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "core-js": "^3.4.4",
     "echarts": "^4.6.0",
-    "element-ui": "^2.3.6",
+    "element-ui": "~2.15.14",
     "vue": "^2.6.10",
     "vue-class-component": "^7.0.2",
     "vue-clipboard2": "^0.3.1",
@@ -25,7 +25,6 @@
     "@vue/cli-plugin-vuex": "^4.1.0",
     "@vue/cli-service": "^4.1.0",
     "axios": "^0.18.0",
-    "node-sass": "^4.12.0",
     "sass": "~1.32.12",
     "sass-loader": "^8.0.0",
     "typescript": "~3.5.3",

Web/src/App.vue

@@ -10,7 +10,7 @@
                         <img class="logo" src="@/common/images/logo.png">
                         <div class="flex-n fac flex-1">
                             <div class="title textnowrap">{{storeName}}</div>
-                            <div class="textnowrap">刺兔智能酒店管家</div>
+                            <div class="textnowrap">刺兔酒店管家 &nbsp;&nbsp;<span style="color:darkgray">[版本V202511]</span></div>
                         </div>
 
                         <div class="flex-n fac">
@@ -295,4 +295,4 @@
     .el-input--mini .el-input__inner {
         width: 150px;
     }
-</style>
+</style>

Web/src/views/component/books.vue

@@ -17,7 +17,7 @@
                            class="w-220"></order-state>
               <el-popconfirm
                 title="是否取消该预定单？"
-                @onConfirm="cancelOrder"
+                @confirm="cancelOrder"
                 v-if="id&&dataForm.auth&&dataForm.auth.isDelete=='1'"
               >
                 <el-button  slot="reference" class="ml-10" size="medium" type="primary"

Web/src/views/component/books2.vue

@@ -18,7 +18,7 @@
                                          class="w-220"></order-state>
                             <el-popconfirm
                                     title="是否取消该预定单？"
-                                    @onConfirm="cancelOrder"
+                                    @confirm="cancelOrder"
                             >
                                 <el-button slot="reference" class="ml-10" size="medium" type="primary"
                                            v-if="type=='编辑'&&dataForm.auth&&dataForm.auth.isDelete=='1'">取消订单

Web/src/views/financial/Reconciliation.vue

@@ -68,7 +68,7 @@
 
                             <el-popconfirm
                                     title="确定删除宴会类型吗？（删除宴会类型会删除关联数据，若不想移除，请使用停用功能）"
-                                    @onConfirm="delCommission(scope.row.id)"
+                                    @confirm="delCommission(scope.row.id)"
                             >
                                 <el-button  slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>

Web/src/views/financial/ReserveCommission.vue

@@ -207,7 +207,7 @@
                         </el-button>
                             <el-popconfirm
                                     title="是否确定修改提成?"
-                                    @onConfirm="gotoCommission(scope.row.id)"
+                                    @confirm="gotoCommission(scope.row.id)"
                                     v-else
 
                             >

Web/src/views/financial/ReserveConfirm.vue

@@ -120,7 +120,7 @@
 
                             <el-popconfirm
                                     title="是否确定核实？"
-                                    @onConfirm="toComfirm(scope.row.confirmId,scope.row.orderId)"
+                                    @confirm="toComfirm(scope.row.confirmId,scope.row.orderId)"
                             >
                                 <el-button v-if="scope.row.confirmStatus=='0'"  slot="reference" type="primary" class="ele-btn-small">核实</el-button>
                             </el-popconfirm>

Web/src/views/financial/WeddingCommission.vue

@@ -209,7 +209,7 @@
                             </el-button>
                             <el-popconfirm
                                     title="是否确定修改提成?"
-                                    @onConfirm="gotoCommission(scope.row.id,scope.row.weddingOrderId,0)"
+                                    @confirm="gotoCommission(scope.row.id,scope.row.weddingOrderId,0)"
                                     v-else
 
                             >

Web/src/views/financial/WeddingConfirm.vue

@@ -118,7 +118,7 @@
 
                             <el-popconfirm
                                     title="是否确定核实？"
-                                    @onConfirm="toComfirm(scope.row.confirmId,scope.row.weddingId)"
+                                    @confirm="toComfirm(scope.row.confirmId,scope.row.weddingId)"
                             >
                                 <el-button v-if="scope.row.confirmStatus=='0'"  slot="reference" type="primary" class="ele-btn-small">核实</el-button>
                             </el-popconfirm>

Web/src/views/settings/Commission.vue

@@ -75,7 +75,7 @@
 
                             <el-popconfirm
                                     title="确定删除提成规则吗？"
-                                    @onConfirm="delCommission(scope.row.id)"
+                                    @confirm="delCommission(scope.row.id)"
                             >
                                 <el-button  slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>

Web/src/views/settings/Date.vue

@@ -60,7 +60,7 @@
                             <el-button type="primary" class="ele-btn-small" @click="editDate(scope.row.id)">编辑</el-button>
                             <el-popconfirm
                                     :title="'确定删除该重点日期么吗？'"
-                                    @onConfirm="delDate(scope.row.id)"
+                                    @confirm="delDate(scope.row.id)"
                                     class="ml-10"
                             >
                                 <el-button slot="reference" type="primary" class="ele-btn-small">删除</el-button>

Web/src/views/settings/Extra.vue

@@ -84,7 +84,7 @@
                             <el-button type="primary" class="ele-btn-small mr-10" @click="editExtra(scope.row.id)">编辑</el-button>
                             <el-popconfirm
                                     title="确定删除该额外项目吗？"
-                                    @onConfirm="delExtra(scope.row.id)"
+                                    @confirm="delExtra(scope.row.id)"
                             >
                                 <el-button slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>

Web/src/views/settings/Field.vue

@@ -93,7 +93,7 @@
                            <template v-if="scope.row.houseState=='1'">
                                <el-popconfirm
                                title="确定启用场地吗？（启用场地将能正常使用）"
-                               @onConfirm="openField(scope.row.id)"
+                               @confirm="openField(scope.row.id)"
                                >
                                <el-button  slot="reference" type="primary" class="ele-btn-small mr-10">启用</el-button>
                                </el-popconfirm>
@@ -101,7 +101,7 @@
                             <template v-else>
                             <el-popconfirm
                                     title="确定停用场地吗？（停用的场地将不能再被选择）"
-                                    @onConfirm="stopField(scope.row.id)"
+                                    @confirm="stopField(scope.row.id)"
                             >
                             <el-button  slot="reference" type="primary" class="ele-btn-small mr-10">停用</el-button>
                             </el-popconfirm>
@@ -109,7 +109,7 @@
 
                             <el-popconfirm
                                     title="确定删除场地吗？（删除场地会删除关联数据，若不想移除，请使用停用功能）"
-                                    @onConfirm="delField(scope.row.id)"
+                                    @confirm="delField(scope.row.id)"
                             >
                             <el-button  slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>

Web/src/views/settings/Order.vue

@@ -88,7 +88,7 @@
                             <el-button type="primary" class="ele-btn-small mr-10" @click="editFood(scope.row.id)">编辑</el-button>
                             <el-popconfirm
                                     title="确定删除该点餐项目吗？"
-                                    @onConfirm="delFood(scope.row.id)"
+                                    @confirm="delFood(scope.row.id)"
                             >
                             <el-button slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>

Web/src/views/settings/Role.vue

@@ -66,7 +66,7 @@
 
                                 <el-popconfirm
                                     :title="'确定删除该角色吗？'"
-                                    @onConfirm="delRole(scope.row.id)"
+                                    @confirm="delRole(scope.row.id)"
                                     class="ml-10"
                             >
                                 <el-button slot="reference" type="primary" class="ele-btn-small">删除</el-button>

Web/src/views/settings/Setmeal.vue

@@ -87,7 +87,7 @@
                             <el-button type="primary" class="ele-btn-small mr-10" @click="editSetmeal(scope.row.id,scope.row.packageTypeCode)">编辑</el-button>
                             <el-popconfirm
                                     title="确定删除该套餐吗？"
-                                    @onConfirm="delSetmeal(scope.row.id,scope.row.packageTypeCode)"
+                                    @confirm="delSetmeal(scope.row.id,scope.row.packageTypeCode)"
                             >
                             <el-button slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>

Web/src/views/settings/User.vue

@@ -86,7 +86,7 @@
                             </el-button>
                             <el-popconfirm
                                     :title="'确定删除该用户吗？'"
-                                    @onConfirm="delUser(scope.row.id)"
+                                    @confirm="delUser(scope.row.id)"
                                     class="ml-10"
                             >
                                 <el-button slot="reference" type="primary" class="ele-btn-small">删除</el-button>
@@ -288,13 +288,13 @@
             },
             //删除
             delUser(id) {
-                console.log(id)
-                    this.$axios.post('/user/logicDeleteByIds',id).then(res=>{
-                        this.$message.success('删除用户成功！');
-                        this.getDataList();
-                    }).catch(err=>{
-                        this.$message.error(err.msg);
-                    })
+                console.log('刪除',id)
+                this.$axios.post('/user/logicDeleteByIds',id).then(res=>{
+                    this.$message.success('删除用户成功！');
+                    this.getDataList();
+                }).catch(err=>{
+                    this.$message.error(err.msg);
+                })
             },
             //添加提交
             addSubmit(){

Web/src/views/settings/sub/HouseType.vue

@@ -58,7 +58,7 @@
                             <template v-if="scope.row.houseTypeState=='1'">
                                 <el-popconfirm
                                         title="确定启用宴会类型吗？（启用客户来源能正常使用）"
-                                        @onConfirm="manageHouseType(0,scope.row)"
+                                        @confirm="manageHouseType(0,scope.row)"
                                 >
                                     <el-button  slot="reference" type="primary" class="ele-btn-small mr-10">启用</el-button>
                                 </el-popconfirm>
@@ -66,7 +66,7 @@
                             <template v-else>
                                 <el-popconfirm
                                         title="确定停用宴会类型吗？（停用的宴会类型不能再被选择）"
-                                        @onConfirm="manageHouseType(1,scope.row)"
+                                        @confirm="manageHouseType(1,scope.row)"
                                 >
                                     <el-button  slot="reference" type="primary" class="ele-btn-small mr-10">停用</el-button>
                                 </el-popconfirm>
@@ -74,7 +74,7 @@
 
                             <el-popconfirm
                                     title="确定删除宴会类型吗？（删除宴会类型会删除关联数据，若不想移除，请使用停用功能）"
-                                    @onConfirm="delHouseType(scope.row.id)"
+                                    @confirm="delHouseType(scope.row.id)"
                             >
                                 <el-button  slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>

Web/src/views/settings/sub/OrderType.vue

@@ -58,7 +58,7 @@
                             <template v-if="scope.row.orderTypeState=='1'">
                                 <el-popconfirm
                                         title="确定启用预定类型吗？（启用预定类型能正常使用）"
-                                        @onConfirm="manageOrderType(0,scope.row)"
+                                        @confirm="manageOrderType(0,scope.row)"
                                 >
                                     <el-button  slot="reference" type="primary" class="ele-btn-small mr-10">启用</el-button>
                                 </el-popconfirm>
@@ -66,7 +66,7 @@
                             <template v-else>
                                 <el-popconfirm
                                         title="确定停用预定类型吗？（停用的预定类型不能再被选择）"
-                                        @onConfirm="manageOrderType(1,scope.row)"
+                                        @confirm="manageOrderType(1,scope.row)"
                                 >
                                     <el-button  slot="reference" type="primary" class="ele-btn-small mr-10">停用</el-button>
                                 </el-popconfirm>
@@ -74,7 +74,7 @@
 
                             <el-popconfirm
                                     title="确定删除预定类型吗？（删除预定类型会删除关联数据，若不想移除，请使用停用功能）"
-                                    @onConfirm="delOrderType(scope.row.id)"
+                                    @confirm="delOrderType(scope.row.id)"
                             >
                                 <el-button  slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>

Web/src/views/settings/sub/UserFrom.vue

@@ -58,7 +58,7 @@
                             <template v-if="scope.row.customFromState=='1'">
                                 <el-popconfirm
                                         title="确定启用客户来源吗？（启用客户来源能正常使用）"
-                                        @onConfirm="manageUserFrom(0,scope.row)"
+                                        @confirm="manageUserFrom(0,scope.row)"
                                 >
                                     <el-button  slot="reference" type="primary" class="ele-btn-small mr-10">启用</el-button>
                                 </el-popconfirm>
@@ -66,7 +66,7 @@
                             <template v-else>
                                 <el-popconfirm
                                         title="确定停用客户来源吗？（停用的客户来源不能再被选择）"
-                                        @onConfirm="manageUserFrom(1,scope.row)"
+                                        @confirm="manageUserFrom(1,scope.row)"
                                 >
                                     <el-button  slot="reference" type="primary" class="ele-btn-small mr-10">停用</el-button>
                                 </el-popconfirm>
@@ -74,7 +74,7 @@
 
                             <el-popconfirm
                                     title="确定删除客户来源吗？（删除客户来源会删除关联数据，若不想移除，请使用停用功能）"
-                                    @onConfirm="delUserFrom(scope.row.id)"
+                                    @confirm="delUserFrom(scope.row.id)"
                             >
                                 <el-button  slot="reference" type="primary" class="ele-btn-small">删除</el-button>
                             </el-popconfirm>