lilei пре 2 година
родитељ
комит
401868799f
100 измењених фајлова са 108 додато и 114 уклоњено
  1. 1 1
      src/views/allocationManagement/transferOut/basicInfoModal.vue
  2. 1 1
      src/views/allocationManagement/transferOut/chooseImportModal.vue
  3. 1 1
      src/views/allocationManagement/transferOut/dsModal.vue
  4. 1 1
      src/views/allocationManagement/transferOut/importGuideModal.vue
  5. 1 1
      src/views/allocationManagement/transferOut/printModal.vue
  6. 1 1
      src/views/allocationManagement/transferReturn/basicInfoModal.vue
  7. 1 1
      src/views/allocationManagement/transferReturn/chooseImportModal.vue
  8. 1 1
      src/views/allocationManagement/transferReturn/edit.vue
  9. 1 1
      src/views/allocationManagement/transferReturn/editGrp.vue
  10. 1 1
      src/views/allocationManagement/transferReturn/importGuideModal.vue
  11. 1 1
      src/views/allocationManagement/transferReturn/printModal.vue
  12. 1 1
      src/views/allocationManagement/transfersPrint/recordModal.vue
  13. 1 1
      src/views/basicData/transferTypeManagement/editModal.vue
  14. 1 1
      src/views/basicData/warehouse/editModal.vue
  15. 1 1
      src/views/basicData/warehouse/storingLocation/editModal.vue
  16. 1 1
      src/views/bnSetting/menu/childModal.vue
  17. 1 1
      src/views/common/auditModal.vue
  18. 1 1
      src/views/common/chooseBrandModal.vue
  19. 1 1
      src/views/common/chooseCustomerModal.vue
  20. 1 1
      src/views/common/chooseProductsModal.vue
  21. 1 1
      src/views/common/chooseSupplierModal.vue
  22. 1 1
      src/views/common/chooseTypeModal.vue
  23. 1 1
      src/views/common/commonModal.vue
  24. 1 1
      src/views/dealerManagement/dealerAccountManagement/detailModal.vue
  25. 1 1
      src/views/dealerManagement/dealerAccountManagement/editModal.vue
  26. 1 1
      src/views/dealerManagement/dealerRelationshipBinding/associateModal.vue
  27. 1 1
      src/views/dealerManagement/marketingDivisionSet/editModal.vue
  28. 1 1
      src/views/dealerManagement/merchantInfoManagement/detailModal.vue
  29. 1 1
      src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue
  30. 1 1
      src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue
  31. 1 1
      src/views/dealerManagement/rebateSettings/associateModal.vue
  32. 1 1
      src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue
  33. 1 1
      src/views/expenseManagement/expenseReimbursement/chooseImportModal.vue
  34. 1 1
      src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue
  35. 1 1
      src/views/expenseManagement/expenseReimbursement/importGuideModal.vue
  36. 1 1
      src/views/expenseManagement/expenseReimbursement/productInfoModal.vue
  37. 1 1
      src/views/expenseManagement/expenseReimbursement/verifyModal.vue
  38. 1 1
      src/views/financialManagement/allocateReturnConfirmation/detailModal.vue
  39. 1 1
      src/views/financialManagement/financialCollection/dispatchModal.vue
  40. 1 1
      src/views/financialManagement/financialCollection/verifyModal.vue
  41. 1 1
      src/views/financialManagement/returnConfirmation/detailModal.vue
  42. 1 1
      src/views/financialManagement/warehousingConfirmation/detailModal.vue
  43. 1 1
      src/views/financialManagement/warehousingConfirmation/list.vue
  44. 1 1
      src/views/inventoryManagement/intelligentReplenishment/detailModal.vue
  45. 1 1
      src/views/inventoryManagement/intelligentReplenishment/serviceLevelModal.vue
  46. 1 1
      src/views/inventoryManagement/inventoryCheck/addModal.vue
  47. 1 1
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  48. 1 1
      src/views/inventoryManagement/inventoryQuery/exportExcelModal.vue
  49. 1 1
      src/views/power/dataDictionary/codeItemModal.vue
  50. 1 1
      src/views/power/dataDictionary/codeModal.vue
  51. 1 1
      src/views/power/menu/childModal.vue
  52. 1 1
      src/views/power/role/menuModal.vue
  53. 1 1
      src/views/power/role/roleModal.vue
  54. 1 1
      src/views/power/user/updateAreal.vue
  55. 1 1
      src/views/power/user/userModal.vue
  56. 1 1
      src/views/productManagement/productBrand/detailModal.vue
  57. 1 1
      src/views/productManagement/productBrand/editModal.vue
  58. 1 1
      src/views/productManagement/productBrand/list.vue
  59. 1 1
      src/views/productManagement/productCategory/editModal.vue
  60. 1 1
      src/views/productManagement/productInfo/detailModal.vue
  61. 1 1
      src/views/productManagement/productInfo/offlineModal.vue
  62. 1 1
      src/views/productManagement/productLevel/editModal.vue
  63. 1 1
      src/views/productManagement/productPricing/auditModal.vue
  64. 1 1
      src/views/productManagement/productPricing/editModal.vue
  65. 1 1
      src/views/productManagement/productUniversal/editModal.vue
  66. 1 1
      src/views/promotionRulesManagement/orderStatistics/detailModal.vue
  67. 1 1
      src/views/promotionRulesManagement/productStatistics/detailModal.vue
  68. 1 1
      src/views/promotionRulesManagement/promotionRules/basicInfoModal.vue
  69. 1 1
      src/views/promotionRulesManagement/promotionRules/chooseImportModal.vue
  70. 1 1
      src/views/promotionRulesManagement/promotionRules/choosePriceProductsModal.vue
  71. 1 1
      src/views/promotionRulesManagement/promotionRules/detail.vue
  72. 1 1
      src/views/promotionRulesManagement/promotionRules/editRuleModal.vue
  73. 1 1
      src/views/promotionRulesManagement/promotionRules/importGuideModal.vue
  74. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue
  75. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/chooseImportModal.vue
  76. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  77. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/importGuideModal.vue
  78. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue
  79. 1 1
      src/views/salesManagement/backorder/detailModal.vue
  80. 1 1
      src/views/salesManagement/examineVerify/auditRejectModal.vue
  81. 1 1
      src/views/salesManagement/outboundOrder/list.vue
  82. 1 1
      src/views/salesManagement/outboundOrder/sendGoodModal.vue
  83. 1 1
      src/views/salesManagement/priceInquiry/carInfoModal.vue
  84. 1 1
      src/views/salesManagement/pushOrderManagement/exportExcelModal.vue
  85. 1 1
      src/views/salesManagement/pushOrderManagement/sendTypeModal.vue
  86. 1 1
      src/views/salesManagement/receiptPrint/printModel.vue
  87. 1 1
      src/views/salesManagement/receiptPrint/recordModal.vue
  88. 1 1
      src/views/salesManagement/salesCollection/detailModal.vue
  89. 9 15
      src/views/salesManagement/salesCollection/voucherModal.vue
  90. 1 1
      src/views/salesManagement/salesQuery/chooseActive.vue
  91. 1 1
      src/views/salesManagement/salesQuery/chooseImportModal.vue
  92. 1 1
      src/views/salesManagement/salesQuery/importGuideModal.vue
  93. 1 1
      src/views/salesManagement/salesQuery/printModal.vue
  94. 1 1
      src/views/salesManagement/salesQuery/receivingAddress/editAddressModal.vue
  95. 1 1
      src/views/salesManagement/salesReturn/chooseImportModal.vue
  96. 1 1
      src/views/salesManagement/salesReturn/importGuideModal.vue
  97. 1 1
      src/views/salesManagement/sendOutOrder/detailModal.vue
  98. 1 1
      src/views/salesManagement/stockPrint/recordModal.vue
  99. 1 1
      src/views/salesManagement/waitDispatch/dsModal.vue
  100. 1 1
      src/views/setting/notice/detailModal.vue

+ 1 - 1
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="新增"
     v-model="isShow"
-    @cancle="isShow = false"
+    @cancel="isShow = false"
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/allocationManagement/transferOut/chooseImportModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->

+ 1 - 1
src/views/allocationManagement/transferOut/dsModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="提交调拨单"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/allocationManagement/transferOut/importGuideModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="750">
     <div class="importGuide-con">
       <div class="explain-con">

+ 1 - 1
src/views/allocationManagement/transferOut/printModal.vue

@@ -6,7 +6,7 @@
     class="allocateBill-print-type-modal"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/allocationManagement/transferReturn/basicInfoModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="新增调拨退货"
     v-model="isShow"
-    @cancle="isShow = false"
+    @cancel="isShow = false"
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/allocationManagement/transferReturn/chooseImportModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->

+ 1 - 1
src/views/allocationManagement/transferReturn/edit.vue

@@ -220,7 +220,7 @@
       :maskClosable="false"
       title="修改备注"
       v-model="editRemark"
-      @cancle="editRemark = false"
+      @cancel="editRemark = false"
       :width="600">
       <a-textarea
         v-model="basicInfoData.remarks"

+ 1 - 1
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -212,7 +212,7 @@
       :maskClosable="false"
       title="修改备注"
       v-model="editRemark"
-      @cancle="editRemark = false"
+      @cancel="editRemark = false"
       :width="600">
       <a-textarea
         v-model="basicInfoData.remarks"

+ 1 - 1
src/views/allocationManagement/transferReturn/importGuideModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="750">
     <div class="importGuide-con">
       <div class="explain-con">

+ 1 - 1
src/views/allocationManagement/transferReturn/printModal.vue

@@ -6,7 +6,7 @@
     class="allocateBill-print-type-modal"
     title="调拨退货打印"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/allocationManagement/transfersPrint/recordModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     v-model="isShow"
     :title="modalTit"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">

+ 1 - 1
src/views/basicData/transferTypeManagement/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/basicData/warehouse/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/basicData/warehouse/storingLocation/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/bnSetting/menu/childModal.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
+    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancel="cancel">
       <a-form :form="form" @submit="handleSubmit">
         <!-- 上级菜单 -->
         <a-form-item label="上级菜单" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">

+ 1 - 1
src/views/common/auditModal.vue

@@ -5,7 +5,7 @@
     :footer="null"
     :maskClosable="false"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="416">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="audit-main">

+ 1 - 1
src/views/common/chooseBrandModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="选择产品品牌"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <div class="chooseBrand-con">
       <div>

+ 1 - 1
src/views/common/chooseCustomerModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="选择客户"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="chooseCustomer-con">

+ 1 - 1
src/views/common/chooseProductsModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="选择产品"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="products-con">

+ 1 - 1
src/views/common/chooseSupplierModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="选择供应商"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="products-con">

+ 1 - 1
src/views/common/chooseTypeModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="选择产品分类"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="50%">
     <div class="chooseType-con">
       <div>

+ 1 - 1
src/views/common/commonModal.vue

@@ -7,7 +7,7 @@
     v-model="isShow"
     :title="modalTit"
     :bodyStyle="bodyPadding?{padding:bodyPadding}:{padding: modalTit?'25px 32px 20px':'50px 32px 15px'}"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="width">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main" v-html="modalHtml"></div>

+ 1 - 1
src/views/dealerManagement/dealerAccountManagement/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <div>
       <a-descriptions bordered size="small" :column="2">

+ 1 - 1
src/views/dealerManagement/dealerAccountManagement/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="账号信息"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/dealerManagement/dealerRelationshipBinding/associateModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="关联下级"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/dealerManagement/marketingDivisionSet/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="title"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <a-spin :spinning="spinning" tip="Loading...">
       <div style="max-height: 400px;overflow: auto;" ref="merchantInfoDetail">

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="title"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <div>
       <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="title"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <div>
       <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="编辑"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="title+'费用明细'"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div>

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/chooseImportModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="确认导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="80%">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="title+'费用明细'"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div>

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/importGuideModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入费用明细"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <div class="importGuide-con">
       <div class="explain-con">

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/productInfoModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="新增产品信息"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div>

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/verifyModal.vue

@@ -5,7 +5,7 @@
     :maskClosable="false"
     title="费用报销单审核进度"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="50%">
     <p>说明:以下信息来自钉钉</p>
     <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/financialManagement/allocateReturnConfirmation/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <div>
       <detail :outBizSn="itemSn" pageType="modal" ref="detail"></detail>

+ 1 - 1
src/views/financialManagement/financialCollection/dispatchModal.vue

@@ -5,7 +5,7 @@
     :maskClosable="false"
     title="关联备货单"
     v-model="isShow"
-    @cancle="handleCommonCancel"
+    @cancel="handleCommonCancel"
     width="50%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div v-if="detailData">

+ 1 - 1
src/views/financialManagement/financialCollection/verifyModal.vue

@@ -5,7 +5,7 @@
     :maskClosable="false"
     title="财务收款单审核进度"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="50%">
     <p>说明:以下信息来自钉钉</p>
     <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/financialManagement/returnConfirmation/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <div>
       <!-- <div style="padding: 0 12px;text-align: right;">

+ 1 - 1
src/views/financialManagement/warehousingConfirmation/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <div>
       <a-descriptions size="small" :column="3" style="margin-bottom: 10px;">

+ 1 - 1
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -76,7 +76,7 @@
       :footer="null"
       :maskClosable="false"
       v-model="confirmationModal"
-      @cancle="confirmationModal=false"
+      @cancel="confirmationModal=false"
       :width="416">
       <div class="confirmation-main">
         <a-icon type="question-circle" style="color: #faad14;font-size: 22px;margin-right: 16px;" />

+ 1 - 1
src/views/inventoryManagement/intelligentReplenishment/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="预测单详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <div>

+ 1 - 1
src/views/inventoryManagement/intelligentReplenishment/serviceLevelModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="选择服务水平"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <div>
       <s-table

+ 1 - 1
src/views/inventoryManagement/inventoryCheck/addModal.vue

@@ -7,7 +7,7 @@
     :closable="false"
     title="新增盘点单"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <div>

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="库存详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/exportExcelModal.vue

@@ -6,7 +6,7 @@
     class="export-excel-modal"
     title="选择导出方式"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/power/dataDictionary/codeItemModal.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
+    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancel="cancel">
       <a-form :form="form" @submit="handleSubmit">
         <a-row :gutter="24">
           <a-col :span="24">

+ 1 - 1
src/views/power/dataDictionary/codeModal.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
+    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancel="cancel">
       <a-form :form="form" @submit="handleSubmit">
         <!-- 类别编码 -->
         <a-form-item label="类别编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">

+ 1 - 1
src/views/power/menu/childModal.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
+    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancel="cancel">
       <a-form :form="form" @submit="handleSubmit">
         <!-- 上级菜单 -->
         <a-form-item label="上级菜单" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">

+ 1 - 1
src/views/power/role/menuModal.vue

@@ -7,7 +7,7 @@
       :maskClosable="false"
       :title="titleText"
       v-model="isshow"
-      @cancle="isshow=false"
+      @cancel="isshow=false"
       :width="800">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model

+ 1 - 1
src/views/power/role/roleModal.vue

@@ -7,7 +7,7 @@
       :maskClosable="false"
       :title="titleText"
       v-model="isshow"
-      @cancle="isshow=false"
+      @cancel="isshow=false"
       :width="800">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model

+ 1 - 1
src/views/power/user/updateAreal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="title"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <div>
       <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/power/user/userModal.vue

@@ -7,7 +7,7 @@
       :maskClosable="false"
       :title="titleText"
       v-model="isshow"
-      @cancle="isshow=false"
+      @cancel="isshow=false"
       :width="800">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model

+ 1 - 1
src/views/productManagement/productBrand/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="产品详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <div>
       <a-descriptions bordered size="small" :column="1">

+ 1 - 1
src/views/productManagement/productBrand/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -88,7 +88,7 @@
       :maskClosable="false"
       title="品牌图片"
       v-model="openPicModal"
-      @cancle="nowPic=''">
+      @cancel="nowPic=''">
       <img :src="nowPic" width="100%" />
     </a-modal>
   </a-card>

+ 1 - 1
src/views/productManagement/productCategory/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/productManagement/productInfo/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="产品详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 产品详情 -->
     <div>

+ 1 - 1
src/views/productManagement/productInfo/offlineModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="提示"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <p v-if="loadData.length==1" style="font-weight: bold;margin-left: 20px;">确认要下线吗?</p>
     <p v-else style="font-weight: bold;margin-left: 20px;">已选有效数据{{ loadData.length }}条,确认要批量下线吗?</p>

+ 1 - 1
src/views/productManagement/productLevel/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="编辑价格"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 编辑价格 -->
     <div>

+ 1 - 1
src/views/productManagement/productPricing/auditModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="定价审核"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 定价审核 -->

+ 1 - 1
src/views/productManagement/productPricing/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="编辑价格"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 编辑价格 -->
     <div>

+ 1 - 1
src/views/productManagement/productUniversal/editModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <div>
       <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/promotionRulesManagement/orderStatistics/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="促销品明细"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <div>
       <p>销售单号:{{ nowData ? (nowData.salesBillNo || '--') : '--' }}</p>

+ 1 - 1
src/views/promotionRulesManagement/productStatistics/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="促销品明细"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <div>
       <p>产品信息:

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/basicInfoModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="itemSn?'编辑':'新增'"
     v-model="isShow"
-    @cancle="isShow = false"
+    @cancel="isShow = false"
     :width="960">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/chooseImportModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/choosePriceProductsModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="选择产品"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <div class="table-operator">
       <a-button v-if="!(ruleType=='PROMO_PROD') && !((ruleType=='ADD_PRICE_PURCH') && (goodsType == 'promo'))" id="choosePosPriceProducts-brand" type="primary" class="button-error" @click="choosePModal('BRAND')">选择产品品牌</a-button>

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/detail.vue

@@ -69,7 +69,7 @@
       :maskClosable="false"
       title="查看"
       v-model="openModal"
-      @cancle="openModal = false"
+      @cancel="openModal = false"
       width="80%">
       <a-table
         ref="lookTable"

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/editRuleModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="itemSn ? '编辑':'新增'"
     v-model="isShow"
-    @cancle="isShow = false"
+    @cancel="isShow = false"
     :width="960">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/importGuideModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="750">
     <div class="importGuide-con">
       <div class="explain-con">

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="新增散件入库单"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/chooseImportModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <!-- <div style="padding: 0 12px;text-align: right;">
       <a-button id="bulkWarehousingOrderDetail-preview-btn" style="margin-right: 15px;">打印预览</a-button>

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/importGuideModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="750">
     <div class="importGuide-con">
       <div class="explain-con">

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :title="(itemSn ? '编辑' : '新增') + '产品'"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/salesManagement/backorder/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="960">
     <a-spin :spinning="spinning" tip="Loading...">
       <div style="padding: 0 12px;text-align: right;" v-if="$hasPermissions('B_oosPrint')">

+ 1 - 1
src/views/salesManagement/examineVerify/auditRejectModal.vue

@@ -7,7 +7,7 @@
     :closable="false"
     title="备注原因"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <div>
       <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -152,7 +152,7 @@
       title="详情"
       v-model="openModal"
       v-if="openModal"
-      @cancle="cancleModal"
+      @cancel="cancleModal"
       width="80%">
       <div style="max-height: 700px;overflow-y: scroll;">
         <pushOrderDetailModal v-if="outBizType=='SALES'" :outBizSubSn="orderSn" />

+ 1 - 1
src/views/salesManagement/outboundOrder/sendGoodModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     v-model="isShow"
     :title="modalTit"
-    @cancle="handleCommonCancel"
+    @cancel="handleCommonCancel"
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">

+ 1 - 1
src/views/salesManagement/priceInquiry/carInfoModal.vue

@@ -5,7 +5,7 @@
     :footer="null"
     :maskClosable="false"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <div>
       <div class="head-info-con">

+ 1 - 1
src/views/salesManagement/pushOrderManagement/exportExcelModal.vue

@@ -6,7 +6,7 @@
     class="export-excel-modal"
     title="导出Excel"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -6,7 +6,7 @@
     class="pushOrderManagement-print-type-modal"
     title="发货分类打印"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/salesManagement/receiptPrint/printModel.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 发货打印 -->
   <div>
-    <a-spin :spinning="spinning" tip="Loading..." id="sendGood-print" style="min-height: 70vh;overflow: auto;width: 100%;">
+    <a-spin :spinning="spinning" tip="Loading..." id="sendGood-print" style="height: 60vh;overflow: auto;width: 100%;padding:20px 40px;">
       <div class="print-box" style="width: 100%;font-size: 10pt;" v-if="detail">
         <h1 style="text-align:center;">销 售 收 款 凭 证</h1>
         <div style="display:flex;align-item:center;justify-content: space-between;flex-wrap: wrap;line-height: 20pt;">

+ 1 - 1
src/views/salesManagement/receiptPrint/recordModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     v-model="isShow"
     :title="modalTit"
-    @cancle="isShow=false"
+    @cancel="handleCommonCancel"
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">

+ 1 - 1
src/views/salesManagement/salesCollection/detailModal.vue

@@ -7,7 +7,7 @@
     v-model="isShow"
     :title="modalTit"
     :bodyStyle="{padding: modalTit?'25px 32px 20px':'50px 32px 15px'}"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="80%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">

+ 9 - 15
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -7,7 +7,7 @@
     v-model="isShow"
     :title="modalTit"
     :bodyStyle="{padding: modalTit?'25px 32px 20px':'50px 32px 15px'}"
-    @cancle="isShow=false"
+    @cancel="handleCommonCancel"
     width="80%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main" v-if="detail">
@@ -65,15 +65,14 @@
             </template>
           </a-table>
         </div>
+        <div class="btn-box">
+          <a-button @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
+          <a-button :loading="spinning" type="primary" @click="handlePrint()">收款打印</a-button>
+        </div>
       </div>
-      <div class="btn-box">
-        <a-button @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button :loading="spinning" type="primary" @click="handlePrint()">收款打印</a-button>
-      </div>
-
       <!-- 收款打印 -->
       <commonModal
-        modalTit="收款打印"
+        modalTit="收款打印预览"
         bodyPadding="10px"
         width="1024px"
         :showFooter="false"
@@ -155,19 +154,13 @@ export default {
       this.$nextTick(() => {
         this.$refs.printModel.getData(this.detail, true)
       })
-    },
-    // 删除
-    handleDel (row) {
-
-    },
-    // 选择
-    handleChoose (row) {
-
     },
     // 取消
     handleCommonCancel () {
       this.$emit('cancel')
       this.detail = null
+      this.tableData = []
+      this.$refs.printModel.handleCommonCancel()
     }
   },
   watch: {
@@ -188,6 +181,7 @@ export default {
 <style lang="less">
   .collection-detail-modal{
     .common-main{
+        min-height:20vh;
        .toolsBar{
          display: flex;
          align-items: center;

+ 1 - 1
src/views/salesManagement/salesQuery/chooseActive.vue

@@ -5,7 +5,7 @@
     :maskClosable="false"
     title="促销品列表"
     v-model="isShow"
-    @cancle="cansel"
+    @cancel="cansel"
     :width="960">
     <a-card size="small" :bordered="false" class="productInfoList-wrap">
       <!-- 列表 -->

+ 1 - 1
src/views/salesManagement/salesQuery/chooseImportModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->

+ 1 - 1
src/views/salesManagement/salesQuery/importGuideModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="750">
     <div class="importGuide-con">
       <div class="explain-con">

+ 1 - 1
src/views/salesManagement/salesQuery/printModal.vue

@@ -6,7 +6,7 @@
     class="sales-print-type-modal"
     :title="modalTit"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/salesManagement/salesQuery/receivingAddress/editAddressModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="收货地址"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model

+ 1 - 1
src/views/salesManagement/salesReturn/chooseImportModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->

+ 1 - 1
src/views/salesManagement/salesReturn/importGuideModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="750">
     <div class="importGuide-con">
       <div class="explain-con">

+ 1 - 1
src/views/salesManagement/sendOutOrder/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     v-model="isShow"
     :title="modalTit"
-    @cancle="handleCommonCancel"
+    @cancel="handleCommonCancel"
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">

+ 1 - 1
src/views/salesManagement/stockPrint/recordModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     v-model="isShow"
     :title="modalTit"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">

+ 1 - 1
src/views/salesManagement/waitDispatch/dsModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="下推销售单"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <!-- 表单 -->
     <div>

+ 1 - 1
src/views/setting/notice/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="公告详情"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="800">
     <div>
       <a-descriptions bordered size="small" :column="2">

Неке датотеке нису приказане због велике количине промена