Browse Source

代码优化

lilei 3 năm trước cách đây
mục cha
commit
def882228e
100 tập tin đã thay đổi với 293 bổ sung29 xóa
  1. 2 4
      src/config/router.config.js
  2. 1 1
      src/utils/request.js
  3. 2 0
      src/views/Home.vue
  4. 8 1
      src/views/allocationManagement/transferReturn/edit.vue
  5. 2 0
      src/views/basicData/transferTypeManagement/editModal.vue
  6. 3 0
      src/views/basicData/transferTypeManagement/list.vue
  7. 2 0
      src/views/basicData/warehouse/editModal.vue
  8. 3 0
      src/views/basicData/warehouse/list.vue
  9. 2 0
      src/views/basicData/warehouse/storingLocation/editModal.vue
  10. 3 0
      src/views/basicData/warehouse/storingLocation/list.vue
  11. 3 1
      src/views/bnSetting/menu/adminMenus.vue
  12. 3 0
      src/views/dataExport/exportCheck/list.vue
  13. 3 0
      src/views/dataExport/exportSales/list.vue
  14. 2 0
      src/views/dealerManagement/dealerAccountManagement/editModal.vue
  15. 3 0
      src/views/dealerManagement/dealerAccountManagement/list.vue
  16. 2 0
      src/views/dealerManagement/dealerRelationshipBinding/associateModal.vue
  17. 3 0
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  18. 3 0
      src/views/dealerManagement/marketingDivisionSet/list.vue
  19. 3 0
      src/views/dealerManagement/merchantInfoManagement/edit.vue
  20. 3 0
      src/views/dealerManagement/merchantInfoManagement/list.vue
  21. 3 0
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  22. 2 0
      src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue
  23. 2 0
      src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue
  24. 2 0
      src/views/dealerManagement/rebateSettings/associateModal.vue
  25. 3 0
      src/views/dealerManagement/rebateSettings/list.vue
  26. 3 0
      src/views/dowloadFile/list.vue
  27. 3 0
      src/views/expenseManagement/expenseReimbursement/add.vue
  28. 3 1
      src/views/expenseManagement/expenseReimbursement/detail.vue
  29. 3 1
      src/views/expenseManagement/expenseReimbursement/list.vue
  30. 3 1
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  31. 3 0
      src/views/financialManagement/allocateReturnConfirmation/list.vue
  32. 3 0
      src/views/financialManagement/financialCollection/list.vue
  33. 3 0
      src/views/financialManagement/inventoryConfirmation/detail.vue
  34. 3 0
      src/views/financialManagement/inventoryConfirmation/list.vue
  35. 3 0
      src/views/financialManagement/returnConfirmation/list.vue
  36. 3 0
      src/views/financialManagement/warehousingConfirmation/list.vue
  37. 5 3
      src/views/inventoryManagement/intelligentReplenishment/detailModal.vue
  38. 3 0
      src/views/inventoryManagement/intelligentReplenishment/edit.vue
  39. 3 0
      src/views/inventoryManagement/intelligentReplenishment/import.vue
  40. 3 0
      src/views/inventoryManagement/intelligentReplenishment/list.vue
  41. 3 0
      src/views/inventoryManagement/intelligentReplenishment/productRange.vue
  42. 3 0
      src/views/inventoryManagement/intelligentReplenishment/set.vue
  43. 3 0
      src/views/inventoryManagement/inventoryCheck/detail.vue
  44. 3 0
      src/views/inventoryManagement/inventoryCheck/list.vue
  45. 3 1
      src/views/inventoryManagement/inventoryQuery/list.vue
  46. 3 0
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  47. 3 0
      src/views/inventoryManagement/inventoryWarning/list.vue
  48. 3 0
      src/views/inventoryManagement/makeInventory/check.vue
  49. 3 0
      src/views/inventoryManagement/makeInventory/list.vue
  50. 3 0
      src/views/inventoryManagement/supervisionDisk/check.vue
  51. 3 0
      src/views/inventoryManagement/supervisionDisk/list.vue
  52. 3 1
      src/views/power/OperateJournal/OperateJournal.vue
  53. 3 1
      src/views/power/dataDictionary/dataDictionary.vue
  54. 2 0
      src/views/power/menu/menu.vue
  55. 2 0
      src/views/power/role/menuModal.vue
  56. 3 1
      src/views/power/role/roleList.vue
  57. 2 0
      src/views/power/role/roleModal.vue
  58. 2 0
      src/views/power/user/updateAreal.vue
  59. 3 1
      src/views/power/user/userList.vue
  60. 2 0
      src/views/power/user/userModal.vue
  61. 3 1
      src/views/productManagement/newProduct/detail.vue
  62. 3 0
      src/views/productManagement/newProduct/list.vue
  63. 3 1
      src/views/productManagement/newProduct/modal.vue
  64. 3 0
      src/views/productManagement/priceChangeRecord/list.vue
  65. 2 0
      src/views/productManagement/productBrand/editModal.vue
  66. 3 0
      src/views/productManagement/productBrand/list.vue
  67. 2 0
      src/views/productManagement/productCategory/editModal.vue
  68. 3 0
      src/views/productManagement/productCategory/list.vue
  69. 3 0
      src/views/productManagement/productInfo/edit.vue
  70. 3 0
      src/views/productManagement/productInfo/list.vue
  71. 3 0
      src/views/productManagement/productLaunchAudit/list.vue
  72. 3 0
      src/views/productManagement/productLevel/list.vue
  73. 3 0
      src/views/productManagement/productOfflineAudit/list.vue
  74. 3 0
      src/views/productManagement/productPricing/list.vue
  75. 3 0
      src/views/productManagement/productUniversal/list.vue
  76. 3 0
      src/views/promotionRulesManagement/orderStatistics/list.vue
  77. 3 0
      src/views/promotionRulesManagement/productStatistics/list.vue
  78. 3 0
      src/views/promotionRulesManagement/promotionRules/detail.vue
  79. 2 0
      src/views/promotionRulesManagement/promotionRules/editRuleModal.vue
  80. 3 0
      src/views/promotionRulesManagement/promotionRules/list.vue
  81. 3 0
      src/views/promotionRulesManagement/promotionRules/rule.vue
  82. 2 0
      src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue
  83. 3 0
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  84. 3 0
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  85. 2 0
      src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue
  86. 6 3
      src/views/reportData/actualSalesReport/list.vue
  87. 3 0
      src/views/reportData/allCountryCostReport/list.vue
  88. 3 0
      src/views/reportData/allocationDetails/list.vue
  89. 3 0
      src/views/reportData/allocationOrderTotal/list.vue
  90. 8 5
      src/views/reportData/allocationPresentation/list.vue
  91. 3 0
      src/views/reportData/billingReturnReport/list.vue
  92. 3 0
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  93. 3 0
      src/views/reportData/priceDifferenceDetailReport/list.vue
  94. 3 0
      src/views/reportData/regionTypeSalesReport/list.vue
  95. 3 0
      src/views/reportData/returnGoodsPresentation/list.vue
  96. 3 0
      src/views/reportData/returnSlipReport/list.vue
  97. 3 0
      src/views/reportData/salesAmountReport/list.vue
  98. 3 1
      src/views/reportData/salesDetails/list.vue
  99. 3 0
      src/views/reportData/salesOrderTotal/list.vue
  100. 3 0
      src/views/reportData/salesPresentation/list.vue

+ 2 - 4
src/config/router.config.js

@@ -1206,8 +1206,7 @@ export const asyncRouterMap = [
             children: [{
               path: 'list',
               name: 'salesAmountReportList',
-              component: () => import(/* webpackChunkName: "reportData" */
-                '@/views/reportData/salesAmountReport/list.vue'),
+              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesAmountReport/list.vue'),
               meta: {
                 title: '开单销售报表列表',
                 icon: 'profile',
@@ -1230,8 +1229,7 @@ export const asyncRouterMap = [
             children: [{
               path: 'list',
               name: 'salesSlipReportList',
-              component: () => import(/* webpackChunkName: "reportData" */
-                '@/views/reportData/salesSlipReport/list.vue'),
+              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesSlipReport/list.vue'),
               meta: {
                 title: '开单销售单报表列表',
                 icon: 'profile',

+ 1 - 1
src/utils/request.js

@@ -15,7 +15,7 @@ const err = (error) => {
   console.log(error, error.response,error.message,'error')
   const config = error.config
   // 网络连接出错
-  if (error.message.indexOf('Network Error') >= 0) {
+  if (error.message.indexOf('Network Error') >= 0 || error.message.indexOf('Request failed') >= 0) {
     notification.destroy()
     notification.error({
       message: '提示',

+ 2 - 0
src/views/Home.vue

@@ -32,12 +32,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { mapGetters } from 'vuex'
 import ResetPwd from '@/views/user/ResetPwd.vue'
 import newProduct from '@/views/productManagement/newProduct/modal.vue'
 import { queryNewProductPage } from '@/api/product'
 export default {
   name: 'Home',
+  mixins: [commonMixin],
   components: { ResetPwd, newProduct },
   data () {
     return {

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

@@ -97,7 +97,14 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="allocateBillEdit-add-btn">添加</a-button>
+                <a-button
+                  size="small"
+                  type="primary"
+                  v-if="record.lastStockCost"
+                  class="button-primary"
+                  @click="handleAdd(record)"
+                  id="allocateBillEdit-add-btn">添加</a-button>
+                <span v-else>--</span>
               </template>
             </s-table>
           </a-collapse-panel>

+ 2 - 0
src/views/basicData/transferTypeManagement/editModal.vue

@@ -42,10 +42,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import { allocateTypeSave } from '@/api/allocateType'
 export default {
   name: 'TransferTypeManagementEditModal',
+  mixins: [commonMixin],
   components: { VSelect },
   props: {
     openModal: { //  弹框显示状态

+ 3 - 0
src/views/basicData/transferTypeManagement/list.vue

@@ -48,10 +48,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import transferTypeManagementEditModal from './editModal.vue'
 import { allocateTypeList, allocateTypeDel } from '@/api/allocateType'
 export default {
+  name: 'TransferTypeManagementList',
+  mixins: [commonMixin],
   components: { STable, VSelect, transferTypeManagementEditModal },
   data () {
     return {

+ 2 - 0
src/views/basicData/warehouse/editModal.vue

@@ -39,10 +39,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { warehouseSave } from '@/api/warehouse'
 export default {
   name: 'WarehouseEditModal',
+  mixins: [commonMixin],
   components: { STable },
   props: {
     openModal: { //  弹框显示状态

+ 3 - 0
src/views/basicData/warehouse/list.vue

@@ -66,10 +66,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { warehouseList, warehouseDel } from '@/api/warehouse'
 import { STable } from '@/components'
 import warehouseEditModal from './editModal.vue'
 export default {
+  name: 'WarehouseList',
+  mixins: [commonMixin],
   components: { STable, warehouseEditModal },
   data () {
     return {

+ 2 - 0
src/views/basicData/warehouse/storingLocation/editModal.vue

@@ -43,10 +43,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { warehouseLocSave, warehouseAllList } from '@/api/warehouse'
 export default {
   name: 'StoringLocationEditModal',
+  mixins: [commonMixin],
   components: { STable },
   props: {
     openModal: { //  弹框显示状态

+ 3 - 0
src/views/basicData/warehouse/storingLocation/list.vue

@@ -68,10 +68,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { warehouseLocList, warehouseLocDel } from '@/api/warehouse'
 import { STable } from '@/components'
 import storingLocationEditModal from './editModal.vue'
 export default {
+  name: 'StoringLocationList',
+  mixins: [commonMixin],
   components: { STable, storingLocationEditModal },
   data () {
     return {

+ 3 - 1
src/views/bnSetting/menu/adminMenus.vue

@@ -184,12 +184,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import childModal from './childModal.vue'
 import { getYyMenuList, saveYyMenu, deleteYyMenu } from '@/api/menu.js'
 
 export default {
-  name: 'Menu',
+  name: 'AdminMenus',
+  mixins: [commonMixin],
   components: {
     STable, VSelect, childModal
   },

+ 3 - 0
src/views/dataExport/exportCheck/list.vue

@@ -40,10 +40,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { checkWarehouseExcelList, checkWarehouseExport } from '@/api/checkWarehouse'
 import { hdExportExcel } from '@/libs/exportExcel'
 export default {
+  name: 'ExportCheckList',
+  mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
     return {

+ 3 - 0
src/views/dataExport/exportSales/list.vue

@@ -40,11 +40,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { checkWarehouseExcelList } from '@/api/checkWarehouse'
 import { exportSalesOutProduct } from '@/api/stockOut.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 export default {
+  name: 'ExportSalesList',
+  mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
     return {

+ 2 - 0
src/views/dealerManagement/dealerAccountManagement/editModal.vue

@@ -78,10 +78,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import custList from '@/views/common/custList.vue'
 import { dealerUserSave, dealerUserDetail } from '@/api/dealer'
 export default {
   name: 'DealerAccountEditModal',
+  mixins: [commonMixin],
   components: { custList },
   props: {
     openModal: { //  弹框显示状态

+ 3 - 0
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -89,11 +89,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import dealerAccountEditModal from './editModal.vue'
 import dealerAccountDetailModal from './detailModal.vue'
 import { dealerUserList, dealerUserEnable, dealerUserResetP } from '@/api/dealer'
 export default {
+  name: 'DealerAccountManagementList',
+  mixins: [commonMixin],
   components: { STable, VSelect, dealerAccountEditModal, dealerAccountDetailModal },
   data () {
     return {

+ 2 - 0
src/views/dealerManagement/dealerRelationshipBinding/associateModal.vue

@@ -36,10 +36,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { bindRelation } from '@/api/dealerRelation'
 import queryChild from './queryChild.vue'
 export default {
   name: 'RelationshipBindingModal',
+  mixins: [commonMixin],
   components: { queryChild },
   props: {
     openModal: { //  弹框显示状态

+ 3 - 0
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -82,11 +82,14 @@
 </template>
 I
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import tablePagination from '@/views/common/tablePagination.vue'
 import associateModal from './associateModal.vue'
 import { dealerRelationList, querySubList, unbindRelation } from '@/api/dealerRelation'
 export default {
+  name: 'DealerRelationshipBindingList',
+  mixins: [commonMixin],
   components: { STable, VSelect, associateModal, tablePagination },
   data () {
     return {

+ 3 - 0
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -55,10 +55,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import marketingDivisionSetEditModal from './editModal.vue'
 import { subareaQueryIncludeAreaAll, subareaDeleteBySn } from '@/api/subarea'
 export default {
+  name: 'MarketingDivisionSetList',
+  mixins: [commonMixin],
   components: { STable, VSelect, marketingDivisionSetEditModal },
   data () {
     return {

+ 3 - 0
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -394,11 +394,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { getArea } from '@/api/data'
 import { VSelect } from '@/components'
 import { dealerSave, dealerFindUpdateInfoBySn } from '@/api/dealer'
 import moment from 'moment'
 export default {
+  name: 'MerchantInfoManagementEdit',
+  mixins: [commonMixin],
   components: { VSelect },
   data () {
     return {

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

@@ -101,6 +101,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { dealerQueryList, dealerExport } from '@/api/dealer'
 import { STable, VSelect } from '@/components'
@@ -109,6 +110,8 @@ import merchantInfoManagementDetailModal from './detailModal.vue'
 import UpdateCooperate from './updateCooperate.vue'
 import UpdateDealerLeve from './updateDealerLevel.vue'
 export default {
+  name: 'MerchantInfoManagementList',
+  mixins: [commonMixin],
   components: { STable, VSelect, merchantInfoManagementDetailModal, subarea, UpdateCooperate, UpdateDealerLeve },
   data () {
     return {

+ 3 - 0
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -82,12 +82,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import ChooseProductsModal from '@/views/common/chooseProductsModal.vue'
 import ChooseBrandModal from '@/views/common/chooseBrandModal.vue'
 import ChooseTypeModal from '@/views/common/chooseTypeModal.vue'
 import { dealerScopeList, dealerScopeSave, dealerScopeDel, dealerScopeQueryList } from '@/api/dealerScope'
 export default {
+  name: 'MerchantInfoManagementSet',
+  mixins: [commonMixin],
   components: { STable, VSelect, ChooseProductsModal, ChooseBrandModal, ChooseTypeModal },
   data () {
     return {

+ 2 - 0
src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue

@@ -42,11 +42,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import { updateCooperate } from '@/api/dealer'
 import moment from 'moment'
 export default {
   name: 'UpdateCooperate',
+  mixins: [commonMixin],
   components: { VSelect },
   props: {
     openUcModal: { //  弹框显示状态

+ 2 - 0
src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue

@@ -34,10 +34,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import { updateDealerLevel } from '@/api/dealer'
 export default {
   name: 'UpdateDealerLevel',
+  mixins: [commonMixin],
   components: { VSelect },
   props: {
     openUdModal: { //  弹框显示状态

+ 2 - 0
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -36,10 +36,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { updateRebate } from '@/api/dealerRelation'
 import queryChild from './queryChild.vue'
 export default {
   name: 'AssociateModal',
+  mixins: [commonMixin],
   components: { queryChild },
   props: {
     openModal: { //  弹框显示状态

+ 3 - 0
src/views/dealerManagement/rebateSettings/list.vue

@@ -68,10 +68,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import associateModal from './associateModal.vue'
 import { queryRebatePage } from '@/api/dealerRelation'
 export default {
+  name: 'RebateSettingsList',
+  mixins: [commonMixin],
   components: { STable, VSelect, associateModal },
   data () {
     return {

+ 3 - 0
src/views/dowloadFile/list.vue

@@ -54,10 +54,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { taskList, dowloadFile } from '@/api/dowloadFile'
 import rangeDate from '@/views/common/rangeDate.vue'
 export default {
+  name: 'DowloadFile',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate },
   data () {
     return {

+ 3 - 0
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -142,6 +142,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect, Upload, STable } from '@/components'
 import epenseDetailModal from './epenseDetailModal.vue'
 import productInfoModal from './productInfoModal.vue'
@@ -150,6 +151,8 @@ import ImportGuideModal from './importGuideModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import { expenseAccountDetail, expenseAcctDetailDelete, expenseAcctDetailFindList, expenseAccountSubmit, expenseInsertImport } from '@/api/expenseManagement.js'
 export default {
+  name: 'ExpenseReimbursementEdit',
+  mixins: [commonMixin],
   components: { VSelect, Upload, STable, epenseDetailModal, productInfoModal, baseDataModal, ImportGuideModal, chooseDepartUserModal },
   data () {
     return {

+ 3 - 1
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -104,12 +104,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { expenseAccountDetail, expenseAcctDetailFindList } from '@/api/expenseManagement'
 import previewModal from './previewModal.vue'
 import { jGPrint } from '@/libs/JGPrint.js'
 export default {
-  name: 'ExpenseReimbursementDetail',
+  name: 'ExpenseReimbursementListDetail',
+  mixins: [commonMixin],
   components: { STable, previewModal },
   data () {
     return {

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

@@ -129,6 +129,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import locale from 'ant-design-vue/es/date-picker/locale/zh_CN'
 import moment from 'moment'
 import subarea from '@/views/common/subarea.js'
@@ -137,7 +138,8 @@ import verifyModal from './verifyModal.vue'
 import { expenseAccountList, expenseAccountDelete } from '@/api/expenseManagement'
 import baseDataModal from './baseDataModal.vue'
 export default {
-  name: 'TableList',
+  name: 'ExpenseReimbursementList',
+  mixins: [commonMixin],
   components: { STable, VSelect, subarea, verifyModal, baseDataModal },
   data () {
     return {

+ 3 - 1
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -168,6 +168,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import 'moment/locale/zh-cn'
 import getDate from '@/libs/getDate.js'
@@ -183,7 +184,8 @@ import { expenseAccountDetailList, expenseAcctDetailReport } from '@/api/expense
 import { hdExportExcel } from '@/libs/exportExcel'
 moment.locale('zh-cn')
 export default {
-  name: 'TableList',
+  name: 'ExpenseReimbursementDetailList',
+  mixins: [commonMixin],
   components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier },
   data () {
     return {

+ 3 - 0
src/views/financialManagement/allocateReturnConfirmation/list.vue

@@ -91,12 +91,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import AllocateReturnDetailModal from './detailModal.vue'
 import { salesReturnFinancialList, salesReturnFinancial } from '@/api/salesReturn'
 export default {
+  name: 'AllocateReturnConfirmationList',
+  mixins: [commonMixin],
   components: { STable, VSelect, AllocateReturnDetailModal, dealerSubareaScopeList, rangeDate },
   data () {
     return {

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

@@ -171,6 +171,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
@@ -179,6 +180,8 @@ import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import { settleReceiptList, settleReceipt } from '@/api/settleReceipt'
 export default {
+  name: 'FinancialCollectionList',
+  mixins: [commonMixin],
   components: { STable, VSelect, subarea, rangeDate },
   data () {
     return {

+ 3 - 0
src/views/financialManagement/inventoryConfirmation/detail.vue

@@ -102,9 +102,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { checkWarehouseDetail, checkWarehouseDetailFinanceList, checkWarehouseDetailCount } from '@/api/checkWarehouse'
 export default {
+  name: 'InventoryConfirmationDetail',
+  mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
     return {

+ 3 - 0
src/views/financialManagement/inventoryConfirmation/list.vue

@@ -65,9 +65,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { checkWarehouseList, checkWarehouseReCheck, checkWarehouseFinanceAudit } from '@/api/checkWarehouse'
 export default {
+  name: 'InventoryConfirmationList',
+  mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
     return {

+ 3 - 0
src/views/financialManagement/returnConfirmation/list.vue

@@ -92,12 +92,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import confirmationDetailModal from './detailModal.vue'
 import { salesReturnFinancialList, salesReturnFinancial } from '@/api/salesReturn'
 export default {
+  name: 'ReturnConfirmationList',
+  mixins: [commonMixin],
   components: { STable, VSelect, confirmationDetailModal, dealerSubareaScopeList, rangeDate },
   data () {
     return {

+ 3 - 0
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -94,10 +94,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import confirmationDetailModal from './detailModal.vue'
 import { stockPutList, stockPutConfirm } from '@/api/stockPut'
 export default {
+  name: 'WarehousingConfirmationList',
+  mixins: [commonMixin],
   components: { STable, VSelect, confirmationDetailModal },
   data () {
     return {

+ 5 - 3
src/views/inventoryManagement/intelligentReplenishment/detailModal.vue

@@ -51,11 +51,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { STable } from '@/components'
 import { predictDetail, predictRangeList, predictstockPredictExport } from '@/api/predict'
 export default {
   name: 'IntelligentReplenishmentDetailModal',
+  mixins: [commonMixin],
   components: { STable },
   props: {
     openModal: { //  弹框显示状态
@@ -73,9 +75,9 @@ export default {
       spinning: false,
       detailsData: null, //  详情数据
       columns: [
-        { title: '序号', dataIndex: 'no', width:'10%', align: 'center' },
-        { title: '类型', dataIndex: 'rangeTypeName',width:'45%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型名称', dataIndex: 'rangeDataName',width:'45%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
+        { title: '类型', dataIndex: 'rangeTypeName', width: '45%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型名称', dataIndex: 'rangeDataName', width: '45%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],
       detailData: null,

+ 3 - 0
src/views/inventoryManagement/intelligentReplenishment/edit.vue

@@ -83,10 +83,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import ReplenishmentServiceLevelModal from './serviceLevelModal.vue'
 import productRange from './productRange.vue'
 import { predictDetail, predictRangeSave, predictSave, predictTrendList, predictRun } from '@/api/predict'
 export default {
+  name: 'IntelligentReplenishmentEdit',
+  mixins: [commonMixin],
   components: { ReplenishmentServiceLevelModal, productRange },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/intelligentReplenishment/import.vue

@@ -54,9 +54,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { predictProductInfoGoods, predictProductInfoInsert } from '@/api/predict'
 export default {
+  name: 'IntelligentReplenishmentImport',
+  mixins: [commonMixin],
   components: { STable },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/intelligentReplenishment/list.vue

@@ -62,11 +62,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import intelligentReplenishmentDetailModal from './detailModal.vue'
 import { predictList, predictSave, predictDel, predictstockPredictExport } from '@/api/predict'
 export default {
+  name: 'IntelligentReplenishmentList',
+  mixins: [commonMixin],
   components: { STable, VSelect, intelligentReplenishmentDetailModal },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/intelligentReplenishment/productRange.vue

@@ -39,12 +39,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import ChooseBrandModal from '@/views/common/chooseBrandModal.vue'
 import ChooseTypeModal from '@/views/common/chooseTypeModal.vue'
 import ChooseSupplierModal from '@/views/common/chooseSupplierModal.vue'
 import { predictRangeList, predictRangeDel } from '@/api/predict'
 export default {
+  name: 'ProductRange',
+  mixins: [commonMixin],
   components: { STable, ChooseBrandModal, ChooseTypeModal, ChooseSupplierModal },
   props: {
     itemSn: {

+ 3 - 0
src/views/inventoryManagement/intelligentReplenishment/set.vue

@@ -67,11 +67,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import VueCookies from 'vue-cookies'
 import { Upload } from '@/components'
 import { predictProductInfoExport } from '@/api/predict'
 export default {
+  name: 'IntelligentReplenishmentSet',
+  mixins: [commonMixin],
   components: { Upload },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/inventoryCheck/detail.vue

@@ -106,10 +106,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import tablePagination from '@/views/common/tablePagination.vue'
 import { checkWarehouseDetail, checkWarehouseDetailList, checkWarehouseDetailCount, checkWarehouseDelete } from '@/api/checkWarehouse'
 export default {
+  name: 'InventoryCheckDetail',
+  mixins: [commonMixin],
   components: { STable, VSelect, tablePagination },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -90,11 +90,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import inventoryCheckAddModal from './addModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import { checkWarehouseList, checkWarehouseStartCheck } from '@/api/checkWarehouse'
 export default {
+  name: 'InventoryCheckList',
+  mixins: [commonMixin],
   components: { STable, VSelect, inventoryCheckAddModal, commonModal },
   data () {
     return {

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

@@ -114,7 +114,7 @@
 </template>
 
 <script>
-import moment from 'moment'
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import inventoryQueryDetailModal from './detailModal.vue'
 import exportExcelModal from './exportExcelModal.vue'
@@ -124,6 +124,8 @@ import { hdExportExcel } from '@/libs/exportExcel'
 import ProductBrand from '@/views/common/productBrand.js'
 import { stockList, stockCount, stockExport } from '@/api/stock'
 export default {
+  name: 'InventoryQueryList',
+  mixins: [commonMixin],
   components: { STable, VSelect, inventoryQueryDetailModal, exportExcelModal, ProductBrand },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -129,12 +129,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { stockFlowCount, stockFlowList, stockFlowExport } from '@/api/stock'
 import { warehouseAllList } from '@/api/warehouse'
 export default {
+  name: 'InventoryQueryWarehouseDetail',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -162,12 +162,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
 import { stockWarnList, stockWarnSaveBatch } from '@/api/stock'
 import ProductBrand from '@/views/common/productBrand.js'
 export default {
+  name: 'InventoryWarningList',
+  mixins: [commonMixin],
   components: { STable, VSelect, ProductBrand },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/makeInventory/check.vue

@@ -156,11 +156,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import tablePagination from '@/views/common/tablePagination.vue'
 import printModal from '@/views/common/auditModal.vue'
 import { checkWarehouseDetail, checkWarehouseDetailList, checkWarehouseDetailCount, checkWarehouseDetailPrint, checkWarehousePrintCheck, checkWarehouseDetailSave, checkWarehouseCheck } from '@/api/checkWarehouse'
 export default {
+  name: 'MakeInventoryCheck',
+  mixins: [commonMixin],
   components: { STable, VSelect, tablePagination, printModal },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/makeInventory/list.vue

@@ -46,9 +46,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { checkWarehouseList } from '@/api/checkWarehouse'
 export default {
+  name: 'MakeInventoryList',
+  mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/supervisionDisk/check.vue

@@ -165,11 +165,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import tablePagination from '@/views/common/tablePagination.vue'
 import printModal from '@/views/common/auditModal.vue'
 import { checkWarehouseDetail, checkWarehouseDetailList, checkWarehouseDetailCount, checkWarehouseDetailPrint, checkWarehousePrintCheck, checkWarehouseDetailSave, checkWarehouseSupervise, checkWarehouseReCheck } from '@/api/checkWarehouse'
 export default {
+  name: 'SupervisionDiskCheck',
+  mixins: [commonMixin],
   components: { STable, VSelect, tablePagination, printModal },
   data () {
     return {

+ 3 - 0
src/views/inventoryManagement/supervisionDisk/list.vue

@@ -46,9 +46,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { checkWarehouseList } from '@/api/checkWarehouse'
 export default {
+  name: 'SupervisionDiskList',
+  mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
     return {

+ 3 - 1
src/views/power/OperateJournal/OperateJournal.vue

@@ -47,12 +47,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate'
 import { STable } from '@/components'
 import { journalList } from '@/api/OperateJournal.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 export default {
-  name: 'OperateJournal',
+  name: 'PowerOperateJournal',
+  mixins: [commonMixin],
   components: { STable, rangeDate },
   data () {
     return {

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

@@ -99,12 +99,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import codeModal from './codeModal.vue'
 import codeItemModal from './codeItemModal.vue'
 import { listLookUp, delLookUp, getLookUpItem, delLookUpItem } from '@/api/lookup.js'
 export default {
-  name: 'DataDictionary',
+  name: 'PowerDD',
+  mixins: [commonMixin],
   components: {
     STable, VSelect, codeModal, codeItemModal
   },

+ 2 - 0
src/views/power/menu/menu.vue

@@ -187,12 +187,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import childModal from './childModal.vue'
 import { getMenuList, saveMenu, deleteMenu } from '@/api/menu.js'
 
 export default {
   name: 'Menu',
+  mixins: [commonMixin],
   components: {
     STable, VSelect, childModal
   },

+ 2 - 0
src/views/power/role/menuModal.vue

@@ -40,10 +40,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { addMenuPower } from '@/api/power-role.js'
 export default {
   name: 'RoleModal',
+  mixins: [commonMixin],
   components: {
     STable, VSelect
   },

+ 3 - 1
src/views/power/role/roleList.vue

@@ -77,6 +77,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import {
   STable,
   VSelect
@@ -90,7 +91,8 @@ import {
   getMenuList
 } from '@/api/power-role.js'
 export default {
-  name: 'RoleList',
+  name: 'PowerRoleList',
+  mixins: [commonMixin],
   components: {
     STable,
     VSelect,

+ 2 - 0
src/views/power/role/roleModal.vue

@@ -54,10 +54,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { saveRolePower } from '@/api/power-role.js'
 export default {
   name: 'RoleModal',
+  mixins: [commonMixin],
   components: {
     STable, VSelect
   },

+ 2 - 0
src/views/power/user/updateAreal.vue

@@ -43,12 +43,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import { userSubareaSave } from '@/api/power-user'
 import { subareaQueryAll } from '@/api/subarea'
 import subarea from '@/views/common/subarea.js'
 export default {
   name: 'UpdateArea',
+  mixins: [commonMixin],
   components: { VSelect, subarea },
   props: {
     openUdModal: { //  弹框显示状态

+ 3 - 1
src/views/power/user/userList.vue

@@ -83,12 +83,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import userModal from './userModal.vue'
 import { resetPSD, updateEnableStatus, getPowerUserList, delectUserPower } from '@/api/power-user.js'
 import UpdateArea from './updateAreal.vue'
 export default {
-  name: 'UserList',
+  name: 'PowerUserList',
+  mixins: [commonMixin],
   components: {
     STable, VSelect, userModal, UpdateArea
   },

+ 2 - 0
src/views/power/user/userModal.vue

@@ -104,10 +104,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { getRoleList, saveUserPower } from '@/api/power-user.js'
 export default {
   name: 'UserModal',
+  mixins: [commonMixin],
   components: {
     STable, VSelect
   },

+ 3 - 1
src/views/productManagement/newProduct/detail.vue

@@ -48,10 +48,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import imgZoom from 'vue2.0-zoom'
 import { productSnDetail } from '@/api/product.js'
 export default {
-  name: 'ProductInfoDetail',
+  name: 'ViewProduct',
+  mixins: [commonMixin],
   components: { imgZoom },
   computed: {
     productTypeName () {

+ 3 - 0
src/views/productManagement/newProduct/list.vue

@@ -97,6 +97,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQueryAll } from '@/api/productType'
 import { queryNewProductPage } from '@/api/product'
@@ -104,6 +105,8 @@ import { STable, VSelect } from '@/components'
 import ProductBrand from '@/views/common/productBrand.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 export default {
+  name: 'NewProductList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, ProductBrand },
   data () {
     return {

+ 3 - 1
src/views/productManagement/newProduct/modal.vue

@@ -22,10 +22,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { queryNewProductPage } from '@/api/product'
 export default {
-  name: 'NewProduct',
+  name: 'NewProductListModal',
+  mixins: [commonMixin],
   components: { STable },
   props: {
     onlineFalg: { // 上下线标识  1为上线,0为下线

+ 3 - 0
src/views/productManagement/priceChangeRecord/list.vue

@@ -108,6 +108,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
@@ -117,6 +118,8 @@ import { productTypeQuery } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
 import { productPriceChangeList, productPriceChangeExport } from '@/api/product'
 export default {
+  name: 'PriceChangeRecordList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, ProductBrand },
   data () {
     return {

+ 2 - 0
src/views/productManagement/productBrand/editModal.vue

@@ -59,12 +59,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect, Upload } from '@/components'
 import Editor from '@/components/WEeditor'
 import dataList from '@/libs/commonData'
 import { productBrandSnDetail, productBrandSave } from '@/api/productBrand'
 export default {
   name: 'ProductBrandEditModal',
+  mixins: [commonMixin],
   components: { VSelect, Upload, Editor },
   props: {
     openModal: { //  弹框显示状态

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

@@ -95,12 +95,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import dataList from '@/libs/commonData'
 import productBrandEditModal from './editModal.vue'
 import productBrandDetailModal from './detailModal.vue'
 import { productBrandList, productBrandDel } from '@/api/productBrand'
 export default {
+  name: 'ProductBrandList',
+  mixins: [commonMixin],
   components: { STable, VSelect, productBrandEditModal, productBrandDetailModal },
   data () {
     return {

+ 2 - 0
src/views/productManagement/productCategory/editModal.vue

@@ -42,10 +42,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import { productTypeSave } from '@/api/productType'
 export default {
   name: 'ProductCategoryEditModal',
+  mixins: [commonMixin],
   components: { STable },
   props: {
     openModal: { //  弹框显示状态

+ 3 - 0
src/views/productManagement/productCategory/list.vue

@@ -54,10 +54,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { productTypeQuery, productTypeDel } from '@/api/productType'
 import { STable } from '@/components'
 import productCategoryEditModal from './editModal.vue'
 export default {
+  name: 'ProductCategoryList',
+  mixins: [commonMixin],
   components: { STable, productCategoryEditModal },
   data () {
     return {

+ 3 - 0
src/views/productManagement/productInfo/edit.vue

@@ -217,12 +217,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect, Upload } from '@/components'
 import Editor from '@/components/WEeditor'
 import { productSave, productSnDetail } from '@/api/product'
 import { productTypeQueryAll } from '@/api/productType'
 import { productBrandQuery } from '@/api/productBrand'
 export default {
+  name: 'ProductInfoEdit',
+  mixins: [commonMixin],
   components: { VSelect, Upload, Editor },
   data () {
     return {

+ 3 - 0
src/views/productManagement/productInfo/list.vue

@@ -184,6 +184,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import productInfoDetailModal from './detailModal.vue'
@@ -193,6 +194,8 @@ import { productTypeQueryAll } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
 import { productList, productAudit, productBatchAudit, productDel, productOnline, productBatchOnline, productExport } from '@/api/product'
 export default {
+  name: 'ProductInfoList',
+  mixins: [commonMixin],
   components: { STable, VSelect, productInfoDetailModal, productInfoOfflineModal, ProductBrand },
   data () {
     return {

+ 3 - 0
src/views/productManagement/productLaunchAudit/list.vue

@@ -76,9 +76,12 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { productOnlineList, productBatchOnlineAudit, productOnlineAudit } from '@/api/product'
 export default {
+  name: 'ProductLaunchAuditList',
+  mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
     return {

+ 3 - 0
src/views/productManagement/productLevel/list.vue

@@ -91,6 +91,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import productLevelEditModal from './editModal.vue'
@@ -99,6 +100,8 @@ import { productTypeQuery } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
 import { productLevelList } from '@/api/product'
 export default {
+  name: 'ProductLevelList',
+  mixins: [commonMixin],
   components: { STable, VSelect, productLevelEditModal, ProductBrand },
   data () {
     return {

+ 3 - 0
src/views/productManagement/productOfflineAudit/list.vue

@@ -112,12 +112,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
 import { productOfflineList, productOfflineAudit, productBatchOfflineAudit } from '@/api/product'
 export default {
+  name: 'ProductOfflineAuditList',
+  mixins: [commonMixin],
   components: { STable, VSelect, ProductBrand },
   data () {
     return {

+ 3 - 0
src/views/productManagement/productPricing/list.vue

@@ -108,6 +108,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import productPricingEditModal from './editModal.vue'
 import productPricingAuditModal from './auditModal.vue'
@@ -116,6 +117,8 @@ import { productTypeQuery } from '@/api/productType'
 import { productPricingList } from '@/api/product'
 import ProductBrand from '@/views/common/productBrand.js'
 export default {
+  name: 'ProductPricingList',
+  mixins: [commonMixin],
   components: { STable, VSelect, productPricingEditModal, productPricingAuditModal, ProductBrand },
   data () {
     return {

+ 3 - 0
src/views/productManagement/productUniversal/list.vue

@@ -90,11 +90,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import productUniversalEditModal from './editModal.vue'
 import { productUniversalCodeList, productUniversalCodeDel } from '@/api/productUniversalCode'
 export default {
+  name: 'ProductUniversalList',
+  mixins: [commonMixin],
   components: { STable, VSelect, productUniversalEditModal },
   data () {
     return {

+ 3 - 0
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -94,6 +94,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -102,6 +103,8 @@ import promoList from '@/views/common/promoList.vue'
 import orderStatisticsDetailModal from './detailModal.vue'
 import { salesPromoList, salesPromoCount } from '@/api/sales'
 export default {
+  name: 'OrderStatisticsList',
+  mixins: [commonMixin],
   components: { STable, VSelect, orderStatisticsDetailModal, custList, promoList, rangeDate },
   data () {
     return {

+ 3 - 0
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -90,6 +90,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -99,6 +100,8 @@ import { productTypeQuery } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
 import { salesDetailPromoList, salesDetailPromoCount } from '@/api/salesDetail'
 export default {
+  name: 'ProductStatisticsList',
+  mixins: [commonMixin],
   components: { STable, VSelect, productStatisticsDetailModal, rangeDate, ProductBrand },
   data () {
     return {

+ 3 - 0
src/views/promotionRulesManagement/promotionRules/detail.vue

@@ -96,8 +96,11 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { promoActiveDetailD } from '@/api/promoActive'
 export default {
+  name: 'PromotionRulesManagementDetail',
+  mixins: [commonMixin],
   data () {
     return {
       spinning: false,

+ 2 - 0
src/views/promotionRulesManagement/promotionRules/editRuleModal.vue

@@ -169,11 +169,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import ChoosePriceProductsModal from './choosePriceProductsModal.vue'
 import { promoRuleSave, promoRuleDetailD } from '@/api/promoRule'
 export default {
   name: 'EditRuleModalModal',
+  mixins: [commonMixin],
   components: { VSelect, ChoosePriceProductsModal },
   props: {
     openModal: {

+ 3 - 0
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -95,11 +95,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import basicInfoModal from './basicInfoModal.vue'
 import { promoActiveList, promoActiveEnable } from '@/api/promoActive'
 export default {
+  name: 'PromotionRulesManagementList',
+  mixins: [commonMixin],
   components: { STable, VSelect, basicInfoModal, rangeDate },
   data () {
     return {

+ 3 - 0
src/views/promotionRulesManagement/promotionRules/rule.vue

@@ -48,10 +48,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import editRuleModal from './editRuleModal.vue'
 import { promoRuleQueryList, promoRuleDel } from '@/api/promoRule'
 export default {
+  name: 'PromotionRulesManagementRule',
+  mixins: [commonMixin],
   components: { STable, VSelect, editRuleModal },
   data () {
     return {

+ 2 - 0
src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -62,11 +62,13 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import { supplierAllList } from '@/api/supplier'
 import { sparePartsSave } from '@/api/spareParts'
 export default {
   name: 'BulkWarehousingOrderBasicInfoModal',
+  mixins: [commonMixin],
   components: { VSelect },
   props: {
     openModal: { //  弹框显示状态

+ 3 - 0
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -104,12 +104,15 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { getOperationalPrecision } from '@/libs/tools.js'
 import sparePartsProductModal from './productModal.vue'
 import ImportGuideModal from './importGuideModal.vue'
 import { sparePartsDetailList, sparePartsPageCount, sparePartsDeleteDetail, sparePartsDetailBatchInsert } from '@/api/spareParts'
 export default {
+  name: 'BulkWarehousingOrderEdit',
+  mixins: [commonMixin],
   components: { STable, VSelect, sparePartsProductModal, ImportGuideModal },
   data () {
     return {

+ 3 - 0
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -106,11 +106,14 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
 import sparePartsDetailModal from './detailModal.vue'
 import { sparePartsList, sparePartsDelete, sparePartsAudit } from '@/api/spareParts'
 export default {
+  name: 'BulkWarehousingOrderList',
+  mixins: [commonMixin],
   components: { STable, VSelect, basicInfoModal, sparePartsDetailModal },
   data () {
     return {

+ 2 - 0
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -80,6 +80,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import debounce from 'lodash/debounce'
 import { supplierProductList } from '@/api/supplier'
@@ -87,6 +88,7 @@ import { warehouseCascadeList } from '@/api/warehouse'
 import { sparePartsSaveDetail, sparePartsDetailD } from '@/api/spareParts'
 export default {
   name: 'BulkWarehousingOrderBasicInfoModal',
+  mixins: [commonMixin],
   components: { VSelect },
   props: {
     openModal: { //  弹框显示状态

+ 6 - 3
src/views/reportData/actualSalesReport/list.vue

@@ -137,6 +137,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -148,13 +149,15 @@ import { hdExportExcel } from '@/libs/exportExcel'
 import { salesBillRealAmountQueryPageList, salesBillRealReportCount } from '@/api/salesBillReport'
 import { actualSalesExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, subarea, custList,reportModal },
+  name: 'ActualSalesReportList',
+  mixins: [commonMixin],
+  components: { STable, VSelect, rangeDate, subarea, custList, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
-      showExport:false,// 导出弹窗初始值
+      showExport: false, // 导出弹窗初始值
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -395,7 +398,7 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          _this.showExport=true
+          _this.showExport = true
           const params = _this.queryParam
           _this.exportLoading = true
           _this.spinning = true

+ 3 - 0
src/views/reportData/allCountryCostReport/list.vue

@@ -108,6 +108,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import reportModal from '@/views/common/reportModal.vue'
@@ -117,6 +118,8 @@ import { reportSalesReturnThjdReportList } from '@/api/reportData'
 import moment from 'moment'
 import reportData from '@/libs/reportData.js'
 export default {
+  name: 'AllCountryCostReportList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, subarea, moment, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/allocationDetails/list.vue

@@ -152,6 +152,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -166,6 +167,8 @@ import { hdExportExcel } from '@/libs/exportExcel'
 import { userQueryList } from '@/api/power-user'
 import { allocateReportDetailList, allocateReportDetailCount, allocateReportDetailExport } from '@/api/allocateReport'
 export default {
+  name: 'AllocationDetailsList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, subarea, ProductBrand, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/allocationOrderTotal/list.vue

@@ -92,6 +92,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -99,6 +100,8 @@ import { allocateTypeAllList } from '@/api/allocateType'
 import { userQueryList } from '@/api/power-user'
 import { allocateReportList, allocateReportCount } from '@/api/allocateReport'
 export default {
+  name: 'AllocationOrderTotalList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate },
   data () {
     return {

+ 8 - 5
src/views/reportData/allocationPresentation/list.vue

@@ -129,12 +129,13 @@
         </template>
       </s-table>
     </a-spin>
-	<!-- 导出提示框 -->
-	<reportModal :visible="showExport" @close="showExport=false"></reportModal>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import reportModal from '@/views/common/reportModal.vue'
@@ -143,12 +144,14 @@ import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportAllocateDbjdReportList, reportAllocateDbjdReportCount, reportAllocateDbjdReportExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDateTime, subarea,reportModal },
+  name: 'AllocationPresentationList',
+  mixins: [commonMixin],
+  components: { STable, VSelect, rangeDateTime, subarea, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
-	  showExport:false,
+      showExport: false,
       queryParam: { //  查询条件
         time: [],
         beginDate: '',
@@ -320,7 +323,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          _this.showExport=true
+          _this.showExport = true
           delete params.time
           _this.exportLoading = true
           _this.spinning = true

+ 3 - 0
src/views/reportData/billingReturnReport/list.vue

@@ -137,6 +137,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -147,6 +148,8 @@ import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnList, salesReportReturnCount, billingReturnExport } from '@/api/reportData'
 export default {
+  name: 'BillingReturnReportList',
+  mixins: [commonMixin],
   components: { STable, VSelect, custList, subarea, rangeDate, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -127,6 +127,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -139,6 +140,8 @@ import ProductType from '@/views/common/productType.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { headRebateDetailReportList, headRebateDetailReportCount, headRebateDetailReportExport } from '@/api/reportData'
 export default {
+  name: 'HPriceDifferenceDetailReportList',
+  mixins: [commonMixin],
   components: { STable, VSelect, custList, subarea, rangeDate, ProductBrand, ProductType, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -86,6 +86,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import custList from '@/views/common/custList.vue'
@@ -96,6 +97,8 @@ import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportRebateReportList, reportRebateCount, reportRebateExport } from '@/api/reportData'
 export default {
+  name: 'PriceDifferenceDetailReportList',
+  mixins: [commonMixin],
   components: { STable, VSelect, custList, subarea, rangeDate, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/regionTypeSalesReport/list.vue

@@ -82,6 +82,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { getArea } from '@/api/data'
@@ -90,6 +91,8 @@ import { hdExportExcel } from '@/libs/exportExcel'
 import reportModal from '@/views/common/reportModal.vue'
 import { realReportSalesByProvince, realReportSalesByProvinceExport, realReportSalesBySubArea, realReportSalesBySubAreaExport } from '@/api/reportData.js'
 export default {
+  name: 'RegionTypeSalesReportList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, subarea, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/returnGoodsPresentation/list.vue

@@ -142,6 +142,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
@@ -150,6 +151,8 @@ import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnThjdReportList, reportSalesReturnThjdReportCount, reportSalesReturnThjdReportExport } from '@/api/reportData'
 export default {
+  name: 'ReturnGoodsPresentationList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, subarea, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/returnSlipReport/list.vue

@@ -142,6 +142,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -152,6 +153,8 @@ import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnBillList, salesReportReturnBillCount, returnSlipExport } from '@/api/reportData'
 export default {
+  name: 'ReturnSlipReportList',
+  mixins: [commonMixin],
   components: { STable, VSelect, custList, subarea, rangeDate, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/salesAmountReport/list.vue

@@ -137,6 +137,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -148,6 +149,8 @@ import { hdExportExcel } from '@/libs/exportExcel'
 import { salesBillReportGroupByBuyerList, salesBillReportCount } from '@/api/salesBillReport'
 import { salesAmountExport } from '@/api/reportData'
 export default {
+  name: 'SalesAmountReportList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, subarea, custList, reportModal },
   data () {
     return {

+ 3 - 1
src/views/reportData/salesDetails/list.vue

@@ -161,6 +161,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
@@ -168,12 +169,13 @@ import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
-import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesBillDetailList, reportSalesBillDetailCount, reportSalesBillDetailExport } from '@/api/reportData'
 export default {
+  name: 'SalesDetailsList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDateTime, custList, subarea, ProductBrand, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/salesOrderTotal/list.vue

@@ -125,6 +125,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
@@ -136,6 +137,8 @@ import { hdExportExcel } from '@/libs/exportExcel'
 import { userQueryList } from '@/api/power-user'
 import { reportSalesBillList, reportSalesBillCount, reportSalesBillExport } from '@/api/reportData'
 export default {
+  name: 'SalesOrderTotalList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDateTime, custList, subarea, reportModal },
   data () {
     return {

+ 3 - 0
src/views/reportData/salesPresentation/list.vue

@@ -142,6 +142,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import custList from '@/views/common/custList.vue'
@@ -151,6 +152,8 @@ import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportDispatchReportList, reportDispatchReportCount, reportDispatchReportExport } from '@/api/reportData'
 export default {
+  name: 'SalesPresentationList',
+  mixins: [commonMixin],
   components: { STable, VSelect, rangeDateTime, subarea, custList, reportModal },
   data () {
     return {

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác