lilei vor 3 Jahren
Ursprung
Commit
3215bce91a
68 geänderte Dateien mit 194 neuen und 115 gelöschten Zeilen
  1. 19 3
      src/layouts/BasicLayout.vue
  2. 73 37
      src/libs/JGPrint.js
  3. 7 0
      src/store/modules/app.js
  4. 1 1
      src/views/allocationManagement/chainTransferOut/basicInfoModal.vue
  5. 1 1
      src/views/allocationManagement/storeTransferOut/basicInfoModal.vue
  6. 1 1
      src/views/allocationManagement/warehouseAllocation/basicInfoModal.vue
  7. 1 1
      src/views/basicData/bulkPartsTypeManagement/editModal.vue
  8. 1 1
      src/views/basicData/customerTypeManagement/editModal.vue
  9. 1 1
      src/views/basicData/expenseType/editModal.vue
  10. 1 1
      src/views/basicData/storeTransferOutTypeManagement/editModal.vue
  11. 1 1
      src/views/bulkManagement/bulkReturnGoods/basicInfoModal.vue
  12. 1 1
      src/views/bulkManagement/bulkReturnGoods/detailModal.vue
  13. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/basicInfoModal.vue
  14. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  15. 1 1
      src/views/common/auditModal.vue
  16. 1 1
      src/views/common/commonModal.vue
  17. 31 11
      src/views/common/pdfViewModal.vue
  18. 1 1
      src/views/customerManagement/customerInfo/detailModal.vue
  19. 1 1
      src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue
  20. 1 1
      src/views/financialManagement/expenseManagement/detailModal.vue
  21. 1 1
      src/views/financialManagement/financialCollection/detailModal.vue
  22. 1 1
      src/views/financialManagement/financialCollection/list.vue
  23. 1 1
      src/views/financialManagement/financialPayment/detailModal.vue
  24. 1 1
      src/views/financialManagement/withdrawalManagement/cashOutModal.vue
  25. 1 1
      src/views/inventoryManagement/inventoryChecking/basicInfoModal.vue
  26. 1 1
      src/views/inventoryManagement/inventoryChecking/detailModal.vue
  27. 1 1
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  28. 1 1
      src/views/inventoryManagement/inventoryChecking/printModal.vue
  29. 1 1
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  30. 1 1
      src/views/inventoryManagement/satelliteWarehouseInventory/addModal.vue
  31. 1 1
      src/views/inventoryManagement/warehouse/editModal.vue
  32. 1 1
      src/views/inventoryManagement/warehouse/storingLocation/editModal.vue
  33. 1 1
      src/views/notice/detailModal.vue
  34. 1 1
      src/views/numsGoodsShelves/replenishmentManagement/confirmModal.vue
  35. 1 1
      src/views/numsGoodsShelves/replenishmentManagement/outWarehousingModal.vue
  36. 1 1
      src/views/numsGoodsShelves/replenishmentManagement/printStickerModal.vue
  37. 1 1
      src/views/numsGoodsShelves/replenishmentManagement/printView.vue
  38. 1 1
      src/views/numsGoodsShelves/replenishmentManagement/putWarehousingModal.vue
  39. 1 1
      src/views/numsGoodsShelves/replenishmentManagement/stockModal.vue
  40. 1 1
      src/views/numsGoodsShelves/settlementManagement/detailModal.vue
  41. 1 1
      src/views/numsGoodsShelves/shelfMonitoring/addModal.vue
  42. 1 1
      src/views/numsGoodsShelves/shelfSet/basicInfoModal.vue
  43. 1 1
      src/views/numsGoodsShelves/shelfSet/bindProductModal.vue
  44. 1 1
      src/views/numsGoodsShelves/shelfSet/chooseImportModal.vue
  45. 1 1
      src/views/numsGoodsShelves/shelfSet/importGuideModal.vue
  46. 1 1
      src/views/outboundOrderManagement/outboundOrder/list.vue
  47. 1 1
      src/views/power/dataDictionary/codeItemModal.vue
  48. 1 1
      src/views/power/dataDictionary/codeModal.vue
  49. 1 1
      src/views/power/role/menuModal.vue
  50. 1 1
      src/views/power/role/roleModal.vue
  51. 1 1
      src/views/power/user/userModal.vue
  52. 1 1
      src/views/power/user/userSyncModal.vue
  53. 1 1
      src/views/productManagement/productBrand/editModal.vue
  54. 1 1
      src/views/productManagement/productCategory/editModal.vue
  55. 1 1
      src/views/productManagement/productInfo/detailModal.vue
  56. 1 1
      src/views/purchasingManagement/purchaseOrder/chooseImportModal.vue
  57. 1 1
      src/views/purchasingManagement/purchaseOrder/importGuideModal.vue
  58. 1 1
      src/views/purchasingManagement/purchaseOrder/outStockModal.vue
  59. 1 1
      src/views/purchasingManagement/purchaseOrder/receivingAddress/editAddressModal.vue
  60. 1 1
      src/views/reportData/chainStockReport/detailModal.vue
  61. 1 1
      src/views/salesManagement/salesQuery/carInfoModal.vue
  62. 1 1
      src/views/salesManagement/salesQuery/chooseImportModal.vue
  63. 1 1
      src/views/salesManagement/salesQuery/importGuideModal.vue
  64. 1 1
      src/views/salesManagement/salesQuery/productSalesRecordModal.vue
  65. 1 1
      src/views/salesManagement/salesman/editModal.vue
  66. 1 1
      src/views/storeManagement/bind/editModal.vue
  67. 1 1
      src/views/storeManagement/userAuthorization/editModal.vue
  68. 1 1
      src/views/supplierManagement/supplierInfo/editModal.vue

+ 19 - 3
src/layouts/BasicLayout.vue

@@ -45,6 +45,7 @@
           <router-view ></router-view>
         </transition>
       </a-layout-content>
+
       <!-- 视频播放弹窗 -->
       <div v-if="isShowVideoVal">
         <a-modal
@@ -64,6 +65,9 @@
           ></video-player>
         </a-modal>
       </div>
+      <!-- pdf 预览 -->
+      <pdfViewModal ref="pdfview" :openModal="showPdfView" @cancel="showPdfView=false"></pdfViewModal>
+
       <!-- layout footer -->
       <a-layout-footer>
         <!-- <global-footer /> -->
@@ -82,7 +86,7 @@ import { triggerWindowResizeEvent } from '@/utils/util'
 import { mapState, mapActions, mapGetters } from 'vuex'
 import { mixin, mixinDevice, commonMixin } from '@/utils/mixin'
 import config from '@/config/defaultSettings'
-
+import pdfViewModal from '@/views/common/pdfViewModal.vue'
 import RouteView from './RouteView'
 import SideMenu from '@/components/Menu/SideMenu'
 import GlobalHeader from '@/components/GlobalHeader'
@@ -104,14 +108,16 @@ export default {
     SideMenu,
     GlobalHeader,
     GlobalFooter,
-    SettingDrawer
+    SettingDrawer,
+    pdfViewModal
   },
   data () {
     return {
       production: config.production,
       collapsed: false,
       menus: [],
-      isRouterAlive: true
+      isRouterAlive: true,
+      showPdfView: false
     }
   },
   computed: {
@@ -185,6 +191,15 @@ export default {
   watch: {
     sidebarOpened (val) {
       this.collapsed = !val
+    },
+    '$store.state.app.showPdfPrintView' (newValue, oldValue) {
+      console.log(newValue)
+      if (newValue) {
+        this.showPdfView = newValue
+        this.$nextTick(() => {
+          this.$refs.pdfview.setData(this.$store.state.app.pdfPrintList)
+        })
+      }
     }
   },
   created () {
@@ -210,6 +225,7 @@ export default {
         description: `临到月底了,请尽快处理系统中没有完结的单据!`
       })
     }
+    this.$store.commit('SET_pdfPrintList', [])
   },
   mounted () {
     const userAgent = navigator.userAgent

+ 73 - 37
src/libs/JGPrint.js

@@ -1,5 +1,6 @@
 import confirm from 'ant-design-vue/es/modal/confirm'
 import notification from 'ant-design-vue/es/notification'
+import store from '@/store'
 import { getLodop } from '@/libs/LodopFuncs'
 import moment from 'moment'
 // 打印页签,支持批量打印
@@ -121,6 +122,75 @@ export const blobToBaseByPdf = function(data,callback){
   })
 }
 
+// pdf 直接打印
+export const pdfPrint = function (data){
+  const LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'))
+  if (!LODOP) {
+    confirm({
+      title: '提示?',
+      content: h => <div>打印控件未安装,请先下载并安装。安装完成后,刷新页面即可打印。</div>,
+      okText: '立即下载',
+      okType: 'danger',
+      cancelText: '暂不打印',
+      onOk () {
+        var agent = navigator.userAgent.toLowerCase();
+        if (agent.indexOf("win32") >= 0 || agent.indexOf("wow32") >= 0) {
+            window.open('https://iscm.360arrow.com/electron/CLodop.exe')
+        }else if (agent.indexOf("win64") >= 0 || agent.indexOf("wow64") >= 0) {
+            window.open('https://iscm.360arrow.com/electron/CLodop.exe')
+        }
+      }
+    })
+    return
+  }
+  LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
+  // LODOP.SET_PRINT_MODE('POS_BASEON_PAPER', true) // 可使输出以纸张边缘为基点
+  // 开始打印
+  const dlen = data.length
+  for(let i=0;i<dlen;i++){
+    LODOP.PRINT_INIT("")
+    LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data[i])
+    LODOP.SET_PRINT_PAGESIZE(3, 2090, (i==dlen-1)?50:0, '')
+    LODOP.PRINT()
+  }
+}
+// pdf 打印预览
+export const pdfPrintView = function(data){
+  store.commit('SET_pdfPrintList', data)
+}
+// lodop 打印预览
+export const lodopPrintView = function(data){
+  const LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'))
+  if (!LODOP) {
+    confirm({
+      title: '提示?',
+      content: h => <div>打印控件未安装,请先下载并安装。安装完成后,刷新页面即可打印。</div>,
+      okText: '立即下载',
+      okType: 'danger',
+      cancelText: '暂不打印',
+      onOk () {
+        var agent = navigator.userAgent.toLowerCase();
+        if (agent.indexOf("win32") >= 0 || agent.indexOf("wow32") >= 0) {
+            window.open('https://iscm.360arrow.com/electron/CLodop.exe')
+        }else if (agent.indexOf("win64") >= 0 || agent.indexOf("wow64") >= 0) {
+            window.open('https://iscm.360arrow.com/electron/CLodop.exe')
+        }
+      }
+    })
+    return
+  }
+  LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
+  // LODOP.SET_PRINT_MODE('POS_BASEON_PAPER', true) // 可使输出以纸张边缘为基点
+  // 预览
+  const dlen = data.length
+  if(dlen > 1){
+    LODOP.SET_SHOW_MODE("HIDE_PBUTTIN_PREVIEW",1);//隐藏打印按钮
+  }
+  LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data[0])
+  LODOP.SET_PRINT_PAGESIZE(3,2090,dlen>1?0:50,"");
+  LODOP.PREVIEW()
+}
+
 // 打印控件
 export const jGPrint = function (data, type, printerType) {
   if (!data) {
@@ -128,46 +198,12 @@ export const jGPrint = function (data, type, printerType) {
   }
   // 针式打印
   if (printerType == 'NEEDLE') {
-    const LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'))
-    if (!LODOP) {
-      confirm({
-        title: '提示?',
-        content: h => <div>打印控件未安装,请先下载并安装。安装完成后,刷新页面即可打印。</div>,
-        okText: '立即下载',
-        okType: 'danger',
-        cancelText: '暂不打印',
-        onOk () {
-          var agent = navigator.userAgent.toLowerCase();
-          if (agent.indexOf("win32") >= 0 || agent.indexOf("wow32") >= 0) {
-              window.open('https://iscm.360arrow.com/electron/CLodop.exe')
-          }else if (agent.indexOf("win64") >= 0 || agent.indexOf("wow64") >= 0) {
-              window.open('https://iscm.360arrow.com/electron/CLodop.exe')
-          }
-        }
-      })
-      return
-    }
-    
-    LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
-    // LODOP.SET_PRINT_MODE('POS_BASEON_PAPER', true) // 可使输出以纸张边缘为基点
     if (type == 'preview') { //  预览
-      const dlen = data.data.length
-      if(dlen > 1){
-        LODOP.SET_SHOW_MODE("HIDE_PBUTTIN_PREVIEW",1);//隐藏打印按钮
-      }
-      LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data.data[0])
-      LODOP.SET_PRINT_PAGESIZE(3,2090,dlen>1?0:50,"");
-      LODOP.PREVIEW()
+      // lodopPrintView(data.data)
+      pdfPrintView(data.data)
     } else if (type == 'print') { //  打印
-      const dlen = data.data.length
-      for(let i=0;i<dlen;i++){
-        LODOP.PRINT_INIT("")
-        LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data.data[i])
-        LODOP.SET_PRINT_PAGESIZE(3, 2090, (i==dlen-1)?50:0, '')
-        LODOP.PRINT()
-      }
+      pdfPrint(data.data)
     }
-    
   } else {
     // 喷墨打印
     const url = window.URL.createObjectURL(new Blob([data], { type: 'application/pdf' }))

+ 7 - 0
src/store/modules/app.js

@@ -36,6 +36,8 @@ const app = {
     loadingStatus: false,
     winHeight: 0 ,//  窗口高度
     isLastDayForMonth: false, // 是否是当月最后一天
+    showPdfPrintView: false, // pdf 打印预览
+    pdfPrintList: [] // 打印的pdf 文件
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -105,6 +107,11 @@ const app = {
     SET_loadingStatus: (state, val) => {
       state.loadingStatus = val
     },
+    SET_pdfPrintList: (state, val) => {
+      console.log(val)
+      state.pdfPrintList = val
+      state.showPdfPrintView = val && val.length > 0
+    },
   },
   actions: {
     setSidebar ({

+ 1 - 1
src/views/allocationManagement/chainTransferOut/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/storeTransferOut/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/warehouseAllocation/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/basicData/bulkPartsTypeManagement/editModal.vue

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

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

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

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

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

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

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

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/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/bulkManagement/bulkReturnGoods/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...">
       <a-card size="small" v-if="$hasPermissions('B_sparePartsRetPrint')" :bordered="false" class="bulkReturnGoodsDetail-cont">

+ 1 - 1
src/views/bulkManagement/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/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -243,7 +243,7 @@
       :maskClosable="false"
       title="新增产品"
       v-model="showNewProduct"
-      @cancle="showNewProduct=false"
+      @cancel="showNewProduct=false"
       :width="800">
       <newProduct
         ref="newProduct"

+ 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/commonModal.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="416">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main" v-html="modalHtml"></div>

+ 31 - 11
src/views/common/pdfViewModal.vue

@@ -6,19 +6,19 @@
     :maskClosable="false"
     v-model="isShow"
     :title="modalTit"
-    :bodyStyle="{padding: modalTit?'25px 32px 20px':'50px 32px 15px'}"
-    @cancle="handleCommonCancel"
-    width="60%">
+    :bodyStyle="{padding: modalTit?'15px 15px 20px':'50px 32px 15px',background: '#f2f2f2'}"
+    @cancel="handleCommonCancel"
+    width="1024px">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">
-        <div style="width: 100%;height: 500px;overflow: auto;border: 1px solid #eee;">
-          {{ page }} <span @click="page=page+1">下一页</span>
+        <vue-scroll :ops="ops" style="width: 100%;height: 70vh;">
+          <!-- {{ page }} <span @click="page=page+1">下一页</span> -->
           <div v-if="loadedRatio > 0 && loadedRatio < 1" style="background-color: green; color: white; text-align: center" :style="{ width: loadedRatio * 100 + '%' }">{{ Math.floor(loadedRatio * 100) }}%</div>
           <pdf
             ref="pdf"
             v-for="(item,index) in pdfList"
             :key="'pdf-'+index"
-            style="width: 100%;"
+            style="width: 100%;border: 1px solid #eee;margin-bottom: 10px;"
             :src="getUrl('data:application/pdf;base64,' + item)"
             :page="page"
             :rotate="rotate"
@@ -26,11 +26,11 @@
             @error="error"
             @num-pages="numPages = $event"
             @link-clicked="page = $event"></pdf>
-        </div>
+        </vue-scroll>
       </div>
       <div class="btn-box">
-        <a-button type="default" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button type="primary" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
+        <a-button size="large" type="default" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
+        <a-button size="large" type="primary" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -39,6 +39,7 @@
 <script>
 import pdf from 'vue-pdf'
 import CMapReaderFactory from 'vue-pdf/src/CMapReaderFactory.js'
+import { pdfPrint } from '@/libs/JGPrint'
 export default {
   components: {
     pdf
@@ -55,7 +56,7 @@ export default {
     },
     okText: { // 确定 按钮文字
       type: String,
-      default: '打印'
+      default: '立即打印'
     },
     cancelText: { // 取消 按钮文字
       type: String,
@@ -81,7 +82,22 @@ export default {
       numPages: 0,
       rotate: 0,
       curpage: 1,
-      total: 3
+      total: 3,
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, // 是否只有滚动的时候才显示滚动条
+          background: '#9d9d9d', // 滚动条颜色
+          opacity: 0.5, // 滚动条透明度
+          size: '10px',
+          'overflow-x': 'hidden'
+        }
+      }
     }
   },
   methods: {
@@ -89,6 +105,7 @@ export default {
       return pdf.createLoadingTask({ url: item, CMapReaderFactory })
     },
     setData (data) {
+      console.log(data)
       this.pdfList = data
       this.src = data[0]
       this.curpage = 1
@@ -99,12 +116,15 @@ export default {
     },
     // 确定
     handleCommonOk () {
+      pdfPrint(this.pdfList)
       this.$emit('ok')
     },
     // 取消
     handleCommonCancel () {
       this.isShow = false
       this.pdfList = []
+      this.$store.commit('SET_pdfPrintList', [])
+      this.$emit('cancel')
     },
     // 下载
     handleDownload () {

+ 1 - 1
src/views/customerManagement/customerInfo/detailModal.vue

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

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/chooseBillModal.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...">
       <!-- 搜索条件 -->

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

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

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

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

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

@@ -132,7 +132,7 @@
       :title="curBizTitle"
       v-model="openDetailModal"
       v-if="openDetailModal&&fcBizType!='SPARE_PARTS_RETURN'"
-      @cancle="handleDetailClose"
+      @cancel="handleDetailClose"
       width="80%">
       <div style="max-height: 700px;overflow-y: auto;">
         <!-- 销售单 -->

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

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="凭证"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="600">
     <!-- 详情 -->
     <div v-if="detailsData">

+ 1 - 1
src/views/financialManagement/withdrawalManagement/cashOutModal.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/inventoryManagement/inventoryChecking/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/inventoryManagement/inventoryChecking/detailModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="详情"
     v-model="isShow"
-    @cancle="isShow = false"
+    @cancel="isShow = false"
     width="80%">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-card size="small" :bordered="false" class="inventoryCheckingDetail-cont">

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -171,7 +171,7 @@
       :maskClosable="false"
       centered
       title="导出excel"
-      @cancle="exportShow=false"
+      @cancel="exportShow=false"
     >
       <div style="line-height: 48px;padding: 0 30px;">
         <div>盘点单号:{{ basicInfoData&&basicInfoData.checkWarehouseNo }}</div>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/printModal.vue

@@ -6,7 +6,7 @@
     class="inventoryChecking-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/inventoryManagement/inventoryQuery/detailModal.vue

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

+ 1 - 1
src/views/inventoryManagement/satelliteWarehouseInventory/addModal.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...">
       <!-- 补货清单 -->

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

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

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

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

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

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

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/confirmModal.vue

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

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/outWarehousingModal.vue

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

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/printStickerModal.vue

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

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/printView.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="打印预览"
     v-model="isShow"
-    @cancle="isShow = false"
+    @cancel="isShow = false"
     :width="400">
     <!-- 列表 -->
     <div id="print">

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/putWarehousingModal.vue

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

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/stockModal.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...">
       <p v-if="type=='confirm'" style="text-align: center;margin: 0 0 20px;font-size: 14px;font-weight: bold;">以下产品库存不足,确认继续补货吗?</p>

+ 1 - 1
src/views/numsGoodsShelves/settlementManagement/detailModal.vue

@@ -5,7 +5,7 @@
     :maskClosable="false"
     title="结算明细"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     width="70%">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-descriptions :column="3">

+ 1 - 1
src/views/numsGoodsShelves/shelfMonitoring/addModal.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-descriptions>

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/basicInfoModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     title="数字货架基础设置"
     v-model="isShow"
-    @cancle="isShow = false"
+    @cancel="isShow = false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <p style="text-align: center;margin: 0 0 20px;font-size: 14px;font-weight: bold;">{{ nowData && nowData.shelfName || '--' }}</p>

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/bindProductModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :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/numsGoodsShelves/shelfSet/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/numsGoodsShelves/shelfSet/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/outboundOrderManagement/outboundOrder/list.vue

@@ -102,7 +102,7 @@
       :title="detailTitle"
       v-model="openModal"
       v-if="openModal"
-      @cancle="cancleModal"
+      @cancel="cancleModal"
       width="80%">
       <div style="max-height: 700px;overflow-y: auto;">
         <pushOrderDetailModal v-if="outBizType=='PURCHASE_RETURN'" :outBizSn="orderSn" />

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <a-spin :spinning="spinning" tip="Loading...">
-      <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,7 +1,7 @@
 <template>
   <div>
     <a-spin :spinning="spinning" tip="Loading...">
-      <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

@@ -6,7 +6,7 @@
         class="modalBox"
         :title="roleName"
         v-model="isshow"
-        @cancle="cancel"
+        @cancel="cancel"
         :maskClosable="false">
         <a-form class="form-box" style="max-height: 600px;" :form="form" @submit="handleSubmit">
           <a-tree

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

@@ -6,7 +6,7 @@
         class="modalBox"
         :title="titleText"
         v-model="isshow"
-        @cancle="cancel"
+        @cancel="cancel"
         :maskClosable="false"
         width="45%">
         <a-form :form="form" @submit="handleSubmit">

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

@@ -8,7 +8,7 @@
         :maskClosable="false"
         :title="titleText"
         v-model="isshow"
-        @cancle="isshow=false"
+        @cancel="isshow=false"
         :width="800">
         <a-form-model
           id="userEdit-form"

+ 1 - 1
src/views/power/user/userSyncModal.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/productBrand/editModal.vue

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

+ 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">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 表单 -->

+ 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/purchasingManagement/purchaseOrder/chooseImportModal.vue

@@ -7,7 +7,7 @@
     title="导入"
     :closable="false"
     v-model="isShow"
-    @cancle="isShow=false"
+    @cancel="isShow=false"
     :width="900">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="chooseImport-con">

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/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/purchaseOrder/outStockModal.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 class="outStock-con">

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/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/reportData/chainStockReport/detailModal.vue

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

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

@@ -6,7 +6,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/salesQuery/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/salesManagement/salesQuery/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/salesManagement/salesQuery/productSalesRecordModal.vue

@@ -7,7 +7,7 @@
       :maskClosable="false"
       :title="modalTit"
       v-model="isShow"
-      @cancle="isShow=false"
+      @cancel="isShow=false"
       :width="960">
       <div>
         <a-tabs size="small" type="card" v-model="curTab" @change="callback">

+ 1 - 1
src/views/salesManagement/salesman/editModal.vue

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

+ 1 - 1
src/views/storeManagement/bind/editModal.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/storeManagement/userAuthorization/editModal.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/supplierManagement/supplierInfo/editModal.vue

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