Selaa lähdekoodia

fix: 全局 @onConfirm 改为@confirm、 onOnConfirm 改为onConfirm

Howie 1 vuosi sitten
vanhempi
commit
10ad6eb9ee
100 muutettua tiedostoa jossa 153 lisäystä ja 153 poistoa
  1. 1 1
      src/components/SalesDialog/SalesDialog.vue
  2. 1 1
      src/views/basic_data/dailyWarehouseRent.vue
  3. 1 1
      src/views/basic_data/dealer/dealer_deposit.vue
  4. 1 1
      src/views/basic_data/dealer/dealer_stock.vue
  5. 1 1
      src/views/basic_data/logistics/logistics_list.vue
  6. 1 1
      src/views/basic_data/material/classify_list.vue
  7. 1 1
      src/views/basic_data/material/machine_list.vue
  8. 3 3
      src/views/basic_data/material/modify_list.vue
  9. 2 2
      src/views/basic_data/material/price_list.vue
  10. 4 4
      src/views/basic_data/material/relation_list.vue
  11. 1 1
      src/views/basic_data/numerusClausus.vue
  12. 1 1
      src/views/basic_data/partya/partyaList.vue
  13. 1 1
      src/views/basic_data/priceSalesType.vue
  14. 1 1
      src/views/basic_data/priceType.vue
  15. 1 1
      src/views/basic_data/sectorAllocation.vue
  16. 2 2
      src/views/basic_data/stock/Issue_list.vue
  17. 1 1
      src/views/basic_data/stock/material_list.vue
  18. 1 1
      src/views/basic_data/stock/warehousing_list.vue
  19. 1 1
      src/views/basic_data/taker/taker_car.vue
  20. 1 1
      src/views/basic_data/taker/taker_list.vue
  21. 1 1
      src/views/basic_data/warehouse/warehouse_cost.vue
  22. 1 1
      src/views/basic_data/warehouse/warehouse_site.vue
  23. 1 1
      src/views/deposit_commerce/components/deposit-apply-surrender.vue
  24. 1 1
      src/views/deposit_home/components/deposit-apply-surrender.vue
  25. 1 1
      src/views/deposit_home/components/deposit_replenish.vue
  26. 1 1
      src/views/deposit_home/deposit_list.vue
  27. 2 2
      src/views/deposit_home/refund_list.vue
  28. 1 1
      src/views/engin_deposit/components/deposit-apply-surrender.vue
  29. 1 1
      src/views/finance/components/receivable_list-add.vue
  30. 1 1
      src/views/finance/rebate_form.vue
  31. 1 1
      src/views/finance/receivable_list.vue
  32. 1 1
      src/views/issue.vue
  33. 1 1
      src/views/merchant/create_account.vue
  34. 2 2
      src/views/merchant/merchant_list.vue
  35. 2 2
      src/views/notice.vue
  36. 1 1
      src/views/pset/login_setting.vue
  37. 1 1
      src/views/sales/price/commercial_list.vue
  38. 1 1
      src/views/sales_control/adjust_warehouse.vue
  39. 1 1
      src/views/sales_control/components/WarehouseForm.vue
  40. 1 1
      src/views/sales_control/sales_management/components/customer_sales_form.vue
  41. 1 1
      src/views/sales_control/sales_management/components/return_sales_details.vue
  42. 1 1
      src/views/sales_control/sales_management/components/return_sales_form.vue
  43. 2 2
      src/views/sales_control/sales_management/customer_sales_list.vue
  44. 1 1
      src/views/sales_control/sales_management/return_sales_list.vue
  45. 3 3
      src/views/sales_policy/components/AddPolicy.vue
  46. 3 3
      src/views/sales_policy/components/details.vue
  47. 3 3
      src/views/sales_policy/components/editPolicy.vue
  48. 5 5
      src/views/sales_policy/policy_list.vue
  49. 1 1
      src/views/sales_rebate/salestype_list.vue
  50. 1 1
      src/views/sales_region/sales_line.vue
  51. 1 1
      src/views/sales_region/sales_man.vue
  52. 1 1
      src/views/sales_region/sales_relation.vue
  53. 3 3
      src/views/setting/account.vue
  54. 1 1
      src/views/setting/department.vue
  55. 1 1
      src/views/setting/menu.vue
  56. 3 3
      src/views/setting/other.vue
  57. 1 1
      src/views/setting/role.vue
  58. 1 1
      src/views/stock_control/adjust_warehouse.vue
  59. 1 1
      src/views/stock_control/components/WarehouseForm.vue
  60. 1 1
      src/views/stock_control/sales_management/components/customer_sales_details.vue
  61. 1 1
      src/views/stock_control/sales_management/components/customer_sales_form.vue
  62. 1 1
      src/views/stock_control/sales_management/components/return_sales_details.vue
  63. 1 1
      src/views/stock_control/sales_management/components/return_sales_form.vue
  64. 2 2
      src/views/stock_control/sales_management/customer_sales_list.vue
  65. 1 1
      src/views/stock_control/sales_management/return_sales_list.vue
  66. 1 1
      src/views/supply/adjust/components/adjust_detail.vue
  67. 1 1
      src/views/supply/allot/components/allot_detail.vue
  68. 4 4
      src/views/supply/apply/apply_list.vue
  69. 1 1
      src/views/supply/apply/components/apply_detail.vue
  70. 1 1
      src/views/supply/apply/components/apply_examine.vue
  71. 1 1
      src/views/supply/apply/components/apply_form.vue
  72. 1 1
      src/views/supply/apply/components/apply_return_form.vue
  73. 1 1
      src/views/supply/apply/components/engin_detail.vue
  74. 1 1
      src/views/supply/apply/components/engin_examine.vue
  75. 1 1
      src/views/supply/apply/components/engin_form.vue
  76. 1 1
      src/views/supply/apply/components/engin_return.vue
  77. 1 1
      src/views/supply/apply/components/engin_return_form.vue
  78. 4 4
      src/views/supply/apply/engin_list.vue
  79. 4 4
      src/views/supply/apply/new_apply.vue
  80. 4 4
      src/views/supply/apply/new_engin.vue
  81. 3 3
      src/views/supply/deliver/components/apply_return_form.vue
  82. 1 1
      src/views/supply/deliver/components/commerce_detail.vue
  83. 1 1
      src/views/supply/deliver/components/deliver_detail.vue
  84. 4 4
      src/views/supply/deliver/components/engin_return_form.vue
  85. 1 1
      src/views/supply/deliver/components/home_detail.vue
  86. 2 2
      src/views/supply/direct/components/direct_examine.vue
  87. 1 1
      src/views/supply/direct/components/direct_form.vue
  88. 1 1
      src/views/supply/direct/direct_list.vue
  89. 1 1
      src/views/supply/displace/components/displace_detail.vue
  90. 2 2
      src/views/supply/displace/components/displace_examine.vue
  91. 3 3
      src/views/supply/displace/components/displace_form.vue
  92. 2 2
      src/views/supply/displace/components/displace_return.vue
  93. 3 3
      src/views/supply/displace/displace_list copy.vue
  94. 1 1
      src/views/supply/displace/displace_list.vue
  95. 4 4
      src/views/supply/engin/commerce_list.vue
  96. 1 1
      src/views/supply/engin/components/commerce_examine.vue
  97. 1 1
      src/views/supply/engin/components/commerce_form.vue
  98. 1 1
      src/views/supply/engin/components/commerce_return.vue
  99. 1 1
      src/views/supply/engin/components/engin_examine.vue
  100. 1 1
      src/views/supply/engin/components/engin_form.vue

+ 1 - 1
src/components/SalesDialog/SalesDialog.vue

@@ -321,7 +321,7 @@ export default {
 <!--                <el-popconfirm-->
 <!--                  style="margin-left: 10px"-->
 <!--                  title="删除?"-->
-<!--                  @onConfirm="handleDel(row)"-->
+<!--                  @confirm="handleDel(row)"-->
 <!--                >-->
 <!--                  <el-button slot="reference" type="text" size="mini">提审</el-button>-->
 <!--                </el-popconfirm>-->

+ 1 - 1
src/views/basic_data/dailyWarehouseRent.vue

@@ -138,7 +138,7 @@ export default {
             {this.$checkBtnRole('tichu', this.$route.meta.roles) ? (
               <el-popconfirm
                 title='确定剔除吗?'
-                onOnConfirm={() => {
+                onConfirm={() => {
                   updateOrderFull({ id: row.orderFullCostId }).then(res => {
                     this.$refs.pageRef.refreshList()
 

+ 1 - 1
src/views/basic_data/dealer/dealer_deposit.vue

@@ -119,7 +119,7 @@
                 <el-button type="text" size="mini" @click="logFn(scope.row.id)">记录</el-button>
                 <el-popconfirm
                 class="import-btn"
-                  @onConfirm="deleFn(scope.row.id)"
+                  @confirm="deleFn(scope.row.id)"
                   v-if="$checkBtnRole('del', $route.meta.roles)"
                   title="这是一段内容确定删除吗?"
                 >

+ 1 - 1
src/views/basic_data/dealer/dealer_stock.vue

@@ -285,7 +285,7 @@ export default {
               </el-button>
             ) : null}
             {this.$checkBtnRole('del', this.$route.meta.roles) ? (
-              <el-popconfirm onOnConfirm={() => this.deleFn(row.id)} title="这是一段内容确定删除吗?">
+              <el-popconfirm onConfirm={() => this.deleFn(row.id)} title="这是一段内容确定删除吗?">
                 <el-button style="font-size:12px" type="text" size="mini" slot="reference">
                   删除
                 </el-button>

+ 1 - 1
src/views/basic_data/logistics/logistics_list.vue

@@ -164,7 +164,7 @@ export default {
                 icon="el-icon-info"
                 icon-color="red"
                 title="内容确定删除吗?"
-                onOnConfirm={() => this.hanleDelete(row.id)}
+                onConfirm={() => this.hanleDelete(row.id)}
               >
                 <el-button slot="reference" type="text" size="mini" class="textColor el-popover-left">
                   删除

+ 1 - 1
src/views/basic_data/material/classify_list.vue

@@ -107,7 +107,7 @@
                     icon="el-icon-info"
                     icon-color="red"
                     title="内容确定删除吗?"
-                    @onConfirm="hanleDelete(scope.row.id)"
+                    @confirm="hanleDelete(scope.row.id)"
                   >
                     <el-button
                       slot="reference"

+ 1 - 1
src/views/basic_data/material/machine_list.vue

@@ -253,7 +253,7 @@ export default {
                 icon="el-icon-info"
                 icon-color="red"
                 title="内容确定删除吗?"
-                onOnConfirm={() => this.hanleDeleteAll(row.id)}
+                onConfirm={() => this.hanleDeleteAll(row.id)}
               >
                 <el-button slot="reference" type="text" size="mini" class="textColor el-popover-left">
                   删除

+ 3 - 3
src/views/basic_data/material/modify_list.vue

@@ -270,7 +270,7 @@ export default {
           <div class="operation-btns">
             {row.examineStatus == '保存' ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onConfirm={async () => {
                   this.handleGetPriceSubmit(row.updPriceBillId)
                 }}
                 title="是否确定需要提审该项内容?"
@@ -285,7 +285,7 @@ export default {
 
             {row.examineStatus == '待审核' ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onConfirm={async () => {
                   this.approvalFn(row.updPriceBillId)
                 }}
                 title="是否确定需要审批该项内容?"
@@ -313,7 +313,7 @@ export default {
             )}
             {row.examineStatus == '审核通过' ? (
               <el-popconfirm
-                onOnConfirm={async() => {
+                onConfirm={async() => {
                   productUpdPriceReview({ id: row.updPriceBillId }).then(() => {
                     this.$successMsg('弃审成功')
                     this.$refs.pageRef.refreshList()

+ 2 - 2
src/views/basic_data/material/price_list.vue

@@ -120,7 +120,7 @@ export default {
           <div class="operation-btns">
             {row.isRevoke === '否' ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onConfirm={async () => {
                   this.handleRevoke(row.id)
                 }}
                 title="是否确定需要作废该项内容?"
@@ -135,7 +135,7 @@ export default {
 
             {this.$checkBtnRole('del', this.$route.meta.roles) ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onConfirm={async () => {
                   this.handleDelete(row.id)
                 }}
                 title="是否确定需要删除该项内容?"

+ 4 - 4
src/views/basic_data/material/relation_list.vue

@@ -285,9 +285,9 @@ export default {
                 cancel-button-text="不用了"
                 icon="el-icon-info"
                 icon-color="red"
-                
+
                 title="内容确定删除吗?"
-                onOnConfirm={() => this.hanleDelete(row.id)}
+                onConfirm={() => this.hanleDelete(row.id)}
               >
                 <el-button slot="reference"  size="mini" type="text" class="textColor el-popover-left">
                   删除
@@ -443,12 +443,12 @@ export default {
       this.showDialogForm = false
     },
     hanleDelete(id) {
-    
+
         getProductDel({ ids: id }).then(res => {
           this.$successMsg('删除成功')
           this.$refs.pageRef.refreshList()
         })
-     
+
     },
     handleExport() {
       let screenData = {

+ 1 - 1
src/views/basic_data/numerusClausus.vue

@@ -215,7 +215,7 @@ export default {
             {
               <el-popconfirm
                 title="确定删除吗?"
-                onOnConfirm={() => {
+                onConfirm={() => {
                   delMerchantLoginQuotaLimit([row.id]).then(res => {
                     this.$refs.pageRef.refreshList()
                     this.$successMsg('删除成功')

+ 1 - 1
src/views/basic_data/partya/partyaList.vue

@@ -133,7 +133,7 @@ export default {
             {
               <el-popconfirm
                 title='确定删除吗?'
-                onOnConfirm={() => {
+                onConfirm={() => {
                   delFirstPartyCustomerManagement({ idList: row.id }).then(res => {
                     this.$refs.pageRef.refreshList()
 

+ 1 - 1
src/views/basic_data/priceSalesType.vue

@@ -221,7 +221,7 @@ export default {
               }}
             >编辑</el-button>
             <el-popconfirm
-              onOnConfirm={() => {
+              onConfirm={() => {
                 delPriceSalesRela([row.priceSaleTypeRelaId]).then(res => {
                   this.$successMsg('删除成功')
                   this.$refs.pageRef.refreshList()

+ 1 - 1
src/views/basic_data/priceType.vue

@@ -166,7 +166,7 @@ export default {
               }}
             >编辑</el-button>
             <el-popconfirm
-              onOnConfirm={() => {
+              onConfirm={() => {
                 delProductPrice([row.priceTypeId]).then(res => {
                   this.$successMsg('删除成功')
                   this.$refs.pageRef.refreshList()

+ 1 - 1
src/views/basic_data/sectorAllocation.vue

@@ -41,7 +41,7 @@
               <el-popconfirm
                 style="margin-left: 10px"
                 title="这是一段内容确定删除吗?"
-                @onConfirm="handleDelete(row.id)"
+                @confirm="handleDelete(row.id)"
               >
                 <el-button slot="reference" type="text" size="mini">删除</el-button>
               </el-popconfirm>

+ 2 - 2
src/views/basic_data/stock/Issue_list.vue

@@ -7,7 +7,7 @@
     :optionsEvensGroup="optionsEvensGroup"
     :columnParsing="columnParsing"
   >
-   
+
   </template-page>
 </template>
 
@@ -70,7 +70,7 @@ export default {
       return (h, { row, index, column }) => {
         return (
           <div class="operation-btns">
-            <el-popconfirm title="弃审吗?" onOnConfirm={() => this.handleUnapprove(row.id, row.billNo)}>
+            <el-popconfirm title="弃审吗?" onConfirm={() => this.handleUnapprove(row.id, row.billNo)}>
               <el-button slot="reference" type="text" size="mini">
                 弃审
               </el-button>

+ 1 - 1
src/views/basic_data/stock/material_list.vue

@@ -87,7 +87,7 @@ export default {
       return (h, { row, index, column }) => {
         return (
           <div class="operation-btns">
-            <el-popconfirm title="弃审吗?" onOnConfirm={() => this.handleUnapprove(row.id, row.billNo)}>
+            <el-popconfirm title="弃审吗?" onConfirm={() => this.handleUnapprove(row.id, row.billNo)}>
               <el-button slot="reference" type="text" size="mini">
                 弃审
               </el-button>

+ 1 - 1
src/views/basic_data/stock/warehousing_list.vue

@@ -70,7 +70,7 @@ export default {
       return (h, { row, index, column }) => {
         return (
           <div class="operation-btns">
-            <el-popconfirm title="弃审吗?" onOnConfirm={() => this.handleUnapprove(row.id, row.billNo)}>
+            <el-popconfirm title="弃审吗?" onConfirm={() => this.handleUnapprove(row.id, row.billNo)}>
               <el-button slot="reference" type="text" size="mini">
                 弃审
               </el-button>

+ 1 - 1
src/views/basic_data/taker/taker_car.vue

@@ -189,7 +189,7 @@ export default {
           <div class="operation-btns">
             {this.$checkBtnRole('del', this.$route.meta.roles) ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onConfirm={async () => {
                   this.delFn(row.id)
                 }}
                 title="是否确定需要删除该项内容?"

+ 1 - 1
src/views/basic_data/taker/taker_list.vue

@@ -250,7 +250,7 @@ export default {
 
             {this.$checkBtnRole('del', this.$route.meta.roles) ? (
               <el-popconfirm
-                onOnConfirm={async() => {
+                onConfirm={async() => {
                   this.deleFn(row.id)
                 }}
                 title='是否确定需要删除该项内容?'

+ 1 - 1
src/views/basic_data/warehouse/warehouse_cost.vue

@@ -236,7 +236,7 @@ export default {
                 icon="el-icon-info"
                 icon-color="red"
                 title="内容确定删除吗?"
-                onOnConfirm={() => this.hanleDelete(row.id)}
+                onConfirm={() => this.hanleDelete(row.id)}
               >
                 <el-button slot="reference" type="text"  size="mini" class="textColor el-popover-left">
                   删除

+ 1 - 1
src/views/basic_data/warehouse/warehouse_site.vue

@@ -219,7 +219,7 @@ export default {
                 icon='el-icon-info'
                 icon-color='red'
                 title='内容确定删除吗?'
-                onOnConfirm={() => {
+                onConfirm={() => {
                   this.hanleDelete(row.id)
                 }}
               >

+ 1 - 1
src/views/deposit_commerce/components/deposit-apply-surrender.vue

@@ -268,7 +268,7 @@
                       <el-popconfirm
                         style="margin-left: 10px"
                         title="这是一段内容确定删除吗?"
-                        @onConfirm="delFile(scope.$index)"
+                        @confirm="delFile(scope.$index)"
                       >
                         <el-button type="text" slot="reference">删除</el-button>
                       </el-popconfirm>

+ 1 - 1
src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -564,7 +564,7 @@
                       <el-popconfirm
                         style="margin-left: 10px"
                         title="这是一段内容确定删除吗?"
-                        @onConfirm="delFile(scope.$index)"
+                        @confirm="delFile(scope.$index)"
                       >
                         <el-button slot="reference" type="text">删除</el-button>
                       </el-popconfirm>

+ 1 - 1
src/views/deposit_home/components/deposit_replenish.vue

@@ -740,7 +740,7 @@
                   <el-popconfirm
                     style="margin-left: 10px"
                     title="这是一段内容确定删除吗?"
-                    @onConfirm="delFile(scope.$index, scope.row.id)"
+                    @confirm="delFile(scope.$index, scope.row.id)"
                   >
                     <el-button slot="reference" type="text">删除</el-button>
                   </el-popconfirm>

+ 1 - 1
src/views/deposit_home/deposit_list.vue

@@ -227,7 +227,7 @@ export default {
                 return (
                   <el-popconfirm
                     title='更新工程信息吗?'
-                    onOnConfirm={() => {
+                    onConfirm={() => {
                       updateDepositManageenginInfo().then(res => {
                         this.$message.success('更新工程信息成功')
                         this.$refs.pageRef.refreshList()

+ 2 - 2
src/views/deposit_home/refund_list.vue

@@ -227,7 +227,7 @@ export default {
                 return (
                   <el-popconfirm
                     title='批量审核吗?'
-                    onOnConfirm={() => {
+                    onConfirm={() => {
                       if (!this.selectData.length) {
                         this.$errorMsg('请选择')
                         return
@@ -336,7 +336,7 @@ export default {
               <el-popconfirm
                 style='margin-left: 10px'
                 title='二次退押吗?'
-                onOnConfirm={() => {
+                onConfirm={() => {
                   this.secondRefund(row)
                 }}
               >

+ 1 - 1
src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -249,7 +249,7 @@
                       <el-popconfirm
                         style="margin-left: 10px"
                         title="这是一段内容确定删除吗?"
-                        @onConfirm="delFile(scope.$index)"
+                        @confirm="delFile(scope.$index)"
                       >
                         <el-button type="text" slot="reference">删除</el-button>
                       </el-popconfirm>

+ 1 - 1
src/views/finance/components/receivable_list-add.vue

@@ -89,7 +89,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-popconfirm @onConfirm="delSeletFn" title="这是一段内容确定删除吗?">
+        <el-popconfirm @confirm="delSeletFn" title="这是一段内容确定删除吗?">
           <el-button
             :disabled="selectList.length < 1"
             type="danger"

+ 1 - 1
src/views/finance/rebate_form.vue

@@ -56,7 +56,7 @@
         <el-popconfirm
           v-if="$checkBtnRole('del', $route.meta.roles)"
           title="这是一段内容确定删除吗?"
-          @onConfirm="delSeletFn"
+          @confirm="delSeletFn"
         >
           <el-button
             slot="reference"

+ 1 - 1
src/views/finance/receivable_list.vue

@@ -187,7 +187,7 @@ export default {
               </el-button>
             ) : null}
             {row.examineStatus !== 'CLOSE' ? (
-              <el-popconfirm title="关闭吗?" onOnConfirm={() => {
+              <el-popconfirm title="关闭吗?" onConfirm={() => {
                 financeOtherReceClose({
                   id: row.id
                 }).then(_res=>{

+ 1 - 1
src/views/issue.vue

@@ -202,7 +202,7 @@ export default {
             {
               <el-popconfirm
                 title="确定删除吗?"
-                onOnConfirm={() => this.deleteData(row.id)}
+                onConfirm={() => this.deleteData(row.id)}
               >
                 <el-button slot="reference" type="text" size="mini">
                   删除

+ 1 - 1
src/views/merchant/create_account.vue

@@ -101,7 +101,7 @@
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{
           formLoading ? '提交中 ...' : '提 交'
         }}</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>

+ 2 - 2
src/views/merchant/merchant_list.vue

@@ -77,7 +77,7 @@
                   v-if="scope.row.status"
                   style="margin-left: 10px"
                   title="确定冻结吗?"
-                  @onConfirm="changeStatus(scope.row.adminUserId, 0)"
+                  @confirm="changeStatus(scope.row.adminUserId, 0)"
                 >
                   <el-button slot="reference" type="text">冻结</el-button>
                 </el-popconfirm>
@@ -85,7 +85,7 @@
                   v-else
                   style="margin-left: 10px"
                   title="确定恢复吗?"
-                  @onConfirm="changeStatus(scope.row.adminUserId, 1)"
+                  @confirm="changeStatus(scope.row.adminUserId, 1)"
                 >
                   <el-button slot="reference" type="text">恢复</el-button>
                 </el-popconfirm>

+ 2 - 2
src/views/notice.vue

@@ -336,9 +336,9 @@ export default {
               </el-button>
             ) : null}
             <el-popconfirm
-       
+
               title="确定删除吗?"
-              onOnConfirm={() => this.deleteData(row.noticeId)}
+              onConfirm={() => this.deleteData(row.noticeId)}
             >
               <el-button slot="reference" type="text" size="mini">
                 删除

+ 1 - 1
src/views/pset/login_setting.vue

@@ -71,7 +71,7 @@
             <el-popconfirm
               title="确定要删除这张轮播图吗?"
               style="margin-left: 10px"
-              @onConfirm="hanleDelete(scope.row.id)"
+              @confirm="hanleDelete(scope.row.id)"
             >
               <el-button slot="reference" type="text" size="small">删除</el-button>
             </el-popconfirm>

+ 1 - 1
src/views/sales/price/commercial_list.vue

@@ -123,7 +123,7 @@ export default {
 
     //         {this.$checkBtnRole('del', this.$route.meta.roles) ? (
     //           <el-popconfirm
-    //             onOnConfirm={async () => {
+    //             onConfirm={async () => {
     //               this.deleFn(row.id)
     //             }}
     //             title="是否确定需要删除该项内容?"

+ 1 - 1
src/views/sales_control/adjust_warehouse.vue

@@ -108,7 +108,7 @@ export default {
             ) : null}
             {row.examineStatus != 'OK' && row.examineStatus != 'FAIL' ? (
               <el-popconfirm
-                onOnConfirm={() => {
+                onConfirm={() => {
                   deleteCustomerStockOrder({ id: row.id }).then(res => {
                     this.$successMsg('删除成功')
                     this.$refs.pageRef.refreshList()

+ 1 - 1
src/views/sales_control/components/WarehouseForm.vue

@@ -20,7 +20,7 @@
         <el-radio :label="0" v-model="row.flag">减少</el-radio>
       </template>
       <template v-slot:operation="{ item: { row, $index } }">
-        <el-popconfirm style="margin-left: 10px" title="删除?" @onConfirm="handleDel(row, $index)">
+        <el-popconfirm style="margin-left: 10px" title="删除?" @confirm="handleDel(row, $index)">
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>
       </template>

+ 1 - 1
src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -32,7 +32,7 @@
       </template>
 
       <template v-slot:operation="{ item: { row, $index } }">
-        <el-popconfirm v-if="dis" style="margin-left: 10px" title="删除?" @onConfirm="handleDel(row, $index)">
+        <el-popconfirm v-if="dis" style="margin-left: 10px" title="删除?" @confirm="handleDel(row, $index)">
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>
       </template>

+ 1 - 1
src/views/sales_control/sales_management/components/return_sales_details.vue

@@ -38,7 +38,7 @@
         <el-radio v-model="row.flag" label="-1">减少</el-radio>
       </template> -->
       <template v-slot:operation="{ item: { row, $index } }">
-        <el-popconfirm v-if="dis" style="margin-left: 10px" title="删除?" @onConfirm="handleDel(row, $index)">
+        <el-popconfirm v-if="dis" style="margin-left: 10px" title="删除?" @confirm="handleDel(row, $index)">
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>
       </template>

+ 1 - 1
src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -36,7 +36,7 @@
         <el-radio v-model="row.flag" label="-1">减少</el-radio>
       </template> -->
       <template v-slot:operation="{ item: { row, $index } }">
-        <el-popconfirm v-if="dis" style="margin-left: 10px" title="删除?" @onConfirm="handleDel(row, $index)">
+        <el-popconfirm v-if="dis" style="margin-left: 10px" title="删除?" @confirm="handleDel(row, $index)">
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>
       </template>

+ 2 - 2
src/views/sales_control/sales_management/customer_sales_list.vue

@@ -129,7 +129,7 @@ export default {
             ) : null}
             {row.status == 1 ? (
               <el-popconfirm
-                onOnConfirm={() => {
+                onConfirm={() => {
                   delFrontOrder({ id: row.id }).then(res => {
                     this.$successMsg('删除成功')
                     this.$refs.pageRef.refreshList()
@@ -147,7 +147,7 @@ export default {
       }
     }
     // <el-popconfirm
-    //   onOnConfirm = {()=>{
+    //   onConfirm = {()=>{
     //     deleteCustomerStockOrder({ id: row.id }).then(res => {
     //       this.$successMsg('删除成功')
     //       this.$refs.pageRef.getTableData()

+ 1 - 1
src/views/sales_control/sales_management/return_sales_list.vue

@@ -104,7 +104,7 @@ export default {
             ) : null}
             {row.status == 1 ? (
               <el-popconfirm
-                onOnConfirm={() => {
+                onConfirm={() => {
                   delDeleteRefund({ id: row.id }).then(res => {
                     this.$successMsg('删除成功')
                     this.$refs.pageRef.refreshList()

+ 3 - 3
src/views/sales_policy/components/AddPolicy.vue

@@ -410,7 +410,7 @@
                   icon="el-icon-info"
                   icon-color="red"
                   title="内容确定删除吗?"
-                  @onConfirm="handleDelete(scope.row.id, scope.$index)"
+                  @confirm="handleDelete(scope.row.id, scope.$index)"
                 >
                   <el-button slot="reference" type="text" class="textColor el-popover-left">删除</el-button>
                 </el-popconfirm>
@@ -421,7 +421,7 @@
                   icon="el-icon-info"
                   icon-color="red"
                   title="启用吗?"
-                  @onConfirm="handleStatus(scope.row.id, true)"
+                  @confirm="handleStatus(scope.row.id, true)"
                 >
                   <el-button slot="reference" type="text" class="textColor el-popover-left">启用</el-button>
                 </el-popconfirm>
@@ -432,7 +432,7 @@
                   icon="el-icon-info"
                   icon-color="red"
                   title="作废吗?"
-                  @onConfirm="handleStatus(scope.row.id, false)"
+                  @confirm="handleStatus(scope.row.id, false)"
                 >
                   <el-button slot="reference" type="text" class="textColor el-popover-left">作废</el-button>
                 </el-popconfirm>

+ 3 - 3
src/views/sales_policy/components/details.vue

@@ -327,7 +327,7 @@
                       icon="el-icon-info"
                       icon-color="red"
                       title="内容确定删除吗?"
-                      @onConfirm="handleCondition(scope.row.id, scope.$index)"
+                      @confirm="handleCondition(scope.row.id, scope.$index)"
                     >
                       <el-button slot="reference" type="text" class="textColor el-popover-left">删除</el-button>
                     </el-popconfirm>
@@ -620,7 +620,7 @@
                         <el-popconfirm
                           style="margin-left: 10px"
                           title="是否确定需要克隆该项内容?"
-                          @onConfirm="handleDelLinit(scope.row.id)"
+                          @confirm="handleDelLinit(scope.row.id)"
                         >
                           <el-button slot="reference" type="text" size="mini">删除</el-button>
                         </el-popconfirm>
@@ -786,7 +786,7 @@
                         <el-popconfirm
                           style="margin-left: 10px"
                           title="是否确定需要克隆该项内容?"
-                          @onConfirm="handleDelLimitGroup(scope.row.id)"
+                          @confirm="handleDelLimitGroup(scope.row.id)"
                         >
                           <el-button slot="reference" type="text" size="mini">删除</el-button>
                         </el-popconfirm>

+ 3 - 3
src/views/sales_policy/components/editPolicy.vue

@@ -413,7 +413,7 @@
                     icon="el-icon-info"
                     icon-color="red"
                     title="内容确定删除吗?"
-                    @onConfirm="handleDelete(scope.row.id, scope.$index)"
+                    @confirm="handleDelete(scope.row.id, scope.$index)"
                   >
                     <el-button slot="reference" type="text" class="textColor el-popover-left">删除</el-button>
                   </el-popconfirm>
@@ -424,7 +424,7 @@
                     icon="el-icon-info"
                     icon-color="red"
                     title="启用吗?"
-                    @onConfirm="handleStatus(scope.row.id, true)"
+                    @confirm="handleStatus(scope.row.id, true)"
                   >
                     <el-button slot="reference" type="text" class="textColor el-popover-left">启用</el-button>
                   </el-popconfirm>
@@ -435,7 +435,7 @@
                     icon="el-icon-info"
                     icon-color="red"
                     title="作废吗?"
-                    @onConfirm="handleStatus(scope.row.id, false)"
+                    @confirm="handleStatus(scope.row.id, false)"
                   >
                     <el-button slot="reference" type="text" class="textColor el-popover-left">作废</el-button>
                   </el-popconfirm>

+ 5 - 5
src/views/sales_policy/policy_list.vue

@@ -407,7 +407,7 @@ export default {
 
             {row.examineStatus == 'SAVE' ? (
               <el-popconfirm
-                onOnConfirm={async() => {
+                onConfirm={async() => {
                   this.handlesubmit(row)
                 }}
                 title='是否确定需要提审该项内容?'
@@ -422,7 +422,7 @@ export default {
 
             {row.examineStatus == 'OK' && row.status ? (
               <el-popconfirm
-                onOnConfirm={async() => {
+                onConfirm={async() => {
                   this.handleNullify(row)
                 }}
                 title='是否确定需要作废该项内容?'
@@ -437,7 +437,7 @@ export default {
 
             {(
               <el-popconfirm
-                onOnConfirm={async() => {
+                onConfirm={async() => {
                   this.handleClone(row)
                 }}
                 title='是否确定需要克隆该项内容?'
@@ -450,7 +450,7 @@ export default {
 
             {row.examineStatus != 'OK' ? (
               <el-popconfirm
-                onOnConfirm={async() => {
+                onConfirm={async() => {
                   this.hanleDelete(row.id)
                 }}
                 title='是否确定需要删除该项内容?'
@@ -465,7 +465,7 @@ export default {
 
             {row.examineStatus == 'OK' ? (
               <el-popconfirm
-                onOnConfirm={async() => {
+                onConfirm={async() => {
                   this.hanleAbandon(row.id)
                 }}
                 title='是否确定需要弃审该项内容?'

+ 1 - 1
src/views/sales_rebate/salestype_list.vue

@@ -223,7 +223,7 @@ export default {
 
             {this.$checkBtnRole('del', this.$route.meta.roles) ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onConfirm={async () => {
                   this.hanleDatele(row.id)
                 }}
                 title="是否确定需要删除该项内容?"

+ 1 - 1
src/views/sales_region/sales_line.vue

@@ -103,7 +103,7 @@
                 v-if="scope.row.status"
                 style="margin-left: 10px"
                 title="确定删除吗?"
-                @onConfirm="handleDelete(scope.row.id, 0)"
+                @confirm="handleDelete(scope.row.id, 0)"
               >
                 <el-button slot="reference" type="text">删除</el-button>
               </el-popconfirm>

+ 1 - 1
src/views/sales_region/sales_man.vue

@@ -113,7 +113,7 @@
                 v-if="scope.row.status"
                 style="margin-left: 10px"
                 title="确定删除吗?"
-                @onConfirm="handleDelete(scope.row.id, 0)"
+                @confirm="handleDelete(scope.row.id, 0)"
               >
                 <el-button slot="reference" type="text">删除</el-button>
               </el-popconfirm>

+ 1 - 1
src/views/sales_region/sales_relation.vue

@@ -75,7 +75,7 @@
                 v-if="scope.row.status"
                 style="margin-left: 10px"
                 title="确定删除吗?"
-                @onConfirm="handleDelete(scope.row.id, 0)"
+                @confirm="handleDelete(scope.row.id, 0)"
               >
                 <el-button slot="reference" type="text">删除</el-button>
               </el-popconfirm>

+ 3 - 3
src/views/setting/account.vue

@@ -167,7 +167,7 @@
                   v-if="scope.row.status"
                   style="margin-right: 10px"
                   title="确定冻结吗?"
-                  @onConfirm="changeStatus(scope.row.adminUserId, 0)"
+                  @confirm="changeStatus(scope.row.adminUserId, 0)"
                 >
                   <el-button slot="reference" type="text">冻结</el-button>
                 </el-popconfirm>
@@ -175,7 +175,7 @@
                   v-else
                   style="margin-right: 10px"
                   title="确定恢复吗?"
-                  @onConfirm="changeStatus(scope.row.adminUserId, 1)"
+                  @confirm="changeStatus(scope.row.adminUserId, 1)"
                 >
                   <el-button slot="reference" type="text">恢复</el-button>
                 </el-popconfirm>
@@ -192,7 +192,7 @@
                 @click="handleReset(scope.row.adminUserId)"
               >重置密码</el-button>
 
-              <!-- <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="deleteAccount(scope.row.id)" v-if="checkBtnRole('del')">
+              <!-- <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @confirm="deleteAccount(scope.row.id)" v-if="checkBtnRole('del')">
                 <el-button slot="reference" type="text">删除</el-button>
               </el-popconfirm> -->
             </template>

+ 1 - 1
src/views/setting/department.vue

@@ -38,7 +38,7 @@
                 style="margin-left: 10px"
                 title="确定删除吗?"
                 v-if="scope.row.parentId > 0"
-                @onConfirm="handleDelete(scope.row.adminWebsitId)"
+                @confirm="handleDelete(scope.row.adminWebsitId)"
               >
                 <el-button slot="reference" size="mini" icon="el-icon-delete">删除</el-button>
               </el-popconfirm>

+ 1 - 1
src/views/setting/menu.vue

@@ -53,7 +53,7 @@
               <el-popconfirm
                 style="margin-left: 10px"
                 title="确定删除吗?"
-                @onConfirm="handleDelete(scope.row.moduleId)"
+                @confirm="handleDelete(scope.row.moduleId)"
               >
                 <el-button slot="reference" size="mini" icon="el-icon-delete" />
               </el-popconfirm>

+ 3 - 3
src/views/setting/other.vue

@@ -193,7 +193,7 @@
                   <el-popconfirm
                     v-if="$checkBtnRole('del', $route.meta.roles)"
                     title="这是一段内容确定删除吗?"
-                    @onConfirm="deleFn(scope.row.sysDictId)"
+                    @confirm="deleFn(scope.row.sysDictId)"
                   >
                     <el-button slot="reference" type="text" class="textColor">删除</el-button>
                   </el-popconfirm>
@@ -240,7 +240,7 @@
                   <el-popconfirm
                     v-if="$checkBtnRole('del', $route.meta.roles)"
                     title="这是一段内容确定删除吗?"
-                    @onConfirm="deleFn(scope.row.sysDictId)"
+                    @confirm="deleFn(scope.row.sysDictId)"
                   >
                     <el-button slot="reference" type="text" class="textColor">删除</el-button>
                   </el-popconfirm>
@@ -287,7 +287,7 @@
                   <el-popconfirm
                     v-if="$checkBtnRole('del', $route.meta.roles)"
                     title="这是一段内容确定删除吗?"
-                    @onConfirm="deleFn(scope.row.sysDictId)"
+                    @confirm="deleFn(scope.row.sysDictId)"
                   >
                     <el-button slot="reference" type="text" class="textColor">删除</el-button>
                   </el-popconfirm>

+ 1 - 1
src/views/setting/role.vue

@@ -59,7 +59,7 @@
                 <el-popconfirm
                   style="margin-left: 10px"
                   title="确定删除吗?"
-                  @onConfirm="handleDelete(scope.row.adminRoleId)"
+                  @confirm="handleDelete(scope.row.adminRoleId)"
                   v-if="scope.row.adminRoleId != 1"
                 >
                   <el-button slot="reference" type="text">删除</el-button>

+ 1 - 1
src/views/stock_control/adjust_warehouse.vue

@@ -106,7 +106,7 @@ export default {
               </el-button>
             ) : null}
             <el-popconfirm
-              onOnConfirm={() => {
+              onConfirm={() => {
                 deleteCustomerStockOrder({ id: row.id }).then(res => {
                   this.$successMsg('删除成功')
                   this.$refs.pageRef.refreshList()

+ 1 - 1
src/views/stock_control/components/WarehouseForm.vue

@@ -20,7 +20,7 @@
         <el-radio label="-1" v-model="row.flag">减少</el-radio>
       </template>
       <template v-slot:operation="{ item: { row, $index } }">
-        <el-popconfirm style="margin-left: 10px" title="删除?" @onConfirm="handleDel(row, $index)">
+        <el-popconfirm style="margin-left: 10px" title="删除?" @confirm="handleDel(row, $index)">
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>
       </template>

+ 1 - 1
src/views/stock_control/sales_management/components/customer_sales_details.vue

@@ -30,7 +30,7 @@
         <el-popconfirm
           style="margin-left: 10px"
           title="删除?"
-          @onConfirm="handleDel(row,$index)"
+          @confirm="handleDel(row,$index)"
         >
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>

+ 1 - 1
src/views/stock_control/sales_management/components/customer_sales_form.vue

@@ -32,7 +32,7 @@
         <el-popconfirm
           style="margin-left: 10px"
           title="删除?"
-          @onConfirm="handleDel(row,$index)"
+          @confirm="handleDel(row,$index)"
         >
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>

+ 1 - 1
src/views/stock_control/sales_management/components/return_sales_details.vue

@@ -24,7 +24,7 @@
         <el-popconfirm
           style="margin-left: 10px"
           title="删除?"
-          @onConfirm="handleDel(row,$index)"
+          @confirm="handleDel(row,$index)"
         >
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>

+ 1 - 1
src/views/stock_control/sales_management/components/return_sales_form.vue

@@ -29,7 +29,7 @@
         <el-popconfirm
           style="margin-left: 10px"
           title="删除?"
-          @onConfirm="handleDel(row,$index)"
+          @confirm="handleDel(row,$index)"
         >
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>

+ 2 - 2
src/views/stock_control/sales_management/customer_sales_list.vue

@@ -115,7 +115,7 @@ export default {
               编辑
             </el-button>
             <el-popconfirm
-              onOnConfirm={() => {
+              onConfirm={() => {
                 delFrontOrder({ id: row.id }).then(res => {
                   this.$successMsg('删除成功')
                   this.$refs.pageRef.refreshList()
@@ -137,7 +137,7 @@ export default {
 
     }
     // <el-popconfirm
-    //   onOnConfirm = {()=>{
+    //   onConfirm = {()=>{
     //     deleteCustomerStockOrder({ id: row.id }).then(res => {
     //       this.$successMsg('删除成功')
     //       this.$refs.pageRef.getTableData()

+ 1 - 1
src/views/stock_control/sales_management/return_sales_list.vue

@@ -124,7 +124,7 @@ export default {
               编辑
             </el-button>
             <el-popconfirm
-              onOnConfirm={() => {
+              onConfirm={() => {
                 delDeleteRefund({ id: row.id }).then(res => {
                   this.$successMsg('删除成功')
                   this.$refs.pageRef.refreshList()

+ 1 - 1
src/views/supply/adjust/components/adjust_detail.vue

@@ -169,7 +169,7 @@
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/allot/components/allot_detail.vue

@@ -114,7 +114,7 @@
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>

+ 4 - 4
src/views/supply/apply/apply_list.vue

@@ -255,7 +255,7 @@ export default {
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定申请吗?"
-                onOnConfirm={() => {
+                onConfirm={() => {
                   this.handleSubmit(row.id, 'WAIT')
                 }}
               >
@@ -272,7 +272,7 @@ export default {
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定撤回吗?"
-                onOnConfirm={() => {
+                onConfirm={() => {
                   this.handleSubmit(row.id, 'SAVE')
                 }}
               >
@@ -288,7 +288,7 @@ export default {
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定弃审吗?"
-                onOnConfirm={() => {
+                onConfirm={() => {
                   this.handleAbandon(row.id)
                 }}
               >
@@ -356,7 +356,7 @@ export default {
               <el-popconfirm
                 style="margin-left: 10px"
                 title="确定删除吗?"
-                onOnConfirm={() => {
+                onConfirm={() => {
                   this.handleDelete(row.id)
                 }}
               >

+ 1 - 1
src/views/supply/apply/components/apply_detail.vue

@@ -277,7 +277,7 @@
             v-if="$checkBtnRole('print', $route.meta.roles)"
             >打 印</el-button
           >
-          <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+          <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
             <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>

+ 1 - 1
src/views/supply/apply/components/apply_examine.vue

@@ -249,7 +249,7 @@
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{
           formLoading ? '提交中 ...' : '提 交'
         }}</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/apply/components/apply_form.vue

@@ -174,7 +174,7 @@
       <div class="footer">
         <!-- <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button> -->
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/apply/components/apply_return_form.vue

@@ -199,7 +199,7 @@
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/apply/components/engin_detail.vue

@@ -299,7 +299,7 @@
             v-if="$checkBtnRole('print', $route.meta.roles)"
             >打 印</el-button
           >
-          <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+          <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
             <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>

+ 1 - 1
src/views/supply/apply/components/engin_examine.vue

@@ -256,7 +256,7 @@
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm('OK')">审批通过</el-button>
         <el-button type="warning" @click="clickSubmitForm('SAVE')">审批驳回</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/apply/components/engin_form.vue

@@ -263,7 +263,7 @@
       <div class="footer" :class="classObj">
         <!-- <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button> -->
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/apply/components/engin_return.vue

@@ -224,7 +224,7 @@
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{
           formLoading ? '提交中 ...' : '提 交'
         }}</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/apply/components/engin_return_form.vue

@@ -262,7 +262,7 @@
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 4 - 4
src/views/supply/apply/engin_list.vue

@@ -276,7 +276,7 @@ export default {
                 (row.examineStatus === 'SAVE' || row.examineStatus === 'FAIL') &&
                 row.type === 2)) ? (
                 <el-popconfirm
-                  onOnConfirm={async() => {
+                  onConfirm={async() => {
                     this.handleSubmit(row.id, 'WAIT')
                   }}
                   title='是否确定需要申请该项内容?'
@@ -294,7 +294,7 @@ export default {
               (this.isCustomer && !row.automaticStatus && row.examineStatus === 'WAIT' && row.type != 2) ||
               (!this.isCustomer && row.automaticStatus && row.examineStatus === 'WAIT' && row.type == 2)) ? (
                 <el-popconfirm
-                  onOnConfirm={async() => {
+                  onConfirm={async() => {
                     this.handleSubmit(row.id, 'SAVE')
                   }}
                   title='是否确定需要撤回该项内容?'
@@ -312,7 +312,7 @@ export default {
               (this.isCustomer && !row.automaticStatus && row.examineStatus === 'OK' && row.type != 2) ||
               (!this.isCustomer && row.automaticStatus && row.examineStatus === 'OK' && row.type == 2)) ? (
                 <el-popconfirm
-                  onOnConfirm={async() => {
+                  onConfirm={async() => {
                     this.handleAbandon(row.id)
                   }}
                   title='是否确定需要弃审该项内容?'
@@ -400,7 +400,7 @@ export default {
               (this.isCustomer && !row.automaticStatus && row.examineStatus !== 'OK' && row.type != 2) ||
               (!this.isCustomer && row.automaticStatus && row.examineStatus !== 'OK' && row.type == 2)) ? (
                 <el-popconfirm
-                  onOnConfirm={async() => {
+                  onConfirm={async() => {
                     this.handleDelete(row.id)
                   }}
                   title='是否确定需要删除该项内容?'

+ 4 - 4
src/views/supply/apply/new_apply.vue

@@ -374,7 +374,7 @@
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
                   style="margin-right: 10px"
                   title="确定申请吗?"
-                  @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
+                  @confirm="handleSubmit(scope.row.id, 'WAIT')"
                 >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
@@ -382,7 +382,7 @@
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
                   style="margin-right: 10px"
                   title="确定撤回吗?"
-                  @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
+                  @confirm="handleSubmit(scope.row.id, 'SAVE')"
                 >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
@@ -390,7 +390,7 @@
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
                   style="margin-right: 10px"
                   title="确定弃审吗?"
-                  @onConfirm="handleAbandon(scope.row.id)"
+                  @confirm="handleAbandon(scope.row.id)"
                 >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
@@ -428,7 +428,7 @@
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
                   style="margin-left: 10px"
                   title="确定删除吗?"
-                  @onConfirm="handleDelete(scope.row.id)"
+                  @confirm="handleDelete(scope.row.id)"
                 >
                   <el-button slot="reference" type="text" style="color: #f56c6c">删除</el-button>
                 </el-popconfirm>

+ 4 - 4
src/views/supply/apply/new_engin.vue

@@ -405,7 +405,7 @@
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
                   style="margin-right: 10px"
                   title="确定申请吗?"
-                  @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
+                  @confirm="handleSubmit(scope.row.id, 'WAIT')"
                 >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
@@ -413,7 +413,7 @@
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
                   style="margin-right: 10px"
                   title="确定撤回吗?"
-                  @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
+                  @confirm="handleSubmit(scope.row.id, 'SAVE')"
                 >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
@@ -421,7 +421,7 @@
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
                   style="margin-right: 10px"
                   title="确定弃审吗?"
-                  @onConfirm="handleAbandon(scope.row.id)"
+                  @confirm="handleAbandon(scope.row.id)"
                 >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
@@ -460,7 +460,7 @@
                   v-if="scope.row.examineStatus !== 'OK'"
                   style="margin-left: 10px"
                   title="确定删除吗?"
-                  @onConfirm="handleDelete(scope.row.id)"
+                  @confirm="handleDelete(scope.row.id)"
                 >
                   <el-button slot="reference" type="text" style="color: #f56c6c">删除</el-button>
                 </el-popconfirm>

+ 3 - 3
src/views/supply/deliver/components/apply_return_form.vue

@@ -199,7 +199,7 @@
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
@@ -749,13 +749,13 @@ export default {
             editApply(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-              
+
             })
           } else {
             addApplyReturn(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-              
+
             })
           }
         }

+ 1 - 1
src/views/supply/deliver/components/commerce_detail.vue

@@ -255,7 +255,7 @@
             v-if="$checkBtnRole('print', $route.meta.roles)"
             >打 印</el-button
           >
-          <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+          <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
             <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>

+ 1 - 1
src/views/supply/deliver/components/deliver_detail.vue

@@ -263,7 +263,7 @@
             v-if="$checkBtnRole('print', $route.meta.roles)"
             >打 印</el-button
           >
-          <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+          <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
             <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>

+ 4 - 4
src/views/supply/deliver/components/engin_return_form.vue

@@ -262,7 +262,7 @@
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
@@ -639,7 +639,7 @@ export default {
     // 返回列表
     goBack() {
         this.$emit('backListFormDetail')
-      
+
     },
 
     getDate() {
@@ -972,13 +972,13 @@ export default {
             editEngin(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-             
+
             })
           } else {
             addApplyReturn(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-             
+
             })
           }
         }

+ 1 - 1
src/views/supply/deliver/components/home_detail.vue

@@ -262,7 +262,7 @@
             v-if="$checkBtnRole('print', $route.meta.roles)"
             >打 印</el-button
           >
-          <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+          <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
             <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>

+ 2 - 2
src/views/supply/direct/components/direct_examine.vue

@@ -192,7 +192,7 @@
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm('OK')">审批通过</el-button>
         <el-button type="warning" @click="clickSubmitForm('SAVE')">审批驳回</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>
@@ -309,7 +309,7 @@ export default {
           examineData(params).then(res => {
             this.$successMsg()
             this.goBack()
-            
+
           })
         })
         .catch(() => {})

+ 1 - 1
src/views/supply/direct/components/direct_form.vue

@@ -263,7 +263,7 @@
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/direct/direct_list.vue

@@ -291,7 +291,7 @@
                 <el-popconfirm
                   style="margin-left: 10px"
                   title="确定删除吗?"
-                  @onConfirm="handleDelete(scope.row.id)"
+                  @confirm="handleDelete(scope.row.id)"
                   v-if="$checkBtnRole('del', $route.meta.roles)"
                 >
                   <el-button slot="reference" type="text">删除</el-button>

+ 1 - 1
src/views/supply/displace/components/displace_detail.vue

@@ -340,7 +340,7 @@
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>

+ 2 - 2
src/views/supply/displace/components/displace_examine.vue

@@ -326,7 +326,7 @@
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{
           formLoading ? '提交中 ...' : '提 交'
         }}</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>
@@ -430,7 +430,7 @@ export default {
           this.$successMsg('审批成功')
           this.$nextTick(() => {
             this.goBack()
-            
+
           })
         })
         .finally(res => {

+ 3 - 3
src/views/supply/displace/components/displace_form.vue

@@ -393,7 +393,7 @@
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>
@@ -895,13 +895,13 @@ export default {
             editData(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-              
+
             })
           } else {
             addData(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-              
+
             })
           }
         }

+ 2 - 2
src/views/supply/displace/components/displace_return.vue

@@ -336,7 +336,7 @@
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm()">确定退订</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>
@@ -440,7 +440,7 @@ export default {
           returnOrder(params).then(res => {
             this.$successMsg()
             this.goBack()
-            
+
           })
         })
         .catch(() => {})

+ 3 - 3
src/views/supply/displace/displace_list copy.vue

@@ -210,7 +210,7 @@
                 <el-popconfirm
                   style="margin-right: 10px"
                   title="确定撤回吗?"
-                  @onConfirm="handleWithdraw(scope.row.displaceOrderId)"
+                  @confirm="handleWithdraw(scope.row.displaceOrderId)"
                   v-if="scope.row.examineStatus === 'WAIT'"
                 >
                   <el-button slot="reference" type="text">撤回</el-button>
@@ -228,7 +228,7 @@
                 <el-popconfirm
                   style="margin-left: 10px"
                   title="确定提审吗?"
-                  @onConfirm="handleSubmit(scope.row.displaceOrderId)"
+                  @confirm="handleSubmit(scope.row.displaceOrderId)"
                   v-if="scope.row.examineStatus === 'SAVE'"
                 >
                   <el-button slot="reference" type="text">提审</el-button>
@@ -236,7 +236,7 @@
                 <el-popconfirm
                   style="margin-left: 10px"
                   title="确定删除吗?"
-                  @onConfirm="handleDelete(scope.row.displaceOrderId)"
+                  @confirm="handleDelete(scope.row.displaceOrderId)"
                 >
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>

+ 1 - 1
src/views/supply/displace/displace_list.vue

@@ -585,7 +585,7 @@
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="submitForm">提交置换</el-button>
-        <el-popconfirm title="确定要重置吗?" style="margin-left: 10px" @onConfirm="resetForm">
+        <el-popconfirm title="确定要重置吗?" style="margin-left: 10px" @confirm="resetForm">
           <el-button slot="reference">重 置</el-button>
         </el-popconfirm>
       </div>

+ 4 - 4
src/views/supply/engin/commerce_list.vue

@@ -265,7 +265,7 @@ export default {
             <div class='operation-btns'>
               {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus == '保存' ? (
                 <el-popconfirm
-                  onOnConfirm={async() => {
+                  onConfirm={async() => {
                     this.handleSubmit(row.parentId, row)
                   }}
                   title='是否确定需要申请该项内容?'
@@ -280,7 +280,7 @@ export default {
 
               {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus == '待审核' ? (
                 <el-popconfirm
-                  onOnConfirm={async() => {
+                  onConfirm={async() => {
                     this.handleWithdraw(row.parentId, row)
                   }}
                   title='是否确定需要撤回该项内容?'
@@ -295,7 +295,7 @@ export default {
 
               {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === '审核通过' ? (
                 <el-popconfirm
-                  onOnConfirm={async() => {
+                  onConfirm={async() => {
                     this.handleAbandon(row.parentId, row)
                   }}
                   title='是否确定需要弃审该项内容?'
@@ -362,7 +362,7 @@ export default {
 
               {this.$checkBtnRole('del', this.$route.meta.roles) && (row.examineStatus == '保存' || row.examineStatus == '关闭') ? (
                 <el-popconfirm
-                  onOnConfirm={async() => {
+                  onConfirm={async() => {
                     this.handleDelete(row.parentId, row)
                   }}
                   title='是否确定需要删除该项内容?'

+ 1 - 1
src/views/supply/engin/components/commerce_examine.vue

@@ -264,7 +264,7 @@
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm(1)">审批通过</el-button>
         <el-button type="warning" @click="clickSubmitForm(0)">审批驳回</el-button>
-        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @onConfirm="goBack">
+        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @confirm="goBack">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/engin/components/commerce_form.vue

@@ -394,7 +394,7 @@
       <div class="footer">
         <!-- <el-button type="primary" @click="clickSubmitForm(1)">保 存</el-button> -->
         <el-button type="primary" :loading="btnLoading" @click="clickSubmitForm(2)">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @onConfirm="goBack">
+        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @confirm="goBack">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/engin/components/commerce_return.vue

@@ -250,7 +250,7 @@
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm()">确定退订</el-button>
-        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @onConfirm="goBack">
+        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @confirm="goBack">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/engin/components/engin_examine.vue

@@ -290,7 +290,7 @@
         <el-button type="primary" :loading="formLoading" @click="clickSubmitForm">{{
           formLoading ? '提交中 ...' : '提 交'
         }}</el-button>
-        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @onConfirm="goBack">
+        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @confirm="goBack">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

+ 1 - 1
src/views/supply/engin/components/engin_form.vue

@@ -332,7 +332,7 @@
       <div class="footer">
         <el-button type="primary" :loading="btnLoading" @click="clickSubmitForm(1)">保 存</el-button>
         <!--        <el-button type="primary" @click="clickSubmitForm(2)">提交审核</el-button>-->
-        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @onConfirm="goBack">
+        <el-popconfirm title="确定关闭吗?" style="margin-left: 10px" @confirm="goBack">
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä