epans 2 years ago
parent
commit
be1a850073
100 changed files with 497 additions and 237 deletions
  1. 1 1
      .env.development
  2. 1 1
      .env.production
  3. BIN
      dist-现代牧业-本地地址-20221129-1.zip
  4. BIN
      dist-现代牧业-正式地址-20221119-1.zip
  5. BIN
      dist-现代牧业-正式地址-20221119.zip
  6. BIN
      dist-现代牧业-正式地址-20221121-1.zip
  7. BIN
      dist-现代牧业-正式地址-20221121-2.zip
  8. BIN
      dist-现代牧业-正式地址-20221121-3.zip
  9. BIN
      dist-现代牧业-正式地址-20221129-1.zip
  10. BIN
      dist-现代牧业-测试地址-20221119-1.zip
  11. BIN
      dist-现代牧业-测试地址-20221119.zip
  12. BIN
      dist-现代牧业-测试地址-20221121-1.zip
  13. BIN
      dist-现代牧业-测试地址-20221121-2.zip
  14. BIN
      dist-现代牧业-测试地址-20221121-3.zip
  15. BIN
      dist-现代牧业-测试地址-20221121-4.zip
  16. BIN
      dist-现代牧业-测试地址-20221121-5.zip
  17. BIN
      dist-现代牧业-测试地址-20221123-1.zip
  18. BIN
      dist-现代牧业-测试地址-20221124-1.zip
  19. BIN
      dist-现代牧业-测试地址-20221124-2.zip
  20. 0 0
      dist/index.html
  21. 2 2
      src/views/asset/SST/index.vue
  22. 4 4
      src/views/asset/basics/index.vue
  23. 4 4
      src/views/asset/basics/index1.vue
  24. 4 4
      src/views/asset/basics/index2.vue
  25. 2 2
      src/views/asset/equipmentAllocation/index.vue
  26. 2 2
      src/views/asset/install/index.vue
  27. 2 2
      src/views/asset/standardAssetAllocation/index.vue
  28. 2 2
      src/views/asset/template/components/baoyang.vue
  29. 3 3
      src/views/asset/template/components/yunxing.vue
  30. 2 2
      src/views/asset/template/index.vue
  31. 4 4
      src/views/basic/brand/index.vue
  32. 2 2
      src/views/basic/maintenanceWorkerCategory/index.vue
  33. 2 2
      src/views/basic/otherinfo/index - 副本.vue
  34. 4 4
      src/views/basic/otherinfo/index.vue
  35. 4 4
      src/views/basic/product/index.vue
  36. 2 2
      src/views/basic/warehouse/index.vue
  37. 2 2
      src/views/console/apisql/index.vue
  38. 2 2
      src/views/console/assetType/index.vue
  39. 2 2
      src/views/console/dict/index.vue
  40. 4 4
      src/views/console/emp/index.vue
  41. 2 2
      src/views/console/feedings/index.vue
  42. 2 2
      src/views/console/menu/index.vue
  43. 2 2
      src/views/console/ranchManagement/index.vue
  44. 2 2
      src/views/console/safetyStock/index.vue
  45. 2 2
      src/views/console/stockType/index.vue
  46. 2 2
      src/views/console/user/index.vue
  47. 2 2
      src/views/console/user/index备份.vue
  48. 2 2
      src/views/console/user/index改好 - 副本.vue
  49. 2 2
      src/views/console/user/index改好.vue
  50. 2 2
      src/views/cost/budget/index.vue
  51. 4 4
      src/views/cost/diesel/index.vue
  52. 4 4
      src/views/cost/elec/index.vue
  53. 4 4
      src/views/cost/gas/index.vue
  54. 4 4
      src/views/cost/generation/index.vue
  55. 4 4
      src/views/cost/methane/index.vue
  56. 2 2
      src/views/cost/other/index.vue
  57. 4 4
      src/views/cost/steam/index.vue
  58. 4 4
      src/views/cost/water/index.vue
  59. 2 2
      src/views/custom/allot/index.vue
  60. 2 2
      src/views/custom/allot/index1.vue
  61. 4 4
      src/views/custom/basic/index.vue
  62. 4 4
      src/views/custom/contract/index.vue
  63. 4 4
      src/views/custom/contractManagement/index.vue
  64. 4 4
      src/views/custom/custom/index.vue
  65. 4 4
      src/views/custom/inventory/index.vue
  66. 2 2
      src/views/custom/outRecord/index.vue
  67. 5 5
      src/views/custom/outStock/index.vue
  68. 5 5
      src/views/custom/outStock/index1.vue
  69. 4 4
      src/views/custom/purchase/index.vue
  70. 4 4
      src/views/custom/purchase/index1.vue
  71. 4 4
      src/views/custom/receive/index.vue
  72. 2 2
      src/views/custom/record/index.vue
  73. 4 4
      src/views/custom/refuse/index.vue
  74. 4 4
      src/views/custom/retreat/index.vue
  75. 4 4
      src/views/custom/returngoods/index.vue
  76. 4 4
      src/views/custom/storage/index.vue
  77. 4 4
      src/views/custom/subscribe/index.vue
  78. 4 4
      src/views/custom/writeoff/index.vue
  79. 4 4
      src/views/custom/writeoff/index1.vue
  80. 2 2
      src/views/electro/electroData/index.vue
  81. 2 2
      src/views/evaluationVerification/assessment/index.vue
  82. 4 4
      src/views/maintenance/maintain/index.vue
  83. 4 4
      src/views/maintenance/maintain/index备份.vue
  84. 4 4
      src/views/maintenance/maintain/index改好.vue
  85. 4 4
      src/views/maintenance/maintenancePlan/index.vue
  86. 4 4
      src/views/maintenance/repair/index.vue
  87. 4 4
      src/views/maintenance/spotCheck/index.vue
  88. 2 2
      src/views/maintenance/upkeep/index.vue
  89. 2 2
      src/views/report/consume/index.vue
  90. 2 2
      src/views/report/farmEquipment/index.vue
  91. 2 2
      src/views/report/inventorySpareParts/index.vue
  92. 2 2
      src/views/report/inventorySummary/index.vue
  93. 2 2
      src/views/report/inventorySummary/index1.vue
  94. 2 2
      src/views/report/maintenanceCategoryAnalysis/index.vue
  95. 12 2
      src/views/report/maintenanceCycle/index.vue
  96. 250 0
      src/views/report/maintenanceCycle/index1.vue
  97. 2 2
      src/views/report/purchaseAndwarehousing/index.vue
  98. 2 2
      src/views/report/queryCombustion/index.vue
  99. 2 2
      src/views/report/queryElec/index.vue
  100. 2 2
      src/views/report/queryRepair/index.vue

+ 1 - 1
.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 # 线上正式地址
 # VUE_APP_BASE_API = 'https://eam.modernfarming.cn:8000/'
 # 后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.56:8082/'
+# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 线上测试
 VUE_APP_BASE_API = 'https://tmrwatch.cn:8082/'
 

+ 1 - 1
.env.production

@@ -5,7 +5,7 @@ ENV = 'production'
 # 线上测试
  VUE_APP_BASE_API = 'https://tmrwatch.cn:8082/'
 # 后台本地
-# VUE_APP_BASE_API = 'http://localhost:8082/'
+# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 正式地址
 # VUE_APP_BASE_API = 'https://eam.modernfarming.cn:8000/'
 

BIN
dist-现代牧业-测试地址-20221116.zip → dist-现代牧业-本地地址-20221129-1.zip


BIN
dist-现代牧业-正式地址-20221119-1.zip


BIN
dist-现代牧业-正式地址-20221119.zip


BIN
dist-现代牧业-正式地址-20221121-1.zip


BIN
dist-现代牧业-正式地址-20221121-2.zip


BIN
dist-现代牧业-正式地址-20221121-3.zip


BIN
dist-现代牧业-正式地址-20221125-1.zip → dist-现代牧业-正式地址-20221129-1.zip


BIN
dist-现代牧业-测试地址-20221119-1.zip


BIN
dist-现代牧业-测试地址-20221119.zip


BIN
dist-现代牧业-测试地址-20221121-1.zip


BIN
dist-现代牧业-测试地址-20221121-2.zip


BIN
dist-现代牧业-测试地址-20221121-3.zip


BIN
dist-现代牧业-测试地址-20221121-4.zip


BIN
dist-现代牧业-测试地址-20221121-5.zip


BIN
dist-现代牧业-测试地址-20221123-1.zip


BIN
dist-现代牧业-测试地址-20221124-1.zip


BIN
dist-现代牧业-测试地址-20221124-2.zip


File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 2 - 2
src/views/asset/SST/index.vue

@@ -431,7 +431,7 @@ export default {
   },
   created() {
     this.$store.dispatch('user/getInfo')
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -556,7 +556,7 @@ export default {
       }
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/asset/basics/index.vue

@@ -1223,7 +1223,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getListSH()
     this.getDownClassList()
@@ -1389,7 +1389,7 @@ export default {
         sortChange(column, this.listAssetPartApply)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const BasicsAdd = 'asset:basics:add'
       const isBasicsAdd = checkButtons(this.$store.state.user.buttons, BasicsAdd)
@@ -1424,7 +1424,7 @@ export default {
       this.isBasicExamine = isBasicExamine
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         if (response.data.list !== null) {
           this.findAllBrand = response.data.findAllBrand.list
@@ -1520,7 +1520,7 @@ export default {
         setTimeout(() => {
           this.listLoading = false
         }, 100)
-        this.getDownList()
+        this.get_select_list()
       })
     },
     getListSH() {

+ 4 - 4
src/views/asset/basics/index1.vue

@@ -1188,7 +1188,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getListSH()
     this.getDownClassList()
@@ -1308,7 +1308,7 @@ export default {
         sortChange(column, this.listAssetPartApply)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const BasicsAdd = 'asset:basics:add'
       const isBasicsAdd = checkButtons(this.$store.state.user.buttons, BasicsAdd)
@@ -1343,7 +1343,7 @@ export default {
       this.isBasicExamine = isBasicExamine
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         if (response.data.list !== null) {
           this.findAllBrand = response.data.findAllBrand.list
@@ -1439,7 +1439,7 @@ export default {
         setTimeout(() => {
           this.listLoading = false
         }, 100)
-        this.getDownList()
+        this.get_select_list()
       })
     },
     getListSH() {

+ 4 - 4
src/views/asset/basics/index2.vue

@@ -1188,7 +1188,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getListSH()
     this.getDownClassList()
@@ -1308,7 +1308,7 @@ export default {
         sortChange(column, this.listAssetPartApply)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const BasicsAdd = 'asset:basics:add'
       const isBasicsAdd = checkButtons(this.$store.state.user.buttons, BasicsAdd)
@@ -1343,7 +1343,7 @@ export default {
       this.isBasicExamine = isBasicExamine
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         if (response.data.list !== null) {
           this.findAllBrand = response.data.findAllBrand.list
@@ -1439,7 +1439,7 @@ export default {
         setTimeout(() => {
           this.listLoading = false
         }, 100)
-        this.getDownList()
+        this.get_select_list()
       })
     },
     getListSH() {

+ 2 - 2
src/views/asset/equipmentAllocation/index.vue

@@ -298,12 +298,12 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
   methods: {
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 2 - 2
src/views/asset/install/index.vue

@@ -442,7 +442,7 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -554,7 +554,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 2 - 2
src/views/asset/standardAssetAllocation/index.vue

@@ -126,12 +126,12 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getDownClassList()
   },
   methods: {
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         if (response.data.list !== null) {
           this.findAllPasture = response.data.findAllPasture.list

+ 2 - 2
src/views/asset/template/components/baoyang.vue

@@ -563,7 +563,7 @@ export default {
   },
   created() {
     this.getList()
-    this.getDownList()
+    this.get_select_list()
   },
 
   // 设置变量
@@ -572,7 +572,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.upkeepTypes = response.data.getDictByName1.list
         this.upkeepgrades = response.data.getDictByName2.list

+ 3 - 3
src/views/asset/template/components/yunxing.vue

@@ -227,7 +227,7 @@ export default {
     },
 
     // 下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllPart = response.data.findAllPart.list
@@ -262,7 +262,7 @@ export default {
       this.dialogStatus = 'create'
       this.dialogFormVisible_st = true
       this.$nextTick(() => {
-        this.getDownList()
+        this.get_select_list()
       })
     },
     add_dialog_save() {
@@ -321,7 +321,7 @@ export default {
       this.dialogStatus = 'update'
       this.dialogFormVisible_st = true
       this.$nextTick(() => {
-        this.getDownList()
+        this.get_select_list()
       })
     },
     edit_dialog_save() {

+ 2 - 2
src/views/asset/template/index.vue

@@ -84,7 +84,7 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
   },
   methods: {
     getDownListAll() {
@@ -94,7 +94,7 @@ export default {
         this.listActive = response.data.getDictByName.list
       })
     },
-    getDownList() {
+    get_select_list() {
       GetDataByName(this.getRecuListParm).then(response => {
         if (response.data.list !== null) {
           this.parentType = transData(response.data.list, 'id', 'pid', 'children')

+ 4 - 4
src/views/basic/brand/index.vue

@@ -292,9 +292,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -302,7 +302,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 删除
       const BrandDelete = 'basic:brand:delete'
       const isBrandDelete = checkButtons(this.$store.state.user.buttons, BrandDelete)
@@ -350,7 +350,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
       })

+ 2 - 2
src/views/basic/maintenanceWorkerCategory/index.vue

@@ -109,14 +109,14 @@ export default {
   },
   created() {
     this.getList()
-    this.getButtons()
+    this.get_auto_buttons()
   },
 
   methods: {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const WorkerAdd = 'basic:worker:add'
       const isWorkerAdd = checkButtons(this.$store.state.user.buttons, WorkerAdd)

+ 2 - 2
src/views/basic/otherinfo/index - 副本.vue

@@ -486,7 +486,7 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -539,7 +539,7 @@ export default {
       })
     },
 
-    getDownList() {
+    get_select_list() {
       this.requestParams[5].params[0] = this.$store.state.user.pastureid
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list

+ 4 - 4
src/views/basic/otherinfo/index.vue

@@ -379,15 +379,15 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getDepartDownList()
   },
 
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 导出
       const OtherinfoExport = 'basic:otherinfo:otherinfoExport'
       const isOtherinfoExport = checkButtons(this.buttons, OtherinfoExport)
@@ -451,7 +451,7 @@ export default {
       })
     },
 
-    getDownList() {
+    get_select_list() {
       this.requestParams[5].params[0] = this.$store.state.user.pastureid
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list

+ 4 - 4
src/views/basic/product/index.vue

@@ -509,9 +509,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    // this.getDownList()
+    // this.get_select_list()
     this.getList()
     this.getStockList()
     this.geteqList()
@@ -522,7 +522,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const ProductAdd = 'basic:product:add'
       const isProductAdd = checkButtons(this.$store.state.user.buttons, ProductAdd)
@@ -587,7 +587,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         // this.findAllProvider = response.data.findAllProvider.list
       //  this.findAllAssetType = response.data.findAllAssetType.list

+ 2 - 2
src/views/basic/warehouse/index.vue

@@ -277,14 +277,14 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
   },
   methods: {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const WarehouseImport = 'basic:warehouse:upload'
       const isWarehouseImport = checkButtons(this.$store.state.user.buttons, WarehouseImport)

+ 2 - 2
src/views/console/apisql/index.vue

@@ -369,7 +369,7 @@ export default {
         })
       }
     },
-    getDownList() {
+    get_select_list() {
       GetDataByName(this.getRecuListParm).then(response => {
         console.log(response)
         this.parent = response.data
@@ -386,7 +386,7 @@ export default {
     getList() {
       this.menuid = 0
       this.listLoading = true
-      this.getDownList()
+      this.get_select_list()
       GetDataByName(this.getdataListParm).then(response => {
         console.log(response)
         this.list = response.data.list

+ 2 - 2
src/views/console/assetType/index.vue

@@ -174,7 +174,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getList()
   },
@@ -182,7 +182,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const AssetTypeAdd = 'console:assetType:insert'
       const isAssetTypeAdd = checkButtons(this.$store.state.user.buttons, AssetTypeAdd)

+ 2 - 2
src/views/console/dict/index.vue

@@ -246,14 +246,14 @@ export default {
         })
       }
     },
-    getDownList() {
+    get_select_list() {
       getRecuData(this.getRecuListParm).then(response => {
         this.parent = response.data
       })
     },
     getList() {
       this.listLoading = true
-      this.getDownList()
+      this.get_select_list()
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
         if (response.data.total) {

+ 4 - 4
src/views/console/emp/index.vue

@@ -289,14 +289,14 @@ export default {
   },
   created() {
     this.getList()
-    this.getButtons()
+    this.get_auto_buttons()
   },
 
   methods: {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const EmpAdd = 'console:emp:add'
       const isEmpAdd = checkButtons(this.$store.state.user.buttons, EmpAdd)
@@ -331,7 +331,7 @@ export default {
         if (response.data.total) {
           this.total = response.data.total
         }
-        this.getDownList()
+        this.get_select_list()
         this.getDeptList()
         // Just to simulate the time of the request
         setTimeout(() => {
@@ -340,7 +340,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
       })

+ 2 - 2
src/views/console/feedings/index.vue

@@ -245,7 +245,7 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -253,7 +253,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
       })

+ 2 - 2
src/views/console/menu/index.vue

@@ -284,14 +284,14 @@ export default {
           this.list = transData(response.data.list, 'id', 'parentid', 'children')
           console.log(this.list, '-----------------')
         }
-        this.getDownList()
+        this.get_select_list()
         // Just to simulate the time of the request
         setTimeout(() => {
           this.listLoading = false
         }, 0.5 * 1000)
       })
     },
-    getDownList() {
+    get_select_list() {
       GetDataByName(this.getRecuListParm).then(response => {
         if (response.data.list !== null) {
           this.parentmenu = transData(response.data.list, 'id', 'parentid', 'children')

+ 2 - 2
src/views/console/ranchManagement/index.vue

@@ -183,11 +183,11 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
   methods: {
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.regionList = response.data.getareaList.list

+ 2 - 2
src/views/console/safetyStock/index.vue

@@ -263,7 +263,7 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getTypeList()
   },
@@ -287,7 +287,7 @@ export default {
     handleSelectProvider(item) {
       console.log('供应商模糊查询选中值', item)
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
       })

+ 2 - 2
src/views/console/stockType/index.vue

@@ -188,7 +188,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getList()
   },
@@ -196,7 +196,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const StockTypeAdd = 'console:stockType:insert'
       const isStockTypeAdd = checkButtons(this.$store.state.user.buttons, StockTypeAdd)

+ 2 - 2
src/views/console/user/index.vue

@@ -254,7 +254,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getList()
   },
@@ -262,7 +262,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const UserAdd = 'console:user:add'
       const isUserAdd = checkButtons(this.$store.state.user.buttons, UserAdd)

+ 2 - 2
src/views/console/user/index备份.vue

@@ -253,7 +253,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getList()
   },
@@ -261,7 +261,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const UserAdd = 'console:user:add'
       const isUserAdd = checkButtons(this.$store.state.user.buttons, UserAdd)

+ 2 - 2
src/views/console/user/index改好 - 副本.vue

@@ -251,12 +251,12 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getList()
   },
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const UserAdd = 'console:user:add'
       const isUserAdd = checkButtons(this.$store.state.user.buttons, UserAdd)

+ 2 - 2
src/views/console/user/index改好.vue

@@ -251,12 +251,12 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     this.getList()
   },
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const UserAdd = 'console:user:add'
       const isUserAdd = checkButtons(this.$store.state.user.buttons, UserAdd)

+ 2 - 2
src/views/cost/budget/index.vue

@@ -291,14 +291,14 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
   },
 
   methods: {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllPasture = response.data.findAllPasture.list

+ 4 - 4
src/views/cost/diesel/index.vue

@@ -485,9 +485,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -498,7 +498,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listDosageRecord)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const DieselAdd = 'cost:diesel:add'
       const isDieselAdd = checkButtons(this.$store.state.user.buttons, DieselAdd)
@@ -797,7 +797,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/cost/elec/index.vue

@@ -483,9 +483,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -496,7 +496,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listDosageRecord)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const ElecAdd = 'cost:elec:add'
       const isElecAdd = checkButtons(this.$store.state.user.buttons, ElecAdd)
@@ -749,7 +749,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/cost/gas/index.vue

@@ -332,9 +332,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -345,7 +345,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listDosageRecord)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const GasAdd = 'cost:gas:add'
       const isGasAdd = checkButtons(this.$store.state.user.buttons, GasAdd)
@@ -576,7 +576,7 @@ export default {
         }, 100)
       })
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/cost/generation/index.vue

@@ -203,13 +203,13 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const GenerationAdd = 'cost:generation:add'
       const isGenerationAdd = checkButtons(this.$store.state.user.buttons, GenerationAdd)
@@ -245,7 +245,7 @@ export default {
     form_search() {
       this.getList()
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllEmploye = response.data.findAllEmploye.list

+ 4 - 4
src/views/cost/methane/index.vue

@@ -510,14 +510,14 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const MethaneAdd = 'cost:methane:add'
       const isMethaneAdd = checkButtons(this.$store.state.user.buttons, MethaneAdd)
@@ -794,7 +794,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 2 - 2
src/views/cost/other/index.vue

@@ -330,7 +330,7 @@ export default {
 
   created() {
     this.getList()
-    this.getDownList()
+    this.get_select_list()
   },
 
   methods: {
@@ -351,7 +351,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/cost/steam/index.vue

@@ -484,9 +484,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -497,7 +497,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listDosageRecord)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const SteamAdd = 'cost:steam:add'
       const isSteamAdd = checkButtons(this.$store.state.user.buttons, SteamAdd)
@@ -782,7 +782,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/cost/water/index.vue

@@ -473,9 +473,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -486,7 +486,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listDosageRecord)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const PermissionButtons = 'cost:water:add'
       const isWaterAdd = checkButtons(this.$store.state.user.buttons, PermissionButtons)
@@ -755,7 +755,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.getDictByName = response.data.getDictByName.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 2 - 2
src/views/custom/allot/index.vue

@@ -554,7 +554,7 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -989,7 +989,7 @@ export default {
       })
     },
 
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllPasture = response.data.findAllPasture.list

+ 2 - 2
src/views/custom/allot/index1.vue

@@ -536,7 +536,7 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -858,7 +858,7 @@ export default {
       })
     },
 
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllPasture = response.data.findAllPasture.list

+ 4 - 4
src/views/custom/basic/index.vue

@@ -908,9 +908,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getDownClassList()
     this.getList()
     this.getMaxCode()
@@ -938,7 +938,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const BasicAdd = 'customs:basic:add'
       const isBasicAdd = checkButtons(this.$store.state.user.buttons, BasicAdd)
@@ -1074,7 +1074,7 @@ export default {
         this.$notify({ title: '提示', message: '请勾选启用备件', type: 'error', duration: 2000 })
       }
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.units = response.data.getDictByName.list
         this.findAllProvider = response.data.findAllProvider.list

+ 4 - 4
src/views/custom/contract/index.vue

@@ -1258,13 +1258,13 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const ContractAdd = 'customs:contract:add'
       const isContractAdd = checkButtons(this.$store.state.user.buttons, ContractAdd)
@@ -1312,7 +1312,7 @@ export default {
       const isContractExamineZX = checkButtons(this.$store.state.user.buttons, ContractExamineZX)
       this.isContractExamineZX = isContractExamineZX
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/custom/contractManagement/index.vue

@@ -1298,11 +1298,11 @@ export default {
   created() {
     // this.keyupSubmit()
     console.log(this.$route.query.contractCode)
-    this.getDownList()
+    this.get_select_list()
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
 
     this.getTab1List()
@@ -1321,7 +1321,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.tab2.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const ContractAdd = 'customs:contract:add'
       const isContractAdd = checkButtons(this.$store.state.user.buttons, ContractAdd)
@@ -1353,7 +1353,7 @@ export default {
       const isContractChange = checkButtons(this.$store.state.user.buttons, ContractChange)
       this.tab1.contractManagement.isContractChange = isContractChange
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/custom/custom/index.vue

@@ -822,7 +822,7 @@ export default {
   },
   created() {
     this.getTypeList()
-    this.getDownList()
+    this.get_select_list()
     this.getDownClassList()
     this.getList()
 
@@ -830,7 +830,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
   },
 
@@ -851,7 +851,7 @@ export default {
         sortChange(column, this.listRecord)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
       const CustomTemplate = 'customs:custom:template'
       const isCustomTemplate = checkButtons(this.$store.state.user.buttons, CustomTemplate)
       this.isCustomTemplate = isCustomTemplate
@@ -881,7 +881,7 @@ export default {
         this.parentDept = this.listType
       })
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProviderByCt.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/custom/inventory/index.vue

@@ -670,15 +670,15 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getTypeList()
   },
 
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       var CustomAdd = 'customs:custom:add'
       var isCustomAdd = checkButtons(this.$store.state.user.buttons, CustomAdd)
@@ -814,7 +814,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllAssetType = response.data.findAllAssetType.list
         this.findAllPasture = response.data.findAllPasture.list

+ 2 - 2
src/views/custom/outRecord/index.vue

@@ -433,7 +433,7 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getListImportInfo()
   },
 
@@ -476,7 +476,7 @@ export default {
       this.getListImportInfo()
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 5 - 5
src/views/custom/outStock/index.vue

@@ -1346,9 +1346,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getTypeList()
   },
@@ -1464,7 +1464,7 @@ export default {
     },
 
 
-    getButtons() {
+    get_auto_buttons() {
 
       const Outsap = 'customs:outStock:sap'
       const isOutsap = checkButtons(this.$store.state.user.buttons, OutStockAdd)
@@ -1554,7 +1554,7 @@ export default {
       console.log(item)
     },
     // ---------------------------------------------
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list
@@ -1883,7 +1883,7 @@ export default {
               response.data.list[i].applyType = '物耗'
               this.getDictByName = [{ 'id': 61, 'label': '物耗', 'value': '物耗' }, { 'id': 62, 'label': '土建', 'value': '土建' }, { 'id': 229, 'label': '工具', 'value': '工具' }]
             } else {
-              this.getDownList()
+              this.get_select_list()
             }
             // response.data.list[i].useTypeV = response.data.list[i].applyType
             this.$set(response.data.list[i], 'useTypeV', response.data.list[i].applyType)

+ 5 - 5
src/views/custom/outStock/index1.vue

@@ -1296,9 +1296,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getTypeList()
   },
@@ -1314,7 +1314,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listSee)
     },
-    getButtons() {
+    get_auto_buttons() {
       const OutStockAdd = 'customs:outStock:add'
       const isOutStockAdd = checkButtons(this.$store.state.user.buttons, OutStockAdd)
       this.isOutStockAdd = isOutStockAdd
@@ -1399,7 +1399,7 @@ export default {
       console.log(item)
     },
     // ---------------------------------------------
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list
@@ -1724,7 +1724,7 @@ export default {
               response.data.list[i].applyType = '物耗'
               this.getDictByName = [{ 'id': 61, 'label': '物耗', 'value': '物耗' }, { 'id': 62, 'label': '土建', 'value': '土建' }, { 'id': 229, 'label': '工具', 'value': '工具' }]
             } else {
-              this.getDownList()
+              this.get_select_list()
             }
             // response.data.list[i].useTypeV = response.data.list[i].applyType
             this.$set(response.data.list[i], 'useTypeV', response.data.list[i].applyType)

+ 4 - 4
src/views/custom/purchase/index.vue

@@ -1252,7 +1252,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
       if (this.isDistributionSheet == true) {
         this.activeName = 'first'
         console.log(1, this.isDistributionSheet, this.isDistributionManagement)
@@ -1264,7 +1264,7 @@ export default {
         console.log(3, this.isDistributionSheet, this.isDistributionManagement)
       }
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList1()
     this.getList2()
     this.getList3()
@@ -1296,7 +1296,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listSee2)
     },
-    getButtons() {
+    get_auto_buttons() {
       const DistributionSheet = 'customs:purchase:distributionSheet'
       const isDistributionSheet = checkButtons(this.$store.state.user.buttons, DistributionSheet)
       this.isDistributionSheet = isDistributionSheet
@@ -1374,7 +1374,7 @@ export default {
         this.getList3()
       }
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllEmploye = response.data.findAllEmploye.list
         this.findAllPasture = response.data.findAllPasture.list

+ 4 - 4
src/views/custom/purchase/index1.vue

@@ -1238,7 +1238,7 @@ export default {
     const that = this
     // GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
     //   that.buttons = response.data.list
-    //   that.getButtons()
+    //   that.get_auto_buttons()
     //   if (this.isDistributionSheet == true) {
     //     this.activeName = 'first'
     //     console.log(1, this.isDistributionSheet, this.isDistributionManagement)
@@ -1250,7 +1250,7 @@ export default {
     //     console.log(3, this.isDistributionSheet, this.isDistributionManagement)
     //   }
     // })
-    // this.getDownList()
+    // this.get_select_list()
     // this.getList1()
     // this.getList2()
     // this.getList3()
@@ -1281,7 +1281,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listSee2)
     },
-    getButtons() {
+    get_auto_buttons() {
       const DistributionSheet = 'customs:purchase:distributionSheet'
       const isDistributionSheet = checkButtons(this.$store.state.user.buttons, DistributionSheet)
       this.isDistributionSheet = isDistributionSheet
@@ -1359,7 +1359,7 @@ export default {
         this.getList3()
       }
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllEmploye = response.data.findAllEmploye.list
         this.findAllPasture = response.data.findAllPasture.list

+ 4 - 4
src/views/custom/receive/index.vue

@@ -671,9 +671,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getPendingList()
   },
@@ -682,7 +682,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.listSee)
     },
-    getButtons() {
+    get_auto_buttons() {
       if (Cookies.get('depids') !== undefined) {
         this.depids = Cookies.get('depids').split(',')
       } else {
@@ -1313,7 +1313,7 @@ export default {
         }
       })
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllEmploye = response.data.findAllEmploye.list

+ 2 - 2
src/views/custom/record/index.vue

@@ -394,7 +394,7 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getListImportInfo()
   },
 
@@ -535,7 +535,7 @@ export default {
       this.getListImportInfo()
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/custom/refuse/index.vue

@@ -395,9 +395,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -405,7 +405,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 销毁/卖掉
       const Old = 'customs:receive:old'
       const isOld = checkButtons(this.$store.state.user.buttons, Old)
@@ -462,7 +462,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 4 - 4
src/views/custom/retreat/index.vue

@@ -800,9 +800,9 @@ export default {
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
       console.log(that.buttons, 'that.buttons')
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -813,7 +813,7 @@ export default {
     tableSort2(column) {
       sortChange(column, this.listSee)
     },
-    getButtons() {
+    get_auto_buttons() {
       const RetreatAdd = 'customs:Retreat:add'
       const isRetreatAdd = checkButtons(this.$store.state.user.buttons, RetreatAdd)
       this.isRetreatAdd = isRetreatAdd
@@ -1393,7 +1393,7 @@ export default {
         this.$refs['temp'].clearValidate()
       })
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllPasture = response.data.findAllPasture.list

+ 4 - 4
src/views/custom/returngoods/index.vue

@@ -852,9 +852,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getPendingList()
   },
@@ -867,7 +867,7 @@ export default {
         sortChange(column, this.list2)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
 
 
       
@@ -1599,7 +1599,7 @@ export default {
         return false
       }
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllPasture = response.data.findAllPasture.list

+ 4 - 4
src/views/custom/storage/index.vue

@@ -979,13 +979,13 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getList2()
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
   },
 
@@ -997,7 +997,7 @@ export default {
         sortChange(column, this.listSee)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
 
  
@@ -1062,7 +1062,7 @@ export default {
       const isIgnoreSynchronization = checkButtons(this.$store.state.user.buttons, IgnoreSynchronization)
       this.isIgnoreSynchronization = isIgnoreSynchronization
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         console.log('下拉框数据', response.data)
         this.findAllProvider = response.data.findAllProviderByCt.list

+ 4 - 4
src/views/custom/subscribe/index.vue

@@ -619,9 +619,9 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getPendingList()
   },
@@ -630,7 +630,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.listSee)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const SubscribeAdd = 'customs:subscribe:add'
       const isSubscribeAdd = checkButtons(this.$store.state.user.buttons, SubscribeAdd)
@@ -1300,7 +1300,7 @@ export default {
         return false
       }
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllPasture = response.data.findAllPasture.list

+ 4 - 4
src/views/custom/writeoff/index.vue

@@ -220,14 +220,14 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const WriteoffAdd = 'customs:writeoff:add'
       const isWriteoffAdd = checkButtons(this.$store.state.user.buttons, WriteoffAdd)
@@ -453,7 +453,7 @@ export default {
       })
     },
 
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllPasture = response.data.findAllPasture.list

+ 4 - 4
src/views/custom/writeoff/index1.vue

@@ -220,14 +220,14 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 新增
       const WriteoffAdd = 'customs:writeoff:add'
       const isWriteoffAdd = checkButtons(this.$store.state.user.buttons, WriteoffAdd)
@@ -447,7 +447,7 @@ export default {
       })
     },
 
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllPasture = response.data.findAllPasture.list

+ 2 - 2
src/views/electro/electroData/index.vue

@@ -486,7 +486,7 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -526,7 +526,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 2 - 2
src/views/evaluationVerification/assessment/index.vue

@@ -511,12 +511,12 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     console.log(this.uploadImageUrl)
   },
   methods: {
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllEmploye = response.data.findAllEmploye.list

+ 4 - 4
src/views/maintenance/maintain/index.vue

@@ -1138,7 +1138,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'MaintenancePlan') {
       this.getdataListParm.parammaps.eqCode = this.$route.query.eqCode
@@ -1146,7 +1146,7 @@ export default {
       this.getdataListParm.parammaps.startTime = this.$route.query.time
       this.getdataListParm.parammaps.stopTime = this.$route.query.time
     }
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getPendingList()
   },
@@ -1162,7 +1162,7 @@ export default {
         sortChange(column, this.listOldProducts)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
       // 查看
       const See = 'maintenance:maintain:see'
       const isSee = checkButtons(JSON.parse(sessionStorage.buttons), See)
@@ -1192,7 +1192,7 @@ export default {
     //   if (this.active++ > 2) this.active = 0
     //   this.finishStatus = 'error'
     // },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllEmploye = response.data.findAllEmploye.list

+ 4 - 4
src/views/maintenance/maintain/index备份.vue

@@ -1137,7 +1137,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'MaintenancePlan') {
       this.getdataListParm.parammaps.eqCode = this.$route.query.eqCode
@@ -1145,7 +1145,7 @@ export default {
       this.getdataListParm.parammaps.startTime = this.$route.query.time
       this.getdataListParm.parammaps.stopTime = this.$route.query.time
     }
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getPendingList()
   },
@@ -1161,7 +1161,7 @@ export default {
         sortChange(column, this.listOldProducts)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
       // 查看
       const See = 'maintenance:maintain:see'
       const isSee = checkButtons(JSON.parse(sessionStorage.buttons), See)
@@ -1191,7 +1191,7 @@ export default {
     //   if (this.active++ > 2) this.active = 0
     //   this.finishStatus = 'error'
     // },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllEmploye = response.data.findAllEmploye.list

+ 4 - 4
src/views/maintenance/maintain/index改好.vue

@@ -1136,7 +1136,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'MaintenancePlan') {
       this.getdataListParm.parammaps.eqCode = this.$route.query.eqCode
@@ -1144,7 +1144,7 @@ export default {
       this.getdataListParm.parammaps.startTime = this.$route.query.time
       this.getdataListParm.parammaps.stopTime = this.$route.query.time
     }
-    this.getDownList()
+    this.get_select_list()
     this.getList()
     this.getPendingList()
   },
@@ -1160,7 +1160,7 @@ export default {
         sortChange(column, this.listOldProducts)
       }
     },
-    getButtons() {
+    get_auto_buttons() {
       // 查看
       const See = 'maintenance:maintain:see'
       const isSee = checkButtons(JSON.parse(sessionStorage.buttons), See)
@@ -1190,7 +1190,7 @@ export default {
     //   if (this.active++ > 2) this.active = 0
     //   this.finishStatus = 'error'
     // },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllEmploye = response.data.findAllEmploye.list

+ 4 - 4
src/views/maintenance/maintenancePlan/index.vue

@@ -309,17 +309,17 @@ export default {
       this.getList()
     }
     this.getTypeList()
-    this.getDownList()
+    this.get_select_list()
     this.getMonths()
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
     // 新增
   },
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 复制
       const MaintenancePlanCopy = 'maintenance:maintenancePlan:copy'
       const isMaintenancePlanCopy = checkButtons(this.$store.state.user.buttons, MaintenancePlanCopy)
@@ -358,7 +358,7 @@ export default {
         }
       })
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllEmploye = response.data.findAllEmploye.list

+ 4 - 4
src/views/maintenance/repair/index.vue

@@ -1680,7 +1680,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
   },
   methods: {
@@ -1693,7 +1693,7 @@ export default {
     tableSort3(column) {
       sortChange(column, this.procurementList)
     },
-    getButtons() {
+    get_auto_buttons() {
       // 报修
       const Repair = 'maintenance:repair:baoxiu'
       const isRepair = checkButtons(this.buttons, Repair)
@@ -1738,11 +1738,11 @@ export default {
       const RejectExport = 'maintenance:repair:rejectExport'
       const isRepairExport = checkButtons(this.buttons, RejectExport)
       this.isRepairExport = isRepairExport
-      this.getDownList()
+      this.get_select_list()
       this.getList()
       this.getPendingList()
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllDepart = response.data.findAllDepart1.list

+ 4 - 4
src/views/maintenance/spotCheck/index.vue

@@ -481,14 +481,14 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 点检
       const SpotCheckAdd = 'maintenance:spotCheck:add'
       const isSpotCheckAdd = checkButtons(this.$store.state.user.buttons, SpotCheckAdd)
@@ -699,7 +699,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 2 - 2
src/views/maintenance/upkeep/index.vue

@@ -526,7 +526,7 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
@@ -565,7 +565,7 @@ export default {
       })
     },
     // 2-2:下拉框
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllProvider = response.data.findAllProvider.list
         this.findAllAssetType = response.data.findAllAssetType.list

+ 2 - 2
src/views/report/consume/index.vue

@@ -254,11 +254,11 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
   methods: {
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllDepart = response.data.findAllDepart.list

+ 2 - 2
src/views/report/farmEquipment/index.vue

@@ -560,7 +560,7 @@ export default {
   },
   created() {
     this.getlistEquipmentIndex()
-    this.getDownList()
+    this.get_select_list()
   },
 
   methods: {
@@ -598,7 +598,7 @@ export default {
     tableSort9(column) {
       sortChange(column, this.dialog.list)
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
       })

+ 2 - 2
src/views/report/inventorySpareParts/index.vue

@@ -90,14 +90,14 @@ export default {
     }
   },
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
   methods: {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
       })

+ 2 - 2
src/views/report/inventorySummary/index.vue

@@ -174,7 +174,7 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
   mounted() {
@@ -188,7 +188,7 @@ export default {
       sortChange(column, this.table2.list)
     },
 
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
       })

+ 2 - 2
src/views/report/inventorySummary/index1.vue

@@ -172,7 +172,7 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
   mounted() {
@@ -186,7 +186,7 @@ export default {
       sortChange(column, this.table2.list)
     },
 
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.findAllPasture = response.data.findAllPasture.list
       })

+ 2 - 2
src/views/report/maintenanceCategoryAnalysis/index.vue

@@ -324,11 +324,11 @@ export default {
       GetDataByName(this.getPastureidParm).then(response => {
         if (response.data.list !== null) {
           this.requestParams[2].parammaps.pastureId = response.data.list[0].id
-          this.getDownList()
+          this.get_select_list()
         }
       })
     },
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         this.equipmentCategoryList = response.data.geteqclasslistSection.list
         this.findAllPasture = response.data.findAllPasture.list

+ 12 - 2
src/views/report/maintenanceCycle/index.vue

@@ -44,6 +44,10 @@
         start-placeholder="维修开始时间"
         end-placeholder="维修结束时间"
       />
+
+
+      
+
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <el-button class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
     </div>
@@ -115,6 +119,12 @@ export default {
           }
         }
       },
+
+      //  下拉框 - 状态 
+      typeNameList: [
+        {id: "刮粪机", name: "刮粪机"}
+      ], 
+
       downLoadParm: {},
       downLoadList: [],
       isPercentage: false,
@@ -127,12 +137,12 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getList()
   },
 
   methods: {
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         if (response.data.list !== null) {
           this.findAllPasture = response.data.findAllPasture.list

+ 250 - 0
src/views/report/maintenanceCycle/index1.vue

@@ -0,0 +1,250 @@
+<template>
+  <div class="app-container">
+    <div v-if="isPercentage" class="percentage" style="width: 210px;height: 90px;background: #fff;position: fixed;bottom: 0;left: 0;z-index: 9999999999999;">
+      <h4 style="padding-left: 10px;line-height: 0;">导出进度:</h4>
+      <el-progress style="padding-left: 10px;" :text-inside="true" :stroke-width="26" :percentage="percentage" />
+    </div>
+    <div class="filter-container">
+      <el-select v-model="table.getdataListParm.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;">
+        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+      </el-select>
+      <el-date-picker
+        ref="BXinputDatetime"
+        v-model="table.getdataListParm.parammaps.BXinputDatetime"
+        class="inputDatetime"
+        type="datetimerange"
+        style="width: 270px;top:-3px;"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        range-separator="至"
+        start-placeholder="报修开始时间"
+        end-placeholder="报修结束时间"
+      />
+      <el-date-picker
+        ref="JDinputDatetime"
+        v-model="table.getdataListParm.parammaps.JDinputDatetime"
+        class="inputDatetime"
+        type="datetimerange"
+        style="width: 270px;top:-3px;"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        range-separator="至"
+        start-placeholder="接单开始时间"
+        end-placeholder="接单结束时间"
+      />
+      <el-date-picker
+        ref="useSHinputDatetime"
+        v-model="table.getdataListParm.parammaps.useSHinputDatetime"
+        class="inputDatetime"
+        type="datetimerange"
+        style="width: 270px;top:-3px;"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        range-separator="至"
+        start-placeholder="维修开始时间"
+        end-placeholder="维修结束时间"
+      />
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+      <el-button class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
+    </div>
+    <el-table
+      :key="table.tableKey"
+      v-loading="table.listLoading"
+      element-loading-text="给我一点时间"
+      :data="table.list"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;"
+      :row-style="rowStyle"
+      :cell-style="cellStyle"
+      class="elTable"
+    >
+      <el-table-column label="序号" align="center" type="index" width="50px">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="牧场" min-width="90px" align="center" prop="pastureName" />
+      <el-table-column label="单号" min-width="90px" align="center" prop="repairCode" />
+      <el-table-column label="设备类别" min-width="90px" align="center" prop="eqClassName" />
+      <el-table-column label="设备名称" min-width="90px" align="center" prop="eqName" />
+      <el-table-column label="设备内部编号" min-width="90px" align="center" prop="eqCode" />
+      <el-table-column label="报修日期" min-width="70px" align="center" prop="BXTime" />
+      <el-table-column label="接单间隔" min-width="90px" sortable align="center" prop="BxAndJd" />
+      <el-table-column label="接单日期" min-width="90px" sortable align="center" prop="JDTime" />
+      <el-table-column label="维修间隔" min-width="70px" sortable align="center" prop="JdAndWx" />
+      <el-table-column label="维修日期" min-width="90px" sortable align="center" prop="WXTime" />
+      <el-table-column label="总维修时长" min-width="90px" sortable align="center" prop="WxAndJS" />
+      <el-table-column label="完成维修日期" min-width="70px" sortable align="center" prop="JSTime" />
+      <el-table-column label="确认间隔" min-width="70px" sortable align="center" prop="JSAnduseSH" />
+      <el-table-column label="使用人确认日期" min-width="70px" sortable align="center" prop="useSHTime" />
+    </el-table>
+    <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+  </div>
+
+</template>
+
+<script>
+import waves from '@/directive/waves' // waves directive
+import Pagination from '@/components/Pagination' // secondary package based on el-pagination
+import { GetDataByName, GetDataByNames } from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+import Cookies from 'js-cookie'
+export default {
+  name: 'MaintenanceCycle',
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
+      table: {
+        tableKey: 0,
+        list: [],
+        total: 0,
+        listLoading: true,
+        getdataListParm: {
+          name: 'getAlleqWX',
+          page: 1, offset: 1, pagecount: 10, returntype: 'Map',
+          parammaps: {
+            BXinputDatetime: '', SGTimeStart: '', SGTimeEnd: '',
+            JDinputDatetime: '', JDTimeStart: '', JDTimeEnd: '',
+            useSHinputDatetime: '', useSHTimeStart: '', useSHTimeEnd: '',
+            pastureName: Cookies.get('pasturename')
+          }
+        }
+      },
+      downLoadParm: {},
+      downLoadList: [],
+      isPercentage: false,
+      percentage: 1,
+      findAllPasture: [],
+      requestParams: [
+        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }}
+      ]
+    }
+  },
+
+  created() {
+    this.get_select_list()
+    this.getList()
+  },
+
+  methods: {
+    get_select_list() {
+      GetDataByNames(this.requestParams).then(response => {
+        if (response.data.list !== null) {
+          this.findAllPasture = response.data.findAllPasture.list
+        }
+      })
+    },
+    getList() {
+      this.table.listLoading = true
+      GetDataByName(this.table.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          for (let i = 0; i < response.data.list.length; i++) {
+            if (response.data.list[i].BxAndJd !== undefined) {
+              this.$set(response.data.list[i], 'BxAndJd', parseFloat(response.data.list[i].BxAndJd))
+            }
+            if (response.data.list[i].JdAndWx !== undefined) {
+              this.$set(response.data.list[i], 'JdAndWx', parseFloat(response.data.list[i].JdAndWx))
+            }
+            if (response.data.list[i].WxAndJS !== undefined) {
+              this.$set(response.data.list[i], 'WxAndJS', parseFloat(response.data.list[i].WxAndJS))
+            }
+            if (response.data.list[i].JSAnduseSH !== undefined) {
+              this.$set(response.data.list[i], 'JSAnduseSH', parseFloat(response.data.list[i].JSAnduseSH))
+            }
+          }
+          this.table.list = response.data.list
+          this.table.pageNum = response.data.pageNum
+          this.table.pageSize = response.data.pageSize
+          this.table.total = response.data.total
+        } else {
+          this.table.list = []
+          this.table.total = 0
+        }
+
+        setTimeout(() => {
+          this.table.listLoading = false
+        }, 100)
+      })
+    },
+    form_search() {
+      this.table.listLoading = true
+      this.table.getdataListParm.offset = 1
+      if (this.table.getdataListParm.parammaps.BXinputDatetime !== [] && this.table.getdataListParm.parammaps.BXinputDatetime !== '' && this.table.getdataListParm.parammaps.BXinputDatetime !== null) {
+        if (this.table.getdataListParm.parammaps.BXinputDatetime.length !== 0) {
+          this.table.getdataListParm.parammaps.BXTimeStart = parseTime(this.table.getdataListParm.parammaps.BXinputDatetime[0], '{y}-{m}-{d}')
+          this.table.getdataListParm.parammaps.BXTimeEnd = parseTime(this.table.getdataListParm.parammaps.BXinputDatetime[1], '{y}-{m}-{d}')
+        }
+      } else {
+        this.table.getdataListParm.parammaps.BXinputDatetime = []
+        this.table.getdataListParm.parammaps.BXTimeStart = ''
+        this.table.getdataListParm.parammaps.BXTimeEnd = ''
+      }
+      if (this.table.getdataListParm.parammaps.JDinputDatetime !== [] && this.table.getdataListParm.parammaps.JDinputDatetime !== '' && this.table.getdataListParm.parammaps.JDinputDatetime !== null) {
+        if (this.table.getdataListParm.parammaps.JDinputDatetime.length !== 0) {
+          this.table.getdataListParm.parammaps.JDTimeStart = parseTime(this.table.getdataListParm.parammaps.JDinputDatetime[0], '{y}-{m}-{d}')
+          this.table.getdataListParm.parammaps.JDTimeEnd = parseTime(this.table.getdataListParm.parammaps.JDinputDatetime[1], '{y}-{m}-{d}')
+        }
+      } else {
+        this.table.getdataListParm.parammaps.JDinputDatetime = []
+        this.table.getdataListParm.parammaps.JDTimeStart = ''
+        this.table.getdataListParm.parammaps.JDTimeEnd = ''
+      }
+      if (this.table.getdataListParm.parammaps.useSHinputDatetime !== [] && this.table.getdataListParm.parammaps.useSHinputDatetime !== '' && this.table.getdataListParm.parammaps.useSHinputDatetime !== null) {
+        if (this.table.getdataListParm.parammaps.useSHinputDatetime.length !== 0) {
+          this.table.getdataListParm.parammaps.useSHTimeStart = parseTime(this.table.getdataListParm.parammaps.useSHinputDatetime[0], '{y}-{m}-{d}')
+          this.table.getdataListParm.parammaps.useSHTimeEnd = parseTime(this.table.getdataListParm.parammaps.useSHinputDatetime[1], '{y}-{m}-{d}')
+        }
+      } else {
+        this.table.getdataListParm.parammaps.useSHinputDatetime = []
+        this.table.getdataListParm.parammaps.useSHTimeStart = ''
+        this.table.getdataListParm.parammaps.useSHTimeEnd = ''
+      }
+      this.getList()
+    },
+    handleDownload() {
+      this.$alert('维修周期效率统计正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
+      this.isPercentage = true
+      this.percentage = 1
+      var timer = setInterval(() => {
+        this.percentage += 5
+        if (this.percentage > 95) {
+          this.percentage = 99
+          clearInterval(timer)
+        }
+        this.percentage = this.percentage
+      }, 1000)
+      this.form_search()
+      this.downLoadParm.getdataListParm = {}
+      this.downLoadParm.getdataListParm.name = 'getAlleqWX'
+      this.downLoadParm.getdataListParm.pagecount = 0
+      this.downLoadParm.getdataListParm.parammaps = this.table.getdataListParm.parammaps
+      GetDataByName(this.downLoadParm.getdataListParm).then(response => {
+        if (response.data.list !== '') {
+          this.percentage = 99
+          setTimeout(() => {
+            this.isPercentage = false
+          }, 2000)
+        }
+        this.$nextTick(() => {
+          this.downLoadParm.list = response.data.list
+          var excelDatas = [
+            {
+              tHeader: ['牧场', '单号', '设备类别', '设备名称', '设备内部编号', '报修日期', '接单间隔', '接单日期', '维修间隔', '维修日期', '总维修时长', '完成维修日期', '确认间隔', '使用人确认时间'],
+              filterVal: ['pastureName', 'repairCode', 'eqClassName', 'eqName', 'eqCode', 'BXTime', 'BxAndJd', 'JDTime', 'JdAndWx', 'WXTime', 'WxAndJS', 'JSTime', 'JSAnduseSH', 'useSHTime'],
+              tableDatas: this.downLoadParm.list,
+              sheetName: 'Sheet'
+            }
+          ]
+          json2excel(excelDatas, '维修周期效率统计', true, 'xlsx')
+        })
+      })
+    }
+  }
+}
+</script>

+ 2 - 2
src/views/report/purchaseAndwarehousing/index.vue

@@ -141,12 +141,12 @@ export default {
   },
 
   created() {
-    this.getDownList()
+    this.get_select_list()
     this.getTimeFn()
   },
 
   methods: {
-    getDownList() {
+    get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
         if (response.data.list !== null) {
           this.findAllPasture = response.data.findAllPasture.list

+ 2 - 2
src/views/report/queryCombustion/index.vue

@@ -217,7 +217,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
   },
   mounted() {
@@ -228,7 +228,7 @@ export default {
     // this.roadBarChart2(this.chart_data5, this.deptment)
   },
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 图1
       const BarChart1 = 'report:queryCombustion:pastures'
       const isBarChart1 = checkButtons(this.$store.state.user.buttons, BarChart1)

+ 2 - 2
src/views/report/queryElec/index.vue

@@ -202,7 +202,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
   },
   mounted() {
@@ -213,7 +213,7 @@ export default {
     // this.roadBarChart2(this.chart_data5, this.deptment)
   },
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 图1
       const BarChart1 = 'report:queryElec:pastures'
       const isBarChart1 = checkButtons(this.$store.state.user.buttons, BarChart1)

+ 2 - 2
src/views/report/queryRepair/index.vue

@@ -339,7 +339,7 @@ export default {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
-      that.getButtons()
+      that.get_auto_buttons()
     })
   },
   mounted() {
@@ -350,7 +350,7 @@ export default {
     // this.roadBarChart2(this.chart_data5, this.deptment)
   },
   methods: {
-    getButtons() {
+    get_auto_buttons() {
       // 图1
       const BarChart1 = 'report:queryRepair:pastures'
       const isBarChart1 = checkButtons(this.$store.state.user.buttons, BarChart1)

Some files were not shown because too many files changed in this diff