Ver código fonte

拖动弹框

lilei 2 anos atrás
pai
commit
ba2fb92d7a
41 arquivos alterados com 268 adições e 59 exclusões
  1. 31 3
      src/components/Table/index.js
  2. 93 0
      src/core/directives/dragModal.js
  3. 1 1
      src/core/use.js
  4. 8 2
      src/views/allocationManagement/transferOut/list.vue
  5. 7 1
      src/views/allocationManagement/transferReturn/list.vue
  6. 8 2
      src/views/allocationManagement/transfersPrint/list.vue
  7. 1 0
      src/views/common/commonModal.vue
  8. 8 2
      src/views/dealerManagement/dealerAccountManagement/list.vue
  9. 7 1
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  10. 7 1
      src/views/dealerManagement/marketingDivisionSet/list.vue
  11. 9 3
      src/views/dealerManagement/merchantInfoManagement/list.vue
  12. 1 1
      src/views/dealerManagement/rebateSettings/list.vue
  13. 1 1
      src/views/expenseManagement/expenseReimbursement/list.vue
  14. 1 1
      src/views/financialManagement/allocateReturnConfirmation/list.vue
  15. 3 3
      src/views/financialManagement/financialCollection/list.vue
  16. 1 1
      src/views/financialManagement/returnConfirmation/list.vue
  17. 2 1
      src/views/financialManagement/warehousingConfirmation/list.vue
  18. 1 1
      src/views/inventoryManagement/intelligentReplenishment/list.vue
  19. 1 1
      src/views/inventoryManagement/inventoryQuery/list.vue
  20. 3 2
      src/views/productManagement/productBrand/list.vue
  21. 7 1
      src/views/productManagement/productCategory/list.vue
  22. 2 2
      src/views/productManagement/productInfo/list.vue
  23. 7 1
      src/views/productManagement/productLevel/list.vue
  24. 2 2
      src/views/productManagement/productPricing/list.vue
  25. 1 1
      src/views/productManagement/productUniversal/list.vue
  26. 2 2
      src/views/productManagement/shelfNoManage/list.vue
  27. 1 1
      src/views/promotionRulesManagement/orderStatistics/list.vue
  28. 1 1
      src/views/promotionRulesManagement/productStatistics/list.vue
  29. 1 1
      src/views/promotionRulesManagement/promotionRules/list.vue
  30. 2 2
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  31. 1 1
      src/views/salesManagement/backorder/list.vue
  32. 14 2
      src/views/salesManagement/examineVerify/list.vue
  33. 8 1
      src/views/salesManagement/outboundOrder/list.vue
  34. 1 1
      src/views/salesManagement/priceInquiry/list.vue
  35. 1 1
      src/views/salesManagement/pushOrderManagement/list.vue
  36. 1 1
      src/views/salesManagement/receiptPrint/list.vue
  37. 8 2
      src/views/salesManagement/salesCollection/list.vue
  38. 1 1
      src/views/salesManagement/salesCollection/voucherModal.vue
  39. 9 3
      src/views/salesManagement/sendOutOrder/list.vue
  40. 3 3
      src/views/salesManagement/stockPrint/list.vue
  41. 1 1
      src/views/salesReturnManagement/pickUp/list.vue

+ 31 - 3
src/components/Table/index.js

@@ -10,7 +10,8 @@ export default {
       localLoading: false,
       localDataSource: [],
       localPagination: Object.assign({}, this.pagination),
-      isSucceed: true //  是否请求成功
+      isSucceed: true ,//  是否请求成功
+      leftAlignId:"",
     }
   },
   props: Object.assign({}, T.props, {
@@ -342,7 +343,34 @@ export default {
           </template>
         </a-alert>
       )
-    }
+    },
+    // 自定义行
+    customRows(record, index) {
+      return {
+        // 自定义属性,也就是官方文档中的props,可通过条件来控制样式
+        style: {
+          // 设置字体颜色
+          // 'color': record.id === this.leftAlignId ? '#fff' : '',
+          //  设置行背景色
+          'background-color': record.id === this.leftAlignId ? '#ffff7f' : ''
+          // 设置字体类型
+          // 'font-family': 'Microsoft YaHei',
+          // // 下划线
+          // 'text-decoration': 'underline',
+          // // 字体样式-斜体
+          // 'font-style': 'italic',
+          // // 字体加粗
+          // 'font-weight': 'bold'
+        },
+        on: {
+          // 鼠标单击行
+          click: event => {
+            // 记录当前点击的行标识
+            this.leftAlignId = record.id
+          }
+        }
+      }
+    },
   },
 
   render () {
@@ -386,7 +414,7 @@ export default {
     }
     // isSucceed
     const table = (
-      <a-table {...{ props, scopedSlots: { ...this.$scopedSlots } }} onChange={this.loadData}>
+      <a-table {...{ props, scopedSlots: { ...this.$scopedSlots } }} customRow={this.customRows} onChange={this.loadData}>
         { Object.keys(this.$slots).map(name => (<template slot={name}>{this.$slots[name]}</template>)) }
       </a-table>
     )

+ 93 - 0
src/core/directives/dragModal.js

@@ -0,0 +1,93 @@
+import Vue from 'vue'
+
+// 弹窗拖拽属性
+/**
+ * @directive 自定义属性
+ * @todo 弹窗拖拽属性
+ * @desc 使用在弹窗内部任意加载的html添加v-drag
+ * @param .ant-modal-header 弹窗头部用来拖动的属性
+ * @param .ant-modal 拖动的属性
+*/
+const dragModal = Vue.directive('drag', (el, binding, vnode, oldVnode) => {
+  // inserted (el, binding, vnode, oldVnode) {
+  Vue.nextTick(() => {
+    const isThemeModal = el.classList.contains('grid-theme')
+    const dialogHeaderEl = isThemeModal ? el.querySelector('.ant-tabs-bar') : el.querySelector('.ant-modal-header')
+    const dragDom = isThemeModal ? el.querySelector('.ant-modal') : el.querySelector('.ant-modal')
+    // dialogHeaderEl.style.cursor = 'move';
+    dialogHeaderEl.style.cssText += ';cursor:move;user-select:none;'
+    // dragDom.style.cssText += ';top:0px;'
+    dragDom.style.cssText += `;left:0px;top:0px;`
+    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+    const sty = (function () {
+      if (window.document.currentStyle) {
+        return (dom, attr) => dom.currentStyle[attr]
+      } else {
+        return (dom, attr) => getComputedStyle(dom, false)[attr]
+      }
+    })()
+
+    dialogHeaderEl.onmousedown = (e) => {
+      // 鼠标按下,计算当前元素距离可视区的距离
+      const disX = e.clientX - dialogHeaderEl.offsetLeft
+      const disY = e.clientY - dialogHeaderEl.offsetTop
+
+      const screenWidth = document.body.clientWidth // body当前宽度
+      const screenHeight = document.documentElement.clientHeight // 可见区域高度(应为body高度,可某些环境下无法获取)
+
+      const dragDomWidth = dragDom.offsetWidth // 对话框宽度
+      const dragDomheight = dragDom.offsetHeight // 对话框高度
+
+      const minDragDomLeft = dragDom.offsetLeft
+      const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth - (isThemeModal ? 10 : 0)
+
+      const minDragDomTop = dragDom.offsetTop
+      const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomheight - (isThemeModal ? 10 : 0)
+
+      // 获取到的值带px 正则匹配替换
+      let styL = sty(dragDom, 'left')
+      let styT = sty(dragDom, 'top')
+      
+      // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+      if (styL.includes('%')) {
+        // eslint-disable-next-line no-useless-escape
+        styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100)
+        // eslint-disable-next-line no-useless-escape
+        styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100)
+      } else {
+        styL = +styL.replace(/\px/g, '')
+        styT = +styT.replace(/\px/g, '')
+      };
+
+      document.onmousemove = function (e) {
+        // 通过事件委托,计算移动的距离
+        let left = e.clientX - disX
+        let top = e.clientY - disY
+
+        // 边界处理
+        if (-(left) > minDragDomLeft) {
+          left = -(minDragDomLeft)
+        } else if (left > maxDragDomLeft) {
+          left = maxDragDomLeft
+        }
+
+        if (-(top) > minDragDomTop) {
+          top = -(minDragDomTop)
+        } else if (top > maxDragDomTop) {
+          top = maxDragDomTop
+        }
+        // 移动当前元素
+        dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
+      }
+
+      document.onmouseup = function (e) {
+        document.onmousemove = null
+        document.onmouseup = null
+        dragDom.releaseCapture && dragDom.releaseCapture();
+      }
+       dragDom.setCapture && dragDom.setCapture();
+    }
+  })
+})
+
+export default dragModal

+ 1 - 1
src/core/use.js

@@ -15,7 +15,7 @@ import PageLoading from '@/components/PageLoading'
 import PermissionHelper from '@/utils/helper/permission'
 // import '@/components/use'
 import './directives/hasPermission'
-
+import './directives/dragModal'
 VueClipboard.config.autoSetContainer = true
 
 Vue.use(Antd)

+ 8 - 2
src/views/allocationManagement/transferOut/list.vue

@@ -157,9 +157,15 @@
       </s-table>
     </a-spin>
     <!-- 新增 -->
-    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+    <basic-info-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_OUT_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal
+      v-drag
+      :openModal="visibleAudit"
+      :spinning="spinningAudit"
+      @close="visibleAudit=false"
+      @ok="auditOrder('WAIT_OUT_WAREHOUSE')"
+      @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </template>
 

+ 7 - 1
src/views/allocationManagement/transferReturn/list.vue

@@ -126,7 +126,13 @@
     <!-- 新增 -->
     <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal=false" />
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal
+      v-drag
+      :openModal="visibleAudit"
+      :spinning="spinningAudit"
+      @close="visibleAudit=false"
+      @ok="auditOrder('WAIT_CHECK')"
+      @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </template>
 

+ 8 - 2
src/views/allocationManagement/transfersPrint/list.vue

@@ -134,9 +134,15 @@
       </a-spin>
     </a-card>
     <!-- 打印导出 -->
-    <print-modal :openModal="openModal" :itemData="itemData" nowType="dbflPrint" @ok="handleOk" @close="openModal=false" />
+    <print-modal
+      v-drag
+      :openModal="openModal"
+      :itemData="itemData"
+      nowType="dbflPrint"
+      @ok="handleOk"
+      @close="openModal=false" />
     <!-- 打印记录 -->
-    <recordModal ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
+    <recordModal v-drag ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
   </div>
 </template>
 

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

@@ -1,6 +1,7 @@
 <template>
   <a-modal
     centered
+    v-drag
     class="common-modal"
     :footer="null"
     :maskClosable="false"

+ 8 - 2
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -82,9 +82,15 @@
       </s-table>
     </a-spin>
     <!-- 新增/编辑 -->
-    <dealer-account-edit-modal :openModal="openModal" :nowData="nowData" :itemId="itemId" @ok="$refs.table.refresh(true)" @close="closeModal" />
+    <dealer-account-edit-modal
+      v-drag
+      :openModal="openModal"
+      :nowData="nowData"
+      :itemId="itemId"
+      @ok="$refs.table.refresh(true)"
+      @close="closeModal" />
     <!-- 查看 -->
-    <dealer-account-detail-modal :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" />
+    <dealer-account-detail-modal v-drag :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" />
   </a-card>
 </template>
 

+ 7 - 1
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -77,7 +77,13 @@
         @changePage="changePage" />
     </a-spin>
     <!-- 关联下级 -->
-    <associate-modal :openModal="openModal" :nowData="nowData" :tabInd="tabInd" @ok="addItemOk" @close="openModal=false" />
+    <associate-modal
+      v-drag
+      :openModal="openModal"
+      :nowData="nowData"
+      :tabInd="tabInd"
+      @ok="addItemOk"
+      @close="openModal=false" />
   </a-card>
 </template>
 I

+ 7 - 1
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -50,7 +50,13 @@
       </s-table>
     </a-spin>
     <!-- 编辑分区 -->
-    <marketing-division-set-edit-modal :nowData="nowData" :openModal="openModal" :itemId="itemId" @ok="$refs.table.refresh()" @close="closeModal" />
+    <marketing-division-set-edit-modal
+      v-drag
+      :nowData="nowData"
+      :openModal="openModal"
+      :itemId="itemId"
+      @ok="$refs.table.refresh()"
+      @close="closeModal" />
   </a-card>
 </template>
 

+ 9 - 3
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -92,11 +92,17 @@
       </s-table>
     </a-spin>
     <!-- 产品详情 -->
-    <merchant-info-management-detail-modal :openModal="openModal" :isAudit="isAudit" :itemId="itemId" @ok="resetForm" @close="closeModal" />
+    <merchant-info-management-detail-modal
+      v-drag
+      :openModal="openModal"
+      :isAudit="isAudit"
+      :itemId="itemId"
+      @ok="resetForm"
+      @close="closeModal" />
     <!-- 合作设置 -->
-    <UpdateCooperate ref="updateCooperate" :openUcModal="openUcModal" @ok="resetForm" @close="openUcModal=false"></UpdateCooperate>
+    <UpdateCooperate ref="updateCooperate" v-drag :openUcModal="openUcModal" @ok="resetForm" @close="openUcModal=false"></UpdateCooperate>
     <!-- 级别设置 -->
-    <UpdateDealerLeve ref="updateDealerLevel" :openUdModal="openUdModal" @ok="resetForm" @close="openUdModal=false"></UpdateDealerLeve>
+    <UpdateDealerLeve ref="updateDealerLevel" v-drag :openUdModal="openUdModal" @ok="resetForm" @close="openUdModal=false"></UpdateDealerLeve>
   </a-card>
 </template>
 

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

@@ -63,7 +63,7 @@
       </s-table>
     </a-spin>
     <!-- 关联下级 -->
-    <associate-modal :openModal="openModal" :nowData="nowData" @ok="$refs.table.refresh(true)" @close="closeModal" />
+    <associate-modal v-drag :openModal="openModal" :nowData="nowData" @ok="$refs.table.refresh(true)" @close="closeModal" />
   </a-card>
 </template>
 

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

@@ -140,7 +140,7 @@
       </s-table>
     </a-spin>
     <!-- 审核进度 -->
-    <verifyModal :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
+    <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
     <!-- 新增 -->
     <baseDataModal :show="openBaseModal" @close="openBaseModal=false"></baseDataModal>
   </a-card>

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

@@ -86,7 +86,7 @@
       </s-table>
     </a-spin>
     <!-- 查看 -->
-    <AllocateReturnDetailModal :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+    <AllocateReturnDetailModal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
   </a-card>
 </template>
 

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

@@ -141,11 +141,11 @@
       </s-table>
     </a-spin>
     <!-- 审核进度 -->
-    <verifyModal :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
+    <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
     <!-- 基础信息 -->
-    <baseModal :show="baseModal" @cancel="baseModal=false"></baseModal>
+    <baseModal v-drag :show="baseModal" @cancel="baseModal=false"></baseModal>
     <!-- 关联备货单 -->
-    <dispatchModal ref="openDisModal" :openModal="openDisModal" :itemSn="itemSn" @close="openDisModal=false"></dispatchModal>
+    <dispatchModal v-drag ref="openDisModal" :openModal="openDisModal" :itemSn="itemSn" @close="openDisModal=false"></dispatchModal>
   </a-card>
 </template>
 

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

@@ -86,7 +86,7 @@
       </s-table>
     </a-spin>
     <!-- 查看 -->
-    <confirmation-detail-modal :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+    <confirmation-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
   </a-card>
 </template>
 

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

@@ -68,10 +68,11 @@
       </s-table>
     </a-spin>
     <!-- 查看 -->
-    <confirmation-detail-modal :openModal="openModal" :itemSn="itemSn" :nowData="nowData" @close="closeModal" />
+    <confirmation-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" :nowData="nowData" @close="closeModal" />
     <!-- 入库确认 -->
     <a-modal
       centered
+      v-drag
       class="confirmation-modal"
       :footer="null"
       :maskClosable="false"

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

@@ -57,7 +57,7 @@
       </s-table>
     </a-spin>
     <!-- 详情 -->
-    <intelligent-replenishment-detail-modal :openModal="openDetailModal" :itemSn="itemSn" @close="closeModal" />
+    <intelligent-replenishment-detail-modal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeModal" />
   </a-card>
 </template>
 

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

@@ -107,7 +107,7 @@
       </s-table>
     </a-spin>
     <!-- 库存详情 -->
-    <inventory-query-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
+    <inventory-query-detail-modal v-drag :openModal="openModal" :itemId="itemId" @close="closeModal" />
     <!-- 导出Excel -->
     <export-excel-modal :openModal="openExcelModal" @ok="handleExcelOk" @close="openExcelModal=false" />
   </a-card>

+ 3 - 2
src/views/productManagement/productBrand/list.vue

@@ -77,12 +77,13 @@
       </s-table>
     </a-spin>
     <!-- 新增/编辑产品品牌 -->
-    <product-brand-edit-modal :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="$refs.table.refresh()" @close="closeModal" />
+    <product-brand-edit-modal v-drag :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="$refs.table.refresh()" @close="closeModal" />
     <!-- 查看产品品牌 -->
-    <product-brand-detail-modal :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
+    <product-brand-detail-modal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
     <!-- 查看图片 -->
     <a-modal
       centered
+      v-drag
       class="productBrandList-modal"
       :footer="null"
       :maskClosable="false"

+ 7 - 1
src/views/productManagement/productCategory/list.vue

@@ -49,7 +49,13 @@
       </s-table>
     </a-spin>
     <!-- 新增/编辑产品分类 -->
-    <product-category-edit-modal :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="handleOk" @close="closeModal" />
+    <product-category-edit-modal
+      v-drag
+      :openModal="openModal"
+      :nowData="nowData"
+      :itemSn="itemSn"
+      @ok="handleOk"
+      @close="closeModal" />
   </a-card>
 </template>
 

+ 2 - 2
src/views/productManagement/productInfo/list.vue

@@ -201,9 +201,9 @@
       </s-table>
     </a-spin>
     <!-- 产品详情 -->
-    <product-info-detail-modal :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+    <product-info-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
     <!-- 产品下线 -->
-    <product-info-offline-modal :openModal="openOfflineModal" :offlineProductList="offlineProductList" @close="closeOfflineModal" @ok="$refs.table.refresh()" />
+    <product-info-offline-modal v-drag :openModal="openOfflineModal" :offlineProductList="offlineProductList" @close="closeOfflineModal" @ok="$refs.table.refresh()" />
   </a-card>
 </template>
 

+ 7 - 1
src/views/productManagement/productLevel/list.vue

@@ -86,7 +86,13 @@
       </template>
     </s-table>
     <!-- 编辑价格 -->
-    <product-level-edit-modal :openModal="openModal" :itemId="itemId" :nowData="nowData" @close="closeModal" @ok="$refs.table.refresh()" />
+    <product-level-edit-modal
+      v-drag
+      :openModal="openModal"
+      :itemId="itemId"
+      :nowData="nowData"
+      @close="closeModal"
+      @ok="$refs.table.refresh()" />
   </a-card>
 </template>
 

+ 2 - 2
src/views/productManagement/productPricing/list.vue

@@ -130,9 +130,9 @@
       </s-table>
     </a-spin>
     <!-- 编辑价格 -->
-    <product-pricing-edit-modal :openModal="openModal" :itemSn="itemSn" @close="closeModal" @ok="$refs.table.refresh()" />
+    <product-pricing-edit-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" @ok="$refs.table.refresh()" />
     <!-- 审核价格 -->
-    <product-pricing-audit-modal :openModal="openAuditModal" :itemSn="itemSn" @close="closeAuditModal" @ok="auditSuccess" />
+    <product-pricing-audit-modal v-drag :openModal="openAuditModal" :itemSn="itemSn" @close="closeAuditModal" @ok="auditSuccess" />
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
   </a-card>

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

@@ -85,7 +85,7 @@
       </s-table>
     </a-spin>
     <!-- 新增/编辑 -->
-    <product-universal-edit-modal :openModal="openModal" :itemId="itemId" @close="closeModal" @ok="$refs.table.refresh()" />
+    <product-universal-edit-modal v-drag :openModal="openModal" :itemId="itemId" @close="closeModal" @ok="$refs.table.refresh()" />
   </a-card>
 </template>
 

+ 2 - 2
src/views/productManagement/shelfNoManage/list.vue

@@ -123,9 +123,9 @@
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
     <!-- 编辑 -->
-    <editHwModal :openModal="openModal" :nowData="nowData" @ok="editOk" @close="closeModal" />
+    <editHwModal v-drag :openModal="openModal" :nowData="nowData" @ok="editOk" @close="closeModal" />
     <!-- 变更记录 -->
-    <changeRecordModal :openModal="recordModal" :detailData="nowData" @close="closeModal"></changeRecordModal>
+    <changeRecordModal v-drag :openModal="recordModal" :detailData="nowData" @close="closeModal"></changeRecordModal>
   </a-card>
 </template>
 

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

@@ -89,7 +89,7 @@
       </s-table>
     </a-spin>
     <!-- 详情 -->
-    <orderStatisticsDetailModal :openModal="openModal" :itemSn="itemSn" :nowData="nowData" @close="closeModal" />
+    <orderStatisticsDetailModal v-drag :openModal="openModal" :itemSn="itemSn" :nowData="nowData" @close="closeModal" />
   </a-card>
 </template>
 

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

@@ -85,7 +85,7 @@
       </s-table>
     </a-spin>
     <!-- 详情 -->
-    <productStatisticsDetailModal :openModal="openModal" :itemSn="itemSn" :nowData="nowData" @close="closeModal" />
+    <productStatisticsDetailModal v-drag :openModal="openModal" :itemSn="itemSn" :nowData="nowData" @close="closeModal" />
   </a-card>
 </template>
 

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

@@ -90,7 +90,7 @@
       </s-table>
     </a-spin>
     <!-- 新增 -->
-    <basic-info-modal :openModal="openModal" :itemSn="itemSn" @ok="handleOk" @close="closeModal" />
+    <basic-info-modal v-drag :openModal="openModal" :itemSn="itemSn" @ok="handleOk" @close="closeModal" />
   </a-card>
 </template>
 

+ 2 - 2
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -134,8 +134,8 @@
       </s-table>
     </a-spin>
     <!-- 选择基本信息弹框 -->
-    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
-    <sparePartsDetailModal :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
+    <basic-info-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+    <sparePartsDetailModal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
     <!-- 导出提示框 -->
     <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>

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

@@ -48,7 +48,7 @@
       </s-table>
     </a-spin>
     <!-- 详情 -->
-    <backorder-detail-modal :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+    <backorder-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
   </a-card>
 </template>
 

+ 14 - 2
src/views/salesManagement/examineVerify/list.vue

@@ -117,8 +117,20 @@
       </s-table>
     </a-spin>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('STOCK_UP_REJECT')" />
-    <auditRejectModal :openModal="visibleAuditReject" :spinning="spinningAuditReject" :itemData="auditInfo" @close="visibleAuditReject=false" @ok="auditReject" />
+    <auditModal
+      v-drag
+      :openModal="visibleAudit"
+      :spinning="spinningAudit"
+      @close="visibleAudit=false"
+      @ok="auditOrder('OUTING_WAREHOUSE')"
+      @fail="auditOrder('STOCK_UP_REJECT')" />
+    <auditRejectModal
+      v-drag
+      :openModal="visibleAuditReject"
+      :spinning="spinningAuditReject"
+      :itemData="auditInfo"
+      @close="visibleAuditReject=false"
+      @ok="auditReject" />
   </a-card>
 </template>
 

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

@@ -146,6 +146,7 @@
     <!-- 详情 -->
     <a-modal
       centered
+      v-drag
       class="outboundOrderDetail-modal"
       :footer="null"
       :maskClosable="false"
@@ -160,7 +161,13 @@
       </div>
     </a-modal>
     <!-- 发货信息 -->
-    <sendGoodModal ref="detailModal" modalTit="新增发货单" :openModal="showDetailModal" @ok="sendSuccess" @cancel="showDetailModal=false"></sendGoodModal>
+    <sendGoodModal
+      v-drag
+      ref="detailModal"
+      modalTit="新增发货单"
+      :openModal="showDetailModal"
+      @ok="sendSuccess"
+      @cancel="showDetailModal=false"></sendGoodModal>
   </a-card>
 </template>
 

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

@@ -111,7 +111,7 @@
       </template>
     </s-table>
     <!-- 查看车辆信息 -->
-    <car-info-modal ref="carInfoModal" :openModal="openCarInfoModal" :infoData="vinInfoData&&vinInfoData.vinInfo" @close="openCarInfoModal=false" />
+    <car-info-modal v-drag ref="carInfoModal" :openModal="openCarInfoModal" :infoData="vinInfoData&&vinInfoData.vinInfo" @close="openCarInfoModal=false" />
   </a-card>
 </template>
 

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

@@ -180,7 +180,7 @@
         <salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
       </commonModal>
       <!-- 发货说明 -->
-      <explainInfoModal :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
+      <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
     </a-spin>
   </a-card>
 </template>

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

@@ -162,7 +162,7 @@
           <printModel ref="printModel" @cancel="closeTipModal" @printOk="printOk"></printModel>
         </commonModal>
         <!-- 打印记录 -->
-        <recordModal ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
+        <recordModal v-drag ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
         <!-- 查看销售单或备货单详情 -->
         <commonModal
           :modalTit="detailType?'备货单详情':'销售单详情'"

+ 8 - 2
src/views/salesManagement/salesCollection/list.vue

@@ -182,9 +182,15 @@
       </s-table>
 
       <!-- 关联收款单 -->
-      <detailModal ref="detailModal" modalTit="关联收款单" @ok="relationSuccess" :openModal="showDetail" @cancel="showDetail=false"></detailModal>
+      <detailModal
+        v-drag
+        ref="detailModal"
+        modalTit="关联收款单"
+        @ok="relationSuccess"
+        :openModal="showDetail"
+        @cancel="showDetail=false"></detailModal>
       <!-- 销售收款凭证 -->
-      <voucherModal ref="voucherModal" modalTit="销售收款凭证" :openModal="showVoucher" @cancel="showVoucher=false"></voucherModal>
+      <voucherModal v-drag ref="voucherModal" modalTit="销售收款凭证" :openModal="showVoucher" @cancel="showVoucher=false"></voucherModal>
 
       <!-- 销售收款弹框 -->
       <commonModal

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

@@ -8,7 +8,7 @@
     :title="modalTit"
     :bodyStyle="{padding: modalTit?'25px 32px 20px':'50px 32px 15px'}"
     @cancel="handleCommonCancel"
-    width="80%">
+    width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main" v-if="detail">
         <div class="toolsBar">

+ 9 - 3
src/views/salesManagement/sendOutOrder/list.vue

@@ -131,11 +131,17 @@
       </s-table>
     </a-spin>
     <!-- 发货单详情 -->
-    <detailModal ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
+    <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
     <!-- 编辑发货单 -->
-    <sendGoodModal ref="sendGoodModal" modalTit="编辑发货单" :openModal="showSendGoodModal" @ok="sendSuccess" @cancel="showSendGoodModal=false"></sendGoodModal>
+    <sendGoodModal
+      v-drag
+      ref="sendGoodModal"
+      modalTit="编辑发货单"
+      :openModal="showSendGoodModal"
+      @ok="sendSuccess"
+      @cancel="showSendGoodModal=false"></sendGoodModal>
     <!-- 导入发货单 -->
-    <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="resetSearchForm" />
+    <importGuideModal v-drag :openModal="openGuideModal" @close="openGuideModal=false" @ok="resetSearchForm" />
   </a-card>
 </template>
 

+ 3 - 3
src/views/salesManagement/stockPrint/list.vue

@@ -159,9 +159,9 @@
           </template>
         </s-table>
         <!-- 分类打印 -->
-        <sendTypeModal ref="typePrint" :openModal="showTipModal" @ok="handlePrintOk" @close="showTipModal=false" />
+        <sendTypeModal v-drag ref="typePrint" :openModal="showTipModal" @ok="handlePrintOk" @close="showTipModal=false" />
         <!-- 打印记录 -->
-        <recordModal ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
+        <recordModal v-drag ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
         <!-- 查看销售单或备货单详情 -->
         <commonModal
           :modalTit="detailType?'备货单详情':'销售单详情'"
@@ -184,7 +184,7 @@
           </div>
         </commonModal>
         <!-- 发货说明 -->
-        <explainInfoModal mode="view" :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
+        <explainInfoModal v-drag mode="view" :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
       </a-spin>
     </a-card>
   </div>

+ 1 - 1
src/views/salesReturnManagement/pickUp/list.vue

@@ -131,7 +131,7 @@ export default {
     return {
       spinning: false,
       // 高级搜索 展开/关闭
-      advanced: false,
+      advanced: true,
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数